summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-08-01 06:09:02 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-08-01 06:09:02 -0300
commit12909a37c0b7d7e6b5ff495ba09f2b673af152b1 (patch)
treec1b8abc798bc49096cbbf5f38592ca4f50e5da56
parent10bd2571ae71fa54408432fff780c85257263d4b (diff)
downloadabslibre-12909a37c0b7d7e6b5ff495ba09f2b673af152b1.tar.gz
abslibre-12909a37c0b7d7e6b5ff495ba09f2b673af152b1.tar.bz2
abslibre-12909a37c0b7d7e6b5ff495ba09f2b673af152b1.zip
mplayer-libre-36285-3: giflib 5.0 rebuild
-rw-r--r--libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch34
-rw-r--r--libre/mplayer-libre/PKGBUILD11
2 files changed, 41 insertions, 4 deletions
diff --git a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch
new file mode 100644
index 000000000..c8a527cf3
--- /dev/null
+++ b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch
@@ -0,0 +1,34 @@
+From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@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
+
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index a49b889bd..36bf2f4ff 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $
+# $Id: PKGBUILD 191803 2013-07-30 21:46:38Z bpiotrowski $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,7 +8,7 @@ _pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
pkgver=36285
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
@@ -18,15 +18,18 @@ url="http://www.mplayerhq.hu/"
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() {