mplayer: add patch for giflib-5.1

This commit is contained in:
Thomas Penteker 2014-08-20 18:38:36 +02:00
parent c388911bc8
commit 3369850033
3 changed files with 42 additions and 2 deletions

View File

@ -1,3 +1,4 @@
1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2
4a41c47d3516784d6e47a9cf5e0ba54b mplayer-2014-07-08.tar.xz 74482f7055580abdf486b4a52f003069 giflib-compatibilty-with-5.1.patch
d917f523dedd78141ca102438b4bc81b mplayer-2014-08-20.tar.xz
5afb114c52e3cc4f1288754d250c7284 mplayer.conf 5afb114c52e3cc4f1288754d250c7284 mplayer.conf

View File

@ -6,15 +6,18 @@
# Nice to have: libsdl, libjpeg-turbo, libpng, lame, zlib, libogg, libvorbis, cdparanoia, win32-essential-codecs, faac, x264, libdvdnav, libdca # Nice to have: libsdl, libjpeg-turbo, libpng, lame, zlib, libogg, libvorbis, cdparanoia, win32-essential-codecs, faac, x264, libdvdnav, libdca
name=mplayer name=mplayer
version=2014-07-08 version=2014-08-20
release=1 release=1
source=(http://crux.nu/~tek/mplayer-$version.tar.xz source=(http://crux.nu/~tek/mplayer-$version.tar.xz
http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
giflib-compatibilty-with-5.1.patch
mplayer.conf) mplayer.conf)
build() { build() {
cd mplayer-$version cd mplayer-$version
patch -i ../giflib-compatibilty-with-5.1.patch -p1
# Keep in line with mplayer CFLAGS, but allow people to set their own march/mtune values. # Keep in line with mplayer CFLAGS, but allow people to set their own march/mtune values.
export CFLAGS="$(echo $CFLAGS | sed -e 's/-O[s0-3]/-O3/') -ffast-math -fomit-frame-pointer -fno-strict-aliasing" export CFLAGS="$(echo $CFLAGS | sed -e 's/-O[s0-3]/-O3/') -ffast-math -fomit-frame-pointer -fno-strict-aliasing"

View File

@ -0,0 +1,36 @@
From 409caa2ec824cd55ef5b8da72966c1608bf532ed Mon Sep 17 00:00:00 2001
From: sherpya <sherpya@netfarm.it>
Date: Sun, 18 May 2014 04:31:04 +0200
Subject: [PATCH 28/29] giflib: compatibilty with 5.1+
---
diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
index 33b5188..fd364ad 100644
--- a/libmpdemux/demux_gif.c
+++ b/libmpdemux/demux_gif.c
@@ -50,6 +50,9 @@ typedef struct {
#define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL)
#define GifError() (gif ? gif->Error : 0)
#define GifErrorString() GifErrorString(gif->Error)
+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
+#define DGifCloseFile(a) DGifCloseFile(a, NULL)
+#endif
#endif
/* >= 4.2 prior GIFLIB did not have MAJOR/MINOR defines */
diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
index 5061870..e8e024f 100644
--- a/libvo/vo_gif89a.c
+++ b/libvo/vo_gif89a.c
@@ -75,6 +75,9 @@ const LIBVO_EXTERN(gif89a)
#define MakeMapObject GifMakeMapObject
#define FreeMapObject GifFreeMapObject
#define QuantizeBuffer GifQuantizeBuffer
+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
+#define EGifCloseFile(a) EGifCloseFile(a, NULL)
+#endif
#endif
// how many frames per second we are aiming for during output.
--
2.0.0