diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-01-15 05:51:38 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-01-15 05:51:38 +0000 |
| commit | e38c6eb036b4ab246f15ded4bdf6f2436f371a1d (patch) | |
| tree | 563c18e6aae8ff8d2c2bbc3a24fa872eebd923af /media-video | |
| parent | Add a jpeg-6b ebuild for SONAME ABI compat. (diff) | |
| download | historical-e38c6eb036b4ab246f15ded4bdf6f2436f371a1d.tar.gz historical-e38c6eb036b4ab246f15ded4bdf6f2436f371a1d.tar.bz2 historical-e38c6eb036b4ab246f15ded4bdf6f2436f371a1d.zip | |
Import some code from vlc ebuilds to fix asm dependencies useflags. sse2 -> sse, sse -> mmx, 3dnow -> mmx, bug #300712
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/transcode/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/transcode/Manifest | 12 | ||||
| -rw-r--r-- | media-video/transcode/transcode-1.1.5.ebuild | 31 |
3 files changed, 40 insertions, 9 deletions
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog index 1a37d960105d..98ce6606e18d 100644 --- a/media-video/transcode/ChangeLog +++ b/media-video/transcode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/transcode # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.267 2010/01/09 15:38:14 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.268 2010/01/15 05:51:38 aballier Exp $ + + 15 Jan 2010; Alexis Ballier <aballier@gentoo.org> transcode-1.1.5.ebuild: + Import some code from vlc ebuilds to fix asm dependencies useflags. sse2 + -> sse, sse -> mmx, 3dnow -> mmx, bug #300712 09 Jan 2010; Christian Faulhammer <fauli@gentoo.org> transcode-1.1.5.ebuild: diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest index 760850d88f52..075327353d5d 100644 --- a/media-video/transcode/Manifest +++ b/media-video/transcode/Manifest @@ -8,13 +8,13 @@ DIST transcode-1.1.4.tar.bz2 2116804 RMD160 6afd10e67503a6a70ee9826a7e1c49a31c4a DIST transcode-1.1.5.tar.bz2 2123207 RMD160 fdc441190110a4ae4a54a4e2abd307db7f0111aa SHA1 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 SHA256 7e01665079eef81625c4761cc5c08a3b53b97de90fb0728d64f5a86a3bc59009 EBUILD transcode-1.0.7.ebuild 3914 RMD160 bf65e7cad4492278ce334099699bbb3c2785a210 SHA1 4a0f9477f1bdf833956c5085400ac80c9991c9fe SHA256 d16c8f315fe7dd1b9cf073e7b6e1a2d6cbddc3741b67618c6d0e77cd8c9f14c1 EBUILD transcode-1.1.4.ebuild 3292 RMD160 ed832c523168698d843a9c05073ce38072f10a11 SHA1 81f0d8d1d6c958b40621aab35cb9d4e3b7e8d7f1 SHA256 69619cdc9cda4cd124d4601f3e8fb874786adfcd43b1006245e3aec91465fcb0 -EBUILD transcode-1.1.5.ebuild 3341 RMD160 87659e17e47b2768ea555ab3bd4cc26cc21cb1b8 SHA1 4fa6abcbcf4fdfafee6bebdb1a918748cd31ba4f SHA256 27544046af402465a7bede4b1e3b177fd37afc4a9565efd0d53f2f886c50f948 -MISC ChangeLog 45088 RMD160 f21eba06ca869b3f72e82d44f95ab0a4cdee29b2 SHA1 54590e5cc424078f43c205a3f661371059a5c77e SHA256 1974bbc09d2dbb932c1295d6f3c70886f63ea91bd640e33de529c8ab3a41ccf4 +EBUILD transcode-1.1.5.ebuild 3971 RMD160 f00bb9e4fd90c359035b219ca4169d528d8cfbc1 SHA1 de6f1b60cc7c70172a86d413f61bc4b793f8beb0 SHA256 71dd2d864230b4a9be5f11b454546618be8bd865908c90d198f605721dda27ef +MISC ChangeLog 45291 RMD160 5e60de3140562731de720ffb03ad5672858ca600 SHA1 a9bcd2545017c00f784558613d41ed163fc6ccaf SHA256 bc326e74c1898d657f4d3b6c90254e14605994569558a2c8c6ecf075b1ede1db MISC metadata.xml 645 RMD160 73b9c254a56c875542316ae2e672cd822e796083 SHA1 ae717e64c138b5c9692760911e8325fdeb3f7584 SHA256 31d2bc07b4751ed99dd1378a429d7d2cadac64ba89be6c1eda268e2e874dc41c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktIousACgkQNQqtfCuFneNXJwCfUOXzm07dgoC059yoQrXntF7G -nbgAnRRbmLJYInZgwmGscGCLskgeCjVh -=0to3 +iEYEARECAAYFAktQAnAACgkQvFcC4BYPU0rJ3gCfUNSDprrIGwt0+00RJU3Yt7Gq +K14AoLuL5NJ343txqysM7coFjQ+kb8rK +=xhUs -----END PGP SIGNATURE----- diff --git a/media-video/transcode/transcode-1.1.5.ebuild b/media-video/transcode/transcode-1.1.5.ebuild index 1894839c30e9..7ba394c68914 100644 --- a/media-video/transcode/transcode-1.1.5.ebuild +++ b/media-video/transcode/transcode-1.1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.5.ebuild,v 1.6 2010/01/09 15:38:14 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.1.5.ebuild,v 1.7 2010/01/15 05:51:38 aballier Exp $ EAPI="2" @@ -49,6 +49,28 @@ DEPEND="${RDEPEND} dev-util/pkgconfig v4l2? ( >=sys-kernel/linux-headers-2.6.11 )" +# Notify the user that some useflag have been forced on +tc_use_force() { + use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." +} + +# Use when $2 depends strictly on $3 +# if use $1 then enable $2 and $3, otherwise disable $2 +tc_use_enable_force() { + if use $1 ; then + echo "--enable-$2 --enable-$3" + else + echo "--disable-$2" + fi +} + +pkg_setup() { + tc_use_force sse mmx + tc_use_force 3dnow mmx + tc_use_force sse2 mmx + tc_use_force sse2 sse +} + src_prepare() { sed -i -e "s:\$(datadir)/doc/transcode:\$(datadir)/doc/${PF}:" \ "${S}"/Makefile.am "${S}"/docs/Makefile.am "${S}"/docs/html/Makefile.am \ @@ -97,7 +119,12 @@ src_configure() { $(use_with X x) \ --enable-deprecated \ --enable-experimental \ - --with-mod-path=/usr/$(get_libdir)/transcode" + --with-mod-path=/usr/$(get_libdir)/transcode \ + $(tc_use_enable_force sse sse mmx) \ + $(tc_use_enable_force 3dnow 3dnow mmx) \ + $(tc_use_enable_force sse2 sse2 mmx) \ + $(tc_use_enable_force sse2 sse2 sse) \ + " econf ${myconf} || die "econf failed" } |