summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-04-25 01:06:39 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-04-25 01:06:39 +0000
commitb8352b0c49ef359a691c024b3441e2772050b973 (patch)
tree35dbf79a08be43fa27bf3d9cba135949221fb813 /media-libs/libmpeg3
parentVersion bump (diff)
downloadgentoo-2-b8352b0c49ef359a691c024b3441e2772050b973.tar.gz
gentoo-2-b8352b0c49ef359a691c024b3441e2772050b973.tar.bz2
gentoo-2-b8352b0c49ef359a691c024b3441e2772050b973.zip
Add patch to fix textrel/non-PIC aware code, thanks to PaX Team and solar.
(Portage version: 2.1_pre9-r4)
Diffstat (limited to 'media-libs/libmpeg3')
-rw-r--r--media-libs/libmpeg3/ChangeLog6
-rw-r--r--media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r33
-rw-r--r--media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild8
3 files changed, 13 insertions, 4 deletions
diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index 87c0cf620032..1fb2141ffd07 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libmpeg3
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.41 2006/04/24 23:58:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.42 2006/04/25 01:06:39 flameeyes Exp $
+
+ 25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+ libmpeg3-1.5.2-r3.ebuild:
+ Add patch to fix textrel/non-PIC aware code, thanks to PaX Team and solar.
24 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+files/libmpeg3-1.5.2-gnustack.patch, libmpeg3-1.5.2-r3.ebuild:
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3
index 21d1de144fcb..db43c0aaf837 100644
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3
+++ b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3
@@ -1,6 +1,9 @@
MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
RMD160 3198e42f529c5699dc7cf376d100831d0648f10f libmpeg3-1.5.2-src.tar.bz2 625682
SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba libmpeg3-1.5.2-src.tar.bz2 625682
+MD5 02bc99e817c7b0a6aabbbe5ee02cc4c9 libmpeg3-1.5.2-textrel-fix.patch.bz2 6386
+RMD160 6547523cac00f1035505f40ce1eb720d5c6e04ac libmpeg3-1.5.2-textrel-fix.patch.bz2 6386
+SHA256 b241e5bd5c05c90ec28ee6fdab33956ad51869ee506bf8b5e76f7f2f362b09dd libmpeg3-1.5.2-textrel-fix.patch.bz2 6386
MD5 84f32e19c88437cbb043367cdc87d2c4 libmpeg3-patches-3.tar.bz2 4251
RMD160 7fbb16804ce0c1cb6b6fc3a7467cc7efa4989988 libmpeg3-patches-3.tar.bz2 4251
SHA256 2b4b200337802a572c321e4a6744c4ea9a889acd3d1325337a80424aaede5186 libmpeg3-patches-3.tar.bz2 4251
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
index 10d6d3e83b3e..6bd21a099e5a 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.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/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.2 2006/04/24 23:58:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.3 2006/04/25 01:06:39 flameeyes Exp $
inherit flag-o-matic eutils toolchain-funcs
@@ -8,7 +8,8 @@ PATCHLEVEL="3"
DESCRIPTION="An mpeg library for linux"
HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
- mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+ mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
+ mirror://gentoo/${P}-textrel-fix.patch.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -38,8 +39,9 @@ src_unpack() {
epatch "${FILESDIR}/${P}-a52.patch"
epatch "${FILESDIR}/${P}-gnustack.patch"
+ epatch "${DISTDIR}/${P}-textrel-fix.patch.bz2"
- if ! use mmx || has_pic ; then
+ if ! use mmx; then
sed -i -e 's:^NASM =.*:NASM =:' \
-e 's|^HAVE_NASM :=.*|HAVE_NASM=n|' \
-e 's|USE_MMX = 1|USE_MMX = 0|' \