mplayer 35014

3 files changed, 31 insertions, 28 deletions

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index 465aef4..66a0c9c 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id$
+# $Id: PKGBUILD 163158 2012-07-08 09:32:14Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=33805
-pkgrel=4
+pkgver=35014
+pkgrel=1
 arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+'aalib'  'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'   'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+ 'fribidi' 'unzip' '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/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop)
-md5sums=('512a0309ba5979a41ae93b740f4592f4'
+source=(ftp://ftp.archlinux.org/other/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop)
+md5sums=('d0785560e5e8eb02e089728ef4412eae'
          'c0d6ef795cf6de48e3b87ff7c23f0319')
 
 build() {
-    cd ${srcdir}/${pkgname}
+    cd "$srcdir/$pkgbase"
 
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
@@ -32,10 +32,11 @@ build() {
         --disable-esd \
         --disable-mga \
         --disable-ass-internal \
-        --disable-pulse \
-        --enable-xvmc \
+        --disable-cdparanoia \
+        --enable-radio \
+        --enable-radio-capture \
         --language=all \
-        --confdir=/etc/mplayer
+        --confdir=/etc/mplayer 
     [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
     make
@@ -46,27 +47,28 @@ package_mplayer() {
     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' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libbluray')
+    'libxinerama' 'libvdpau'  'smbclient' 'xvidcore' 'opencore-amr'  'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libjpeg' 'faac' 'faad2'  'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
 
-    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/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
 }
 
 package_mencoder() {
     pkgdesc="Free command line video decoding, encoding and filtering tool"
-    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass')
+    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio')
 
-    cd ${srcdir}/${pkgbase}
-    make DESTDIR=${pkgdir} install-mencoder
-#    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.gz' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
+    rm -rf $pkgdir/usr/share/man
 }
diff --git a/abs/core/mplayer/__changelog b/abs/core/mplayer/__changelog
new file mode 100644
index 0000000..07977e4
--- /dev/null
+++ b/abs/core/mplayer/__changelog
@@ -0,0 +1,2 @@
+removed pulse
+remove man pages from mencoder
diff --git a/abs/core/mplayer/__changlog b/abs/core/mplayer/__changlog
deleted file mode 100644
index fdf7dab..0000000
--- a/abs/core/mplayer/__changlog
+++ /dev/null
@@ -1 +0,0 @@
--disable pulse and remove libpulse deps in PKGBUILD