Fixed problem with missing png-support when USE=-quicktime, bug #144551. Added use-flag png and dependency to libpng which has been missing up to now.

Package-Manager: portage-2.1.1_pre5-r3

4 files changed, 50 insertions, 17 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index f3c3d81f9427..6b28c476dcaa 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,18 @@
 # 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.115 2006/07/30 11:42:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.116 2006/08/25 12:21:43 zzam Exp $
+
+  25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/mjpegtools-1.8.0-pkg-config.patch, mjpegtools-1.8.0-r1.ebuild:
+  Fixed problem with missing png-support when USE=-quicktime, bug #144551.
+  Added use-flag png and dependency to libpng which has been missing up to
+  now.
+
+  25 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/mjpegtools-1.8.0-pkg-config.patch, mjpegtools-1.8.0-r1.ebuild:
+  Fixed problem with missing png-support when USE=-quicktime, bug #144551.
+  Added use-flag png and dependency to libpng which has been missing up to
+  now.
 
   30 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/mjpegtools-1.8.0-libquicktime.patch, mjpegtools-1.8.0-r1.ebuild:
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index f4aa36f2cbd5..920b3e731757 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -13,15 +13,19 @@ AUX mjpegtools-1.8.0-parallelmake.patch 2163 RMD160 1bf0d3c30601b2b6d421c8dad316
 MD5 78e3f74445e8ab3c4e3f171cfb21a17f files/mjpegtools-1.8.0-parallelmake.patch 2163
 RMD160 1bf0d3c30601b2b6d421c8dad3167a42304cce39 files/mjpegtools-1.8.0-parallelmake.patch 2163
 SHA256 d2456d4a75c7c2b205fc9c71431aaae427dd5667c71dd3bee2fa4869cb438b03 files/mjpegtools-1.8.0-parallelmake.patch 2163
+AUX mjpegtools-1.8.0-pkg-config.patch 423 RMD160 2d3d55fb7561a9c0ceeb7ce880953cb12662489c SHA1 5d284a7754816a5e48e364f512f1f1fe71b58e00 SHA256 3b26122803c1ea805534308137323ee119fbc29777fa4a588ebe6dade0a8d490
+MD5 d50c3cb88e659af5e2679530e645c0bf files/mjpegtools-1.8.0-pkg-config.patch 423
+RMD160 2d3d55fb7561a9c0ceeb7ce880953cb12662489c files/mjpegtools-1.8.0-pkg-config.patch 423
+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
-EBUILD mjpegtools-1.8.0-r1.ebuild 2877 RMD160 0090f5817a5e46c87768ef8600385f5f76f9b5e4 SHA1 4b64996d059bf75ab1cc4fcb58dd2021943441ee SHA256 8182111e0f66cca971e1eb2000d500e1daf161356744802790c18c2047c961a8
-MD5 6cdb307f221b4b083fc18f244d9b559a mjpegtools-1.8.0-r1.ebuild 2877
-RMD160 0090f5817a5e46c87768ef8600385f5f76f9b5e4 mjpegtools-1.8.0-r1.ebuild 2877
-SHA256 8182111e0f66cca971e1eb2000d500e1daf161356744802790c18c2047c961a8 mjpegtools-1.8.0-r1.ebuild 2877
-MISC ChangeLog 20160 RMD160 ef95af19810c954966324682f9f324dc134ec34b SHA1 0eff0632a5a42a032c92c221baed9a6be02817e7 SHA256 79b7dd8dd36c3481a6aaa2a9a3578e308deb46680bdaf278a1db1be258aa9cd9
-MD5 7cd3958ca7d5cdee99fb937a07523a85 ChangeLog 20160
-RMD160 ef95af19810c954966324682f9f324dc134ec34b ChangeLog 20160
-SHA256 79b7dd8dd36c3481a6aaa2a9a3578e308deb46680bdaf278a1db1be258aa9cd9 ChangeLog 20160
+EBUILD mjpegtools-1.8.0-r1.ebuild 3067 RMD160 089d8f55f06bc8d5a192c172cd13dd9a17e101d5 SHA1 fac03979bac247f8080b4e569e439f11a81eebbf SHA256 45edf2af82300f5d859bb39344580c8c0bf989ece85e8a8689a3189caa045787
+MD5 f37d95e3fddc041f1eafe8cde158afca mjpegtools-1.8.0-r1.ebuild 3067
+RMD160 089d8f55f06bc8d5a192c172cd13dd9a17e101d5 mjpegtools-1.8.0-r1.ebuild 3067
+SHA256 45edf2af82300f5d859bb39344580c8c0bf989ece85e8a8689a3189caa045787 mjpegtools-1.8.0-r1.ebuild 3067
+MISC ChangeLog 20721 RMD160 2bd6ee13a89182e5dafca8fa65eb22685a82fc48 SHA1 8fb239876c911663d8bf28cada313eb733d47f8b SHA256 b2117dc38d77243fe8a1c2c53de86dd3ea8acc379ae3d71764ee2ccee9a1c798
+MD5 33264d3450a8cb3592ff7339be2f2605 ChangeLog 20721
+RMD160 2bd6ee13a89182e5dafca8fa65eb22685a82fc48 ChangeLog 20721
+SHA256 b2117dc38d77243fe8a1c2c53de86dd3ea8acc379ae3d71764ee2ccee9a1c798 ChangeLog 20721
 MISC metadata.xml 311 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 SHA1 228093feb5989936d0480ac2bc543df959b06dfa SHA256 74869f2267904c0a7409e16cc0d2e54f41b186683c4f5bb6e0127b275e66b4b0
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
 RMD160 5d2d2fac1a97018f75e5ff1e8e7c90fb02511cb9 metadata.xml 311
@@ -30,9 +34,9 @@ MD5 2188754e2cd2108901028f4e9c83d696 files/digest-mjpegtools-1.8.0-r1 253
 RMD160 5743c9441f2552b35045c0b5d3b9797079f8d30d files/digest-mjpegtools-1.8.0-r1 253
 SHA256 21770c4dd885e9231db381f9693c0650f32cd48f0a5c4438e62338c3b75d3c97 files/digest-mjpegtools-1.8.0-r1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEzJs+AiZjviIA2XgRAk1hAKCwcctg4PS/l7lhOidyV21n+g1zRQCgr4F0
-svvLbVv5hM5upkXErkxH3NA=
-=o1Y5
+iD8DBQFE7utpt2vP6XvVdOcRAm/GAKDWcOP1VYhgMtYKsH2YBMrNlj3SpgCeP8oG
+a7pHccBgCHhK+4zdstCZ370=
+=tYLq
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-pkg-config.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-pkg-config.patch
new file mode 100644
index 000000000000..dc4a0fb0898d
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-pkg-config.patch
@@ -0,0 +1,12 @@
+diff -ru mjpegtools-1.8.0-orig/configure.ac mjpegtools-1.8.0/configure.ac
+--- mjpegtools-1.8.0-orig/configure.ac	2006-08-20 20:39:40.719351212 +0200
++++ mjpegtools-1.8.0/configure.ac	2006-08-20 20:20:43.652651808 +0200
+@@ -233,6 +233,8 @@
+       have_jpeg=true ],,)
+ fi
+ 
++PKG_PROG_PKG_CONFIG
++
+ have_libquicktime=false
+ if test x$with_libquicktime != xno ; then
+   PKG_CHECK_MODULES(LIBQUICKTIME, [libquicktime >= 0.9.4],
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index 60605f4ed352..ed0604f0da99 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.16 2006/07/30 11:42:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.17 2006/08/25 12:21:43 zzam Exp $
 
-inherit flag-o-matic toolchain-funcs eutils libtool
+inherit flag-o-matic toolchain-funcs eutils libtool autotools
 
 DESCRIPTION="Tools for MJPEG video"
 HOMEPAGE="http://mjpeg.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="1"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="gtk dv quicktime sdl X yv12 3dnow mmx sse v4l dga"
+IUSE="gtk dv quicktime sdl X yv12 3dnow mmx sse v4l dga png"
 
 RDEPEND="media-libs/jpeg
 	x86? ( media-libs/libmovtar
@@ -21,6 +21,7 @@ RDEPEND="media-libs/jpeg
 		=dev-libs/glib-1.2* )
 	dv? ( >=media-libs/libdv-0.99 )
 	quicktime? ( virtual/quicktime )
+	png? ( media-libs/libpng )
 	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
 	X? ( || ( ( x11-libs/libX11
 				x11-libs/libXt
@@ -43,9 +44,12 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-gcc41.patch"
 	epatch "${FILESDIR}/${P}-parallelmake.patch"
+	epatch "${FILESDIR}/${P}-pkg-config.patch"
 	has_version ">=media-libs/libquicktime-0.9.9" && epatch "${FILESDIR}/${P}-libquicktime.patch"
 
-	elibtoolize
+	# eautoreconf instead of elibtoolize
+	# as pkg-config-patch changes configure.in
+	eautoreconf
 }
 
 src_compile() {
@@ -84,6 +88,7 @@ src_compile() {
 		$(use_with X x) \
 		$(use_enable dga xfree-ext) \
 		$(use_with quicktime libquicktime) \
+		$(use_with png libpng) \
 		$(use_with v4l) \
 		$(use_with gtk) \
 		$(use_with sdl) \