From 689ad578e7a3ca38d9f599b558af46c141c7df61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <apoyosis@correo.inta.gob.ar>
Date: Fri, 5 Aug 2011 13:46:33 -0300
Subject: libre/mplayer-vaapi-libre-33161-3

---
 libre/mplayer-vaapi-libre/PKGBUILD | 71 ++++++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 30 deletions(-)

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

diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 22517928e..73f3e6022 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -4,8 +4,9 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
+_pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
-pkgver=33025
+pkgver=33161
 _vaapi_version=20110127
 pkgrel=3
 pkgdesc="A movie player, compiled with vaapi support, without faac dependency, added speex support"
@@ -13,63 +14,73 @@ arch=('i686' 'x86_64')
 url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/"
 license=('GPL')
 depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
-         'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+         'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa' 'smbclient'
          'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'speex'
          'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger'
-         'libvpx' 'libpulse' 'fribidi' 'libva' 'desktop-file-utils')
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm')
-provides=("mplayer-vaapi=$pkgver" 'mplayer')
-conflicts=('mplayer' 'mplayer-vaapi')
+         'libvpx' 'libpulse' 'fribidi' 'faad2' 'libva' 'libass'
+         'desktop-file-utils')
+makedepends=('unzip' 'live-media' 'yasm' 'ladspa')
+provides=("$_pkgname=$pkgver" 'mplayer')
+conflicts=('mplayer' "$_pkgname")
 replaces=('mplayer-vaapi')
 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
-        patch-fixes.patch)
+        patch-fixes.patch
+        gcc-4.6-mp3lib-sse-code-miscompilation.patch)
+options=('!buildflags' '!emptydirs')
 install=mplayer-vaapi.install
-md5sums=('3814e5c47458de4bf0878d3996820341'
+md5sums=('b8b2842ba3fff04a9b64a94bd2b0a667'
          'b39bd73ae8241dcb21dd1a8fa5eb87eb'
          '647b9f4ab5284a7fef3f84f992214e77'
          'd00874ccc644b7f43d6ef1c942fcef28'
-         '9f96a03dddbea8be5ff2fa3925311d04')
+         'c7a1df1c1d0f1e51ee400d96b0f34195'
+         'd56174335d3c5bcdf3732f4a869f01dd')
 
 build() {
   cd "$srcdir/mplayer-$pkgver"
 
-  # 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"
 
+  # Workaround mp3lib SSE code miscompilation with gcc 4.6 (r33469 upstream)
+  # Patch by Jindrich Makovicka <makovick <at> gmail>
+  patch -Np0 -i "$srcdir/gcc-4.6-mp3lib-sse-code-miscompilation.patch"
+
   for patch in mplayer-{vaapi{,-{gma500-workaround,0.29}},vdpau}; do
     patch -Np1 -i "$srcdir/mplayer-vaapi-$_vaapi_version/patches/$patch.patch"
   done
 
   ./configure --prefix=/usr \
-      --disable-faac \
-      --enable-runtime-cpudetection \
-      --disable-gui \
-      --disable-arts \
-      --disable-liblzo \
-      --enable-speex \
-      --disable-openal \
-      --disable-libdv \
-      --disable-musepack \
-      --disable-esd \
-      --disable-mga \
-      --enable-xvmc \
-      --disable-vdpau \
-      --enable-vaapi \
-      --language=all \
-      --confdir=/etc/mplayer
+    --enable-runtime-cpudetection \
+    --disable-gui \
+    --disable-arts \
+    --disable-liblzo \
+    --enable-speex \
+    --disable-openal \
+    --disable-libdv \
+    --disable-musepack \
+    --disable-esd \
+    --disable-mga \
+    --disable-faac \
+    --enable-xvmc \
+    --disable-vdpau \
+    --enable-vaapi \
+    --language=all \
+    --confdir=/etc/mplayer
 
-  [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+  [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak
 
   make
-  make -j1 DESTDIR=$pkgdir install
+}
+
+package() {
+  cd "$srcdir/mplayer-$pkgver"
+
+  make -j1 DESTDIR="$pkgdir" install-mplayer install-mplayer-man
   install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
   install -dm755 "$pkgdir/usr/share/mplayer/"
   ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
-- 
cgit v1.2.3-2-g168b