2 files changed, 61 insertions, 56 deletions
diff --git a/abs/core-testing/mplayer-nogui-svn/PKGBUILD b/abs/core-testing/mplayer-nogui-svn/PKGBUILD
deleted file mode 100644
index d241aef..0000000
--- a/abs/core-testing/mplayer-nogui-svn/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: catwell <catwell@archlinux.us>
-# Contributor: Army <uli[dot]armbruster[at]gmail[dot].com>
-
-pkgname=mplayer-nogui-svn
-pkgver=29134
-pkgrel=2
-pkgdesc="Famous multimedia player, dev. version, without its GUI"
-arch=('i686' 'x86_64')
-url="http://www.mplayerhq.hu/"
-license=('GPL')
-depends=('ttf-dejavu' 'libcdio')
-makedepends=('subversion')
-conflicts=('mplayer')
-provides=('mplayer')
-source=()
-md5sums=()
-
-_svnmod="mplayer"
-_svntrunk=svn://svn.mplayerhq.hu/mplayer/trunk/
-
-build() {
-
-  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"
-
-  cp -r $_svnmod $_svnmod-build
-  cd $_svnmod-build
-
-  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 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
-
-}
diff --git a/abs/core-testing/mplayer/PKGBUILD b/abs/core-testing/mplayer/PKGBUILD
new file mode 100644
index 0000000..0dcbd64
--- /dev/null
+++ b/abs/core-testing/mplayer/PKGBUILD
@@ -0,0 +1,61 @@
+pkgname=mplayer
+pkgver=29134
+pkgrel=7
+pkgdesc="Famous multimedia player, dev. version, without its GUI"
+arch=('i686' 'x86_64')
+url="http://www.mplayerhq.hu/"
+license=('GPL')
+depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'gtk2'
+         'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
+         'libgl' 'smbclient' 'aalib' 'x264>=20090108' 'faac' 'lirc-utils' 
+	 'ttf-dejavu' 'fribidi')
+license=('GPL')
+makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'subversion' 'nvidia-utils')
+
+conflicts=('mplayer-nogui-svn')
+provides=('mplayer')
+source=(http://knoppmyth.net/repo/source/mplayer-export-snapshot.tar.bz2  http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2)
+md5sums=()
+
+_svnmod="mplayer"
+_svntrunk=svn://svn.mplayerhq.hu/mplayer/trunk/
+
+build() {
+
+  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"
+  
+  #cp -r $_svnmod $_svnmod-build
+  cp -r mplayer-export-2009-04-03/ $_svnmod-build
+  cd $_svnmod-build
+
+  msg "Building the package..."
+  CFLAGS="$CFLAGS -fomit-frame-pointer"
+  # Custom CFLAGS break the mplayer build
+#  unset CFLAGS
+  ./configure --prefix=/usr --enable-gui --disable-arts --enable-x11 \
+      --enable-runtime-cpudetection --confdir=/etc/mplayer --disable-nas \
+      --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 --disable-jack \
+      --enable-freetype --enable-vdpau
+  make || return 1
+  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
+  rm -rf ${pkgdir}/usr/share/mplayer/font
+  mv ${srcdir}/Blue ${pkgdir}/usr/share/mplayer/skins/default
+  msg "Cleaning build files..."
+  rm -rf $srcdir/$_svnmod-build
+
+}