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

[Thomas Baechler]

    Date: Saturday, November 3, 2007 @ 14:14:06
  Author: thomas
    Path: /home/cvs-extra/extra/multimedia/mplayer

Modified: PKGBUILD (1.12 -> 1.13)

upgpkg: mplayer 1.0rc2-1


----------+
 PKGBUILD |   70 +++++++++++++++----------------------------------------------
 1 file changed, 18 insertions(+), 52 deletions(-)


Index: extra/multimedia/mplayer/PKGBUILD
diff -u extra/multimedia/mplayer/PKGBUILD:1.12 extra/multimedia/mplayer/PKGBUILD:1.13
--- extra/multimedia/mplayer/PKGBUILD:1.12	Sun Sep 16 19:01:01 2007
+++ extra/multimedia/mplayer/PKGBUILD	Sat Nov  3 14:14:06 2007
@@ -1,36 +1,23 @@
-# $Id: PKGBUILD,v 1.12 2007/09/16 17:01:01 thomas Exp $
+# $Id: PKGBUILD,v 1.13 2007/11/03 13:14:06 thomas Exp $
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=mplayer
-pkgver=1.0rc1
-pkgrel=8
+pkgver=1.0rc2
+pkgrel=1
 pkgdesc="A movie player for linux"
 arch=(i686 x86_64)
 depends=('libxxf86dga' 'libxv' 'libmad' 'libungif' 'cdparanoia' 'gtk2'
-         'sdl' 'lame' 'libtheora' 'ttf-bitstream-vera' 'xvidcore'
-         'libgl' 'smbclient' 'aalib' 'dbus-glib' 'jack-audio-connection-kit'
+         'sdl' 'lame' 'libtheora' 'xvidcore'
+         'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit'
          'x264>=20070616' 'faac' 'lirc-utils')
+license=('GPL')
+url="http://www.mplayerhq.hu/"
 makedepends=('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
-        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 aviheader.patch)
-md5sums=('18c05d88e22c3b815a43ca8d7152ccdc'
-         'e4e2020d11b681aac898103b3ba723c4'
-         'fa8cd2a04b994a5d74bec60f6efd59e4'
-         'a5f3a87cff594f9ed69a3453f5630bec'
-         '9b575d01f94f50dd4dcf570cd8a14dda'
-         '607a14d090898ffb0f72c1aa6aa6ce31'
-         'f0b71c38b1207c1d604be091876ac051'
-         'bd8a233ea31c6686a956387ad28c5c5c'
-         '86b7dc64d7d21b241bbff32b423dcc12'
-         '8d432e2e56384d2a99dcdaf843f43ef4')
-url="http://www.mplayerhq.hu/"
+        ftp://ftp1.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2)
+        #MPlayer-1.0rc1-gnome-screensaver.patch)
+md5sums=('7e27e535c2d267637df34898f1b91707'
+         'e4e2020d11b681aac898103b3ba723c4')
 
 build() {
   cd $startdir/src/MPlayer-${pkgver}
@@ -38,44 +25,23 @@
   # Custom CFLAGS break the mplayer build
   unset CFLAGS
 
-  # Fix potential buffer overflow
-  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
-  # Fix aalib
-  patch -p1 -i ../aalib-configure.patch || return 1
   # Add support for gnome screensaver
-  patch -p1 -i ../MPlayer-1.0rc1-gnome-screensaver.patch || return 1
-  # Fix security issue in the avi demuxer
-  patch -Np1 -i ../aviheader.patch
-
-  # Add support for AMR codecs (3gp videos)
-  mkdir libavcodec/amr_float libavcodec/amrwb_float
-  cd libavcodec/amr_float
-  unzip -q ${startdir}/src/26104-510_ANSI_C_source_code.zip
-  cd ../amrwb_float
-  unzip -q ${startdir}/src/26204-510_ANSI-C_source_code.zip
+  #patch -p1 -i ../MPlayer-1.0rc1-gnome-screensaver.patch || return 1
   
   cd $startdir/src/MPlayer-${pkgver}
 
-  # i686 extra options
-  [ "$CARCH" = "i686" ] && EXTRAOPTS="--with-win32libdir=/usr/lib/win32"
-
   ./configure --prefix=/usr --enable-gui --disable-arts --enable-x11 \
-      --enable-runtime-cpudetection --enable-sdl \
-      --enable-theora --confdir=/etc/mplayer --disable-nas \
-      --enable-xvid --enable-gl --enable-tv-v4l1 --enable-tv-v4l2 --enable-largefiles \
+      --enable-runtime-cpudetection --confdir=/etc/mplayer --disable-nas \
+      --enable-gl --enable-tv-v4l1 --enable-tv-v4l2 --enable-largefiles \
       --disable-liblzo --disable-speex --disable-openal \
-      --enable-smb --enable-aa --disable-fribidi --disable-libdv --disable-musepack \
-      --language=all --enable-lirc --disable-dvdnav --disable-esd \
-      --enable-live --with-livelibdir=/usr/lib/live-media $EXTRAOPTS
+      --disable-fribidi --disable-libdv --disable-musepack \
+      --language=all --disable-dvdnav --disable-esd --disable-mga \
+      --with-extraincdir=/usr/lib/live-media
 
   [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make -j1 DESTDIR=${startdir}/pkg install
   cp etc/{codecs.conf,input.conf,example.conf} ${startdir}/pkg/etc/mplayer/
   ln -s /usr/share/fonts/TTF/Vera.ttf ${startdir}/pkg/usr/share/mplayer/subfont.ttf
   rm -rf ${startdir}/pkg/usr/share/mplayer/font