From afc238bb913a96a485f09d6e14357395772885f5 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 6 Mar 2009 23:45:51 -0600 Subject: make xine/mplayer-vdpau depend on nvidia and not nvidia-beta. --- .../community/mplayer-vdpau-nogui/PKGBUILD | 70 +++++++++------------- .../community/xine-lib-vdpau-svn/PKGBUILD | 2 +- 2 files changed, 28 insertions(+), 44 deletions(-) diff --git a/abs/extra-testing/community/mplayer-vdpau-nogui/PKGBUILD b/abs/extra-testing/community/mplayer-vdpau-nogui/PKGBUILD index 8253f99..744203a 100644 --- a/abs/extra-testing/community/mplayer-vdpau-nogui/PKGBUILD +++ b/abs/extra-testing/community/mplayer-vdpau-nogui/PKGBUILD @@ -1,57 +1,41 @@ -#Contributor: Vincent Kriek [Vintendo] -#Contributor: Reiser - pkgname=mplayer-vdpau-nogui -pkgver=28348 +pkgver=28785 pkgrel=3 pkgdesc="Famous multimedia player, dev. version, without its GUI and support for nvidia VDPAU" arch=('i686' 'x86_64') url="http://www.mplayerhq.hu/" license=('GPL') -depends=('ttf-dejavu' 'nvidia-beta') +depends=('ttf-dejavu' 'nvidia-utils>=1.80.22') makedepends=('subversion') conflicts=('mplayer') provides=('mplayer') -source=('ftp://download.nvidia.com/XFree86/vdpau/mplayer-vdpau-3482714.tar.bz2' - 'no_segfault_configure.diff') -md5sums=(60547e0d950c414fe72ede79cf801327 - ed962f7642ffcf2411ec6465fdc8c132) +source=('no_segfault_configure.diff') +md5sums=(ed962f7642ffcf2411ec6465fdc8c132) +_svntrunk=svn://svn.mplayerhq.hu/mplayer/trunk +_svnmod=mplayer-vdpau build() { -# if [ "${CFLAGS}" != *"-fpic"* ]; then -# CFLAGS=$CFLAGS' -fpic' -# fi - unset CFLAGS - - cd $srcdir/mplayer-vdpau-3482714 - - co_dir=mplayer-vdpau - svn co --ignore-externals -r 28348 svn://svn.mplayerhq.hu/mplayer/trunk ${co_dir} - cd ${co_dir} - svn co -r 16724 svn://svn.mplayerhq.hu/ffmpeg/trunk/libpostproc - svn co -r 16724 svn://svn.mplayerhq.hu/ffmpeg/trunk/libavformat - svn co -r 16724 svn://svn.mplayerhq.hu/ffmpeg/trunk/libavcodec - svn co -r 16724 svn://svn.mplayerhq.hu/ffmpeg/trunk/libavutil - svn co -r 1166 svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/src libdvdread4 - svn co -r 1166 svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav/src libdvdnav - - patch -p0 < ../mplayer-vdpau-mplayer.patch - patch -p0 < ../mplayer-vdpau-libavcodec.patch - - patch -p1 < ../../no_segfault_configure.diff - ./configure --prefix=/usr --confdir=/etc/mplayer --disable-gui \ - --enable-runtime-cpudetection --enable-largefiles --enable-menu \ - --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 \ - --disable-directfb + cd $srcdir + svn co $_svntrunk $_svnmod + cp -R $_svnmod $_svnmod-build + cd $_svnmod-build + #unset CFLAGS + CFLAGS="$CFLAGS -fomit-frame-pointer" + ./configure --prefix=/usr --confdir=/etc/mplayer --disable-gui \ + --enable-runtime-cpudetection --enable-largefiles --enable-menu \ + --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 \ + --disable-directfb + make || return 1 + make DESTDIR=$pkgdir install || return 1 - 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 - 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 + cd ../ + rm -rf ./$_svnmod-build } diff --git a/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD b/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD index 881b636..588c582 100644 --- a/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD +++ b/abs/extra-testing/community/xine-lib-vdpau-svn/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc="A free video player library for Unix with support for vdpau" arch=('i686' 'x86_64') url="http://xinehq.de/" license=('GPL') -depends=('libxvmc' 'esound' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora' 'libxcb' 'wavpack' 'ffmpeg>=20080715' 'heimdal>=1.2.1' 'nvidia-utils-beta>=180.16' 'nvidia-beta>=180.16') +depends=('libxvmc' 'esound' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora' 'libxcb' 'wavpack' 'ffmpeg>=20080715' 'heimdal>=1.2.1' 'nvidia-utils>=180.22' 'nvidia>=180.22') optdepends=('codecs') makedepends=('subversion' 'pkgconfig' 'libtool' 'imagemagick' 'smbclient' 'mesa' 'alsa-lib' 'vcdimager' 'jack-audio-connection-kit' 'cvs') conflicts=('xine-lib') -- cgit v0.12