Add a patch that changes the default emms function on x86_64 architecture to the MMX version, not using 3DNow! instructions in EM64T systems.

(Portage version: 2.1_pre7-r5)

5 files changed, 97 insertions, 14 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 5ec51933ef83..d79b167c3561 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.58 2006/02/06 12:41:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.59 2006/04/17 14:25:41 flameeyes Exp $
+
+*xvid-1.1.0-r1 (17 Apr 2006)
+
+  17 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xvid-1.1.0-3dnow.patch, +xvid-1.1.0-r1.ebuild:
+  Add a patch that changes the default emms function on x86_64 architecture to
+  the MMX version, not using 3DNow! instructions in EM64T systems.
 
 *xvid-1.1.0 (06 Feb 2006)
 
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 9e31e005ec32..caf7ea9a34c0 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bf46f48de865eacdfdb744baf3d878af ChangeLog 7478
 RMD160 034a9b1221e3f1a3972d7b033a896eb6e3144e85 ChangeLog 7478
 SHA256 58d1e3869e998844d2176efc9b0a744d8f1df5c28cae848540f95f2a1b2a1d40 ChangeLog 7478
@@ -16,6 +13,9 @@ SHA256 820e2a89e22238c6082da7da6e5ef7853cfd1abf8b5a4501e9bed7db77fddf99 files/di
 MD5 1f38af1f2eb1d1974aef412e1b027d4b files/digest-xvid-1.1.0 521
 RMD160 df64668c49d9194c5c53e624fbafa44e73fb825c files/digest-xvid-1.1.0 521
 SHA256 f52b1defaca15b9c73c241248ff11af3629914ed9c5c2bf4d73ebc38d4f479ed files/digest-xvid-1.1.0 521
+MD5 1f38af1f2eb1d1974aef412e1b027d4b files/digest-xvid-1.1.0-r1 521
+RMD160 df64668c49d9194c5c53e624fbafa44e73fb825c files/digest-xvid-1.1.0-r1 521
+SHA256 f52b1defaca15b9c73c241248ff11af3629914ed9c5c2bf4d73ebc38d4f479ed files/digest-xvid-1.1.0-r1 521
 MD5 efdb459d255b1c1d8c6784303c1cd575 files/digest-xvid-1.1.0_beta2-r1 149
 RMD160 d2768af5ea525844ab8c37ec348e976f2a769bc3 files/digest-xvid-1.1.0_beta2-r1 149
 SHA256 5bbf5b9caf1cc6ad827e6b9e008067eb0a9818097f2ec58c8d8fc6957b7869a8 files/digest-xvid-1.1.0_beta2-r1 149
@@ -25,6 +25,9 @@ SHA256 7cb82d6d71f9ccdb6b902313ca6922dd3dc9dca4ef18a3e481e8b361e36a8157 files/xv
 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
+MD5 59dd07c645db4dd89c0d8a811317bb18 files/xvid-1.1.0-3dnow.patch 417
+RMD160 2fc9a193e28fbf41eb7a8a279a158a844021511e files/xvid-1.1.0-3dnow.patch 417
+SHA256 552e7dd73c7ad41838e126ff102f63654ae371d6617df1fe984f84851d05bed7 files/xvid-1.1.0-3dnow.patch 417
 MD5 80a43f67032aa35894fcb976e575c252 files/xvid-1.1.0_beta2-altivec.patch 1070
 RMD160 316da7461c58ddabec7d2907431fbb9675cea322 files/xvid-1.1.0_beta2-altivec.patch 1070
 SHA256 5644023118344e577e7af0188161899bf5e91de92f864666066dc79e007f991d files/xvid-1.1.0_beta2-altivec.patch 1070
@@ -40,16 +43,9 @@ SHA256 f8c1f0366c0afd9db2ea5eaf6f9fc2044f9e6ec4d2096ff31f4bb21278f7fb35 xvid-1.0
 MD5 9216d6d67f3a57fbe19895891d8e3c35 xvid-1.0.3.ebuild 1163
 RMD160 bc3cb9b08ec2f2dd24ed3c7f015a143b5aa46d46 xvid-1.0.3.ebuild 1163
 SHA256 2861085e0b50bb81092a5010404f2d46cc8a8dda93099d4f0a4f6c1d115e3170 xvid-1.0.3.ebuild 1163
-MD5 06c7c3230260a4e3334912d804d2bef5 xvid-1.1.0.ebuild 1604
-RMD160 beb6ac17281118443cf1f53681dc5f839019a1c4 xvid-1.1.0.ebuild 1604
-SHA256 0c0b1d8819090cb2a57445034d616e2cbab6865498b7425cb1fdb357dcf40ba9 xvid-1.1.0.ebuild 1604
+MD5 917407e1d5c6abf1574da127241b3849 xvid-1.1.0-r1.ebuild 1643
+RMD160 08280c8b1f3e37b3e84335dc5325fa7a76fbd7f1 xvid-1.1.0-r1.ebuild 1643
+SHA256 1a2ec17da62d2f5f4c5a5b53637b6c481453198d8325726918ff68ee2593fbf4 xvid-1.1.0-r1.ebuild 1643
 MD5 c1a7e7dcc3f66120502d2aa8f523f11a xvid-1.1.0_beta2-r1.ebuild 1754
 RMD160 3d2719a328d4e7d16f9fc0f45cc85788c581e1be xvid-1.1.0_beta2-r1.ebuild 1754
 SHA256 b45fbf45425c90e6adf79beef34fc921411306e7a1d9235b09836d2579f9d72e xvid-1.1.0_beta2-r1.ebuild 1754
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD50QYAiZjviIA2XgRAgm6AJ9TOdbuvqCaJxk2MFmCy44/uwTAXwCeIjac
-HCHp+W+X8+zKdv/PhoeRONw=
-=vyzT
------END PGP SIGNATURE-----
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0-r1 b/media-libs/xvid/files/digest-xvid-1.1.0-r1
new file mode 100644
index 000000000000..31b550c2ac6e
--- /dev/null
+++ b/media-libs/xvid/files/digest-xvid-1.1.0-r1
@@ -0,0 +1,6 @@
+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 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.patch b/media-libs/xvid/files/xvid-1.1.0-3dnow.patch
new file mode 100644
index 000000000000..94af4d7756e5
--- /dev/null
+++ b/media-libs/xvid/files/xvid-1.1.0-3dnow.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
+@@ -636,7 +636,7 @@ int xvid_gbl_init(xvid_gbl_init_t * init
+ 	 * features there really are. */
+ 	if (cpu_flags & XVID_CPU_ASM) {
+ 		/* SIMD state flusher */
+-		emms = emms_3dn;
++		emms = emms_mmx;
+ 
+ 		/* DCT operators */
+ 		fdct = fdct_skal_x86_64;
diff --git a/media-libs/xvid/xvid-1.1.0-r1.ebuild b/media-libs/xvid/xvid-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..01c696787efc
--- /dev/null
+++ b/media-libs/xvid/xvid-1.1.0-r1.ebuild
@@ -0,0 +1,61 @@
+# 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-r1.ebuild,v 1.1 2006/04/17 14:25:41 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"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+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.patch"
+
+	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
+}