From: Tomas Chvatal Date: Tue, 18 Oct 2011 09:41:36 +0000 (+0000) Subject: Depend on virtual/ffmpeg. Fixes bug #362071. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e43d99d854136fa73b4814bcc6a787554e582913;p=gentoo.git Depend on virtual/ffmpeg. Fixes bug #362071. Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64 --- diff --git a/media-libs/FusionSound/ChangeLog b/media-libs/FusionSound/ChangeLog index 5cfeb5176ddc..9a1fca80e4da 100644 --- a/media-libs/FusionSound/ChangeLog +++ b/media-libs/FusionSound/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/FusionSound # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.12 2011/06/29 14:54:46 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.13 2011/10/18 09:41:36 scarabeus Exp $ + + 18 Oct 2011; Tomáš Chvátal + -FusionSound-1.1.1.ebuild, FusionSound-1.1.1-r1.ebuild: + Depend on virtual/ffmpeg. Fixes bug #362071. 29 Jun 2011; Christoph Mende FusionSound-1.1.1-r1.ebuild: diff --git a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild index 1cac2e7e2258..f7cbdad345e5 100644 --- a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild +++ b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.5 2011/06/29 14:54:46 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.6 2011/10/18 09:41:36 scarabeus Exp $ EAPI=2 inherit autotools eutils @@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/DirectFB-${PV} vorbis? ( media-libs/libvorbis ) mad? ( media-libs/libmad ) cddb? ( media-libs/libcddb ) - ffmpeg? ( >=media-video/ffmpeg-0.6.90_rc0 ) + ffmpeg? ( >=virtual/ffmpeg-0.6.90_rc0 ) !net-zope/zodb" DEPEND="${RDEPEND} dev-util/pkgconfig diff --git a/media-libs/FusionSound/FusionSound-1.1.1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1.ebuild deleted file mode 100644 index 7f60d1b2008e..000000000000 --- a/media-libs/FusionSound/FusionSound-1.1.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1.ebuild,v 1.6 2009/12/23 11:13:31 ssuominen Exp $ - -EAPI=2 -inherit autotools eutils - -DESCRIPTION="Audio sub system for multiple applications" -HOMEPAGE="http://www.directfb.org/" -SRC_URI="http://www.directfb.org/downloads/Core/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="alsa cddb ffmpeg mad oss timidity vorbis" - -RDEPEND=">=dev-libs/DirectFB-${PV} - alsa? ( media-libs/alsa-lib ) - timidity? ( media-libs/libtimidity - media-sound/timidity++ ) - vorbis? ( media-libs/libvorbis ) - mad? ( media-libs/libmad ) - cddb? ( media-libs/libcddb ) - ffmpeg? ( >=media-video/ffmpeg-0.5 ) - !net-zope/zodb" -DEPEND="${RDEPEND} - dev-util/pkgconfig - sys-apps/sed" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-ffmpeg.patch - sed -i -e 's:-O3 -ffast-math -pipe::' configure.in \ - || die "sed failed" - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - local myaudio="wave" - - use alsa && myaudio="${myaudio} alsa" - use oss && myaudio="${myaudio} oss" - - # Lite is used only for tests or examples. - # Tremor isn't there with latest libvorbis. - econf \ - --disable-dependency-tracking \ - --without-lite \ - --with-drivers="${myaudio}" \ - --without-examples \ - $(use_with timidity) \ - --with-wave \ - $(use_with vorbis) \ - --without-tremor \ - $(use_with mad) \ - $(use_with cddb cdda) \ - $(use_with ffmpeg) \ - --with-playlist -} - -src_install() { - emake DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html \ - install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/media-libs/FusionSound/Manifest b/media-libs/FusionSound/Manifest index 0567219befba..11e054bda075 100644 --- a/media-libs/FusionSound/Manifest +++ b/media-libs/FusionSound/Manifest @@ -1,18 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX FusionSound-1.1.1-ffmpeg-0.6.90.patch 499 RMD160 89046316ea2bee0f4f5a64c32187008d4326a171 SHA1 1614f68a2eb5cec93bc55cbd507909f053b0c6ec SHA256 2711be9cf1d011084c77753539c221bff47daab0ca1e5c7fbb7d1d0419d62cba AUX FusionSound-1.1.1-ffmpeg.patch 1909 RMD160 ace5650fd14967d226cc2183cfb8016002a9833b SHA1 36f7d62672e4f92506ce09af28a64076cdc88a1c SHA256 2d4923474c6fd22bafdfb6f2454a1b280d24cb7d8ec2ad20e75c547cdb559439 AUX FusionSound-1.1.1-gcc43.patch 966 RMD160 778aa15f55614479ac26fa46b7e9d5d9e032d7fc SHA1 d718d3fb2a9914e4c675f6a6058ce750b20337c2 SHA256 501b0a9fc9c109ce38564863cf4ae1737de99eff3f22052506e3371fef443c3b DIST FusionSound-1.1.1.tar.gz 1103465 RMD160 08fca827c50dbc2abc754f8ec25fcc62a7896917 SHA1 cd5e45d5ab3d83b9474e8d4dc36a0b43e637f302 SHA256 573505cb6d8e39174f188ef8f749fc4c0f3476397f379d2b65ff8d07b8aa6f6d -EBUILD FusionSound-1.1.1-r1.ebuild 1762 RMD160 edc7cd030cb51a003879bdc9c5e5da691526197b SHA1 de53a6a34c973e929309ee264ff4b9409743acf4 SHA256 273e3378699cd034c86282c54e21cd10b96fa52e0b3078a71a982211857c5eba -EBUILD FusionSound-1.1.1.ebuild 1706 RMD160 240d638dfb305b177cbf380b446f8b54c238f11a SHA1 1f9defb8c0419da2026c4e28657fa45e5ac1ccdb SHA256 d5164fb414aaa561a1d4d1def099e59154d4885fa89468389b13249c6c3a6688 -MISC ChangeLog 1936 RMD160 8557fa96fefc9dcca7df01aad8a81a5e28514796 SHA1 a3457228713eb072514fc61eabf24b58d9646151 SHA256 8872e7e70bf64a553a7deeebb8a50cb582984cf65a0e5750e9db3e38f87133c5 +EBUILD FusionSound-1.1.1-r1.ebuild 1760 RMD160 191a4593eac83b2c1dbf0eca45278816de553efe SHA1 542a8022b78448a794a10d9f860fbf19a0a3eed0 SHA256 b01c854702d1dab2817c3cb89eb71473366548eaee1ee7aaecb1a45db0cc311a +MISC ChangeLog 2099 RMD160 b1e1d61f3037a7484cb1b7afcfc8277372caf0fa SHA1 14ab86de9eb11b640ba9e44ba200d34d7be98530 SHA256 81784a9b1c9022cedeec0adbb808934ca2945f238d28efd48ff2b715a8f2b4dd MISC metadata.xml 258 RMD160 5095033a3f1e005eb3f3a84860d66ddec69a3f2a SHA1 9a67dcf026c0a4fb909ce2567329156394735796 SHA256 b2a9da76f94c1e0ae408d46f9621abe6df070aa121366378e2fbc8ec5037c451 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk4LPLwACgkQmWq1bYTyC0O09gD/T+XJZr05X81qk+vzaBBtPfXm -oGGdvA03qb53/ZsByu0BALN1z8yAr+8AbNYuFtCJss1dW5xMBZb3sHZNtqUi5RA2 -=Whds +iQIcBAEBAgAGBQJOnUl+AAoJEOSiRoyO7jvoEMgP/jS2CQyDn92SKGvUnUhDbR5t +zEv/kEbtJeJOiTNScoeu+lkgYSXPgOllpxR3mhp554jx8plOB9vcCxVAywhMThw4 +ZK5jGfWcynTN8wEklvLsrHh6wEQO6RQCxDqjY5RGMfurxbebZkLMUnNAbEG77+E/ +NlHMkZooP/ieGVeXsCArXlTtxr/ajU+LWXUu4aKQ4Hbl6NQvNANPuU8LRd8dgrk7 +GcRrSByYzpP4sBA4wTyeu4vje8JI1zm1/71+7W4B0Mo2uVDUTeu2YBC5ner14eIa +D4Nz7WSUeYI/+4dUO9cA0piID8hSDAe/MuMZWXvIugfgiWnIek198zkuc0AtOOZU +Jw4BuUw4pwBE0XWHTuSfojxLE9RbLdJh+R1gUBzd87RmOr25Am6F6W58rzs2rlNp +1m+LrZBQj6yjnqk7yMLpiSnTXxE6kYCvI8tbFVEVjefPZZBl/mSLwSUg9uEIHs4s +1QaXznU6ZFBU3RAKoA0YmDUzr9nQGNjw+yq/ws+CBi7HfwelTIvkxerZf9NuXhZV +dI7DaS4Av3PbIfNPlslyg1Tf3q9/voLDiimgB9jpfsCR1A5BtEZrcStr8BP96Puh +TR3qX3xAFJAwHMrUO2s9gDnHC5TfEpEuU+l7x8Zxt5YeWXKBXAbLTvU9NM1d/dJf +XrYitPX1AWHPoWEkqGMX +=IML/ -----END PGP SIGNATURE-----