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.

(Portage version: 2.1.1_pre5-r3)

3 files changed, 34 insertions, 5 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/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) \