Explicitly disable usage of jpeg-mmx to prevent automagic depend.

(Portage version: 2.1.2_rc2)

4 files changed, 65 insertions, 3 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 44f5ebd5f9ce..1b577b66c9fe 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.124 2006/11/19 17:44:23 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.125 2006/11/20 13:02:30 zzam Exp $
+
+  20 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/mjpegtools-1.8.0-no-jpeg-mmx.patch, mjpegtools-1.8.0-r1.ebuild,
+  mjpegtools-1.8.0-r2.ebuild:
+  Explicitly disable usage of jpeg-mmx to prevent automagic depend.
 
   19 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   files/mjpegtools-1.8.0-fix-lav2mpeg.patch:
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-no-jpeg-mmx.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-no-jpeg-mmx.patch
new file mode 100644
index 000000000000..1f388fa5f53f
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-no-jpeg-mmx.patch
@@ -0,0 +1,53 @@
+diff -ru mjpegtools-1.8.0-orig/configure.ac mjpegtools-1.8.0-no-jpeg-mmx/configure.ac
+--- mjpegtools-1.8.0-orig/configure.ac	2006-11-19 17:11:41.000000000 +0100
++++ mjpegtools-1.8.0-no-jpeg-mmx/configure.ac	2006-11-20 13:56:47.000000000 +0100
+@@ -197,29 +197,32 @@
+   AC_MSG_ERROR([
+ *** A directory must be specified for --with-jpeg-mmx option.])
+ fi
+-if test x$with_jpeg_mmx = x ; then
+-  dnl Special case for building .deb's
+-  if test -d ../jpeg-mmx ; then
+-    with_jpeg_mmx=`pwd`/../jpeg-mmx
+-  else
+-    with_jpeg_mmx=/usr/local/src/jpeg-mmx
++if test x$with_jpeg_mmx != xno ; then
++  if test x$with_jpeg_mmx = x ; then
++    dnl Special case for building .deb's
++    if test -d ../jpeg-mmx ; then
++      with_jpeg_mmx=`pwd`/../jpeg-mmx
++    else
++      with_jpeg_mmx=/usr/local/src/jpeg-mmx
++    fi
+   fi
+-fi
+ 
+ dnl
+ dnl Look for the installed/specified copy
+ dnl
+ 
+-OLD_CFLAGS="$CFLAGS"
+-OLD_LIBS="$LIBS"
+-LIBS="$LIBS -L$with_jpeg_mmx"
+-CFLAGS="$CFLAGS -I$with_jpeg_mmx"
+-AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress,
+-   [ JPEG_LIBS="$LIBS -ljpeg-mmx"
+-     JPEG_CFLAGS="-I$with_jpeg_mmx"
+-       have_jpeg=true ],,)
+-  LIBS="$OLD_LIBS"
+-  CFLAGS="$OLD_CFLAGS"
++  OLD_CFLAGS="$CFLAGS"
++  OLD_LIBS="$LIBS"
++  LIBS="$LIBS -L$with_jpeg_mmx"
++  CFLAGS="$CFLAGS -I$with_jpeg_mmx"
++  AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress,
++     [ JPEG_LIBS="$LIBS -ljpeg-mmx"
++       JPEG_CFLAGS="-I$with_jpeg_mmx"
++         have_jpeg=true ],,)
++    LIBS="$OLD_LIBS"
++    CFLAGS="$OLD_CFLAGS"
++
++fi
+ 
+ dnl 
+ dnl Look for _a_ jpeg lib that will work.
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index e76f0c657b59..26c9eee56c85 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.23 2006/11/05 10:28:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.24 2006/11/20 13:02:30 zzam Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -47,6 +47,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-pkg-config.patch"
 	epatch "${FILESDIR}/${P}-as-needed.patch"
 	has_version ">=media-libs/libquicktime-0.9.9" && epatch "${FILESDIR}/${P}-libquicktime.patch"
+	epatch "${FILESDIR}/${P}-no-jpeg-mmx.patch"
 
 	# eautoreconf instead of elibtoolize
 	# as pkg-config-patch changes configure.in
@@ -97,6 +98,7 @@ src_compile() {
 		$(use_with sdl) \
 		$(use_with dv libdv /usr) \
 		--enable-largefile \
+		--without-jpeg-mmx \
 		${myconf} || die "configure failed"
 
 	emake || die "emake failed"
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
index 2234418ac158..26587cce921e 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.1 2006/11/19 17:22:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.2 2006/11/20 13:02:30 zzam Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -46,6 +46,7 @@ src_unpack() {
 	has_version ">=media-libs/libquicktime-0.9.9" && epatch "${FILESDIR}/${P}-libquicktime.patch"
 	epatch "${FILESDIR}/${P}-fix-lav2mpeg.patch"
 	epatch "${FILESDIR}/${P}-lavrec-memleak.patch"
+	epatch "${FILESDIR}/${P}-no-jpeg-mmx.patch"
 
 	# eautoreconf instead of elibtoolize
 	# as pkg-config-patch changes configure.in
@@ -81,6 +82,7 @@ src_compile() {
 		$(use_with dv libdv /usr) \
 		$(use_enable mmx simd-accel) \
 		--enable-largefile \
+		--without-jpeg-mmx \
 		${myconf} || die "configure failed"
 
 	emake || die "emake failed"