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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 42 insertions, 10 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index c10b1ee8a180..38e6a16cecaa 100644
--- 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/libvpx-0.9.0_p20100612.ebuild b/media-libs/libvpx/libvpx-0.9.0_p20100612.ebuild
index aa7882129de6..2ec842cc212c 100644
--- 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 240f57147e07..9f45e35d8c11 100644
--- 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 84868f595a3a..97795ba3d431 100644
--- 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>