summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2016-05-28 09:27:24 (GMT)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-05-28 11:23:29 (GMT)
commit04658d5003353a84f120ed5ceb5d815f1a5b354d (patch)
tree9ab07ee491cf8bd064a196d63fc04ce156c7f307
parenta1db78af758f702e87144fdc5c3c1d154a8f723f (diff)
downloadbuildroot-next.tar.gz
buildroot-next.tar.bz2
package/mplayer: bump version to 1.3.0next
Added upstream commit to fix compilation when zlib is missing. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/mplayer/0004-configure-zlib.patch30
-rw-r--r--package/mplayer/mplayer.hash8
-rw-r--r--package/mplayer/mplayer.mk2
3 files changed, 35 insertions, 5 deletions
diff --git a/package/mplayer/0004-configure-zlib.patch b/package/mplayer/0004-configure-zlib.patch
new file mode 100644
index 0000000..7c1b2c8
--- /dev/null
+++ b/package/mplayer/0004-configure-zlib.patch
@@ -0,0 +1,30 @@
+configure: Fix compilation when zlib is missing.
+
+Downloaded from upstream commit:
+
+$ LC_ALL=C svn log -r 37816
+------------------------------------------------------------------------
+r37816 | reimar | 2016-02-28 14:39:42 +0100 (Sun, 28 Feb 2016) | 3 lines
+
+configure: Fix compilation when zlib is missing.
+
+APNG and a few other decoders also cannot be enabled without it.
+------------------------------------------------------------------------
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+Index: configure
+===================================================================
+--- a/configure (revision 37795)
++++ b/configure (revision 37816)
+@@ -6464,8 +6464,8 @@
+ mplayer_encoders="$mplayer_encoders PNG_ENCODER"
+ else
+ def_zlib='#define CONFIG_ZLIB 0'
+- libavdecoders=$(filter_out_component decoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M TSCC ZEROCODEC')
+- libavencoders=$(filter_out_component encoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB')
++ libavdecoders=$(filter_out_component decoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M RSCC SCREENPRESSO TDSC TSCC ZEROCODEC')
++ libavencoders=$(filter_out_component encoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB')
+ fi
+ echores "$_zlib"
+
diff --git a/package/mplayer/mplayer.hash b/package/mplayer/mplayer.hash
index 49c5631..e6b8842 100644
--- a/package/mplayer/mplayer.hash
+++ b/package/mplayer/mplayer.hash
@@ -1,4 +1,4 @@
-# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.2.tar.xz.md5
-md5 58409fccb8ef33013fb780405405491f MPlayer-1.2.tar.xz
-# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.2.tar.xz.sha1
-sha1 64fad840dfae466ab5ef3be2b6c74058892cd981 MPlayer-1.2.tar.xz
+# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz.md5
+md5 e8a4d77ad4f509e81dd5e13b51636c1d MPlayer-1.3.0.tar.xz
+# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz.sha1
+sha1 11db20434a4e1aabb9c52f7712241dae1b3730e3 MPlayer-1.3.0.tar.xz
diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index cbbd1e7..507fb5d 100644
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MPLAYER_VERSION = 1.2
+MPLAYER_VERSION = 1.3.0
MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
MPLAYER_DEPENDENCIES = host-pkgconf