[Frugalware-git] ffmpeg200911: mplayer-1.0rc2-15-i686

2010-01-04 Thread Cedynamix
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ffmpeg200911.git;a=commitdiff;h=a941ab2f14f0bbbeb6d616e4487f344eb1cee94c

commit a941ab2f14f0bbbeb6d616e4487f344eb1cee94c
Author: Cedynamix cedyna...@gmail.com
Date:   Mon Jan 4 21:14:59 2010 +0100

mplayer-1.0rc2-15-i686

* Fix Version

diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 341cdfb..80ec11e 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -1,13 +1,14 @@
# Compiling time: 1.5 SBU
-# Maintainer: Miklos Vajna vmik...@frugalware.org
+# Maintainer: Cedynamix cedyna...@gmail.com
+# Contributor: Miklos Vajna vmik...@frugalware.org

-USE_DEVEL=${USE_DEVEL:-y}
+USE_DEVEL=${USE_DEVEL:-n}

pkgname=mplayer
_F_archive_name=MPlayer
pkgver=1.0rc2
Fuse $USE_DEVEL  pkgver=1.0rc2.29962
-pkgextraver=
+pkgextraver=.29962
pkgrel=15
Fuse $USE_DEVEL  pkgrel=1
pkgdesc=The Movie Player
@@ -15,7 +16,7 @@ url=http://www.mplayerhq.hu/;
depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \
'libungif' 'xvidcore' 'libpng' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' \
'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2=2.16.2-2' \
-'x264=20090416' 'dejavu-ttf' 'openal=1.7.411' 'vidix' 'amrnb' 
'amrwb' 'aalib')
+'x264=20090416' 'dejavu-ttf' 'openal=1.7.411' 'vidix' 'opencore-amr' 
'aalib')
[ $CARCH == i686 ]  depends=(${depen...@]} 'codecs')
[ $CARCH != ppc ]  depends=(${depen...@]} 'liblirc')
makedepends=('gcc=4.4.2')
@@ -23,37 +24,20 @@ groups=('xapps')
backup=('etc/mplayer/mplayer.conf')
archs=('i686' 'x86_64' 'ppc')
options=('scriptlet')
-up2date=lynx -dump http://www.mplayerhq.hu/MPlayer/releases/|Flasttar
-source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver$pkgextraver.tar.bz2
 \
+replaces=('mplayer=1.0rc2.30166')
+up2date=lynx -dump http://ftp.frugalware.org/pub/other/sources/mplayer/ | 
Flasttar
+source=(http://ftp.frugalware.org/pub/other/sources/mplayer/$_F_archive_name-$pkgver$pkgextraver.tar.bz2
 \
http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.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 \
-   http://www.mplayerhq.hu/MPlayer/patches/url_fix_20080120.diff \
-   http://www.mplayerhq.hu/MPlayer/patches/demux_mov_fix_20080129.diff \
-   http://www.mplayerhq.hu/MPlayer/patches/demux_audio_fix_20080129.diff \
-   http://www.mplayerhq.hu/MPlayer/patches/stream_cddb_fix_20080120.diff \
-   CVE-2008-0073.diff \
-   http://www.ocert.org/patches/2008-013/mplayer_demux_real.patch \
-   fix-for-vqf-demuxer-crashes.patch \
-   ivtv_2.6.24.patch \
-   ffmpeg-r16846.patch)
-sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \
+   
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2)
+sha1sums=('8dbf4717409e0d645c53f597d3021d0db1677a9a' \
'45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \
'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \
'152c40bf20de34aa8802d7f80d34d673b0b67212' \
'7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \
-  '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
-  '1e92ded6f27bf07601fa318e24ec468fe225ffe5' \
-  'a17d82baff58e8cc569365341503273956fd26c8' \
-  'e25ba7d8d696d9c6365f105134ba723404adb4e1' \
-  '8d901c7a88fa120ed26492e741e1ae0fbe57e12d' \
-  'df2d0c46a73be32ec5e3d575532c34b939a79d5f' \
-  '3139c1c13d411cbacef9a9d050c9df87431aba71' \
-  '19f886cddc59a6f7ef5b9c4c1cdb731ec481fe13' \
-  'dbb1eab7de79cbff3a15eeb8acbe34a853800afa' \
-  'e4c28fa466118d07a3f7d8376b725eda2e196e21')
+  '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d')

if Fuse $USE_DEVEL; then
source=(${source[1]} ${source[2]} ${source[3]} ${source[4]} ${source[5]})
@@ -68,7 +52,7 @@ fi

subpkgs=('mencoder')
subdescs=('The Movie Encoder')
-subdepends=('x264 lame libpng libjpeg libungif alsa-lib cdparanoia fontconfig 
lzo libmad libtheora libstdc++ amrnb amrwb libdv xvidcore libxcb')
+subdepends=('x264 lame libpng libjpeg libungif alsa-lib cdparanoia fontconfig 
lzo libmad libtheora libstdc++ opencore-amr libdv xvidcore libxcb')
[ $CARCH != ppc ]  subdepends[0]=${subdepends[0]} liblirc
subgroups=('xmultimedia')
subarchs=('i686 x86_64 ppc')
@@ -83,7 +67,7 @@ build()
unset CFLAGS
Fpatchall
if ! Fuse $USE_DEVEL; then
-   Fconfopts=$Fconfopts --disable-vidix-internal
+   Fconfopts=$Fconfopts --disable-vidix
fi
Fmake --confdir=/etc/mplayer --enable-gui --language=all \
--enable-runtime-cpudetection --enable-liblzo \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] ffmpeg200911: mplayer-1.0rc2-15-i686

2010-01-04 Thread Cedynamix
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ffmpeg200911.git;a=commitdiff;h=a80094ed6b04234ebed1a0508318149850326a69

commit a80094ed6b04234ebed1a0508318149850326a69
Author: Cedynamix cedyna...@gmail.com
Date:   Mon Jan 4 22:39:19 2010 +0100

mplayer-1.0rc2-15-i686

* add conflicts('mplayer=1.0rc2.30166')

diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 80ec11e..45b8080 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -24,7 +24,7 @@ groups=('xapps')
backup=('etc/mplayer/mplayer.conf')
archs=('i686' 'x86_64' 'ppc')
options=('scriptlet')
-replaces=('mplayer=1.0rc2.30166')
+conflicts=('mplayer=1.0rc2.30166')
up2date=lynx -dump http://ftp.frugalware.org/pub/other/sources/mplayer/ | 
Flasttar
source=(http://ftp.frugalware.org/pub/other/sources/mplayer/$_F_archive_name-$pkgver$pkgextraver.tar.bz2
 \
http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] ffmpeg200911: mplayer-1.0rc2-15-i686

2010-01-04 Thread Cedynamix
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ffmpeg200911.git;a=commitdiff;h=01d1cdf0b6056114c0319669c9078f253ab627af

commit 01d1cdf0b6056114c0319669c9078f253ab627af
Author: Cedynamix cedyna...@gmail.com
Date:   Mon Jan 4 22:51:00 2010 +0100

mplayer-1.0rc2-15-i686

* Delete conflicts
* Add options('force')

diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 45b8080..7d4d818 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -23,8 +23,7 @@ makedepends=('gcc=4.4.2')
groups=('xapps')
backup=('etc/mplayer/mplayer.conf')
archs=('i686' 'x86_64' 'ppc')
-options=('scriptlet')
-conflicts=('mplayer=1.0rc2.30166')
+options=('scriptlet' 'force')
up2date=lynx -dump http://ftp.frugalware.org/pub/other/sources/mplayer/ | 
Flasttar
source=(http://ftp.frugalware.org/pub/other/sources/mplayer/$_F_archive_name-$pkgver$pkgextraver.tar.bz2
 \
http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git