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

[Thomas Baechler]

    Date: Tuesday, February 26, 2008 @ 15:27:18
  Author: thomas
    Path: /home/cvs-extra/extra/multimedia/mplayer

Modified: PKGBUILD (1.16 -> 1.17)

upgpkg: mplayer 1.0rc2-3


----------+
 PKGBUILD |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)


Index: extra/multimedia/mplayer/PKGBUILD
diff -u extra/multimedia/mplayer/PKGBUILD:1.16 extra/multimedia/mplayer/PKGBUILD:1.17
--- extra/multimedia/mplayer/PKGBUILD:1.16	Tue Jan 22 18:22:47 2008
+++ extra/multimedia/mplayer/PKGBUILD	Tue Feb 26 15:27:18 2008
@@ -1,23 +1,30 @@
-# $Id: PKGBUILD,v 1.16 2008/01/22 17:22:47 thomas Exp $
+# $Id: PKGBUILD,v 1.17 2008/02/26 14:27:18 thomas Exp $
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=mplayer
 pkgver=1.0rc2
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A movie player for linux"
 arch=(i686 x86_64)
 depends=('libxxf86dga' 'libxv' 'libmad' 'libungif' 'cdparanoia' 'gtk2'
          'sdl' 'lame' 'libtheora' 'xvidcore'
          'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit'
-         'x264>=20070616' 'faac' 'lirc-utils')
+         'x264>=20070616' 'faac' 'lirc-utils' 'ttf-dejavu')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'mesa')
 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-1.0rc1-gnome-screensaver.patch)
+source=(http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${pkgver}.tar.bz2
+        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2        
+        http://www.mplayerhq.hu/MPlayer/patches/demux_audio_fix_20080129.diff
+        http://www.mplayerhq.hu/MPlayer/patches/demux_mov_fix_20080129.diff
+        http://www.mplayerhq.hu/MPlayer/patches/url_fix_20080120.diff
+        http://www.mplayerhq.hu/MPlayer/patches/stream_cddb_fix_20080120.diff)
 md5sums=('7e27e535c2d267637df34898f1b91707'
-         'e4e2020d11b681aac898103b3ba723c4')
+         'e4e2020d11b681aac898103b3ba723c4'
+         '320af7daa1b248ee8e8c15d34d7923e3'
+         'ce999929155f509a3e6bee41d9d613ed'
+         '6a2c124586e1e6c44ae4ca1b4be9b6e4'
+         'c7d1bcdd61fcceb7598d61fe2213c587')
 
 build() {
   cd $startdir/src/MPlayer-${pkgver}
@@ -28,6 +35,11 @@
   # Add support for gnome screensaver
   #patch -p1 -i ../MPlayer-1.0rc1-gnome-screensaver.patch || return 1
   
+  # Fix security issues
+  for p in demux_audio_fix_20080129.diff demux_mov_fix_20080129.diff url_fix_20080120.diff stream_cddb_fix_20080120.diff; do
+    patch -p0 -i ../${p}
+  done
+  
   cd $startdir/src/MPlayer-${pkgver}
 
   ./configure --prefix=/usr --enable-gui --disable-arts --enable-x11 \
@@ -43,7 +55,7 @@
   make || return 1
   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
+  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${startdir}/pkg/usr/share/mplayer/subfont.ttf
   rm -rf ${startdir}/pkg/usr/share/mplayer/font
   mv ${startdir}/src/Blue ${startdir}/pkg/usr/share/mplayer/skins/default
 }