summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-08-01 06:10:23 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-08-01 06:10:23 -0300
commit5887f39e11863485131e53021d45936c244176d9 (patch)
tree765a96820b5203909e00f946d82ecff9d1693f1a /libre
parent12909a37c0b7d7e6b5ff495ba09f2b673af152b1 (diff)
downloadabslibre-5887f39e11863485131e53021d45936c244176d9.tar.gz
abslibre-5887f39e11863485131e53021d45936c244176d9.tar.bz2
abslibre-5887f39e11863485131e53021d45936c244176d9.zip
mplayer-vaapi-libre-36265-3: Explicitly disable giflib support
Diffstat (limited to 'libre')
-rw-r--r--libre/mplayer-vaapi-libre/PKGBUILD12
-rw-r--r--libre/mplayer-vaapi-libre/demux-gif.patch19
2 files changed, 4 insertions, 27 deletions
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 6fa12c5c6..9923b356b 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94263 2013-07-18 12:09:29Z foutrelis $
+# $Id: PKGBUILD 94736 2013-07-29 18:51:32Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
@@ -9,7 +9,7 @@
_pkgname=mplayer-vaapi
pkgname=mplayer-vaapi-libre
pkgver=36265
-pkgrel=2
+pkgrel=3
pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support"
arch=('i686' 'x86_64')
url="http://gitorious.org/vaapi/mplayer"
@@ -20,7 +20,7 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
'libbluray' 'libva' 'libass' 'desktop-file-utils')
-makedepends=('unzip-libre' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
+makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver")
conflicts=('mplayer' 'mplayer-vaapi')
replaces=('mplayer-vaapi')
@@ -28,7 +28,6 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
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
@@ -36,7 +35,6 @@ sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
'SKIP'
'72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
'5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
- '6774f57c027474388497606edfccbb33509cc78b573cdc322dd0955764c6f9c2'
'8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3')
@@ -46,9 +44,6 @@ prepare() {
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"
}
@@ -61,6 +56,7 @@ build() {
--enable-runtime-cpudetection \
--disable-gui \
--disable-arts \
+ --disable-gif \
--disable-liblzo \
--enable-speex \
--disable-cdparanoia \
diff --git a/libre/mplayer-vaapi-libre/demux-gif.patch b/libre/mplayer-vaapi-libre/demux-gif.patch
deleted file mode 100644
index 68add7d28..000000000
--- a/libre/mplayer-vaapi-libre/demux-gif.patch
+++ /dev/null
@@ -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)