From b0bc002fab7222d3693f6cf15a8c82ee3912d728 Mon Sep 17 00:00:00 2001
From: Sorin-Mihai Vârgolici <smv@yobicore.org>
Date: Wed, 30 Mar 2011 23:31:13 +0300
Subject: update

---
 libre/mplayer-vaapi-libre/PKGBUILD | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'libre/mplayer-vaapi-libre/PKGBUILD')

diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 82b38d6a8..2f1028119 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -5,9 +5,9 @@
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=mplayer-vaapi-libre
-pkgver=32825
+pkgver=33025
 _vaapi_version=20110127
-pkgrel=1
+pkgrel=3
 pkgdesc="A movie player, compiled with vaapi support, without faac dependency, added speex support"
 arch=('i686' 'x86_64')
 url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/"
@@ -16,7 +16,7 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
          'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
          'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'speex'
          'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger'
-         'libvpx' 'libpulse' 'libva')
+         'libvpx' 'libpulse' 'fribidi' 'libva' 'desktop-file-utils')
 makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm')
 provides=("mplayer-vaapi=$pkgver")
 conflicts=('mplayer' 'mplayer-vaapi')
@@ -25,7 +25,14 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz
         http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2
         mplayer.desktop
-        mplayer.png)
+        mplayer.png
+        patch-fixes.patch)
+install=mplayer-vaapi.install
+md5sums=('3814e5c47458de4bf0878d3996820341'
+         'b39bd73ae8241dcb21dd1a8fa5eb87eb'
+         '647b9f4ab5284a7fef3f84f992214e77'
+         'd00874ccc644b7f43d6ef1c942fcef28'
+         '9f96a03dddbea8be5ff2fa3925311d04')
 
 build() {
   cd "$srcdir/mplayer-$pkgver"
@@ -33,6 +40,10 @@ build() {
   # Custom CFLAGS break the mplayer build
   unset CFLAGS LDFLAGS
 
+  # Update vaapi patches for changes introduced in mplayer/ffmpeg
+  patch -d "$srcdir/mplayer-vaapi-$_vaapi_version" -p1 -i \
+    "$srcdir/patch-fixes.patch"
+
   for patch in mplayer-{vaapi{,-{gma500-workaround,0.29}},vdpau}; do
     patch -Np1 -i "$srcdir/mplayer-vaapi-$_vaapi_version/patches/$patch.patch"
   done
@@ -43,8 +54,8 @@ build() {
       --disable-gui \
       --disable-arts \
       --disable-liblzo \
+      --enable-speex \
       --disable-openal \
-      --disable-fribidi \
       --disable-libdv \
       --disable-musepack \
       --disable-esd \
@@ -69,7 +80,3 @@ build() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('997a869feaa2fa3376407ee344fa280e'
-         'b39bd73ae8241dcb21dd1a8fa5eb87eb'
-         '647b9f4ab5284a7fef3f84f992214e77'
-         'd00874ccc644b7f43d6ef1c942fcef28')
-- 
cgit v1.2.3-54-g00ecf