Date: Monday, March 5, 2012 @ 04:38:48
  Author: ibiru
Revision: 152227

fix live-media compilation FS#28759
libcdio instead of libcdparanoia FS#27970
--enable-radio-capture FS#28253 

Modified:
  mplayer/trunk/PKGBUILD

----------+
 PKGBUILD |   44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2012-03-05 09:23:14 UTC (rev 152226)
+++ PKGBUILD    2012-03-05 09:38:48 UTC (rev 152227)
@@ -4,22 +4,26 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=34426
-pkgrel=3
+pkgver=34799
+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'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 
'mpg123' 'ladspa' 'libass' 'libbluray')
+'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 
'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio')
 license=('GPL')
 url="http://www.mplayerhq.hu/";
 options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz 
mplayer.desktop)
-md5sums=('ff81117293e76b59e54debc439d8e612'
-         'c0d6ef795cf6de48e3b87ff7c23f0319')
+source=(ftp://ftp.archlinux.org/other/$pkgbase/$pkgbase-$pkgver.tar.xz 
mplayer.desktop
+        live-media.patch)
+md5sums=('e8bd960bcdb48fdc5a1f45390dc13c53'
+         'c0d6ef795cf6de48e3b87ff7c23f0319'
+         'b6c057633ff7001ee0c102b5f81ec1e3')
 
 build() {
-    cd "${srcdir}/${pkgname}"
+    cd "$srcdir/$pkgbase"
 
+    patch -Np0 -i "$srcdir/live-media.patch"
+
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
         --disable-gui \
@@ -32,8 +36,10 @@
         --disable-esd \
         --disable-mga \
         --disable-ass-internal \
+        --disable-cdparanoia \
         --enable-xvmc \
         --enable-radio \
+        --enable-radio-capture \
         --language=all \
         --confdir=/etc/mplayer
     [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
@@ -47,26 +53,26 @@
     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'
-    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 
'libxxf86vm' 'libbluray')
+    'libjpeg' 'faac' 'faad2' 'libxvmc' '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' 'libbluray')
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 
'mpg123' 'libass' 'libbluray' 'libcdio')
 
-    cd "${srcdir}/${pkgbase}"
-    make DESTDIR="${pkgdir}" install-mencoder install-mencoder-man
+    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}"' _ {} \;
 }

Reply via email to