Removing automagic dependency on quicktime and jpeg, see Bug #146243, Thanks to Polarina <gabrielp@simnet.is> for providing first patch.

(Portage version: 2.1.1_rc1-r5)

3 files changed, 101 insertions, 3 deletions

diff --git a/media-video/dvgrab/ChangeLog b/media-video/dvgrab/ChangeLog
index 66c81dbf20f7..a787dd89e514 100644
--- a/media-video/dvgrab/ChangeLog
+++ b/media-video/dvgrab/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/dvgrab
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.15 2006/07/06 23:11:39 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.16 2006/09/06 12:04:18 zzam Exp $
+
+  06 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/dvgrab-1.8-configure.patch, dvgrab-1.8.ebuild:
+  Removing automagic dependency on quicktime and jpeg, see Bug #146243, Thanks
+  to Polarina <gabrielp@simnet.is> for providing first patch.
 
   06 Jul 2006; Jon Hood <squinky86@gentoo.org> dvgrab-1.8.ebuild:
   Stable on amd64, bug #103926.
diff --git a/media-video/dvgrab/dvgrab-1.8.ebuild b/media-video/dvgrab/dvgrab-1.8.ebuild
index 035c558046ac..ad07edaaafa1 100644
--- a/media-video/dvgrab/dvgrab-1.8.ebuild
+++ b/media-video/dvgrab/dvgrab-1.8.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/dvgrab/dvgrab-1.8.ebuild,v 1.7 2006/07/06 23:11:39 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.8.ebuild,v 1.8 2006/09/06 12:04:18 zzam Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
 HOMEPAGE="http://kino.schirmacher.de/"
@@ -17,6 +17,21 @@ DEPEND="sys-libs/libavc1394
 	>=media-libs/libdv-0.102
 	jpeg? ( media-libs/jpeg )
 	quicktime? ( media-libs/libquicktime )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-configure.patch
+	cd ${S}
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_with quicktime libquicktime) \
+		$(use_with jpeg libjpeg) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
 
 src_install () {
 	make DESTDIR=${D} install || die "make install failed"
diff --git a/media-video/dvgrab/files/dvgrab-1.8-configure.patch b/media-video/dvgrab/files/dvgrab-1.8-configure.patch
new file mode 100644
index 000000000000..0d362b5aeb19
--- /dev/null
+++ b/media-video/dvgrab/files/dvgrab-1.8-configure.patch
@@ -0,0 +1,78 @@
+--- dvgrab-1.8/configure.in.old	2006-09-06 13:29:08.632750806 +0200
++++ dvgrab-1.8/configure.in	2006-09-06 13:32:20.919348163 +0200
+@@ -67,37 +67,46 @@
+ 	AC_WARN(libdv missing; I make better dv2 AVI files with libdv 0.98 or newer installed.)
+ ])
+ 
+-AC_CHECK_HEADERS(quicktime/quicktime.h,,
+-[
+-	AC_WARN(quicktime headers missing; install libquicktime or quicktime4linux to support Quicktime files.)
+-])
++AC_ARG_WITH(libquicktime, [  --with-libquicktime  Enables Quicktime support],
++[enable_libquicktime=$withval], [enable_libquicktime=yes])
+ 
+-# add various libs if using quicktime4linux and not libquicktime
+-AC_CHECK_HEADERS(quicktime/lqt.h,
+-	[AC_CHECK_LIB(quicktime, quicktime_open, ,
+-		[AC_WARN(libquicktime missing; install libquicktime or quicktime4linux to support Quicktime files.)]
+-	)],
+-[
+-	AC_CHECK_LIB(png, png_read_image)
+-	AC_CHECK_LIB(ogg, ogg_stream_pagein)
+-	AC_CHECK_LIB(vorbis, vorbis_info_clear)
+-	AC_CHECK_LIB(vorbisenc, vorbis_encode_ctl)
+-	AC_CHECK_LIB(jpeg, jpeg_read_scanlines)
+-	AC_CHECK_LIB(a52, a52_init)
+-	AC_CHECK_LIB(mpeg3, mpeg3demux_read_char_packet)
+-	AC_CHECK_LIB(quicktime, quicktime_open, ,
+-		[AC_WARN(libquicktime missing; install libquicktime or quicktime4linux to support Quicktime files.)]
+-	)
+-])
++if test "$enable_libquicktime" = yes; then
++	AC_CHECK_HEADERS(quicktime/quicktime.h,,
++	[
++		AC_ERROR(quicktime headers missing)
++	])
++	
++	AC_CHECK_HEADERS(quicktime/lqt.h,
++		[AC_CHECK_LIB(quicktime, quicktime_open, ,
++			[AC_ERROR(libquicktime missing)]
++		)],
++	[
++		AC_CHECK_LIB(png, png_read_image)
++		AC_CHECK_LIB(ogg, ogg_stream_pagein)
++		AC_CHECK_LIB(vorbis, vorbis_info_clear)
++		AC_CHECK_LIB(vorbisenc, vorbis_encode_ctl)
++		AC_CHECK_LIB(jpeg, jpeg_read_scanlines)
++		AC_CHECK_LIB(a52, a52_init)
++		AC_CHECK_LIB(mpeg3, mpeg3demux_read_char_packet)
++		AC_CHECK_LIB(quicktime, quicktime_open, ,
++			[AC_ERROR(libquicktime missing)]
++		)
++	])
++fi
+ 
+-AC_CHECK_HEADERS(jpeglib.h,,
+-[
+-	AC_WARN(jpeglib headers missing; install jpeglib to save to JPEG files.)
+-])
+-AC_CHECK_LIB(jpeg, jpeg_CreateCompress,,
+-[
+-	AC_WARN(jpeglib missing; install jpeglib to save to JPEG files.)
+-])
++AC_ARG_WITH(libjpeg, [  --with-libjpeg  Enables JPEG support],
++[enable_libjpeg=$withval], [enable_libjpeg=yes])
++
++if test "$enable_libjpeg" = yes; then
++	AC_CHECK_HEADERS(jpeglib.h,,
++	[
++		AC_WARN(jpeglib headers missing; install jpeglib to save to JPEG files.)
++	])
++	AC_CHECK_LIB(jpeg, jpeg_CreateCompress,,
++	[
++		AC_WARN(jpeglib missing; install jpeglib to save to JPEG files.)
++	])
++fi
+ 
+ # EFENCE
+ AC_ARG_WITH(efence,[  --with-efence        Use ElectricFence for debugging support.],