Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/inetutils/PKGBUILD
	extra/audacious/PKGBUILD
	extra/cvs/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD
	libre/pacman/PKGBUILD
	libre/psutils-libre/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD
	staging/kdebase-runtime/PKGBUILD

1 files changed, 24 insertions, 34 deletions

diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index e06c9a9b1..3b2aeb1ed 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -6,53 +6,39 @@
 
 _pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
-pkgver=33161
-_vaapi_version=20110127
-pkgrel=3
-pkgdesc="A movie player, compiled with vaapi support, without faac dependency, added speex support"
+pkgver=34180
+_sha1=79e6aa7b
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/"
 license=('GPL')
 depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
-         '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' 'faad2' 'libva' 'libass'
-         'desktop-file-utils')
-makedepends=('unzip' 'live-media' 'yasm' 'ladspa')
+         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
+         'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'speex'
+         'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
+         'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'faad2'
+         'libva' 'libass' 'desktop-file-utils')
+makedepends=('p7zip-libre' 'live-media' 'yasm' 'ladspa' 'git')
 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
+#source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz
+#        http://www.splitted-desktop.com/static/libva/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2
+source=(mplayer-vaapi-$_sha1.tar.gz::http://gitorious.org/vaapi/mplayer/archive-tarball/$_sha1
         mplayer.desktop
-        mplayer.png
-        patch-fixes.patch
-        gcc-4.6-mp3lib-sse-code-miscompilation.patch)
+        mplayer.png)
 options=('!buildflags' '!emptydirs')
 install=mplayer-vaapi.install
-md5sums=('b8b2842ba3fff04a9b64a94bd2b0a667'
-         'b39bd73ae8241dcb21dd1a8fa5eb87eb'
-         '647b9f4ab5284a7fef3f84f992214e77'
-         'd00874ccc644b7f43d6ef1c942fcef28'
-         'c7a1df1c1d0f1e51ee400d96b0f34195'
-         'd56174335d3c5bcdf3732f4a869f01dd')
+sha256sums=('df3ec3d6eba8fd66d6ed7e84dcc909db3b0dcbee2fafdff86c8e66340de1e323'
+            '9aa54571b37d15aec2c8e3ddf086753217efc3084ebf466335b2f28d819c74da'
+            '061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48')
 
 build() {
-  cd "$srcdir/mplayer-$pkgver"
+  cd "$srcdir/vaapi-mplayer"
 
-  # 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
+  [[ -d ffmpeg ]] && rm -rf ffmpeg
+  tsocks git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg
 
   ./configure --prefix=/usr \
     --enable-runtime-cpudetection \
@@ -65,6 +51,7 @@ build() {
     --disable-musepack \
     --disable-esd \
     --disable-mga \
+    --disable-ass-internal \
     --disable-faac \
     --enable-xvmc \
     --disable-vdpau \
@@ -78,7 +65,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/mplayer-$pkgver"
+  cd "$srcdir/vaapi-mplayer"
 
   make -j1 DESTDIR="$pkgdir" install-mplayer install-mplayer-man
   install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
@@ -91,3 +78,6 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
+sha256sums=('ab9386e81df7ea7f25102940f7d86fdac797bcdc9b489e0ce118c505c02508ba'
+            '9aa54571b37d15aec2c8e3ddf086753217efc3084ebf466335b2f28d819c74da'
+            '061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48')