[arch-commits] CVS update of extra/multimedia/mplayer (PKGBUILD)

[Thomas Baechler]

    Date: Thursday, June 7, 2007 @ 08:19:29
  Author: thomas
    Path: /home/cvs-extra/extra/multimedia/mplayer

Modified: PKGBUILD (1.8 -> 1.9)

upgpkg: mplayer 1.0rc1-6


----------+
 PKGBUILD |   46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)


Index: extra/multimedia/mplayer/PKGBUILD
diff -u extra/multimedia/mplayer/PKGBUILD:1.8 extra/multimedia/mplayer/PKGBUILD:1.9
--- extra/multimedia/mplayer/PKGBUILD:1.8	Sun Apr  8 03:30:25 2007
+++ extra/multimedia/mplayer/PKGBUILD	Thu Jun  7 08:19:28 2007
@@ -1,23 +1,35 @@
-# $Id: PKGBUILD,v 1.8 2007/04/08 07:30:25 tpowa Exp $
+# $Id: PKGBUILD,v 1.9 2007/06/07 12:19:28 thomas Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=mplayer
 pkgver=1.0rc1
-pkgrel=5
+pkgrel=6
 pkgdesc="A movie player for linux"
 arch=(i686 x86_64)
-depends=('libxxf86dga' 'libxv' 'libmad' 'libungif' 'cdparanoia' 'gtk2'\
-         'codecs' 'sdl' 'lame' 'libtheora' 'ttf-bitstream-vera' 'xvidcore'\
-         'libgl' 'smbclient' 'aalib' 'dbus-glib' 'jack-audio-connection-kit')
-makedepends=('lirc-utils' 'libcaca' 'unzip')
+depends=('libxxf86dga' 'libxv' 'libmad' 'libungif' 'cdparanoia' 'gtk2'
+         'codecs' 'sdl' 'lame' 'libtheora' 'ttf-bitstream-vera' 'xvidcore'
+         'libgl' 'smbclient' 'aalib' 'dbus-glib' 'jack-audio-connection-kit'
+         'x264')
+makedepends=('lirc-utils' 'libcaca' 'unzip' 'live-media' 'libdts')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-${pkgver}.tar.bz2 \
-        ftp://ftp1.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 \
-        mplayer-lirc-libdl.diff aalib-configure.patch \
-        MPlayer-1.0rc1-gnome-screensaver.patch \
-        http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip \
-        http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip \
+source=(ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-${pkgver}.tar.bz2
+        ftp://ftp1.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
+        mplayer-lirc-libdl.diff aalib-configure.patch
+        MPlayer-1.0rc1-gnome-screensaver.patch
+        http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
+        http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip
         http://www.mplayerhq.hu/MPlayer/patches/asmrules_fix_20061231.diff
+        http://www.mplayerhq.hu/MPlayer/patches/cddb_fix_20070605.diff
 	dmo.patch)
+md5sums=('18c05d88e22c3b815a43ca8d7152ccdc'
+         'e4e2020d11b681aac898103b3ba723c4'
+         'fda186b412a76695338a17e673b96cc4'
+         'fa8cd2a04b994a5d74bec60f6efd59e4'
+         'a5f3a87cff594f9ed69a3453f5630bec'
+         '9b575d01f94f50dd4dcf570cd8a14dda'
+         '607a14d090898ffb0f72c1aa6aa6ce31'
+         'f0b71c38b1207c1d604be091876ac051'
+         'bd8a233ea31c6686a956387ad28c5c5c'
+         '86b7dc64d7d21b241bbff32b423dcc12')
 install=$pkgname.install
 url="http://www.mplayerhq.hu/"
 
@@ -31,6 +43,8 @@
   patch -p0 -i ../asmrules_fix_20061231.diff || return 1 
   # fix dmo vulnerability
   patch -Np1 -i ../dmo.patch || return 1
+  # fix cddb vulnerability
+  patch -p0 -i ../cddb_fix_20070605.diff
   # Make lirc-utils dependency optional
   [ "$CARCH" = "x86_64" ] &&  sed -i -e "s/(CFLAGS) -llirc_client/(CFLAGS) -fPIC -llirc_client/" ../mplayer-lirc-libdl.diff
   patch -p1 -i ../mplayer-lirc-libdl.diff || return 1
@@ -57,7 +71,8 @@
       --enable-xvid --enable-gl --enable-tv-v4l1 --enable-tv-v4l2 --enable-largefiles \
       --disable-liblzo --disable-speex --disable-openal --disable-faac \
       --enable-smb --enable-aa --disable-fribidi --disable-libdv --disable-musepack \
-      --language=all --enable-lirc --disable-dvdnav --disable-esd $EXTRAOPTS
+      --language=all --enable-lirc --disable-dvdnav --disable-esd \
+      --enable-live --with-livelibdir=/usr/lib/live-media $EXTRAOPTS
 
   [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
@@ -68,8 +83,3 @@
   rm -rf ${startdir}/pkg/usr/share/mplayer/font
   mv ${startdir}/src/Blue ${startdir}/pkg/usr/share/mplayer/skins/default
 }
-md5sums=('18c05d88e22c3b815a43ca8d7152ccdc' 'e4e2020d11b681aac898103b3ba723c4'\
-         'fda186b412a76695338a17e673b96cc4' 'fa8cd2a04b994a5d74bec60f6efd59e4'\
-         'a5f3a87cff594f9ed69a3453f5630bec' '9b575d01f94f50dd4dcf570cd8a14dda'\
-         '607a14d090898ffb0f72c1aa6aa6ce31' 'f0b71c38b1207c1d604be091876ac051'\
-         '86b7dc64d7d21b241bbff32b423dcc12')