Add a different patch for the 3dNow problem, so that it's used only when really present. Should fix both em64t and true amd64 boxes. See bug #129022.

(Portage version: 2.1.2_pre2-r1)

4 files changed, 93 insertions, 1 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index e33d65aa2b16..366efa77d6db 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/xvid
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.72 2006/09/24 09:04:30 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.73 2006/10/02 08:19:53 flameeyes Exp $
+
+*xvid-1.1.0-r2 (02 Oct 2006)
+
+  02 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xvid-1.1.0-3dnow-2.patch, +xvid-1.1.0-r2.ebuild:
+  Add a different patch for the 3dNow problem, so that it's used only when
+  really present. Should fix both em64t and true amd64 boxes. See bug #129022.
 
   24 Sep 2006; Michael Hanselmann <hansmi@gentoo.org> xvid-1.1.0-r1.ebuild:
   Stable on ppc.
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0-r2 b/media-libs/xvid/files/digest-xvid-1.1.0-r2
new file mode 100644
index 000000000000..30d3f0daf255
--- /dev/null
+++ b/media-libs/xvid/files/digest-xvid-1.1.0-r2
@@ -0,0 +1,9 @@
+MD5 891c95e3e4660da30db9badfbd724f6b xvid-1.1.0-noexec-stack.patch.bz2 3443
+RMD160 3da4597854b67975e424614ac403397fa566f2d1 xvid-1.1.0-noexec-stack.patch.bz2 3443
+SHA256 d63027784787b418947d969513621711a94fba847d51e7b1b4ac7c50ba14511e xvid-1.1.0-noexec-stack.patch.bz2 3443
+MD5 acd8faae452c61ec31004aa0cd52d489 xvid-1.1.0-textrel-2.patch.bz2 24494
+RMD160 5ba4a367fa6ece1de693100112fe2d328c0ae3bb xvid-1.1.0-textrel-2.patch.bz2 24494
+SHA256 32ea754d71ac82461cd3fdc9a0f5eacbf8e0d0b3441e9e602baa2cacb9861440 xvid-1.1.0-textrel-2.patch.bz2 24494
+MD5 359eebc5fb496a2bf7b15010059e7897 xvidcore-1.1.0.tar.bz2 612101
+RMD160 582927437970cf81534b9ed4f02173201e10f47b xvidcore-1.1.0.tar.bz2 612101
+SHA256 bde8cdf8fd490e91b75f98128fd3718b2c570e7cc8f6b83e71896dbbca135e3c xvidcore-1.1.0.tar.bz2 612101
diff --git a/media-libs/xvid/files/xvid-1.1.0-3dnow-2.patch b/media-libs/xvid/files/xvid-1.1.0-3dnow-2.patch
new file mode 100644
index 000000000000..cc22744eb953
--- /dev/null
+++ b/media-libs/xvid/files/xvid-1.1.0-3dnow-2.patch
@@ -0,0 +1,13 @@
+Index: xvidcore-1.1.0/src/xvid.c
+===================================================================
+--- xvidcore-1.1.0.orig/src/xvid.c
++++ xvidcore-1.1.0/src/xvid.c
+@@ -634,7 +634,7 @@ int xvid_gbl_init(xvid_gbl_init_t * init
+ 	 * disable asm usage the usual way. When Intel EMT64 cpus will
+ 	 * be out, maybe we'll have to check more precisely what cpu
+ 	 * features there really are. */
+-	if (cpu_flags & XVID_CPU_ASM) {
++	if (cpu_flags & XVID_CPU_3DNOW) {
+ 		/* SIMD state flusher */
+ 		emms = emms_3dn;
+ 
diff --git a/media-libs/xvid/xvid-1.1.0-r2.ebuild b/media-libs/xvid/xvid-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..1a103bedf402
--- /dev/null
+++ b/media-libs/xvid/xvid-1.1.0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/10/02 08:19:53 flameeyes Exp $
+
+inherit eutils fixheadtails autotools
+
+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
+	mirror://gentoo/${PN}-1.1.0-noexec-stack.patch.bz2
+	mirror://gentoo/${P}-textrel-2.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc altivec"
+
+DEPEND="x86? ( >=dev-lang/nasm-0.98.36 )
+	amd64? ( dev-lang/yasm )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}/build/generic
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${WORKDIR}"/${MY_P}
+	epatch "${FILESDIR}/${PN}-1.1.0_beta2-altivec.patch"
+	epatch "${WORKDIR}/${PN}-1.1.0-noexec-stack.patch"
+	epatch "${FILESDIR}/${P}-3dnow-2.patch"
+	epatch "${DISTDIR}/${P}-textrel-2.patch.bz2"
+
+	cd ${S}
+	eautoreconf
+}
+
+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/*
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.*.dylib))
+		dosym ${mylib} /usr/$(get_libdir)/libxvidcore.dylib
+	else
+		local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*))
+		dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
+		dosym ${mylib} /usr/$(get_libdir)/${mylib/.1}
+	fi
+
+	if use doc ; then
+		dodoc CodingStyle doc/README
+		docinto examples
+		dodoc examples/*
+	fi
+}