Fixed a compilation-error on ppc, if the compiler is unable to compile Altivec-code. Added ~ppc to KEYWORDS.

4 files changed, 46 insertions, 13 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 694b3c406368..53b537bf1ef1 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.64 2004/06/09 17:09:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.65 2004/06/14 21:09:48 hansmi Exp $
+
+  14 Jun 2004; Michael Hanselmann <hansmi@gentoo.org>
+  +files/altivec-fix-1.6.2.patch, mjpegtools-1.6.2-r2.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). It patches the configure.in-file. Added ~ppc to KEYWORDS.
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild,
   mjpegtools-1.6.1.90-r2.ebuild, mjpegtools-1.6.2-r1.ebuild,
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index a229065826e9..585ae8056ea0 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,19 +1,20 @@
-MD5 48637c77f969c11e66b76b0297c6df83 ChangeLog 11989
-MD5 18e20b00bc8bef8dd28ca859a368888a mjpegtools-1.6.0-r7.ebuild 2861
+MD5 7948ffff522ec811fbeebcf6418399fb mjpegtools-1.6.2-r2.ebuild 2870
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
-MD5 3d6741d6db6250accfc153051c0b5e41 mjpegtools-1.6.2-r2.ebuild 2733
+MD5 f8d60c087aa02c1b36ca6e69987448ec ChangeLog 12332
+MD5 18e20b00bc8bef8dd28ca859a368888a mjpegtools-1.6.0-r7.ebuild 2861
 MD5 8df6fb93b0a49a96822556736d2136f4 mjpegtools-1.6.1.90-r2.ebuild 1920
 MD5 643dc453cc5573bf081a129b2c1bd35b mjpegtools-1.6.2-r1.ebuild 2518
-MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555
+MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
 MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
+MD5 3150d43b1c44c02265b8481e271093c8 files/altivec-fix-1.6.2.patch 1011
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.91-fPIC.patch 555
 MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r2 69
 MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.91-fPIC.patch 555
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.2-fPIC.patch 555
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.93-fPIC.patch 555
+MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086
 MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r2 72
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
-MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
+MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r2 69
 MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
diff --git a/media-video/mjpegtools/files/altivec-fix-1.6.2.patch b/media-video/mjpegtools/files/altivec-fix-1.6.2.patch
new file mode 100644
index 000000000000..0700f4d5e743
--- /dev/null
+++ b/media-video/mjpegtools/files/altivec-fix-1.6.2.patch
@@ -0,0 +1,21 @@
+--- configure.in.orig	2004-06-14 22:03:42.109367120 +0200
++++ configure.in	2004-06-14 22:04:49.835071248 +0200
+@@ -502,15 +502,15 @@
+     ALTIVEC_CFLAGS=""
+     if $CC -o conftest conftest.c >/dev/null 2>&1; then
+       have_altivec=true
+-    elif $CC -faltivec -o conftest conftest.c >/dev/null 2>&1; then
++    elif $CC $CFLAGS -faltivec -o conftest conftest.c >/dev/null 2>&1; then
+       # Mac OS X style
+       have_altivec=true
+       ALTIVEC_CFLAGS="-faltivec"
+-    elif $CC -fvec -o conftest conftest.c >/dev/null 2>&1; then
++    elif $CC $CFLAGS -fvec -o conftest conftest.c >/dev/null 2>&1; then
+       # Motorola style
+       have_altivec=true
+       ALTIVEC_CFLAGS="-fvec"
+-    elif $CC -DHAVE_ALTIVEC_H=1 -maltivec -mabi=altivec -o conftest conftest.c >/dev/null 2>&1; then
++    elif $CC $CFLAGS -DHAVE_ALTIVEC_H=1 -maltivec -mabi=altivec -o conftest conftest.c >/dev/null 2>&1; then
+       # gcc 3.1 style
+       have_altivec=true
+       ALTIVEC_CFLAGS="-DHAVE_ALTIVEC_H=1 -maltivec -mabi=altivec"
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild
index 8404b5db5b16..612d63511d8f 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r2.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-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild,v 1.2 2004/06/09 17:09:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r2.ebuild,v 1.3 2004/06/14 21:09:48 hansmi Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="1"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse"
 
 DEPEND="media-libs/jpeg
@@ -37,6 +37,11 @@ src_unpack() {
 	[ "$ARCH" != x86 ] && epatch ${FILESDIR}/${P}-fPIC.patch
 	epatch ${FILESDIR}/${P}-gcc34.patch
 
+	# Fix an error in the detection of the altivec-support
+	# in the compiler
+	epatch "${FILESDIR}/altivec-fix-${PV}.patch"
+	autoreconf
+
 	use X || epatch "${FILESDIR}/no-x11-lib-2.patch"
 }