Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting5.git;a=commitdiff;h=30e5011ba45adc663391d81d26b82f25df71a456
commit 30e5011ba45adc663391d81d26b82f25df71a456 Merge: 1bcfee0 a2b458b Author: James Buren <[email protected]> Date: Fri Aug 31 13:51:13 2012 -0500 Merge branch 'master' of ../current Conflicts: source/apps-extra/mplayer2/FrugalBuild diff --cc source/apps-extra/mplayer2/FrugalBuild index 2951413,dcdba9b..cb6afe9 --- a/source/apps-extra/mplayer2/FrugalBuild +++ b/source/apps-extra/mplayer2/FrugalBuild @@@ -2,17 -2,16 +2,16 @@@ # Maintainer: kikadf <[email protected]> pkgname=mplayer2 - pkgver=2.0.gde435ed - pkgrel=2 - pkgdesc="mplayer2 is an advanced general-purpose video player. A fork of the original MPlayer project." + pkgver=2.0.g95e81df + pkgrel=1 + pkgdesc="Mplayer2 is an advanced general-purpose video player. A fork of the original MPlayer project." url="http://www.mplayer2.org/"; depends=('aalib' 'cdparanoia' 'faad2' 'ffmpeg' 'jack' 'ladspa_sdk' 'libass' 'libbluray' \ - 'libcaca' 'libcdio' 'libdvdnav' 'libgl' 'libmad' 'libpulse' 'libdca' \ + 'libcaca' 'libcdio' 'libdvdnav' 'libgl' 'libmad' 'libpulse>=2.1' 'libdca' \ 'libvdpau' 'libxinerama' 'libxscrnsaver' 'libxv' 'libxxf86dga' 'libxxf86vm' \ - 'mpg123' 'dejavu-ttf' 'speex' 'liblirc' 'libdv' 'libmng' 'live' 'python-3.0') + 'mpg123' 'dejavu-ttf' 'speex' 'liblirc' 'libdv' 'libmng' 'live' 'python-3.0' \ + 'libnemesi' 'libquvi') makedepends=('yasm') - conflicts=('mplayer') - provides=('mplayer') _F_scm_type="git" _F_scm_url="git://git.mplayer2.org/mplayer2.git" Finclude scm _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
