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

Conflicts:
	community/beye/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/libvpx/PKGBUILD
	extra/libxfce4menu/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/pixman/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/thunar-volman/PKGBUILD
	extra/vdpau-video/PKGBUILD
	extra/xfce4-appfinder/PKGBUILD
	extra/xfce4-battery-plugin/PKGBUILD
	extra/xfce4-cpufreq-plugin/PKGBUILD
	extra/xfce4-cpugraph-plugin/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	extra/xfce4-diskperf-plugin/PKGBUILD
	extra/xfce4-eyes-plugin/PKGBUILD
	extra/xfce4-fsguard-plugin/PKGBUILD
	extra/xfce4-mixer/PKGBUILD
	extra/xfce4-mount-plugin/PKGBUILD
	extra/xfce4-mpc-plugin/PKGBUILD
	extra/xfce4-power-manager/PKGBUILD
	extra/xfce4-systemload-plugin/PKGBUILD
	extra/xfce4-taskmanager/PKGBUILD
	extra/xfce4-time-out-plugin/PKGBUILD
	extra/xfce4-timer-plugin/PKGBUILD
	extra/xfce4-wavelan-plugin/PKGBUILD
	extra/xorg-luit/PKGBUILD
	extra/xorg-xfontsel/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD
	testing/systemd/PKGBUILD

1 files changed, 19 insertions, 14 deletions

diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 0c97f1d96..72ca386e9 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -2,14 +2,16 @@
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
+# libvdpau is currently useful only with proprietary software
+
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
 pkgver=34426
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
+'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
 'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
 # no lirc
 [ "$CARCH" = "mips64el" ] && \
@@ -38,6 +40,7 @@ build() {
         --disable-esd \
         --disable-mga \
         --disable-ass-internal \
+        --disable-vdpau \
         --enable-xvmc \
         --enable-radio \
         --language=all \
@@ -52,7 +55,7 @@ package_mplayer-libre() {
     install=mplayer.install
     backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
     depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
-    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libxinerama' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
     'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
 [ "$CARCH" = "mips64el" ] && \
     depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
@@ -62,16 +65,16 @@ package_mplayer-libre() {
     replaces=('mplayer')
     conflicts=('mplayer')
 
-    cd ${srcdir}/${_pkgbase}
+    cd "${srcdir}/${_pkgbase}"
 
-    make 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
-    rm -rf ${pkgdir}/usr/share/mplayer/font
+    make 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"
+    rm -rf "${pkgdir}/usr/share/mplayer/font"
     #desktop file  FS#14770
-    install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
-    install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+    install -Dm644 "${srcdir}/mplayer.desktop" "${pkgdir}/usr/share/applications/mplayer.desktop"
+    install -Dm644 etc/mplayer.png "${pkgdir}/usr/share/pixmaps/mplayer.png"
 }
 
 package_mencoder-libre() {
@@ -82,7 +85,9 @@ package_mencoder-libre() {
     replaces=('mencoder')
     conflicts=('mencoder')
 
-    cd ${srcdir}/${_pkgbase}
-    make DESTDIR=${pkgdir} install-mencoder install-mencoder-man
-    find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
+    cd "${srcdir}/${_pkgbase}"
+    make DESTDIR="${pkgdir}" install-mencoder install-mencoder-man
+    find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
 }
+md5sums=('ff81117293e76b59e54debc439d8e612'
+         '647b9f4ab5284a7fef3f84f992214e77')