Temporary fix for bug 66927.

3 files changed, 25 insertions, 19 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 6d21aa0360f1..536de1c15fb7 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.72 2004/10/23 21:20:52 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.73 2004/11/03 19:30:48 hansmi Exp $
+
+  03 Nov 2004; Michael Hanselmann <hansmi@gentoo.org>
+  mjpegtools-1.6.2-r3.ebuild:
+  Temporary fix for the SDL-problem in bug 66927.
 
   23 Oct 2004; Jason Wever <weeve@gentoo.org> mjpegtools-1.6.2-r3.ebuild:
   Added ~sparc keyword.
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 15b8706f7ddd..d237eb37ad47 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,22 +1,22 @@
-MD5 3dbff7e3b12c73567645711318e49894 ChangeLog 13467
+MD5 f481f78859d3229dc7fbbc578c68054f mjpegtools-1.6.2-r3.ebuild 3029
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
+MD5 325ea849afb581e7e843eb16e28431d4 ChangeLog 13603
 MD5 ea564d3a0b8f7435249b8d54c5b6fc11 mjpegtools-1.6.0-r7.ebuild 2853
 MD5 f37748181fc868c34d64151104a52b84 mjpegtools-1.6.1.90-r2.ebuild 1912
-MD5 1889dde4756321f27bc3b846fa7d7fae mjpegtools-1.6.2-r3.ebuild 3001
 MD5 076b96be4393adb0f7e71e9f9cd22a40 mjpegtools-1.6.2-r1.ebuild 2699
-MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
+MD5 a4cae44ea5989aed95d7b8d84aaf0af4 files/mjpegtools-1.6.2-fPIC.patch 9945
+MD5 f16b681aebfa408a1ff5b6030c50fad8 files/mjpegtools-1.6.2-gcc34-altivec.patch 3693
+MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
 MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r3 69
+MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
 MD5 3150d43b1c44c02265b8481e271093c8 files/altivec-fix-1.6.2.patch 1011
-MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r2 72
-MD5 f16b681aebfa408a1ff5b6030c50fad8 files/mjpegtools-1.6.2-gcc34-altivec.patch 3693
 MD5 abdfec9a9d07b842509b709ba17d69ab files/mjpegtools-1.6.2-nogtk.patch 556
-MD5 094ac8c3e42a24141ae45bfa0d5d029d files/digest-mjpegtools-1.6.2-r1 69
-MD5 0d5f90e8ac4023e403bf79d2e14314cb files/mjpegtools-1.6.0-gcc3.patch 5086
 MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.91-fPIC.patch 555
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.92-fPIC.patch 555
-MD5 6f4bc7cb8bdf27f1ba2d5a69e8fff635 files/mjpegtools-1.6.1.93-fPIC.patch 555
-MD5 a4cae44ea5989aed95d7b8d84aaf0af4 files/mjpegtools-1.6.2-fPIC.patch 9945
-MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
+MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
 MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497
+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-r3 69
 MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
index 5e04daaa07c0..4e3098d1d6d5 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r3.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-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.8 2004/10/23 21:20:52 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild,v 1.9 2004/11/03 19:30:48 hansmi Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -40,11 +40,13 @@ src_unpack() {
 	# remove checks for gtk in configure in
 	use gtk || epatch ${FILESDIR}/${P}-nogtk.patch
 
-	# Fix an error in the detection of the altivec-support
-	# in the compiler
-	epatch "${FILESDIR}/altivec-fix-${PV}.patch"
-	sed -i 's:-O3::' configure.in
-	autoreconf || die
+	if use ppc; then
+		# Fix an error in the detection of the altivec-support
+		# in the compiler
+		epatch "${FILESDIR}/altivec-fix-${PV}.patch"
+		sed -i 's:-O3::' configure.in
+		autoreconf || die
+	fi
 
 	use X || epatch "${FILESDIR}/no-x11-lib-2.patch"
 }