Version bump, bug #103252

(Portage version: 2.1.2_rc2-r5)

5 files changed, 146 insertions, 1 deletions

diff --git a/media-video/dvgrab/ChangeLog b/media-video/dvgrab/ChangeLog
index d2800d851b0a..97a08bd32f0c 100644
--- a/media-video/dvgrab/ChangeLog
+++ b/media-video/dvgrab/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2006/10/21 22:59:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.18 2006/12/07 19:17:09 aballier Exp $
+
+*dvgrab-2.0 (07 Dec 2006)
+
+  07 Dec 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/dvgrab-2.0-asneeded.patch, +files/dvgrab-2.0-automagic.patch,
+  +dvgrab-2.0.ebuild:
+  Version bump, bug #103252
 
   21 Oct 2006; Alexis Ballier <aballier@gentoo.org>
   +files/dvgrab-libquicktime-compat.patch, dvgrab-1.8.ebuild:
diff --git a/media-video/dvgrab/dvgrab-2.0.ebuild b/media-video/dvgrab/dvgrab-2.0.ebuild
new file mode 100644
index 000000000000..0df74f47feaf
--- /dev/null
+++ b/media-video/dvgrab/dvgrab-2.0.ebuild
@@ -0,0 +1,46 @@
+# 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-2.0.ebuild,v 1.1 2006/12/07 19:17:09 aballier Exp $
+
+WANT_AUTOCONF=2.5
+WANT_AUTOMAKE=1.9
+
+inherit eutils autotools
+
+DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
+HOMEPAGE="http://kino.schirmacher.de/"
+SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="jpeg quicktime"
+
+DEPEND=">=sys-libs/libraw1394-1.1.0
+	>=media-libs/libdv-0.103
+	>=media-libs/libiec61883-1.0.0
+	sys-libs/libavc1394
+	jpeg? ( media-libs/jpeg )
+	quicktime? ( media-libs/libquicktime )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd ${S}
+	epatch "${FILESDIR}/${P}-automagic.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/${PN}-libquicktime-compat.patch"
+	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"
+	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
+}
diff --git a/media-video/dvgrab/files/digest-dvgrab-2.0 b/media-video/dvgrab/files/digest-dvgrab-2.0
new file mode 100644
index 000000000000..848ab8a68010
--- /dev/null
+++ b/media-video/dvgrab/files/digest-dvgrab-2.0
@@ -0,0 +1,3 @@
+MD5 17115cdd309048a9e2a6652f117a22c6 dvgrab-2.0.tar.gz 160566
+RMD160 8b539526a19226c2e6112d4c65306d4e71f474e5 dvgrab-2.0.tar.gz 160566
+SHA256 57549e9bca397237d41638b2d810a5bf0d7f2f178352fded9cf3d8e02419bffa dvgrab-2.0.tar.gz 160566
diff --git a/media-video/dvgrab/files/dvgrab-2.0-asneeded.patch b/media-video/dvgrab/files/dvgrab-2.0-asneeded.patch
new file mode 100644
index 000000000000..444e9d3d0c0a
--- /dev/null
+++ b/media-video/dvgrab/files/dvgrab-2.0-asneeded.patch
@@ -0,0 +1,11 @@
+--- dvgrab-2.0/Makefile.am.old	2006-12-07 19:52:56.000000000 +0100
++++ dvgrab-2.0/Makefile.am	2006-12-07 19:53:15.000000000 +0100
+@@ -17,7 +17,7 @@
+ 	@LIBIEC61883_CFLAGS@ \
+ 	@LIBDV_CFLAGS@
+ 
+-dvgrab_LDFLAGS = \
++dvgrab_LDADD = \
+ 	@LIBRAW1394_LIBS@ \
+ 	@LIBIEC61883_LIBS@ \
+ 	@LIBDV_LIBS@
diff --git a/media-video/dvgrab/files/dvgrab-2.0-automagic.patch b/media-video/dvgrab/files/dvgrab-2.0-automagic.patch
new file mode 100644
index 000000000000..b069959d43fe
--- /dev/null
+++ b/media-video/dvgrab/files/dvgrab-2.0-automagic.patch
@@ -0,0 +1,78 @@
+--- dvgrab-2.0/configure.in.old	2006-12-07 19:41:05.000000000 +0100
++++ dvgrab-2.0/configure.in	2006-12-07 19:41:09.000000000 +0100
+@@ -41,37 +41,46 @@
+ 	AC_ERROR(You need the pthread library to compile dvgrab)
+ ])
+ 
+-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.],