remove text relocations in shared library, big thanks to the pax team, bug #135326

Package-Manager: portage-2.1.4_rc4

4 files changed, 104 insertions, 8 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index a481b01bd017..2d5f82ce4256 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.95 2007/11/27 18:53:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.96 2007/12/02 17:39:22 aballier Exp $
+
+*xvid-1.1.3-r1 (02 Dec 2007)
+
+  02 Dec 2007; Alexis Ballier <aballier@gentoo.org> +xvid-1.1.3-r1.ebuild:
+  remove text relocations in shared library, big thanks to the pax team, bug
+  #135326
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> xvid-1.0.2.ebuild,
   xvid-1.1.0-r1.ebuild, xvid-1.1.0-r3.ebuild:
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index cab959f54c2d..7b0f9cf1fee5 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -32,6 +32,7 @@ SHA256 2b95dc6c1e39b9a39b88284cba7f43580131a140467d7b7893624869098df067 files/xv
 DIST xvid-1.1.0-noexec-stack.patch.bz2 3443 RMD160 3da4597854b67975e424614ac403397fa566f2d1 SHA1 41eba0bcda09741773dace31a4321005f6e35445 SHA256 d63027784787b418947d969513621711a94fba847d51e7b1b4ac7c50ba14511e
 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.patch.bz2 24760 RMD160 7a511ce369eade1de7e6d3d3a775cfa37e0e426a SHA1 55817963cf010776f181764496b60b8046876a19 SHA256 46419954aef27ec8a4ab8342eecb99b9816a9a6e233e1b5a8b0268523ec3a819
 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
@@ -52,14 +53,18 @@ EBUILD xvid-1.1.0-r3.ebuild 1661 RMD160 ae8c760beb5dced4498e3da5860fbabcc8eab5c4
 MD5 2c0dd9b8e24903c0a16889af9546f2e9 xvid-1.1.0-r3.ebuild 1661
 RMD160 ae8c760beb5dced4498e3da5860fbabcc8eab5c4 xvid-1.1.0-r3.ebuild 1661
 SHA256 8fa97f81769973b0c0c4c3483cbdc5bc45c4ff3803c854df2e203ee87767fa79 xvid-1.1.0-r3.ebuild 1661
+EBUILD xvid-1.1.3-r1.ebuild 2264 RMD160 0d572998f4e450e18251b64352de81f4b77af4db SHA1 7f9fef47aae12716fb907ff8f6852dd5122e9833 SHA256 8f257c41ed5c7b2383e6d005f642ca2a0d64d70578f6f3eeb42c1428954b60c9
+MD5 6895667720eb2e41560f53b5d5cab788 xvid-1.1.3-r1.ebuild 2264
+RMD160 0d572998f4e450e18251b64352de81f4b77af4db xvid-1.1.3-r1.ebuild 2264
+SHA256 8f257c41ed5c7b2383e6d005f642ca2a0d64d70578f6f3eeb42c1428954b60c9 xvid-1.1.3-r1.ebuild 2264
 EBUILD xvid-1.1.3.ebuild 1875 RMD160 61aa265000c6b92e62afe2172db47dbf62dfb5fc SHA1 0965e58a77047ba8f5e809e6eae1bbd7f7230411 SHA256 238316234351f6a64aa34ceb3291208b928f50d6bf8e29a7d24995c76b61cc59
 MD5 114ede4a1ed1ca37c4b57b3477bce3f1 xvid-1.1.3.ebuild 1875
 RMD160 61aa265000c6b92e62afe2172db47dbf62dfb5fc xvid-1.1.3.ebuild 1875
 SHA256 238316234351f6a64aa34ceb3291208b928f50d6bf8e29a7d24995c76b61cc59 xvid-1.1.3.ebuild 1875
-MISC ChangeLog 12111 RMD160 f64647cca5d1bc54dd990bd2e9dc15b9bec0ce9b SHA1 c0225e5859f95714237b346ca9bcfdf544f064a8 SHA256 306f491c8e574edc0a8215bfa4c3d185ac75ff447f357e3774214c837f09dcb7
-MD5 3dd728d6821f002919d63a7c9a27ab06 ChangeLog 12111
-RMD160 f64647cca5d1bc54dd990bd2e9dc15b9bec0ce9b ChangeLog 12111
-SHA256 306f491c8e574edc0a8215bfa4c3d185ac75ff447f357e3774214c837f09dcb7 ChangeLog 12111
+MISC ChangeLog 12308 RMD160 2be64e1883eeca62be72294b329bbb5dc80b2518 SHA1 f598908515b3e5f84595fd42594b3407522cc2b9 SHA256 8388bac2cad89ba3fd1e18ef9c83534dc80f6ff8cc8e9d5e027738dce9416c9f
+MD5 9d71a01dea139ee58ea8116ceeac4362 ChangeLog 12308
+RMD160 2be64e1883eeca62be72294b329bbb5dc80b2518 ChangeLog 12308
+SHA256 8388bac2cad89ba3fd1e18ef9c83534dc80f6ff8cc8e9d5e027738dce9416c9f ChangeLog 12308
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -79,10 +84,13 @@ SHA256 8ec504a3d639a9a000280899ca4efba3e9426ba35a04a17a39408902e87f8c8b files/di
 MD5 774cffb327d8130368dfbcf7bdee5935 files/digest-xvid-1.1.3 521
 RMD160 c391c70c1c01b60d5bdb983ac10b0b7338144816 files/digest-xvid-1.1.3 521
 SHA256 93ee42b97d08ec9fb4718c2d2f143734732992a316fc77f691466be42b00927a files/digest-xvid-1.1.3 521
+MD5 1aa34229482c4231c3fb6d9ba892102e files/digest-xvid-1.1.3-r1 783
+RMD160 073ecd5f7447c81d057c0070d83ea44d5562682f files/digest-xvid-1.1.3-r1 783
+SHA256 304502d76de450e0d72792e16b2c9c1ce3675c67f3f0aa166bc44b93366d8679 files/digest-xvid-1.1.3-r1 783
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHTGent2vP6XvVdOcRAkasAJ0XWeMmiXlgndnKaswy5c4qN+8ztwCg1C9t
-qSVH49eFDspNAqk85jC3CQ4=
-=Ddnv
+iD8DBQFHUu3TvFcC4BYPU0oRAijJAJ9vAzlq9SZXdKmmDp8Xl1rgiYRGpgCdG8WT
+YynsXYso/pDK7ahxSI6RB9A=
+=wbdA
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xvid/files/digest-xvid-1.1.3-r1 b/media-libs/xvid/files/digest-xvid-1.1.3-r1
new file mode 100644
index 000000000000..ede909f05770
--- /dev/null
+++ b/media-libs/xvid/files/digest-xvid-1.1.3-r1
@@ -0,0 +1,9 @@
+MD5 919ac7d4f8be05626e4d98abde100ab3 xvid-1.1.2-noexec-stack.patch.bz2 2426
+RMD160 083da9ab8e4fdcd067cd2970eeb7ad634894219f xvid-1.1.2-noexec-stack.patch.bz2 2426
+SHA256 6de38a05303e02a2524e3f0093a3e0b021bba93d0889c2b97a05a29ba21efffa xvid-1.1.2-noexec-stack.patch.bz2 2426
+MD5 03088a8568f91caf570149243b61d48c xvid-1.1.3-textrel.patch.bz2 24760
+RMD160 7a511ce369eade1de7e6d3d3a775cfa37e0e426a xvid-1.1.3-textrel.patch.bz2 24760
+SHA256 46419954aef27ec8a4ab8342eecb99b9816a9a6e233e1b5a8b0268523ec3a819 xvid-1.1.3-textrel.patch.bz2 24760
+MD5 29c60d4d991ac18f687a8fd13cfe64b7 xvidcore-1.1.3.tar.bz2 625974
+RMD160 f890a2ef58be5362aa1d2894e748ef11a0c7bba8 xvidcore-1.1.3.tar.bz2 625974
+SHA256 f5d7f658840ef6fda5b2cd8b105d3738e1a3e735ee12ddc0136527f0185c14ed xvidcore-1.1.3.tar.bz2 625974
diff --git a/media-libs/xvid/xvid-1.1.3-r1.ebuild b/media-libs/xvid/xvid-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..6e3b8185126a
--- /dev/null
+++ b/media-libs/xvid/xvid-1.1.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/12/02 17:39:22 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.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.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
+}