summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hanselmann <hansmi@gentoo.org>2004-06-06 19:58:02 +0000
committerMichael Hanselmann <hansmi@gentoo.org>2004-06-06 19:58:02 +0000
commit1f69deaa8b0d810d4ec37615c616f4d8b191513f (patch)
tree00a5410cb0b40bb7a30b7280cee552ca1e0aaef0 /media-libs
parentSparc me like a hurricane. (diff)
downloadhistorical-1f69deaa8b0d810d4ec37615c616f4d8b191513f.tar.gz
historical-1f69deaa8b0d810d4ec37615c616f4d8b191513f.tar.bz2
historical-1f69deaa8b0d810d4ec37615c616f4d8b191513f.zip
Fixed a compilation-error when Altivec is disabled on PowerPC.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libmpeg2/ChangeLog8
-rw-r--r--media-libs/libmpeg2/Manifest11
-rw-r--r--media-libs/libmpeg2/files/altivec-fix-0.4.0b.diff25
-rw-r--r--media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild5
4 files changed, 42 insertions, 7 deletions
diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog
index ec9a82c862da..990b345fde30 100644
--- a/media-libs/libmpeg2/ChangeLog
+++ b/media-libs/libmpeg2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/libmpeg2
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.23 2004/04/27 09:07:24 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.24 2004/06/06 19:58:02 hansmi Exp $
+
+ 06 Jun 2004; Michael Hanselmann <hansmi@gentoo.org>
+ +files/altivec-fix-0.4.0b.diff, libmpeg2-0.4.0b.ebuild:
+ Added a patch to fix compilation-errors on PowerPC with Altivec disabled. This
+ may happen if the code is being compiled for a G3-processor (-mcpu=G3 or
+ -mcpu=750).
11 Apr 2004; Jason Wever <weeve@gentoo.org> libmpeg2-0.4.0b.ebuild:
Added ~sparc keyword.
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index 73d2124ad0c5..bfb67d86a418 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -1,11 +1,12 @@
+MD5 b7ae67b63e4aed6bdcc3b5a99da1ddcb libmpeg2-0.4.0b.ebuild 1337
+MD5 f13945098fbf0284fcbc2e4f6bf54580 libmpeg2-0.3.2_pre20030625.ebuild 1371
+MD5 d24fe06415c1c347ac0d5415e5264033 ChangeLog 3119
MD5 b837c2a52ec57239b5922cfff22a8698 libmpeg2-0.4.0.ebuild 1149
-MD5 3c384f405bdeddd138250a06a70998c5 libmpeg2-0.4.0b.ebuild 1278
MD5 4545a5a01a07f15b106d5b54de5e7470 libmpeg2-0.2.1.ebuild 1292
-MD5 f13945098fbf0284fcbc2e4f6bf54580 libmpeg2-0.3.2_pre20030625.ebuild 1371
MD5 fdac1a1bc841a7ac1d1cd41ee814bf70 libmpeg2-0.3.1.ebuild 1389
-MD5 d7a7f988c02ab5d517389eb7237c3fc2 ChangeLog 2834
+MD5 6ed53be491fa83ebc59d0d7b285c5e4f files/altivec-fix-0.4.0b.diff 890
MD5 2a17e6b990abf2db666678d21accc928 files/digest-libmpeg2-0.2.1 66
-MD5 ee59810a9eb538c8b6e66e5db9d21399 files/digest-libmpeg2-0.3.1 66
-MD5 c55e953292f2922558ea3f50f6437581 files/digest-libmpeg2-0.4.0 66
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
diff --git a/media-libs/libmpeg2/files/altivec-fix-0.4.0b.diff b/media-libs/libmpeg2/files/altivec-fix-0.4.0b.diff
new file mode 100644
index 000000000000..1f5361396eda
--- /dev/null
+++ b/media-libs/libmpeg2/files/altivec-fix-0.4.0b.diff
@@ -0,0 +1,25 @@
+--- configure.in 2003-12-23 10:14:56.000000000 +0100
++++ /root/configure.in 2004-06-06 02:13:29.182121072 +0200
+@@ -71,9 +71,19 @@
+ AC_CHECK_HEADER([altivec.h],
+ [TRY_CFLAGS="$ARCH_OPT_CFLAGS -maltivec"],
+ [TRY_CFLAGS="$ARCH_OPT_CFLAGS -faltivec"])
+- AC_TRY_CFLAGS([$OPT_CFLAGS $TRY_CFLAGS $CFLAGS],
+- [ARCH_OPT_CFLAGS="$TRY_CFLAGS"
+- AC_DEFINE([ARCH_PPC],,[ppc architecture])]);;
++ CFLAGS="$OPT_CFLAGS"
++ AC_TRY_COMPILE([
++ #ifdef HAVE_ALTIVEC_H
++ #include <altivec.h>
++ #endif
++ ], [
++ vector float v = (vector float) { 0.0, 0.0, 0.0, 0.0 };
++ vec_andc((vector float)v, (vector float)v);
++ ], [ AC_TRY_CFLAGS([$OPT_CFLAGS $TRY_CFLAGS $CFLAGS],
++ [ARCH_OPT_CFLAGS="$TRY_CFLAGS"
++ AC_DEFINE([ARCH_PPC],,[ppc architecture])])
++ ] )
++ ;;
+ sparc-* | sparc64-*)
+ AC_DEFINE([ARCH_SPARC],,[sparc architecture])
+ TRY_CFLAGS="$OPT_CFLAGS -mcpu=ultrasparc -mvis"
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
index 45a5eb7f051e..72fbba8c4726 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 Technologies, Inc.
# 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.6 2004/04/12 03:21:48 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.7 2004/06/06 19:58:02 hansmi Exp $
inherit libtool flag-o-matic
@@ -30,6 +30,9 @@ src_unpack() {
sed -i \
-e 's:OPT_CFLAGS=\"$CFLAGS -mcpu=.*\":OPT_CFLAGS=\"$CFLAGS\":g' \
configure || die "sed configure failed"
+
+ epatch "${FILESDIR}/altivec-fix-${PV}.diff"
+ autoreconf
}
src_compile() {