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
commit2e2b0aaea056a7b0ffe3f67be88f5566c0c4b5be (patch)
treed5419fadb117589eb36334e8bfe424d31d4821c1 /media-libs/libmpeg2
parentSparc me like a hurricane. (Manifest recommit) (diff)
downloadgentoo-2-2e2b0aaea056a7b0ffe3f67be88f5566c0c4b5be.tar.gz
gentoo-2-2e2b0aaea056a7b0ffe3f67be88f5566c0c4b5be.tar.bz2
gentoo-2-2e2b0aaea056a7b0ffe3f67be88f5566c0c4b5be.zip
Fixed a compilation-error when Altivec is disabled on PowerPC.
Diffstat (limited to 'media-libs/libmpeg2')
-rw-r--r--media-libs/libmpeg2/ChangeLog8
-rw-r--r--media-libs/libmpeg2/files/altivec-fix-0.4.0b.diff25
-rw-r--r--media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild5
3 files changed, 36 insertions, 2 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/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() {