Add altivec,mmx,sse,sse2,sse3,ssse3 USE flags, consolidate live and normal ebuilds.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index c10b1ee8a1806bd5d6d690aff05fbd02c0d586d1..38e6a16cecaa73a8bad67487d5c3d7f890d983d3 100644 (file)
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libvpx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.3 2010/06/12 21:11:14 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.4 2010/06/12 21:45:36 spatz Exp $
+
+  12 Jun 2010; Dror Levin <spatz@gentoo.org> libvpx-0.9.0_p20100612.ebuild,
+  libvpx-9999.ebuild, metadata.xml:
+  Add altivec,mmx,sse,sse2,sse3,ssse3 USE flags, consolidate live and normal
+  ebuilds.
 
   12 Jun 2010; Dror Levin <spatz@gentoo.org> libvpx-0.9.0_p20100612.ebuild,
   libvpx-9999.ebuild:

diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 3b369bed3caba1f7e873b8927b4a1eebf8be629b..c6efd02fd0871e876cd27f583a43f68e681a0e20 100644 (file)
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA512
 
 DIST libvpx-0.9.0_p20100612.tar.bz2 1184266 RMD160 4e33243feb76f1a39ebb2d071534676c57682ae5 SHA1 57a61efd6c62abb22dee008d85f8fac576229f64 SHA256 6cd45b29db343eb23968ea503385bf033b5e702dcae9b8427df1535fe1efdcf0
-EBUILD libvpx-0.9.0_p20100612.ebuild 995 RMD160 129bcfff513cb6e6d9dae0c452c8f8c67d6f142e SHA1 b82c1dff905b25250bf0a74bc66f0ab257a49938 SHA256 b6b2df80046d286bef6f891dcd87a163ff0290eaf5784b60aba8ad252a9f8702
-EBUILD libvpx-9999.ebuild 994 RMD160 28fffb39aeb89f3e3f346155ffb652a64ec6aa3d SHA1 5e02bfdc908dc21302bba9f54d5529b4cee968b3 SHA256 bb254eed550c5f6b37a73aa8da58d57cb4955dc8864f158404a463c51e28f6da
-MISC ChangeLog 763 RMD160 605cd51cdcd24117ba790e74cdd283855ea7be2f SHA1 401f4b5dc7ecaca95633c474505193cbacead9ad SHA256 775942fc358fbb06855888e549b685092a5ceaa5780a39d6bbd9b1b50f88757a
-MISC metadata.xml 325 RMD160 cde021d17878bb76292f4bcf9198545c90ba951e SHA1 06804e0bbc17efafa7af7c0916e4622a4a9fa7cb SHA256 e923df7f0891b5fdf84e3a4eea3eb941084b9ce3dedc10023ea2d7dfb5677c04
+EBUILD libvpx-0.9.0_p20100612.ebuild 1291 RMD160 e091d3c5e660c85e89ea85fe4036fdf27a04c82e SHA1 6467bcb55b7769be21441ddf1288ec6d69f16d99 SHA256 26c45906eb73c96864d738c23ab6ab85b221d1a7d601915490a864056f2a5d0b
+EBUILD libvpx-9999.ebuild 1280 RMD160 098936393ba5e8e8803460ebe4c4cd9120b32eaa SHA1 a26b4b5ec6a13d8b60cd05a53555784d390f5601 SHA256 5518d01eebdbd57debc396a91639a80f18e0e869bb2acce7e219033948fd3136
+MISC ChangeLog 964 RMD160 2c3c9568dd4dc0c6738982c0b7210eff221d750a SHA1 ed9e21e096e793eb6e7cdfa74f9b38db27dcfe19 SHA256 404e287e83678dc629b78bec92cbba9d2477f293ea70eb0ba90d5e601179186f
+MISC metadata.xml 517 RMD160 5b8c2af107175fc8be0fd0f3d676dcb1fb1b2bc1 SHA1 a9164f13235a7bce3d266767c1d47bc2be4c3021 SHA256 b94ac8d73429cfe726eb618f80bf11865e682f5129d6268a3182c70b34325734
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQEcBAEBCgAGBQJME/f9AAoJEAWF714uGAc6sDMH/2G/9Ed6oB0jeT6P/aYEjj5f
-NEOt7eh2kB7KZZqf/6GfxS7pzc7TgGJKYP4V3fwrZNtWtIwtxuiba/VyMEKD2G7H
-ISsTdqd0/03ViPnxqp2cXjK/0BRdrU1D7QS8YesGQWxVvPVwcjhe85F7ikqGVLEF
-vX4MSLIheXxZZlYhoMgEs2IrcXLfrsIyhsKKC1c6I6wYjAlxZan+9bkaJOccodQh
-aTMG7fbJxrZDE8YyqHQpIlcSMuyoZHHd2k2eLBlQkvX2i9oYPeEZFUQOVMPcCkbn
-1s7vlEotdb2KTDie8Yy7aV3kR7lYYjTBOarzPe7u1DNvRcDlpc1LoQ8Rtwc9GiI=
-=ycUH
+iQEcBAEBCgAGBQJMFAAJAAoJEAWF714uGAc6mfsIAIvSHQtU9713VCL4XURU+EWK
+ATC9UkOyFcMPGllElWBjmGBuiUwRIsKeLM2v6gNsGJeNW8jEKRmwlxiKuwe0SS7H
+hDIlEdHeoilDC2WAM8Youq1xMharTn74Se0PbrXTGxnWi8ONk0JeQWrA52G6nybB
+/ueegGeL6oiFJnET/HDPhd8nzS7iiT1PxL/TG8Kvf5Br0ZtZN+xO0cnzzBwzGkDU
+dwbsNKH4zNQeODE25tAw/+Fkd07tSX+qFA1QIH9NHpHBwo/W5sJ1Bq64sQ3B5XmK
+bwYYbk5WEgXYG9Qxo8mjzs9Ys9u9nuzIFl9x8PS3zR45g4+zH/S8tnaqNECpVEo=
+=l7GE
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libvpx/libvpx-0.9.0_p20100612.ebuild b/media-libs/libvpx/libvpx-0.9.0_p20100612.ebuild
index aa7882129de62a82bc90d24a6f6bc5df358f5c02..2ec842cc212c1f6b9856cc5713d0d19bda43fd50 100644 (file)
--- a/media-libs/libvpx/libvpx-0.9.0_p20100612.ebuild
+++ b/media-libs/libvpx/libvpx-0.9.0_p20100612.ebuild
@@ -1,18 +1,25 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-0.9.0_p20100612.ebuild,v 1.2 2010/06/12 21:11:14 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-0.9.0_p20100612.ebuild,v 1.3 2010/06/12 21:45:36 spatz Exp $
 
 EAPI=2
 inherit multilib toolchain-funcs
 
+if [[ ${PV} == *9999* ]]; then
+       inherit git
+       EGIT_REPO_URI="git://review.webmproject.org/${PN}.git"
+       KEYWORDS=""
+else
+       SRC_URI="mirror://gentoo/${P}.tar.bz2"
+       KEYWORDS="~amd64 ~x86"
+fi
+
 DESCRIPTION="WebM VP8 Codec SDK"
 HOMEPAGE="http://www.webmproject.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc postproc +threads"
+IUSE="altivec debug doc mmx postproc sse sse2 sse3 ssse3 +threads"
 
 RDEPEND=""
 DEPEND="amd64? ( dev-lang/yasm )
@@ -31,6 +38,12 @@ src_configure() {
                --enable-pic \
                --enable-vp8 \
                --enable-shared \
+               $(use_enable altivec) \
+               $(use_enable mmx) \
+               $(use_enable sse) \
+               $(use_enable sse2) \
+               $(use_enable sse3) \
+               $(use_enable ssse3) \
                $(use_enable debug) \
                $(use_enable debug debug-libs) \
                $(use_enable doc install-docs) \

diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index 240f57147e07e57ff9b43b05605e45c810cfc0fc..9f45e35d8c110688e2a9f143495399f35edc2e9d 100644 (file)
--- a/media-libs/libvpx/libvpx-9999.ebuild
+++ b/media-libs/libvpx/libvpx-9999.ebuild
@@ -1,19 +1,25 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.4 2010/06/12 21:11:14 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.5 2010/06/12 21:45:36 spatz Exp $
 
 EAPI=2
-inherit multilib toolchain-funcs git
+inherit multilib toolchain-funcs
 
-EGIT_REPO_URI="git://review.webmproject.org/${PN}.git"
+if [[ ${PV} == *9999* ]]; then
+       inherit git
+       EGIT_REPO_URI="git://review.webmproject.org/${PN}.git"
+       KEYWORDS=""
+else
+       SRC_URI="mirror://gentoo/${P}.tar.bz2"
+       KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="WebM VP8 Codec SDK"
 HOMEPAGE="http://www.webmproject.org"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug doc postproc +threads"
+IUSE="altivec debug doc mmx postproc sse sse2 sse3 ssse3 +threads"
 
 RDEPEND=""
 DEPEND="amd64? ( dev-lang/yasm )
@@ -32,6 +38,12 @@ src_configure() {
                --enable-pic \
                --enable-vp8 \
                --enable-shared \
+               $(use_enable altivec) \
+               $(use_enable mmx) \
+               $(use_enable sse) \
+               $(use_enable sse2) \
+               $(use_enable sse3) \
+               $(use_enable ssse3) \
                $(use_enable debug) \
                $(use_enable debug debug-libs) \
                $(use_enable doc install-docs) \

diff --git a/media-libs/libvpx/metadata.xml b/media-libs/libvpx/metadata.xml
index 84868f595a3a57738ffd172c5e0b94ea7af5f364..97795ba3d4317edddcadb1814457beb9abdc8d46 100644 (file)
--- a/media-libs/libvpx/metadata.xml
+++ b/media-libs/libvpx/metadata.xml
@@ -7,5 +7,7 @@
   </maintainer>
   <use>
     <flag name="postproc">Enable additional post processing filters</flag>
+    <flag name="sse3">Enable optimization for SSE3 capable chips</flag>
+    <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
   </use>
 </pkgmetadata>