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.

Package-Manager: portage-2.1.2_pre2-r1

5 files changed, 118 insertions, 5 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/Manifest b/media-libs/xvid/Manifest
index 2d9ede54bfd2..29b23dcc013d 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.2-DESTDIR.patch 1450 RMD160 4812c2444247b8306d1ad0874ab45762ac898093 SHA1 71d1e00c431a8dd1840cfc067504a51beec6bdef SHA256 5aa2571d3e5053d15a9efa21a71ff8a851df6afb7dee73bb1075696346159e83
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.2-DESTDIR.patch 1450
 RMD160 4812c2444247b8306d1ad0874ab45762ac898093 files/1.0.2-DESTDIR.patch 1450
@@ -10,6 +13,10 @@ AUX xvid-1.0.1-64bit-clean.patch 1723 RMD160 511fbf80fdae52f8f6bfad66d68bd1dfdcc
 MD5 b2f1f286ed22acfa893dae382f47fee2 files/xvid-1.0.1-64bit-clean.patch 1723
 RMD160 511fbf80fdae52f8f6bfad66d68bd1dfdcc5aced files/xvid-1.0.1-64bit-clean.patch 1723
 SHA256 d1d46f1111e72f8a4c22f0ae58eb97678e526fb80ed91e9f4afa87b4473989c3 files/xvid-1.0.1-64bit-clean.patch 1723
+AUX xvid-1.1.0-3dnow-2.patch 510 RMD160 6676868458608d25cc93a696dcec73bf4be80392 SHA1 94407b1b98ca8680b3c8fec88931ef1c87e897dd SHA256 4528dacdd88db8cf2bffe7894af284e3ca79e02c3d3f3c48196642d971ddeb46
+MD5 916e1e795e7579097d2b0031346dda50 files/xvid-1.1.0-3dnow-2.patch 510
+RMD160 6676868458608d25cc93a696dcec73bf4be80392 files/xvid-1.1.0-3dnow-2.patch 510
+SHA256 4528dacdd88db8cf2bffe7894af284e3ca79e02c3d3f3c48196642d971ddeb46 files/xvid-1.1.0-3dnow-2.patch 510
 AUX xvid-1.1.0-3dnow.patch 417 RMD160 2fc9a193e28fbf41eb7a8a279a158a844021511e SHA1 507ec6b41a5b591208d0ce52272bcd93de3b8cd7 SHA256 552e7dd73c7ad41838e126ff102f63654ae371d6617df1fe984f84851d05bed7
 MD5 59dd07c645db4dd89c0d8a811317bb18 files/xvid-1.1.0-3dnow.patch 417
 RMD160 2fc9a193e28fbf41eb7a8a279a158a844021511e files/xvid-1.1.0-3dnow.patch 417
@@ -35,14 +42,18 @@ EBUILD xvid-1.1.0-r1.ebuild 1735 RMD160 22f202f4ad4c58591af1f99c83cbfa2a70151006
 MD5 01b7b662958778a765f09e4036e8cddf xvid-1.1.0-r1.ebuild 1735
 RMD160 22f202f4ad4c58591af1f99c83cbfa2a70151006 xvid-1.1.0-r1.ebuild 1735
 SHA256 5ecee40aa19daf3e87a1cb8773682632eb967c4ab5c553d1fd38dd45d94f1c58 xvid-1.1.0-r1.ebuild 1735
+EBUILD xvid-1.1.0-r2.ebuild 1745 RMD160 9814485b410000e18a8cc19accca7a46e853ce3c SHA1 08bc90f300e2b128addd3e2b1c4d2cb6b739cbbf SHA256 fdedeafe1254e04bb39a33f5f9dd53ce4e17330efe3cf229656366f4338edbc6
+MD5 5971fb3e5ff171405df85e58c8ef9104 xvid-1.1.0-r2.ebuild 1745
+RMD160 9814485b410000e18a8cc19accca7a46e853ce3c xvid-1.1.0-r2.ebuild 1745
+SHA256 fdedeafe1254e04bb39a33f5f9dd53ce4e17330efe3cf229656366f4338edbc6 xvid-1.1.0-r2.ebuild 1745
 EBUILD xvid-1.1.0.ebuild 1601 RMD160 f356e6cb25c1efa9406840ceead8ac1fb395ec0f SHA1 f1d134f7749815d2664be87c235ea703890191b2 SHA256 0ca29d2b3e03b4b2f79c82030a1f532d1e94add8eedbaf15dd74c900c847b1e2
 MD5 01be81ecfee18e03edf81918793be35e xvid-1.1.0.ebuild 1601
 RMD160 f356e6cb25c1efa9406840ceead8ac1fb395ec0f xvid-1.1.0.ebuild 1601
 SHA256 0ca29d2b3e03b4b2f79c82030a1f532d1e94add8eedbaf15dd74c900c847b1e2 xvid-1.1.0.ebuild 1601
-MISC ChangeLog 9202 RMD160 7771063cb1bf05fd53352c64b41d814b1c8421c5 SHA1 3e1b5d852d72cb4916bf2a3619fe15675b9f54a7 SHA256 0aee223338a4efecab1dccb2c0bf4afeeabe81cfdcfbcb58e892064fc22ed5d8
-MD5 b1392df69cd09ed5795716e288958845 ChangeLog 9202
-RMD160 7771063cb1bf05fd53352c64b41d814b1c8421c5 ChangeLog 9202
-SHA256 0aee223338a4efecab1dccb2c0bf4afeeabe81cfdcfbcb58e892064fc22ed5d8 ChangeLog 9202
+MISC ChangeLog 9501 RMD160 a0ebd641b7025bab40a9376e4733938b5f7c659c SHA1 a25ea0472117cb047e38fee484ff4b7f418bb46a SHA256 9273b3aefe7a7433d127ced0a0f42772cbc2935b98e4ae6936e1965506588ccf
+MD5 a29b0e182acd00f94838d0d1366a8934 ChangeLog 9501
+RMD160 a0ebd641b7025bab40a9376e4733938b5f7c659c ChangeLog 9501
+SHA256 9273b3aefe7a7433d127ced0a0f42772cbc2935b98e4ae6936e1965506588ccf ChangeLog 9501
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -59,3 +70,13 @@ SHA256 f52b1defaca15b9c73c241248ff11af3629914ed9c5c2bf4d73ebc38d4f479ed files/di
 MD5 72d5ac6407edb7c072a50ad5fa8fe610 files/digest-xvid-1.1.0-r1 789
 RMD160 06f53882da57b698c9bcc2bc3550dbee170d58a0 files/digest-xvid-1.1.0-r1 789
 SHA256 06d6cf1d481f2181faf3de3baae5cee1a73810288614cf54209404ae8287d021 files/digest-xvid-1.1.0-r1 789
+MD5 72d5ac6407edb7c072a50ad5fa8fe610 files/digest-xvid-1.1.0-r2 789
+RMD160 06f53882da57b698c9bcc2bc3550dbee170d58a0 files/digest-xvid-1.1.0-r2 789
+SHA256 06d6cf1d481f2181faf3de3baae5cee1a73810288614cf54209404ae8287d021 files/digest-xvid-1.1.0-r2 789
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFIMuxAiZjviIA2XgRAkxnAKCdiDsH7JBcmL0L0FYXoS756kPmJQCgrBrg
+kkFxZzapuVwhIBKHcYjQNlo=
+=OfMp
+-----END PGP SIGNATURE-----
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
+}