Add static-libs support (bug #378307 by Agostino Sarubbo and Nikoli).

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

4 files changed, 114 insertions, 13 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index 2ccf8a556f80..6d54627d7030 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libvpx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.31 2011/08/08 10:43:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.32 2011/09/21 20:35:58 radhermit Exp $
+
+*libvpx-0.9.7-r1 (21 Sep 2011)
+
+  21 Sep 2011; Tim Harder <radhermit@gentoo.org> +libvpx-0.9.7-r1.ebuild,
+  libvpx-9999.ebuild:
+  Add static-libs support (bug #378307 by Agostino Sarubbo and Nikoli).
 
 *libvpx-0.9.7 (08 Aug 2011)
 
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index f46f3781b671..605cb95af5e7 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,8 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX libvpx-0.9.5-enable-shared.patch 655 RMD160 a72ba77666e088103a48fb31c445fc12f8163959 SHA1 4ee0feade82667b1e6d42cafcbe4113205482011 SHA256 44239d453714ca62523b299612d2ec279eceb2e74c296de1ef8eb5c8575ad86e
 DIST libvpx-v0.9.6.tar.bz2 1230418 RMD160 b85038b92d911b29b3b912c3d71c60e13f89a551 SHA1 a3522bd2b73d52381ba767ded1cbf4760e9cc6f8 SHA256 28bd8a8ef216fb570912f0d378668051d99681bf13735b59e68a12ad79f2aa73
 DIST libvpx-v0.9.7.tar.bz2 1244448 RMD160 1e322f97de39ad0126bf847c94de06f5b34e78d4 SHA1 639596df7182a93db83f61af8f5bb5b6a13dcf63 SHA256 4436275b905d996f4f0e4a3f98f5d3ca4507a05b9b1e101adfd6f508fa6ae14b
 EBUILD libvpx-0.9.6.ebuild 1989 RMD160 4842532c0fcd0ec873f06e927bbc4150c3833343 SHA1 752be1e621e5fd0fa56b6f77ad1a20fa6f110afb SHA256 d9a5451f7a94289593b27d33e07c98d7cc11cc97c59711f307b85cc08c93985e
+EBUILD libvpx-0.9.7-r1.ebuild 2038 RMD160 1585b302dd56543c05ca39ec960c9a5b3e1473a1 SHA1 0b35a1c189badb92fc7df11a6386ac4ddf8b3dc1 SHA256 47b97a56c50c655f9437e9ac576536d096fe3fc5a99fb125dd712b7009275c21
 EBUILD libvpx-0.9.7.ebuild 1996 RMD160 376501f3a1814ae4936792fc24eeb9044e91219d SHA1 40339dee05d716b304f4b5c0a483176ed45c8806 SHA256 aa6d4756675e131a1c47d2227936798fb48e1d66a505aced9194f541af2b8dc1
-EBUILD libvpx-9999.ebuild 1603 RMD160 009eb2d4fde9086f20504506d4bb2d7ab8337eed SHA1 2abae487ddc32cf923236b3c52905dcdcc4b2e0a SHA256 0acbc4ed0e1629d4262da9d21d04d0ac7676d3b62a4b99ff37ab8072d65435e9
-MISC ChangeLog 4508 RMD160 194f1b2d7be018605d0bfc2ad190c205a52cd6b6 SHA1 d94cc785ef614a52dc34fac107918e056f228127 SHA256 f05c4b1ef2f20f515ac81f8b002da806a0809a89dbc54cac419d331f122eb96f
+EBUILD libvpx-9999.ebuild 1640 RMD160 6a26796360d0c598c14ca194cc2ac53d4faf7ba3 SHA1 c5a9ea0d1caf73a1dc32236ef60f447626bd5b1d SHA256 fa7c0b8c4102f7ebd4ff8b5b3b25d9b997eec9caf2ecb77d60060e07c1351c01
+MISC ChangeLog 4711 RMD160 684f38e418f1e0b0d04cef6df98827bbd62d8dd0 SHA1 ccef2c2eb5abdb7c7aa5d85f1147097284f7f3dc SHA256 3d19533edbe1f81562d08e203196c61d1e822547155a8773e14778c6152e65e6
 MISC metadata.xml 633 RMD160 3fd0be4f03715d6228e2d6997bac46ba01c09867 SHA1 7804245c809a3f9a66310736a812817c7a82844b SHA256 3b6d0692cac6d33871e62eb7d10cf25fbadc7421e1447e83f6151f5b1e60473f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOekq3AAoJEEqz6FtPBkyj0x8H/1+PvEd4aAG1Aj0Y8KLSQAy1
+lLq2d0eDvEed8xFwAFqRQJewHjwU8G8GXJTNJ0y/zvHszqoLzkVfjLBx1HQY+SVm
+monYq2kFcz/RW2IpZV2TxKdtKus4vME8G0q4iXZGrwMGQwy4oMzhTDN9qZQk1zaK
+f2QsQ++kWWQiQtc1O97bX56FuGRw4jyB2zH3MdiC+nZX6QyU+nfBbRc5NjToa4UO
+4TBVtoFZeJDD6rxhtZL8c9icJgzGN1UXvcZO4tJFBwmRqOuhJXSGtN6UvtznrB4k
+3ey7KBHI0muAmMKXs1YIcgiyAvxx8KIT/KTe++h4ZLTA7N++JJCeeDm5TUJ0j7A=
+=fgQV
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/libvpx-0.9.7-r1.ebuild b/media-libs/libvpx/libvpx-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..0a759bb491df
--- /dev/null
+++ b/media-libs/libvpx/libvpx-0.9.7-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-0.9.7-r1.ebuild,v 1.1 2011/09/21 20:35:58 radhermit Exp $
+
+EAPI=4
+inherit eutils multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://review.webmproject.org/${PN}.git"
+	KEYWORDS=""
+elif [[ ${PV} == *pre* ]]; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+	MY_P="${PN}-v${PV}"
+	SRC_URI="http://webm.googlecode.com/files/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="WebM VP8 Codec SDK"
+HOMEPAGE="http://www.webmproject.org"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="altivec debug doc mmx postproc sse sse2 sse3 ssse3 static-libs +threads"
+
+RDEPEND=""
+DEPEND="amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	doc? (
+		app-doc/doxygen
+		dev-lang/php
+	)
+"
+
+REQUIRED_USE="
+	sse2? ( mmx )
+	"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.5-enable-shared.patch
+}
+
+src_configure() {
+	tc-export CC
+	local archparams=""
+	[ "$ABI" = "x86" ] && archparams=" --target=x86-linux-gcc"
+	[ "$ABI" = "amd64" ] && archparams=" --target=x86_64-linux-gcc"
+	( use x86 || use amd64 ) && archparams+=" --as=yasm"
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-pic \
+		--enable-vp8 \
+		--enable-shared \
+		$(use_enable altivec) \
+		$(use_enable debug debug-libs) \
+		$(use_enable debug) \
+		$(use_enable doc install-docs) \
+		$(use_enable mmx) \
+		$(use_enable postproc) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable sse3) \
+		$(use_enable ssse3) \
+		$(use_enable static-libs static) \
+		$(use_enable threads multithread) \
+		$archparams \
+		|| die
+}
+
+src_install() {
+	# http://bugs.gentoo.org/show_bug.cgi?id=323805
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc AUTHORS CHANGELOG README
+}
diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index 004575f825b8..15640373f95d 100644
--- a/media-libs/libvpx/libvpx-9999.ebuild
+++ b/media-libs/libvpx/libvpx-9999.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/libvpx/libvpx-9999.ebuild,v 1.15 2011/07/29 02:11:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.16 2011/09/21 20:35:58 radhermit Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.webmproject.org"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="altivec debug doc mmx postproc sse sse2 sse3 ssse3 sse4_1 +threads"
+IUSE="altivec debug doc mmx postproc sse sse2 sse3 ssse3 sse4_1 static-libs +threads"
 
 RDEPEND=""
 DEPEND="amd64? ( dev-lang/yasm )
@@ -47,22 +47,22 @@ src_configure() {
 		--enable-vp8 \
 		--enable-shared \
 		$(use_enable altivec) \
+		$(use_enable debug debug-libs) \
+		$(use_enable debug) \
+		$(use_enable doc install-docs) \
 		$(use_enable mmx) \
+		$(use_enable postproc) \
 		$(use_enable sse) \
 		$(use_enable sse2) \
 		$(use_enable sse3) \
-		$(use_enable ssse3) \
 		$(use_enable sse4_1) \
-		$(use_enable debug) \
-		$(use_enable debug debug-libs) \
-		$(use_enable doc install-docs) \
-		$(use_enable postproc) \
+		$(use_enable ssse3) \
+		$(use_enable static-libs static ) \
 		$(use_enable threads multithread) \
 		|| die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS CHANGELOG README || die
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS CHANGELOG README
 }