[arch-commits] Commit in mplayer/repos (extra-i686 extra-i686/PKGBUILD)

[Giovanni Scafora]

    Date: Monday, January 26, 2009 @ 08:00:04
  Author: giovanni
Revision: 25315

Merged revisions 25313 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mplayer/trunk

........
  r25313 | hugo | 2009-01-26 04:18:58 -0800 (lun, 26 gen 2009) | 2 lines
  
  upgpkg: mplayer 28347-2
      Fixing FS#12908 FS#12900 FS#12897
........

Modified:
  mplayer/repos/extra-i686/	(properties)
  mplayer/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)


Property changes on: mplayer/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mplayer/trunk:1-24954
   + /mplayer/trunk:1-25314

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-01-26 12:19:17 UTC (rev 25314)
+++ extra-i686/PKGBUILD	2009-01-26 13:00:04 UTC (rev 25315)
@@ -3,7 +3,7 @@
 
 pkgname=mplayer
 pkgver=28347
-pkgrel=1
+pkgrel=2
 pkgdesc="A movie player for linux"
 arch=('i686' 'x86_64')
 depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'gtk2'
@@ -15,18 +15,14 @@
 makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'mesa')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(ftp://ftp.archlinux.org/other/mplayer/${pkgname}-${pkgver}.tar.bz2
-        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 mplayer_desktop.patch)
+        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2)
 md5sums=('41fb540025a51930d318e99728a19c66'
-         'e4e2020d11b681aac898103b3ba723c4'
-         'fe66b052e74d35aa115f78a49d9d5aed')
+         'e4e2020d11b681aac898103b3ba723c4')
 
 build() {
   # Custom CFLAGS break the mplayer build
   unset CFLAGS
 
-  cd ${srcdir}/${pkgname}/etc
-  patch -p0 < ${srcdir}/mplayer_desktop.patch || return 1
-
   cd ${srcdir}/${pkgname}
 
   ./configure --prefix=/usr --enable-gui --disable-arts --enable-x11 \
@@ -36,7 +32,7 @@
       --enable-fribidi --disable-libdv --disable-musepack \
       --language=all --disable-dvdnav --disable-esd --disable-mga \
       --disable-libamr_nb --disable-lirc \
-      --with-extraincdir=/usr/lib/live-media
+      --with-extraincdir=/usr/lib/live-media --enable-freetype
 
   [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak