Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH/next 1/1] package/mplayer: bump version to 1.3.0
@ 2016-05-28  9:27 Bernd Kuhls
  2016-05-28 11:34 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Bernd Kuhls @ 2016-05-28  9:27 UTC (permalink / raw)
  To: buildroot

Added upstream commit to fix compilation when zlib is missing.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mplayer/0004-configure-zlib.patch | 30 ++++++++++++++++++++++++++++++
 package/mplayer/mplayer.hash              |  8 ++++----
 package/mplayer/mplayer.mk                |  2 +-
 3 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 package/mplayer/0004-configure-zlib.patch

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 33eba38..347ed5e 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
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH/next 1/1] package/mplayer: bump version to 1.3.0
  2016-05-28  9:27 [Buildroot] [PATCH/next 1/1] package/mplayer: bump version to 1.3.0 Bernd Kuhls
@ 2016-05-28 11:34 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2016-05-28 11:34 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 28 May 2016 11:27:24 +0200, Bernd Kuhls wrote:
> Added upstream commit to fix compilation when zlib is missing.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/mplayer/0004-configure-zlib.patch | 30 ++++++++++++++++++++++++++++++
>  package/mplayer/mplayer.hash              |  8 ++++----
>  package/mplayer/mplayer.mk                |  2 +-
>  3 files changed, 35 insertions(+), 5 deletions(-)
>  create mode 100644 package/mplayer/0004-configure-zlib.patch

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-05-28 11:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-28  9:27 [Buildroot] [PATCH/next 1/1] package/mplayer: bump version to 1.3.0 Bernd Kuhls
2016-05-28 11:34 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox