[arch-commits] Commit in mplayer2/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Sunday, July 14, 2013 @ 11:00:47
  Author: bpiotrowski
Revision: 94077

upgpkg: mplayer2 20130428-2

- rebuild against ffmpeg 2.0

Added:
  mplayer2/trunk/0001-demux_gif-declare-missing-PrintGifError.patch
Modified:
  mplayer2/trunk/PKGBUILD

----------------------------------------------------+
 0001-demux_gif-declare-missing-PrintGifError.patch |   34 +++++++++++++++++++
 PKGBUILD                                           |   10 +++--
 2 files changed, 41 insertions(+), 3 deletions(-)

Added: 0001-demux_gif-declare-missing-PrintGifError.patch
===================================================================
--- 0001-demux_gif-declare-missing-PrintGifError.patch	                        (rev 0)
+++ 0001-demux_gif-declare-missing-PrintGifError.patch	2013-07-14 09:00:47 UTC (rev 94077)
@@ -0,0 +1,34 @@
+From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
+Date: Sun, 14 Jul 2013 10:51:11 +0200
+Subject: [PATCH] demux_gif: declare missing PrintGifError
+
+Apparently it has been removed from newer Giflib releases.
+---
+ libmpdemux/demux_gif.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
+index eee7a85..3d761c0 100644
+--- a/libmpdemux/demux_gif.c
++++ b/libmpdemux/demux_gif.c
+@@ -44,6 +44,16 @@ typedef struct {
+ 
+ #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
+ 
++static void PrintGifError(void)
++{
++  char *Err = GifErrorString();
++
++  if (Err != NULL)
++    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
++  else
++    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
++}
++
+ #ifndef CONFIG_GIF_TVT_HACK
+ // not supported by certain versions of the library
+ static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
+-- 
+1.8.3.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-14 08:27:48 UTC (rev 94076)
+++ PKGBUILD	2013-07-14 09:00:47 UTC (rev 94077)
@@ -5,7 +5,7 @@
 
 pkgname=mplayer2
 pkgver=20130428
-pkgrel=1
+pkgrel=2
 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -22,10 +22,13 @@
 provides=('mplayer')
 conflicts=('mplayer')
 options=(!emptydirs)
-source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa)
-sha256sums=('SKIP')
+source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa
+        0001-demux_gif-declare-missing-PrintGifError.patch)
+sha256sums=('SKIP'
+            'f5442289fee5eaf3c86c28cc5cbf2af8e85c6ccfdc9c2a73c71aa22efb7cdf09')
 
 pkgver() {
+  cd $pkgname
   git log -1 --format="%cd" --date=short | sed 's|-||g'
 }
 
@@ -33,6 +36,7 @@
   cd $pkgname
   sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
   find -type f -exec sed -e 's/python3/python/' -i {} \;
+  patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch
 }
 
 build() {