From 23a2524aaddc11b9ad6b766f4986041abab1b501 Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Tue, 28 Feb 2012 01:42:38 +0100
Subject: [PATCH] mplayer-vaapi: merge with master

---
 mplayer-vaapi/PKGBUILD | 51 +++++++++++++++---------------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/mplayer-vaapi/PKGBUILD b/mplayer-vaapi/PKGBUILD
index bdd0f1430..493614547 100644
--- a/mplayer-vaapi/PKGBUILD
+++ b/mplayer-vaapi/PKGBUILD
@@ -1,3 +1,4 @@
+#
 # Apps Packages for Chakra, part of chakra-project.org
 #
 # contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
@@ -6,47 +7,31 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=mplayer-vaapi
-pkgver=33161
-_vaapi_version=20110127
-pkgrel=5
+pkgver=34357
+pkgrel=2
 pkgdesc="A movie player, compiled with vaapi support"
 arch=('i686' 'x86_64')
 url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/"
 license=('GPL')
-depends=('a52dec' 'aalib' 'alsa-lib' 'bzip2' 'cdparanoia' 'enca' 'faac' 'faad2' 'fontconfig' 'freetype2'
-         'gcc-libs' 'giflib' 'glibc' 'jack' 'lame' 'libcaca' 'libdca' 'libgl' 'libjpeg' 'libmad' 'libmng' 'libogg'
-         'libpng' 'libtheora' 'libvdpau>=0.4' 'libvpx' 'libx11' 'libxext' 'libxinerama' 'libxv' 'libxvmc' 'libxxf86dga'
-         'libxxf86vm' 'libxss' 'lirc-utils' 'mpg123' 'ncurses' 'opencore-amr' 'openjpeg' 'orc' 'rtmpdump' 'schroedinger'
-         'sdl' 'smbclient' 'ttf-dejavu' 'x264' 'xvidcore' 'zlib')
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm' 'ladspa')
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
+         'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+         'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils' 'ttf-dejavu'
+         'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger'
+         'libvpx' 'libpulse' 'mesa' 'libva')
+makedepends=('unzip' 'live-media' 'yasm' 'ladspa')
 provides=("mplayer=$pkgver")
 conflicts=('mplayer')
 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
+source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
         mplayer.desktop
-        mplayer.png
-	patch-fixes.patch)
+        mplayer.png)
 install=mplayer.install
-md5sums=('b8b2842ba3fff04a9b64a94bd2b0a667'
-         'b39bd73ae8241dcb21dd1a8fa5eb87eb'
+md5sums=('eb239c50b099c807524d4c38f2445c1c'
          '647b9f4ab5284a7fef3f84f992214e77'
-         'd00874ccc644b7f43d6ef1c942fcef28'
-	 'c7a1df1c1d0f1e51ee400d96b0f34195')
+         'd00874ccc644b7f43d6ef1c942fcef28')
 
 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"
-
-  for patch in mplayer-{vaapi{,-{gma500-workaround,0.29}},vdpau}; do
-    patch -Np1 -i "$srcdir/mplayer-vaapi-$_vaapi_version/patches/$patch.patch"
-  done
+  cd "$srcdir/mplayer-vaapi-$pkgver"
 
   ./configure --prefix=/usr \
       --enable-runtime-cpudetection \
@@ -72,8 +57,9 @@ build() {
 }
 
 package() {
-  cd "$srcdir/mplayer-$pkgver"
-  make -j1 DESTDIR=$pkgdir install
+  cd "$srcdir/mplayer-vaapi-$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"
@@ -81,5 +67,4 @@ package() {
   # Desktop file (FS#14770)
   install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
   install -Dm644 "$srcdir/mplayer.png" "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
+}
\ No newline at end of file