Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=28d6aa5a31edc808d12cf9bd3e7602bdb1c4f0b2
commit 28d6aa5a31edc808d12cf9bd3e7602bdb1c4f0b2 Merge: bef1045 9917413 Author: bouleetbil <[email protected]> Date: Sun Nov 6 20:14:12 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/xapps-extra/gmerlin/FrugalBuild diff --cc source/xapps-extra/gmerlin/FrugalBuild index ab4706a,25de7b7..c3eaf20 --- a/source/xapps-extra/gmerlin/FrugalBuild +++ b/source/xapps-extra/gmerlin/FrugalBuild @@@ -3,12 -3,12 +3,12 @@@ pkgname=gmerlin pkgver=1.0.0 --pkgrel=3 ++pkgrel=4 pkgdesc="Gmerlin is a multimedia architecture for Linux." Finclude sourceforge url="http://gmerlin.sourceforge.net/"; up2date="lynx -dump http://sourceforge.net/projects/gmerlin/files/gmerlin/ | grep 'http.*gmerlin/.*gmerlin/.*/$'|sed 's|.*/\(.*\)/|\1|;q' " - depends=('esd>=0.2.41' 'libcdio>=0.82' 'libxv>=1.0.4-1' 'gavl>=1.1.2' 'libmusicbrainz' 'freetype2' 'libxml2' 'transcode' \ -depends=('esd' 'libcdio>=0.83' 'libxv>=1.0.4-1' 'gavl>=1.1.2' 'libmusicbrainz' 'freetype2' 'libxml2' 'transcode' \ ++depends=('esd>=0.2.41' 'libcdio>=0.83' 'libxv>=1.0.4-1' 'gavl>=1.1.2' 'libmusicbrainz' 'freetype2' 'libxml2' 'transcode' \ 'libmikmod' 'speex' 'libquicktime>=1.1.5-4' 'mjpegtools>=1.9.0-2' 'libuuid' 'libvisual') rodepends=('gmerlin-avdecoder>=0.1.7' 'gmerlin-encoders>=0.2.5') makedepends=('esd' 'doxygen') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
