Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2481143554317ac4fe45a7a78862a54c9287854c
commit 2481143554317ac4fe45a7a78862a54c9287854c Author: kikadf <[email protected]> Date: Sat Jul 7 13:13:24 2012 +0200 mplayer-1.1-1-i686 * Version bump * Conflict with mplayer2 * Disable live support (can't build) diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild index 4da2223..7f9ba11 100644 --- a/source/xapps/mplayer/FrugalBuild +++ b/source/xapps/mplayer/FrugalBuild @@ -6,43 +6,40 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=mplayer _F_archive_name=MPlayer -pkgver=1.0rc4 +pkgver=1.1 Fuse $USE_DEVEL && pkgver=1.0rc2.29962 pkgextraver=.29962 -pkgrel=14 +pkgrel=1 Fuse $USE_DEVEL && pkgrel=1 pkgdesc="The Movie Player" url="http://www.mplayerhq.hu/"; -depends=('libxml2>=2.7.8' 'libgl' 'fontconfig' 'libstdc++' 'libdv' 'ncurses' 'libjpeg' 'libmad' \ +depends=('libxml2>=2.8.0' 'libgl' 'fontconfig' 'libstdc++' 'libdv' 'ncurses' 'libjpeg' 'libmad' \ 'libungif' 'xvidcore' 'libpng' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' 'amrnb' 'amrwb' \ - 'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2>=2.20.0-2' \ - 'x264>=20120213' 'dejavu-ttf' 'openal>=1.12.854' 'vidix' 'opencore-amr' 'aalib' \ - 'pulseaudio>=1.1' 'gdbm>=1.10') + 'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'gtk+2>=2.24.10' \ + 'x264>=20120213' 'dejavu-ttf' 'openal>=1.14' 'vidix' 'opencore-amr' 'aalib' \ + 'pulseaudio>=1.1' 'gdbm>=1.10' 'faad2' 'libbluray') makedepends=('yasm') [ "$CARCH" == "i686" ] && depends=(${depends[@]} 'codecs') depends=(${depends[@]} 'liblirc') groups=('xapps') backup=('etc/mplayer/mplayer.conf') +conflicts=('mplayer2') replaces=('emovix') archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump http://www.mplayerhq.hu/MPlayer/releases | Flasttar" -source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver.tar.bz2 \ +source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver.tar.xz \ http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2 \ http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-cp1250.tar.bz2 \ http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \ http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 \ - http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2 \ - mp3lib_gcc46.patch 0001-Fix-ff_imdct_calc_sse-on-gcc-4.6.patch) + http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2) -sha1sums=('36dfaeda726896b6831d66b0fe179623e0385fbe' \ +sha1sums=('913a4bbeab7cbb515c2f43ad39bc83071b2efd75' \ '0250d0b468b36ee13f160a814297afcb77f97e1d' \ 'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \ '152c40bf20de34aa8802d7f80d34d673b0b67212' \ - '7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \ - '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \ - 'ca0df52d64f72f28f70af19432439c5e530daa87' \ - '0bd0b40a4137cac72873cba1b7a01680859267ca') + '7b99bbe0e9ba89a57eccbea8f93c453c4f268181') if Fuse $USE_DEVEL; then source=(${source[1]} ${source[2]} ${source[3]} ${source[4]} ${source[5]}) @@ -75,10 +72,11 @@ build() if ! Fuse $USE_DEVEL; then Fconfopts="$Fconfopts --disable-vidix" fi + Fmake --confdir=/etc/mplayer --enable-gui --language=all \ --enable-runtime-cpudetection --enable-liblzo \ - --enable-largefiles --enable-mga --enable-xmga \ - --enable-tdfxfb --enable-debug + --enable-mga --enable-xmga --enable-tdfxfb \ + --enable-debug unset MAKEFLAGS make DESTDIR=$Fdestdir install || Fdie Fmkdir /usr/share/doc/$pkgname-$pkgver diff --git a/source/xapps/mplayer/mp3lib_gcc46.patch b/source/xapps/mplayer/mp3lib_gcc46.patch deleted file mode 100644 index 9eb295d..0000000 --- a/source/xapps/mplayer/mp3lib_gcc46.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: mp3lib/dct64_sse.c -=================================================================== ---- mp3lib/dct64_sse.c (revisione 33468) -+++ mp3lib/dct64_sse.c (revisione 33469) -@@ -112,7 +112,6 @@ - } - - { -- real *costab = costab_mmx + 24; - int i; - - __asm__( -@@ -121,7 +120,7 @@ - "movaps %1, %%xmm5\n\t" - "movaps %%xmm5, %%xmm6\n\t" - : -- :"m"(*costab), "m"(*nnnn) -+ :"m"(costab_mmx[24]), "m"(*nnnn) - ); - - for (i = 0; i < 0x20; i += 8) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
