Added patch to fix textrels on x86 thanks to PaX Team. See bug #90287.

(Portage version: 2.1_pre9-r4)

4 files changed, 13 insertions, 3 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index d79b167c3561..7c48dea43711 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,9 @@
 # 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.59 2006/04/17 14:25:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.60 2006/04/25 01:29:45 flameeyes Exp $
+
+  25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> xvid-1.1.0-r1.ebuild:
+  Added patch to fix textrels on x86 thanks to PaX Team. See bug #90287.
 
 *xvid-1.1.0-r1 (17 Apr 2006)
 
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0-r1 b/media-libs/xvid/files/digest-xvid-1.1.0-r1
index 31b550c2ac6e..6c5b3b9c6400 100644
--- a/media-libs/xvid/files/digest-xvid-1.1.0-r1
+++ b/media-libs/xvid/files/digest-xvid-1.1.0-r1
@@ -1,6 +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 9612e37bf4afa9e74b068162b0a02a46 xvid-1.1.0-textrel.patch.bz2 24499
+RMD160 461799d1e1b9c97afbf36a9c3278fb3eda8b907b xvid-1.1.0-textrel.patch.bz2 24499
+SHA256 2c6d93494b64191e4eb0e414041be9edbf54b6137c4eacc4defbac18b50f916b xvid-1.1.0-textrel.patch.bz2 24499
 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/digest-xvid-1.1.0_beta2-r1 b/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
index 50ef637893b9..91dcab5c0b83 100644
--- a/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
+++ b/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
@@ -1,2 +1,4 @@
 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 1556584438f5b9fcd4c5e4ca829da602 xvidcore-1.1.0-beta2.tar.bz2 594159
diff --git a/media-libs/xvid/xvid-1.1.0-r1.ebuild b/media-libs/xvid/xvid-1.1.0-r1.ebuild
index 01c696787efc..5c4e2f5381c9 100644
--- a/media-libs/xvid/xvid-1.1.0-r1.ebuild
+++ b/media-libs/xvid/xvid-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.0-r1.ebuild,v 1.2 2006/04/25 01:29:45 flameeyes Exp $
 
 inherit eutils fixheadtails autotools
 
@@ -8,7 +8,8 @@ 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/${PN}-1.1.0-noexec-stack.patch.bz2
+	mirror://gentoo/${P}-textrel.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -28,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.1.0_beta2-altivec.patch"
 	epatch "${WORKDIR}/${PN}-1.1.0-noexec-stack.patch"
 	epatch "${FILESDIR}/${P}-3dnow.patch"
+	epatch "${DISTDIR}/${P}-textrel.patch.bz2"
 
 	cd ${S}
 	eautoreconf