New revision for xvid which adds altivec useflag and a patch to enable/disable altivec support at request. Fixes #91875. Removed ~ppc keyword for testing.

(Portage version: 2.0.51.21-r1)

5 files changed, 102 insertions, 23 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 7beb8179fe52..1c3916bae3e7 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/xvid
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.42 2005/05/07 13:39:04 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.43 2005/05/08 12:09:38 flameeyes Exp $
+
+*xvid-1.1.0_beta2-r1 (08 May 2005)
+
+  08 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xvid-1.1.0_beta2-altivec.patch, +xvid-1.1.0_beta2-r1.ebuild:
+  New revision for xvid which adds altivec useflag and a patch to
+  enable/disable altivec support at request. Fixes #91875. Removed ~ppc
+  keyword for testing.
 
   07 May 2005; Herbie Hopkins <herbs@gentoo.org> xvid-1.1.0_beta2.ebuild:
   Added amd64 depend on yasm, bug #79990
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index dbcdc17d8937..d3aba2f9b30a 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,32 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b9df0b3dd75c05b7440daac11468ab83 xvid-1.1.0_beta2.ebuild 1203
-MD5 684af8a8c5e487d5e197b2b0f7793cec xvid-1.0.2.ebuild 1212
+MD5 c4b4405ca835cee1ca3edee1cec92a53 ChangeLog 5184
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 8e01e1865534a13a85e07a39895a556e xvid-0.9.1.ebuild 1036
+MD5 c951ce0d729ba204c7657bd7008d1ee6 xvid-0.9.2-r1.ebuild 1146
 MD5 d332fc92996c01572c8f514106f41c6d xvid-1.0.0_rc4.ebuild 1074
 MD5 12796f897e8656ae363eee47d96a4e59 xvid-1.0.1.ebuild 1291
-MD5 c951ce0d729ba204c7657bd7008d1ee6 xvid-0.9.2-r1.ebuild 1146
-MD5 8e01e1865534a13a85e07a39895a556e xvid-0.9.1.ebuild 1036
+MD5 684af8a8c5e487d5e197b2b0f7793cec xvid-1.0.2.ebuild 1212
 MD5 f184c3cf02cd241edbeacdab5b92a9e4 xvid-1.0.3.ebuild 1153
-MD5 c4b4405ca835cee1ca3edee1cec92a53 ChangeLog 5184
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 42c2f590cdec073092377187fe49c870 xvid-1.1.0_beta2-r1.ebuild 1459
+MD5 b9df0b3dd75c05b7440daac11468ab83 xvid-1.1.0_beta2.ebuild 1203
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.0_rc4-DESTDIR.patch 1450
+MD5 8c100445a64d960693db8424931ff0eb files/1.0.1-DESTDIR.patch 1450
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.2-DESTDIR.patch 1450
-MD5 0d3933d54c7cd6f3b8a0ff039c73d2de files/digest-xvid-1.1.0_beta2 73
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.3-DESTDIR.patch 1450
-MD5 666fc1f16bf35b48d500b495509b07b2 files/xvid-1.0-ia64.patch 264
 MD5 e83498fda540ee61cdb0ce3fe79585c8 files/digest-xvid-0.9.1 67
+MD5 3943af38157fef55f9da6987560d2e77 files/digest-xvid-0.9.2-r1 67
+MD5 181053d1f28fcfb20d9a491c674d5064 files/digest-xvid-1.0.0_rc4 71
 MD5 ea0eb745946d70fea0c5dfd32d166ddb files/digest-xvid-1.0.1 67
 MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
 MD5 a508fb244e68f01cbf06e590abbee04e files/digest-xvid-1.0.3 67
-MD5 3943af38157fef55f9da6987560d2e77 files/digest-xvid-0.9.2-r1 67
 MD5 b2f1f286ed22acfa893dae382f47fee2 files/xvid-1.0.1-64bit-clean.patch 1723
-MD5 181053d1f28fcfb20d9a491c674d5064 files/digest-xvid-1.0.0_rc4 71
-MD5 8c100445a64d960693db8424931ff0eb files/1.0.1-DESTDIR.patch 1450
-MD5 8c100445a64d960693db8424931ff0eb files/1.0.0_rc4-DESTDIR.patch 1450
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfMUo2G5bA0cA/ScRAoPuAJsEUefpn2hEtz4rzJR+GgOc2OAqMACgkxQW
-g1mdkRuqmpnrD+9xzWff8rQ=
-=tjg/
------END PGP SIGNATURE-----
+MD5 666fc1f16bf35b48d500b495509b07b2 files/xvid-1.0-ia64.patch 264
+MD5 0d3933d54c7cd6f3b8a0ff039c73d2de files/digest-xvid-1.1.0_beta2 73
+MD5 d9759861a1f0ba2c9238f987d4e261f5 files/xvid-1.1.0_beta2-altivec.patch 800
+MD5 0d3933d54c7cd6f3b8a0ff039c73d2de files/digest-xvid-1.1.0_beta2-r1 73
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1 b/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
new file mode 100644
index 000000000000..de40693aba77
--- /dev/null
+++ b/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
@@ -0,0 +1 @@
+MD5 1556584438f5b9fcd4c5e4ca829da602 xvidcore-1.1.0-beta2.tar.bz2 594159
diff --git a/media-libs/xvid/files/xvid-1.1.0_beta2-altivec.patch b/media-libs/xvid/files/xvid-1.1.0_beta2-altivec.patch
new file mode 100644
index 000000000000..caf37286869e
--- /dev/null
+++ b/media-libs/xvid/files/xvid-1.1.0_beta2-altivec.patch
@@ -0,0 +1,17 @@
+diff -ur -x '*~' xvidcore-1.1.0-beta2/build/generic/configure.in xvidcore-1.1.0-beta2-fixaltivec/build/generic/configure.in
+--- xvidcore-1.1.0-beta2/build/generic/configure.in	2005-04-03 22:39:45.000000000 +0200
++++ xvidcore-1.1.0-beta2-fixaltivec/build/generic/configure.in	2005-05-08 13:35:40.881006256 +0200
+@@ -426,8 +426,12 @@
+ dnl * The vector definition is handled in portab.h thx to
+ dnl   HAVE_PARENTHESES/BRACES_ALTIVEC_DECL
+ dnl
++AC_ARG_ENABLE([altivec],
++	AC_HELP_STRING([--disable-altivec], [Disable altivec support on PPC architecture.]),
++	[ want_altivec=$enableval ], [ want_altivec=yes ] )
++
+ PPC_ALTIVEC_SOURCES=""
+-if test "$ARCHITECTURE" = "PPC" ; then
++if test "$ARCHITECTURE" = "PPC" && test "$want_altivec" = yes; then
+    AS="\$(CC)"
+    AFLAGS=""
+    ASSEMBLY_EXTENSION=".s"
diff --git a/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild b/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..e7bdf928f265
--- /dev/null
+++ b/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.0_beta2-r1.ebuild,v 1.1 2005/05/08 12:09:38 flameeyes Exp $
+
+inherit eutils
+
+MY_P=${PN}core-${PV/_beta/-beta}
+DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
+HOMEPAGE="http://www.xvid.org/"
+SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="doc altivec"
+
+DEPEND="x86? ( >=dev-lang/nasm-0.98.36 )
+	amd64? ( dev-lang/yasm )
+	=sys-devel/autoconf-2.5*
+	sys-devel/automake"
+
+# This is used to avoid having build deps in DEPEND with an empty RDEPEND
+RDEPEND="virtual/libc"
+
+S="${WORKDIR}/${MY_P}/build/generic"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${WORKDIR}/${MY_P}"
+	epatch "${FILESDIR}/${P}-altivec.patch"
+
+	cd ${S}
+	WANT_AUTOCONF="2.5"
+	./bootstrap.sh || die "Bootstrap failed"
+}
+
+src_compile() {
+	econf \
+		$(use_enable altivec) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	cd ${S}/../../
+	dodoc AUTHORS ChangeLog README TODO doc/*
+
+	local mylib="$(basename $(ls ${D}/usr/$(get_libdir)/libxvidcore.so*))"
+	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
+	dosym ${mylib} /usr/$(get_libdir)/${mylib/.1}
+
+	if use doc ; then
+		dodoc CodingStyle doc/README
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+}