summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hanselmann <hansmi@gentoo.org>2004-07-09 22:32:52 +0000
committerMichael Hanselmann <hansmi@gentoo.org>2004-07-09 22:32:52 +0000
commit3b316881ae7a6a228797c0487ade4ff02c40f4c7 (patch)
tree29e19d953949a3c051f1e01eea4c59d5e8396329 /media-libs/libmpeg2
parentswitch linux-headers dependency to virtual/os-headers (diff)
downloadhistorical-3b316881ae7a6a228797c0487ade4ff02c40f4c7.tar.gz
historical-3b316881ae7a6a228797c0487ade4ff02c40f4c7.tar.bz2
historical-3b316881ae7a6a228797c0487ade4ff02c40f4c7.zip
Fixed a compilatioin-error with gcc 3.4
Diffstat (limited to 'media-libs/libmpeg2')
-rw-r--r--media-libs/libmpeg2/ChangeLog5
-rw-r--r--media-libs/libmpeg2/Manifest11
-rw-r--r--media-libs/libmpeg2/files/gcc34-inline-fix-0.4.0b.diff11
-rw-r--r--media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild5
4 files changed, 25 insertions, 7 deletions
diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog
index e0a88bd953fb..77bfd8dde575 100644
--- a/media-libs/libmpeg2/ChangeLog
+++ b/media-libs/libmpeg2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libmpeg2
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.28 2004/07/01 07:59:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.29 2004/07/09 22:32:52 hansmi Exp $
+
+ 10 Jul 2004; Michael Hanselmann <hansmi@gentoo.org> libmpeg2-0.4.0b.ebuild:
+ Fixed a compilation-issue with gcc 3.4. Bug #51964.
01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
libmpeg2-0.4.0b.ebuild:
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index d4c132722dc9..a3696629e2c3 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -1,12 +1,13 @@
-MD5 e7f9747c22a9cad5697872505fa0a7cc ChangeLog 3426
-MD5 0e77dde2120847ccb980d905cff77bd1 libmpeg2-0.2.1.ebuild 1282
-MD5 d934d630d1aa33687310af33307797ee libmpeg2-0.3.1.ebuild 1379
+MD5 4813c875354b32a2fdd3e5e4f4f2ba96 libmpeg2-0.4.0b.ebuild 1455
MD5 6d5b592df599a4a9763938769c8fc863 libmpeg2-0.3.2_pre20030625.ebuild 1365
+MD5 dda1d2b5bccc76648a10bd61ae750672 ChangeLog 3555
MD5 19d6eac2dab1da0e1585f8379645609c libmpeg2-0.4.0.ebuild 1139
-MD5 7502b1a4fd5d855813a38f7dce512eb7 libmpeg2-0.4.0b.ebuild 1338
+MD5 0e77dde2120847ccb980d905cff77bd1 libmpeg2-0.2.1.ebuild 1282
+MD5 d934d630d1aa33687310af33307797ee libmpeg2-0.3.1.ebuild 1379
MD5 6ed53be491fa83ebc59d0d7b285c5e4f files/altivec-fix-0.4.0b.diff 890
MD5 2a17e6b990abf2db666678d21accc928 files/digest-libmpeg2-0.2.1 66
+MD5 c868934aab8fc4ea039b4fb9d3c46d71 files/gcc34-inline-fix-0.4.0b.diff 292
+MD5 c7958c7996a268d8cf161e4b32e70ac0 files/digest-libmpeg2-0.4.0b 67
MD5 ee59810a9eb538c8b6e66e5db9d21399 files/digest-libmpeg2-0.3.1 66
MD5 a127dad465c6dbf851ee95df74166bc0 files/digest-libmpeg2-0.3.2_pre20030625 73
MD5 c55e953292f2922558ea3f50f6437581 files/digest-libmpeg2-0.4.0 66
-MD5 c7958c7996a268d8cf161e4b32e70ac0 files/digest-libmpeg2-0.4.0b 67
diff --git a/media-libs/libmpeg2/files/gcc34-inline-fix-0.4.0b.diff b/media-libs/libmpeg2/files/gcc34-inline-fix-0.4.0b.diff
new file mode 100644
index 000000000000..f4007c065d52
--- /dev/null
+++ b/media-libs/libmpeg2/files/gcc34-inline-fix-0.4.0b.diff
@@ -0,0 +1,11 @@
+--- libmpeg2/cpu_accel.c.orig 2004-07-10 00:25:35.477608630 +0200
++++ libmpeg2/cpu_accel.c 2004-07-10 00:25:56.794588961 +0200
+@@ -127,7 +127,7 @@
+ }
+
+ #ifdef ARCH_PPC
+-static inline uint32_t arch_accel (void)
++static uint32_t arch_accel (void)
+ {
+ static RETSIGTYPE (* oldsig) (int);
+
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
index 33b667be405f..e13b193acf82 100644
--- a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.11 2004/07/01 07:59:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.12 2004/07/09 22:32:52 hansmi Exp $
inherit eutils libtool flag-o-matic
@@ -31,6 +31,9 @@ src_unpack() {
-e 's:OPT_CFLAGS=\"$CFLAGS -mcpu=.*\":OPT_CFLAGS=\"$CFLAGS\":g' \
configure || die "sed configure failed"
+ # Fix a compilation-error with gcc 3.4. Bug #51964.
+ ( cd "${S}" && epatch "${FILESDIR}/gcc34-inline-fix-${PV}.diff" )
+
epatch "${FILESDIR}/altivec-fix-${PV}.diff"
autoreconf
}