LinHES 6.01.00

1 files changed, 47 insertions, 51 deletions

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index f69a21a..0b670c1 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -1,67 +1,63 @@
-# $Id: PKGBUILD 3632 2008-06-26 11:48:49Z paul $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=mplayer
-pkgver=1.0rc2
-pkgrel=5
-pkgdesc="A movie player for linux"
-arch=(i686 x86_64)
+pkgver=29438
+pkgrel=1
+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'
-         'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit'
-         'x264>=20080625' 'faac' 'lirc-utils' 'ttf-dejavu')
+         'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
+         'libgl' 'smbclient' 'aalib' 'x264>=20090108' 'faac' 'lirc-utils' 
+	 'ttf-dejavu' 'fribidi' 'libmng' 'libxfont' 'libjpeg')
 license=('GPL')
-url="http://www.mplayerhq.hu/"
-makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'mesa')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-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
-	ivtv_2.6.24.patch)
-md5sums=('7e27e535c2d267637df34898f1b91707'
-         'e4e2020d11b681aac898103b3ba723c4'
-         '320af7daa1b248ee8e8c15d34d7923e3'
-         'ce999929155f509a3e6bee41d9d613ed'
-         '6a2c124586e1e6c44ae4ca1b4be9b6e4'
-         'c7d1bcdd61fcceb7598d61fe2213c587'
-	 '1ef35068587f6b6dbc99342567895236')
+makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'subversion' 'nvidia-utils')
 
-build() {
-  cd $startdir/src/MPlayer-${pkgver}
+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=()
 
-  # Custom CFLAGS break the mplayer build
-  unset CFLAGS
+_svnmod="mplayer"
+_svntrunk=svn://svn.mplayerhq.hu/mplayer/trunk/
 
-  # Add support for gnome screensaver
-  #patch -p1 -i ../MPlayer-1.0rc1-gnome-screensaver.patch || return 1
+build() {
 
-  # Workaround for changed ivtv interface since it went mainline in 2.6.24
-  patch -p1 -i ../ivtv_2.6.24.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 $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 $startdir/src/MPlayer-${pkgver}
+  #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-gl --enable-tv-v4l1 --enable-tv-v4l2 --enable-largefiles \
+      --enable-tv-v4l1 --enable-tv-v4l2 --enable-largefiles \
       --disable-liblzo --disable-speex --disable-openal \
-      --disable-fribidi --disable-libdv --disable-musepack \
+      --enable-fribidi --disable-libdv --disable-musepack \
       --language=all --disable-dvdnav --disable-esd --disable-mga \
-      --disable-libamr_nb \
-      --with-extraincdir=/usr/lib/live-media
+      --disable-libamr_nb --enable-lirc --disable-jack \
+      --enable-freetype --enable-vdpau
+  make || return 1
+  make DESTDIR=$pkgdir install || return 1
 
-  [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+  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
+  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
 
-  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/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
 }