Merge branch 'testing' of ssh://linhes.org/mount/repository/linhes_pkgbuild into testing

1 files changed, 49 insertions, 34 deletions

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index 0b670c1..211fb50 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mplayer
-pkgver=29438
+pkgver=32613
 pkgrel=1
 pkgdesc="Famous multimedia player, dev. version, without its GUI"
 arch=('i686' 'x86_64')
@@ -7,57 +7,72 @@ 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' 'libmng' 'libxfont' 'libjpeg')
+         'libgl' 'smbclient' 'aalib' 'x264>=20101109' 'faac' 'lirc-utils' 
+	 'ttf-dejavu' 'libmng' 'libxfont' 'libjpeg' 'rtmpdump' 'ladspa'
+         'mpg123' 'libbluray-git' 'libcdio')
 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=()
+#source=(http://knoppmyth.net/repo/source/mplayer-export-snapshot.tar.bz2  http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2)
+source=(http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2)
 
 _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"
+  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
+  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"
+#  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
+  unset CFLAGS LDFLAGS
+  ./configure --prefix=/usr \
+      --enable-runtime-cpudetection \
+      --disable-gui \
+      --disable-arts \
+      --disable-liblzo \
+      --disable-speex \
+      --disable-openal \
+      --disable-fribidi \
+      --disable-libdv \
+      --disable-musepack \
+      --disable-esd \
+      --disable-mga \
+      --enable-xvmc \
+      --language=all \
+      --confdir=/etc/mplayer
+
+  [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+
   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
+package() {
+  cd "${srcdir}/${_svnmod}-build"
+  make -j1 DESTDIR=${pkgdir} install
+  install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
+  install -dm755 ${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
+  mkdir -p ${pkgdir}/usr/share/mplayer/skins/default
   mv ${srcdir}/Blue ${pkgdir}/usr/share/mplayer/skins/default
   mkdir -p ${pkgdir}/usr/share/doc/mplayer
-  cp ${srcdir}/$_svnmod-build/DOCS/tech/* ${pkgdir}/usr/share/doc/mplayer
-  msg "Cleaning build files..."
-  rm -rf $srcdir/$_svnmod-build
+  cp -r ${srcdir}/${_svnmod}-build/DOCS/tech/* ${pkgdir}/usr/share/doc/mplayer/
 
+  msg "Cleaning build files..."
+  rm -rf "${srcdir}/${_svnmod}-build"
 }
+md5sums=('e4e2020d11b681aac898103b3ba723c4')