[arch-commits] Commit in mplayer-vaapi/trunk (PKGBUILD demux-gif.patch)

[Evangelos Foutras]

    Date: Monday, July 29, 2013 @ 20:51:32
  Author: foutrelis
Revision: 94736

upgpkg: mplayer-vaapi 36265-3

Explicitly disable giflib support.

Modified:
  mplayer-vaapi/trunk/PKGBUILD
Deleted:
  mplayer-vaapi/trunk/demux-gif.patch

-----------------+
 PKGBUILD        |    8 ++------
 demux-gif.patch |   19 -------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-29 18:19:16 UTC (rev 94735)
+++ PKGBUILD	2013-07-29 18:51:32 UTC (rev 94736)
@@ -5,7 +5,7 @@
 
 pkgname=mplayer-vaapi
 pkgver=36265
-pkgrel=2
+pkgrel=3
 pkgdesc="A movie player, compiled with vaapi support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
@@ -23,7 +23,6 @@
 source=(http://pkgbuild.com/~foutrelis/sources/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
         cdio-includes.patch
         tweak-desktop-file.patch
-        demux-gif.patch
         subreader-fix-srt-parsing.patch)
 options=('!buildflags' '!emptydirs')
 install=mplayer-vaapi.install
@@ -31,7 +30,6 @@
             'SKIP'
             '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
             '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
-            '6774f57c027474388497606edfccbb33509cc78b573cdc322dd0955764c6f9c2'
             '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3')
 
 
@@ -41,9 +39,6 @@
   patch -Np0 -i "$srcdir/cdio-includes.patch"
   patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
 
-  # https://bugs.archlinux.org/task/36039
-  patch -Np0 -i "$srcdir/demux-gif.patch"
-
   # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
   patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch"
 }
@@ -56,6 +51,7 @@
     --enable-runtime-cpudetection \
     --disable-gui \
     --disable-arts \
+    --disable-gif \
     --disable-liblzo \
     --disable-speex \
     --disable-cdparanoia \

Deleted: demux-gif.patch
===================================================================
--- demux-gif.patch	2013-07-29 18:19:16 UTC (rev 94735)
+++ demux-gif.patch	2013-07-29 18:51:32 UTC (rev 94736)
@@ -1,19 +0,0 @@
---- libmpdemux/demux_gif.c-old  2012-08-20 08:47:01.000000000 -0600
-+++ libmpdemux/demux_gif.c	2013-07-05 11:27:55.488387360 -0600
-@@ -45,6 +45,16 @@
- 
- #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)