3 files changed, 44 insertions, 52 deletions
diff --git a/abs/core-testing/mplayer/PKGBUILD b/abs/core-testing/mplayer/PKGBUILD
index e412933..f36ac94 100644
--- a/abs/core-testing/mplayer/PKGBUILD
+++ b/abs/core-testing/mplayer/PKGBUILD
@@ -1,53 +1,56 @@
-# $Id: PKGBUILD 25315 2009-01-26 13:00:04Z giovanni $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
+# Maintainer: catwell <catwell@archlinux.us>
+# Contributor: Army <uli[dot]armbruster[at]gmail[dot].com>
 
-pkgname=mplayer
-pkgver=28347
-pkgrel=6
-pkgdesc="A movie player for linux"
+pkgname=mplayer-nogui-svn
+pkgver=29037
+pkgrel=1
+pkgdesc="Famous multimedia player, dev. version, without its GUI"
 arch=('i686' 'x86_64')
-depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'gtk2'
-         'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
-         'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit'
-         'x264>=20090108' 'faac' 'lirc-utils' 'ttf-dejavu' 'fribidi' )
-license=('GPL')
 url="http://www.mplayerhq.hu/"
-makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'mesa')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf' 'etc/mplayer/mplayer.conf')
-source=(ftp://ftp.archlinux.org/other/mplayer/${pkgname}-${pkgver}.tar.bz2
-        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
-	mplayer-svn-gnome-screensaver.patch.tar.gz)
-md5sums=('41fb540025a51930d318e99728a19c66'
-         'e4e2020d11b681aac898103b3ba723c4'
-	 'c55b6eeb2b4071dd65226f2a08b9c07d')
+license=('GPL')
+depends=('ttf-dejavu')
+makedepends=('subversion')
+conflicts=('mplayer')
+provides=('mplayer')
+source=()
+md5sums=()
+
+_svnmod="mplayer"
+_svntrunk=svn://svn.mplayerhq.hu/mplayer/trunk/
 
 build() {
-  # Custom CFLAGS break the mplayer build
-  unset CFLAGS
 
-  cd ${srcdir}/${pkgname}
-  patch -p1 < ../mplayer-svn-gnome-screensaver.patch
+  cd $srcdir
+  if [ -d $_svnmod/.svn ]; then
+    cd $_svnmod
+    svn up -r $pkgver
+  else
+    svn co $_svntrunk --config-dir . -r $pkgver $_svnmod
+  fi
+  msg "SVN checkout done or server timeout"
 
-  ./configure --prefix=/usr --enable-gui --disable-arts --enable-x11 \
-      --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-fribidi --disable-libdv --disable-musepack \
-      --language=all --disable-dvdnav --disable-esd --disable-mga \
-      --disable-libamr_nb --enable-lirc \
-      --with-extraincdir=/usr/lib/live-media --enable-freetype --disable-directfb
+  cp -r $_svnmod $_svnmod-build
+  cd $_svnmod-build
 
-  [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+  msg "Building the package..."
+  CFLAGS="$CFLAGS -fomit-frame-pointer"
+  ./configure --prefix=/usr --confdir=/etc/mplayer --disable-gui \
+    --enable-runtime-cpudetection --enable-largefiles --enable-menu \
+    --disable-x264 --enable-mencoder --disable-directfb \
+    --disable-libdv --disable-aa --disable-liblzo --disable-speex \
+    --disable-fribidi --disable-arts --disable-smb --disable-dvdnav \
+    --disable-openal --disable-faad-internal --disable-jack \
+    --disable-musepack --disable-libamr_nb --disable-libamr_wb --enable-lirc
+    --disable-lircc --disable-x264 --disable-x264-lavc --enable-vdpau 
 
   make || return 1
-  make -j1 DESTDIR=${pkgdir} install || return 1
-  cp etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
-  if [ ! -e ${pkgdir}/etc/mplayer/mplayer.conf ]; then
-     echo "# Write your default config options here" > ${pkgdir}/etc/mplayer/mplayer.conf
-     echo "" >> ${pkgdir}/etc/mplayer/mplayer.conf
-  fi
+  make DESTDIR=$pkgdir install || return 1
+
+  install -m0644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer
+  install -d $pkgdir/usr/share/mplayer/
+  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf
+
+  msg "Cleaning build files..."
+  rm -rf $srcdir/$_svnmod-build
 
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
-  rm -rf ${pkgdir}/usr/share/mplayer/font
-  mv ${srcdir}/Blue ${pkgdir}/usr/share/mplayer/skins/default
 }
diff --git a/abs/core-testing/mplayer/mplayer-svn-gnome-screensaver.patch.tar.gz b/abs/core-testing/mplayer/mplayer-svn-gnome-screensaver.patch.tar.gz
deleted file mode 100644
index cbae488..0000000
--- a/abs/core-testing/mplayer/mplayer-svn-gnome-screensaver.patch.tar.gz
+++ /dev/null
diff --git a/abs/core-testing/mplayer/mplayer_desktop.patch b/abs/core-testing/mplayer/mplayer_desktop.patch
deleted file mode 100644
index d7c6ff3..0000000
--- a/abs/core-testing/mplayer/mplayer_desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mplayer.desktop	2008-04-12 21:29:02.000000000 -0300
-+++ mplayer.desktop-new	2009-01-21 23:02:11.000000000 -0300
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Type=Application
- Encoding=UTF-8
--Name=MPlayer
-+Name=GMPlayer
- GenericName=Multimedia player
- Comment=Multimedia player
- Comment[de]=Multimedia-Player