Force disable altivec support in ffmpeg wrt #252641.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 15 insertions, 11 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index d3b9b371374a..69df5c93616e 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpegthumbnailer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.68 2009/05/19 20:36:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.69 2009/05/20 13:04:55 ssuominen Exp $
+
+  20 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  ffmpegthumbnailer-1.5.0.ebuild, ffmpegthumbnailer-1.5.1.ebuild:
+  Force disable altivec support in ffmpeg wrt #252641.
 
   19 May 2009; Brent Baude <ranger@gentoo.org>
   ffmpegthumbnailer-1.5.0.ebuild:
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 2e57e190f757..6033fa1a3ea6 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -2,7 +2,7 @@ DIST ffmpegthumbnailer-1.3.0.tar.gz 322063 RMD160 343ecee23543beb23030655942d381
 DIST ffmpegthumbnailer-1.5.0.tar.gz 314289 RMD160 679ded3bb49cb73d71a6adb02232b9fa6cc0eb68 SHA1 7a84ac7bbc03bf62b44031dee58301aedc26aeef SHA256 eda42e942a746ab17977b13ce9222c67286a59984bb4557ba41f8c708bcfc540
 DIST ffmpegthumbnailer-1.5.1.tar.gz 326752 RMD160 fafadab033bd759ca2ae19bb6cf7ff0d51b11b3b SHA1 49848d7bc9cb80dd6f264cbd905134f3593fd8b4 SHA256 4dae04721bc27fc8b018ebb4cf4d98c7506eec94d01fdfee9f5b896220b10351
 EBUILD ffmpegthumbnailer-1.3.0.ebuild 979 RMD160 5df63ad6f6b8d5555e0de5a1d35b3b5ff8bfdfba SHA1 6d31efd929568035de5bfc6c63e4abe47b05879c SHA256 f6e765d570d3631378d1b8cb8854f9f67e2945940a541381a8ee76ab0f0ce9ea
-EBUILD ffmpegthumbnailer-1.5.0.ebuild 933 RMD160 0031679cc0b76227806862481715d8c0a23fac97 SHA1 dfff4db91acc8f6927437970a4fea86a06f3dc1a SHA256 b8264c2392e1b4db8edf1889236cd590a1a19900e985934a7e3438d4dbc27ecf
-EBUILD ffmpegthumbnailer-1.5.1.ebuild 909 RMD160 01a5a46193c756e49274af137ded994cb29511e8 SHA1 2189f529af46b4522e81a5a786728998160063c5 SHA256 bd10c6c4e03ed3986a57551e831ee74315feb884a8d5583cffc8e943a4960250
-MISC ChangeLog 10174 RMD160 ef749b18621440a5655d03c415fd98cd40480815 SHA1 7b500d110783daee961dd5a52ac29f0999a7e73d SHA256 f410b8b31d8adb18519a23b1241f622ab6a638886e805bec17d70ca0774e5c56
+EBUILD ffmpegthumbnailer-1.5.0.ebuild 860 RMD160 cf0a34208c179292f69bf3507d201f743240fc3e SHA1 fe55de90a70fc53a383d3c4ed227999d35a761cd SHA256 9e91d64b9ce3f910b839725789c3959417638336078a2dae3543e63d472bbd1e
+EBUILD ffmpegthumbnailer-1.5.1.ebuild 989 RMD160 c4ebbc7f3bfc862a4711ac62e7efb8a343cb5636 SHA1 ec161150014a84d9326c80da9f7b4c3368a363f5 SHA256 3e233b44dd7bf206556f008302076c0b7e3448282d60ac1e9cb92618d318783f
+MISC ChangeLog 10353 RMD160 b10e4f7ed66aaaf34a93b0ccf07c1e12375fd5b2 SHA1 d1c084de80dbb497d827fe399f90e9d5abbf597c SHA256 43169e284ef8e75c1842c9a8d7068c1e4456e985237bdc7a942fd169005ad005
 MISC metadata.xml 257 RMD160 77deff120c2aad50bc9b62c3b24c67cfbe15c1ce SHA1 61fdd16534463e801e095a21cd46ca7ca77ef5b2 SHA256 c1f8984e243bd5f7824eacc472f2efa96297f979e0761b8de3be169768815a9e
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild
index 15735cb58b0f..90b3e30c8f14 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild,v 1.5 2009/05/19 20:36:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.0.ebuild,v 1.6 2009/05/20 13:04:55 ssuominen Exp $
 
 EAPI=2
-inherit multilib
 
 DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
 HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer"
@@ -16,16 +15,16 @@ IUSE=""
 
 RDEPEND="media-libs/libpng
 	media-libs/jpeg
-	>=media-video/ffmpeg-0.4.9_p20070330"
+	>=media-video/ffmpeg-0.4.9_p20070330[-altivec]"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_configure() {
-	econf --disable-dependency-tracking --disable-static
+	econf \
+		--disable-dependency-tracking
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO
-	rm -f "${D}"/usr/$(get_libdir)/libffmpegthumbnailer.la
 }
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild
index e2c02af65b21..b6a2dfa838dd 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild,v 1.1 2009/05/13 14:03:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.1.ebuild,v 1.2 2009/05/20 13:04:55 ssuominen Exp $
 
 EAPI=2
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="jpeg png"
 
-RDEPEND=">=media-video/ffmpeg-0.5
+# See bug 252641, please try to remove the -altivec soon as possible.
+RDEPEND=">=media-video/ffmpeg-0.5[-altivec]
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )"
 DEPEND="${RDEPEND}