Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 39 insertions, 13 deletions

diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 311c469ca..6fa12c5c6 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 91641 2013-05-26 08:06:21Z foutrelis $
+# $Id: PKGBUILD 94263 2013-07-18 12:09:29Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
+_pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
-pkgver=35107
-pkgrel=8
-pkgdesc="A movie player, compiled with vaapi, without nonfree faac support"
+pkgver=36265
+pkgrel=2
+pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
 license=('GPL')
@@ -24,30 +25,36 @@ provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver")
 conflicts=('mplayer' 'mplayer-vaapi')
 replaces=('mplayer-vaapi')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
+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
-sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
+sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
+            'SKIP'
             '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
             '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
+            '6774f57c027474388497606edfccbb33509cc78b573cdc322dd0955764c6f9c2'
             '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3')
 
 
 prepare() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   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"
 }
 
 build() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -78,7 +85,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
   install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
diff --git a/libre/mplayer-vaapi-libre/demux-gif.patch b/libre/mplayer-vaapi-libre/demux-gif.patch
new file mode 100644
index 000000000..68add7d28
--- /dev/null
+++ b/libre/mplayer-vaapi-libre/demux-gif.patch
@@ -0,0 +1,19 @@
+--- 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)
diff --git a/pcr/otf-stix/PKGBUILD b/pcr/otf-stix/PKGBUILD
index 60fc88680..6a9b2d62c 100644
--- a/pcr/otf-stix/PKGBUILD
+++ b/pcr/otf-stix/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=otf-stix
 pkgver=1.1.0
 #_pkgver=${pkgver//_/-}
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='A comprehensive set of fonts that serve the scientific and 
 engineering community.'
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 1fb918903..71517f39b 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.07.17.1
+pkgver=2013.07.18
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('689d7d2507a0a452e53c2c40957220dc'
+md5sums=('a644d8419f5387a91387d1e9db97d00f'
           'SKIP')
 
 prepare() {