Textrel patch update from the PaX team, part of bug #211652; fixes a segfault when using mpeg quantization

Package-Manager: portage-2.1.4.4

3 files changed, 94 insertions, 3 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 9db19c0ed490..230d9447de8a 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/xvid
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.97 2007/12/17 09:17:02 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.98 2008/03/01 18:58:02 aballier Exp $
+
+*xvid-1.1.3-r3 (01 Mar 2008)
+
+  01 Mar 2008; Alexis Ballier <aballier@gentoo.org> +xvid-1.1.3-r3.ebuild:
+  Textrel patch update from the PaX team, part of bug #211652; fixes a
+  segfault when using mpeg quantization
 
 *xvid-1.1.3-r2 (17 Dec 2007)
 
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index f4fb833625d6..3b75b6f9ef57 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
 AUX xvid-1.0-ia64.patch 264 RMD160 1aecaf0076461d2dd64c562a930f2e6d65929655 SHA1 e820c6e6e2fdb3147fb65115eb43d4fb3913e422 SHA256 7cb82d6d71f9ccdb6b902313ca6922dd3dc9dca4ef18a3e481e8b361e36a8157
 AUX xvid-1.0.1-64bit-clean.patch 1723 RMD160 511fbf80fdae52f8f6bfad66d68bd1dfdcc5aced SHA1 bb84d5ef608f8dae41317ab6a404402c2d815e7b SHA256 d1d46f1111e72f8a4c22f0ae58eb97678e526fb80ed91e9f4afa87b4473989c3
@@ -9,6 +12,7 @@ DIST xvid-1.1.0-noexec-stack.patch.bz2 3443 RMD160 3da4597854b67975e424614ac4033
 DIST xvid-1.1.0-textrel-2.patch.bz2 24494 RMD160 5ba4a367fa6ece1de693100112fe2d328c0ae3bb SHA1 0f23b4e4333030ee5c370483a475b749aff7018a SHA256 32ea754d71ac82461cd3fdc9a0f5eacbf8e0d0b3441e9e602baa2cacb9861440
 DIST xvid-1.1.2-noexec-stack.patch.bz2 2426 RMD160 083da9ab8e4fdcd067cd2970eeb7ad634894219f SHA1 0f5e9e15e96c6c2a1a6d7bea67e8abd5b41442fa SHA256 6de38a05303e02a2524e3f0093a3e0b021bba93d0889c2b97a05a29ba21efffa
 DIST xvid-1.1.3-textrel-2.patch.bz2 24734 RMD160 087e816f2bb1ab48a8f6e0652f1ad283ea49cf67 SHA1 3c7b688f2673008d8c7cb79b6aae21db4516912f SHA256 e80a115e8248e4b901d62d32a0f9e48df7a59f7d0c84ee54278661efc1f6f4fa
+DIST xvid-1.1.3-textrel-3.patch.bz2 24815 RMD160 bd1a798a2f0da00a024534fc46328cb768472df6 SHA1 94c7753e405ae62dd7f32f0543b48e9164f327bd SHA256 3f8796b5b7db07583f92c580df18ddb3a65637716f71882cc0ccafbc432bcd87
 DIST xvidcore-1.0.2.tar.bz2 541407 RMD160 373cd9da39ffe250e8a536a2f7e2f7724c0794c9 SHA1 843c6d9d20a6525331726d5357f5032fcd62b4de SHA256 0fe361f203ff37dfab556a82e1004237a7de513b5333fe3cacdf1cdcaaf57546
 DIST xvidcore-1.0.3.tar.bz2 541841 RMD160 96e4d46f617ebb802c2a6cacbf64502356a70741 SHA1 4b7de410e55c318cb68a829bb7e3619cbf40a1cf SHA256 dbe805e16caaf9e3a781619d03feb9b032603b21f626beda80f98383ac1dfd94
 DIST xvidcore-1.1.0.tar.bz2 612101 RMD160 582927437970cf81534b9ed4f02173201e10f47b SHA1 f3ffc21529ab7941e423df7365de22c391d2eaeb SHA256 bde8cdf8fd490e91b75f98128fd3718b2c570e7cc8f6b83e71896dbbca135e3c
@@ -18,6 +22,14 @@ EBUILD xvid-1.0.3.ebuild 1163 RMD160 bc3cb9b08ec2f2dd24ed3c7f015a143b5aa46d46 SH
 EBUILD xvid-1.1.0-r1.ebuild 1723 RMD160 ab917d4f2284b6da72862a6ffd8b9ebcb66be67a SHA1 254e8bd5a3915b6f75c578b37c49c470e7706c96 SHA256 95eebf2856f01993fe36ba7f91dac76f5acc547909e36b3f8c713839c53d6fea
 EBUILD xvid-1.1.0-r3.ebuild 1661 RMD160 ae8c760beb5dced4498e3da5860fbabcc8eab5c4 SHA1 f4ae300bb553334bf50343882731747c2bd40a67 SHA256 8fa97f81769973b0c0c4c3483cbdc5bc45c4ff3803c854df2e203ee87767fa79
 EBUILD xvid-1.1.3-r2.ebuild 2267 RMD160 d052fd1c78e7d45da227a2330b192d60b3bb1674 SHA1 a73350fe2074059b3845c8c380179cdd8fbeb268 SHA256 fd78fc39d59f688b89f80d6210a397a1a5cc460dba79f57344bb09598576bc18
+EBUILD xvid-1.1.3-r3.ebuild 2267 RMD160 02632006c8ffe14a0c37e99cc0695a05d462a8b6 SHA1 9995e7142ebd5cdc6625c3c2fbd38888df6d1991 SHA256 6ea95588e2bee8bde97f3aab330e0536d4617efa51dd66f586af50280bcbe757
 EBUILD xvid-1.1.3.ebuild 1875 RMD160 61aa265000c6b92e62afe2172db47dbf62dfb5fc SHA1 0965e58a77047ba8f5e809e6eae1bbd7f7230411 SHA256 238316234351f6a64aa34ceb3291208b928f50d6bf8e29a7d24995c76b61cc59
-MISC ChangeLog 12538 RMD160 3f7f191e0b7f0c647aae3687be11d1c36d653590 SHA1 abacdc2671900374ddad9eebd215282d634de73f SHA256 c020e0fb4bc418bcaec00fc5b2f416d4df9010d846c4299ece6298599febdeb2
+MISC ChangeLog 12755 RMD160 05b400420fe04d63b22e13fac96b26c84f38043a SHA1 9b6d3fc77e28f987c2b94ade9efa30a60efc707d SHA256 406daab5ef57b809d2287708d376bdabe2cfab0ef7332a11da7a93431613c310
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHyadEvFcC4BYPU0oRAkueAJ4hVvLBLuf4vC7CHD9y+6iTuaSpUwCdFiUS
+/Eo/GV7cIif7KVLStigvQ6o=
+=Ai8U
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xvid/xvid-1.1.3-r3.ebuild b/media-libs/xvid/xvid-1.1.3-r3.ebuild
new file mode 100644
index 000000000000..a127800ba4f7
--- /dev/null
+++ b/media-libs/xvid/xvid-1.1.3-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.3-r3.ebuild,v 1.1 2008/03/01 18:58:02 aballier Exp $
+
+inherit eutils fixheadtails autotools
+
+MY_P=${PN}core-${PV}
+
+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.2-noexec-stack.patch.bz2
+	mirror://gentoo/${P}-textrel-3.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples altivec"
+
+# once yasm-0.6.0+ comes out, we can switch this to
+# dev-lang/nasm >=dev-lang/yasm-0.6.0
+# and then drop the quotes from section in the noexec-stack.patch
+
+# yasm < 0.6.2 has a bug when computing pic adresses.
+# See http://www.tortall.net/projects/yasm/ticket/114
+# the build system prefers yasm if it finds it
+# thus if we intend to have || (yasm nasm) for building
+# we need to make it block yasm < 0.6.2 on x86
+# otherwise it will compile wrong code
+NASM=">=dev-lang/yasm-0.6.2"
+DEPEND="x86? ( ${NASM} )
+	amd64? ( ${NASM} )"
+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.2-noexec-stack.patch
+	epatch "${FILESDIR}"/${PN}-1.1.0-3dnow-2.patch
+	epatch "${FILESDIR}"/${P}-ia64-build.patch
+	epatch "${WORKDIR}/${P}-textrel-3.patch"
+	cd "${S}"
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable altivec)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	dodoc "${S}"/../../{AUTHORS,ChangeLog*,README,TODO}
+
+	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 examples; then
+		dodoc "${S}"/../../CodingStyle
+		insinto /usr/share/${PN}
+		doins -r "${S}"/../../examples
+	fi
+}