Merge branch 'master' of ssh://gparabola/srv/git/abslibre

1 files changed, 12 insertions, 18 deletions

diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index cf2be2b5f..3e9d0a44d 100644..100755
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,33 +1,27 @@
-# $Id: PKGBUILD 152227 2012-03-05 09:38:48Z ibiru $
+# $Id: PKGBUILD 163126 2012-07-07 16:29:25Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-# libvdpau is currently useful only with proprietary software
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=34799
-pkgrel=2
+pkgver=35014
+pkgrel=1
 arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' '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'
-'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio')
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop
-        live-media.patch)
-md5sums=('e8bd960bcdb48fdc5a1f45390dc13c53'
-         'c0d6ef795cf6de48e3b87ff7c23f0319'
-         'b6c057633ff7001ee0c102b5f81ec1e3')
+source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop)
+md5sums=('d0785560e5e8eb02e089728ef4412eae'
+         'c0d6ef795cf6de48e3b87ff7c23f0319')
 
 build() {
     cd "$srcdir/$_pkgbase"
 
-    patch -Np0 -i "$srcdir/live-media.patch"
-
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
         --disable-gui \
@@ -52,11 +46,11 @@ build() {
 }
 
 package_mplayer-libre() {
-    pkgdesc="A movie player for GNU/Linux (no unfree faac support)"
+    pkgdesc="A movie player for GNU/Linux (without unfree faac support)"
     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' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
     'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
@@ -76,7 +70,7 @@ package_mplayer-libre() {
 
 package_mencoder-libre() {
     pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
-    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
+    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
     'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio')
     provides=("mencoder=$pkgver")
     replaces=('mencoder')