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

Package-Manager: portage-2.1.2_rc2

5 files changed, 84 insertions, 18 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/Manifest b/media-video/mjpegtools/Manifest
index 6536a626041e..fb53796c0ed1 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -21,6 +21,10 @@ AUX mjpegtools-1.8.0-libquicktime.patch 1186 RMD160 125fe4cfdecb5b98480d45670e3c
 MD5 f24ed418a30be9f6a3c581312ff2137f files/mjpegtools-1.8.0-libquicktime.patch 1186
 RMD160 125fe4cfdecb5b98480d45670e3cb6d84f894c4f files/mjpegtools-1.8.0-libquicktime.patch 1186
 SHA256 abf3043efbcdb29af2ee1b2a2e0b92b948a740d377d8e534635eb8599e6fb386 files/mjpegtools-1.8.0-libquicktime.patch 1186
+AUX mjpegtools-1.8.0-no-jpeg-mmx.patch 1539 RMD160 eb2b1756e65ce56b128e0c6763a27253d5cd9d4c SHA1 09e6c05a4c277498c277b9480d4f51c29e707b0c SHA256 f748ee564a03473ea027ab69d08fe1e25ab6ff05cbf4f223fefa657f1cd3e3aa
+MD5 6dd4046d242bd54517cf256c8f8a8411 files/mjpegtools-1.8.0-no-jpeg-mmx.patch 1539
+RMD160 eb2b1756e65ce56b128e0c6763a27253d5cd9d4c files/mjpegtools-1.8.0-no-jpeg-mmx.patch 1539
+SHA256 f748ee564a03473ea027ab69d08fe1e25ab6ff05cbf4f223fefa657f1cd3e3aa files/mjpegtools-1.8.0-no-jpeg-mmx.patch 1539
 AUX mjpegtools-1.8.0-parallelmake.patch 2163 RMD160 1bf0d3c30601b2b6d421c8dad3167a42304cce39 SHA1 72c4caeb7d18f9bb82176bad8e10347da6ea3f1e SHA256 d2456d4a75c7c2b205fc9c71431aaae427dd5667c71dd3bee2fa4869cb438b03
 MD5 78e3f74445e8ab3c4e3f171cfb21a17f files/mjpegtools-1.8.0-parallelmake.patch 2163
 RMD160 1bf0d3c30601b2b6d421c8dad3167a42304cce39 files/mjpegtools-1.8.0-parallelmake.patch 2163
@@ -31,18 +35,18 @@ RMD160 2d3d55fb7561a9c0ceeb7ce880953cb12662489c files/mjpegtools-1.8.0-pkg-confi
 SHA256 3b26122803c1ea805534308137323ee119fbc29777fa4a588ebe6dade0a8d490 files/mjpegtools-1.8.0-pkg-config.patch 423
 DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA1 e11d68298a64b52f98724dbf3fd14f168e140290 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a
 DIST mjpegtools-m4-1.tar.bz2 4547 RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 SHA1 4c69f9918dcc56fc544fef9af9aaed968da1ae67 SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522
-EBUILD mjpegtools-1.8.0-r1.ebuild 3155 RMD160 0fc8ecb1fcce183b0eedc799e6133f9bf5d12ae6 SHA1 761400dab96335f3abd759e430495417efb299a4 SHA256 b6362d20b5726421e37f75c4444abc3c4950d2290482eae4ab5bedd8a2a820c4
-MD5 62dbd56ea57eca711a4bfa40a47b6cd3 mjpegtools-1.8.0-r1.ebuild 3155
-RMD160 0fc8ecb1fcce183b0eedc799e6133f9bf5d12ae6 mjpegtools-1.8.0-r1.ebuild 3155
-SHA256 b6362d20b5726421e37f75c4444abc3c4950d2290482eae4ab5bedd8a2a820c4 mjpegtools-1.8.0-r1.ebuild 3155
-EBUILD mjpegtools-1.8.0-r2.ebuild 2809 RMD160 2233b82fb042b5976633adde1ad3c5bbbaf4251e SHA1 0cc918e182dd89a61bc98cf4edbb7143d2b52cbc SHA256 be302c170a99c6431a598e0754f66075bd57ee79a86b57c8086f7e949abb1a56
-MD5 f547088b082bf9438aee582085e34d07 mjpegtools-1.8.0-r2.ebuild 2809
-RMD160 2233b82fb042b5976633adde1ad3c5bbbaf4251e mjpegtools-1.8.0-r2.ebuild 2809
-SHA256 be302c170a99c6431a598e0754f66075bd57ee79a86b57c8086f7e949abb1a56 mjpegtools-1.8.0-r2.ebuild 2809
-MISC ChangeLog 22153 RMD160 8abd8eeaeed38ec910c0967d0d656edec0049b48 SHA1 c05cd0d83ed67d6f2d28f72cd701c895ca6a4595 SHA256 befcbad8272e4b4eb35c8e3eb23ba608e8725680575f2ea1e0985015d0371f3f
-MD5 21e7785c2024880d3f35c77428ce874b ChangeLog 22153
-RMD160 8abd8eeaeed38ec910c0967d0d656edec0049b48 ChangeLog 22153
-SHA256 befcbad8272e4b4eb35c8e3eb23ba608e8725680575f2ea1e0985015d0371f3f ChangeLog 22153
+EBUILD mjpegtools-1.8.0-r1.ebuild 3221 RMD160 edac4c080eaa1becff9118220b141e7d855c2019 SHA1 1431cb62a4afa13966f4886d31cf01c3e8fd169c SHA256 a5f501d066ea78b67c61d774584a2d33beab05033fad58fa94b77d6d9733dfba
+MD5 6e46772475aa320926fd58b6988f5cc1 mjpegtools-1.8.0-r1.ebuild 3221
+RMD160 edac4c080eaa1becff9118220b141e7d855c2019 mjpegtools-1.8.0-r1.ebuild 3221
+SHA256 a5f501d066ea78b67c61d774584a2d33beab05033fad58fa94b77d6d9733dfba mjpegtools-1.8.0-r1.ebuild 3221
+EBUILD mjpegtools-1.8.0-r2.ebuild 2877 RMD160 131b226c8a3a8a0d2efeca6fd95c8fa383976b28 SHA1 a167fe8367034e85774a8637296471cd3d42601f SHA256 0509f917817eefcd5d8823e380ce612ed5f7b9251daf63f2fb3508c5623b9abb
+MD5 4f11832f1f17f68336ee83a2288ec1a7 mjpegtools-1.8.0-r2.ebuild 2877
+RMD160 131b226c8a3a8a0d2efeca6fd95c8fa383976b28 mjpegtools-1.8.0-r2.ebuild 2877
+SHA256 0509f917817eefcd5d8823e380ce612ed5f7b9251daf63f2fb3508c5623b9abb mjpegtools-1.8.0-r2.ebuild 2877
+MISC ChangeLog 22378 RMD160 07ca5e314a9d3f103c1f047b72041636ecbdb2e7 SHA1 8fadc47269b682cafaa9098b39816d6f51710c3d SHA256 e50f69306bf72de9c6b376bb533e0c74bb642f2fcc4cfe3c59c012796c7bbc96
+MD5 1e3e198fb88a24eb5526bf9e137f01e6 ChangeLog 22378
+RMD160 07ca5e314a9d3f103c1f047b72041636ecbdb2e7 ChangeLog 22378
+SHA256 e50f69306bf72de9c6b376bb533e0c74bb642f2fcc4cfe3c59c012796c7bbc96 ChangeLog 22378
 MISC metadata.xml 311 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 SHA1 228093feb5989936d0480ac2bc543df959b06dfa SHA256 74869f2267904c0a7409e16cc0d2e54f41b186683c4f5bb6e0127b275e66b4b0
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 metadata.xml 311
@@ -56,7 +60,7 @@ SHA256 4b2cc5ce3875c7bd8e06e9dda7c0e3cc89ccd78dc4c8e163c42066537a25d175 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYJf+t2vP6XvVdOcRAkZBAKCwhua4WGVJnEK/fuV229yuslCx/gCgmNI6
-v5/DfpzMdHLxok6lfZiGCxk=
-=6QgG
+iD8DBQFFYad8t2vP6XvVdOcRAijnAJ924sPdaIuiA2RImuxDo+yhLmGiMQCfWPmB
+m3ikJfvYnADvxcVu6yKcoes=
+=vHD8
 -----END PGP SIGNATURE-----
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"