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

[Bartłomiej Piotrowski]

    Date: Sunday, July 14, 2013 @ 12:48:44
  Author: bpiotrowski
Revision: 190070

upgpkg: mplayer 36285-2

- rebuild against ffmpeg 2.0

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

----------------------------------------------------+
 0001-demux_gif-declare-missing-PrintGifError.patch |   34 +++++++++++++++++++
 PKGBUILD                                           |    9 +++--
 2 files changed, 40 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 10:48:44 UTC (rev 190070)
@@ -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 09:54:42 UTC (rev 190069)
+++ PKGBUILD	2013-07-14 10:48:44 UTC (rev 190070)
@@ -5,7 +5,7 @@
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
 pkgver=36285
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
@@ -15,15 +15,18 @@
 options=('!buildflags' '!emptydirs')
 source=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz
         mplayer.desktop
-        cdio-includes.patch)
+        cdio-includes.patch
+        0001-demux_gif-declare-missing-PrintGifError.patch)
 md5sums=('5e4f0d4d039b0219514cf52ae6da831d'
          'c0d6ef795cf6de48e3b87ff7c23f0319'
-         '7b5be7191aafbea64218dc4916343bbc')
+         '7b5be7191aafbea64218dc4916343bbc'
+         '12a2a5b79849d57eab60a1bfec2978c4')
 
 prepare() {
     cd "$srcdir/$pkgbase-$pkgver"
 
     patch -Np0 -i ../cdio-includes.patch
+    patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch
 }
 
 build() {