some minor fixes, and bump the rev for a new patch

6 files changed, 152 insertions, 15 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index d8d74b49cb8b..eca8ae69806d 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.2 2004/03/09 20:20:47 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.3 2004/03/11 08:33:19 iggy Exp $
+
+*ivtv-0.1.9-r2 (11 Mar 2004)
+
+  11 Mar 2004; Brian Jackson <iggy@gentoo.org> ivtv-0.1.9-r1.ebuild,
+  ivtv-0.1.9-r2.ebuild, metadata.xml:
+  some minor fixes, and bump the rev for a new patch
 
   09 Mar 2004; Brian Jackson <iggy@gentoo.org> ivtv-0.1.9-r1.ebuild:
   install a few other things, and change an include in the radio application
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index b0aabacf0d0e..b665a467ae29 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,3 +1,6 @@
-MD5 79f610cc9f6dc66caefe9f1045c32fa7 ChangeLog 549
-MD5 6cf5f624409008ae2b2e6ee96d40aa55 ivtv-0.1.9-r1.ebuild 3263
+MD5 c57c00b8e877049bce21060cac112b7d ivtv-0.1.9-r2.ebuild 3290
+MD5 4801325c3f36cd99b16d2182e3f7ee6b ivtv-0.1.9-r1.ebuild 3290
+MD5 e57bfed8b343195e8d8324e19396d92a ChangeLog 740
+MD5 212f198236ed9fef7b10b46f8cb80c63 metadata.xml 446
 MD5 5f8ee4e434626f37d191131c01e61bf2 files/digest-ivtv-0.1.9-r1 191
+MD5 75be3f5e54f30252df7ffba8922ee46d files/digest-ivtv-0.1.9-r2 188
diff --git a/media-tv/ivtv/files/digest-ivtv-0.1.9-r2 b/media-tv/ivtv/files/digest-ivtv-0.1.9-r2
new file mode 100644
index 000000000000..b943d3545d6e
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.1.9-r2
@@ -0,0 +1,3 @@
+MD5 ff350ebc9f3f593031085e63381ca362 ivtv-0.1.9.tar.gz 168331
+MD5 c34803bc1ca86567076ac7dc0df91076 pvr250_17_21288.exe 2615322
+MD5 e93720281d1907d6350cc94889197a9a ivtv-0.1.9-r2.patch 201
diff --git a/media-tv/ivtv/ivtv-0.1.9-r1.ebuild b/media-tv/ivtv/ivtv-0.1.9-r1.ebuild
index 4538709a88b8..228ca23a8518 100644
--- a/media-tv/ivtv/ivtv-0.1.9-r1.ebuild
+++ b/media-tv/ivtv/ivtv-0.1.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.1.9-r1.ebuild,v 1.3 2004/03/10 07:51:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.1.9-r1.ebuild,v 1.4 2004/03/11 08:33:19 iggy Exp $
 
 # TODO
 # the "Gentoo way" is to use /usr/src/linux, not the running kernel
@@ -36,14 +36,6 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${WORKDIR}/ivtv/utils
-	cp ${DISTDIR}/pvr250_17_21288.exe .
-	dodir /lib/modules
-	touch ${D}/lib/modules/ivtv-{enc,dec}-fw.bin
-	./ivtvfwextract.pl pvr250_17_21288.exe \
-		${D}/lib/modules/ivtv-enc-fw.bin \
-		${D}/lib/modules/ivtv-dec-fw.bin
-
 #	if `grep -q I2C_VERSION.*2\.8 /usr/src/linux/include/linux/i2c.h` ;then
 #		einfo "found new i2c in your kernel source"
 #		sed -i -e \
@@ -59,13 +51,22 @@ src_compile() {
 }
 
 src_install() {
+	cd ${WORKDIR}/ivtv/utils
+	cp ${DISTDIR}/pvr250_17_21288.exe .
+	dodir /lib/modules
+	touch ${D}/lib/modules/ivtv-{enc,dec}-fw.bin
+	./ivtvfwextract.pl pvr250_17_21288.exe \
+		${D}/lib/modules/ivtv-fw-enc.bin \
+		${D}/lib/modules/ivtv-fw-dec.bin
+
 	cd ${WORKDIR}/ivtv
 	dodoc README doc/*
 
 	cd ${WORKDIR}/ivtv/utils
-	dobin test_ioctl ivtvfbctl ivtvplay ptune-ui.pl ptune.pl record-v4l2.pl radio
+	dobin test_ioctl ivtvfbctl ivtvplay ptune-ui.pl ptune.pl record-v4l2.pl
+	dobin radio vbi mpegindex
 	newdoc README README.utils
-	dodoc README.mythtv-ivtv README.ptune README.radio README.vbi
+	dodoc README.mythtv-ivtv README.ptune README.radio README.vbi zvbi.diff
 	dodoc lircd-g.conf lircd.conf lircrc
 
 	cd ${WORKDIR}/ivtv/driver
@@ -73,7 +74,7 @@ src_install() {
 
 	dodir /etc/modules.d
 
-	echo <<-myEOF >${D}/etc/modules.d/ivtv
+	echo <<-myEOF >>${D}/etc/modules.d/ivtv
 	alias char-major-81     videodev
 	alias char-major-81-0   ivtv
 	options ivtv debug=1
diff --git a/media-tv/ivtv/ivtv-0.1.9-r2.ebuild b/media-tv/ivtv/ivtv-0.1.9-r2.ebuild
new file mode 100644
index 000000000000..9f6c8135ea6e
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.1.9-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.1.9-r2.ebuild,v 1.1 2004/03/11 08:33:19 iggy Exp $
+
+# TODO
+# the "Gentoo way" is to use /usr/src/linux, not the running kernel
+# make it detect whether it's a 2.6 kernel and patch if necessary
+
+inherit eutils
+
+DESCRIPTION="ivtv driver for Hauppauge PVR[23]50 cards"
+HOMEPAGE="http://ivtv.sourceforge.net"
+
+SRC_URI="mirror://sourceforge/ivtv/${P}.tar.gz
+	http://hauppauge.lightpath.net/software/pvr250/pvr250_17_21288.exe
+	mirror://gentoo/${PF}.patch"
+
+RESTRICT="nomirror"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+IUSE="lirc"
+
+DEPEND="lirc? app-misc/lirc
+	!virtual/ivtv-driver"
+RDEPEND="${DEPEND}"
+PROVIDE="virtual/ivtv-driver"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${WORKDIR}/ivtv
+	epatch ${DISTDIR}/${PF}.patch || die "${PF} patch failed"
+	sed -i -e 's:include <linux/videodev2.h>:include "videodev2.h":' utils/radio.c
+}
+
+src_compile() {
+#	if `grep -q I2C_VERSION.*2\.8 /usr/src/linux/include/linux/i2c.h` ;then
+#		einfo "found new i2c in your kernel source"
+#		sed -i -e \
+#			's:^#CFLAGS += -DNEW_I2C:CFLAGS += -DNEW_I2C:' \
+#			${WORKDIR}/ivtv/driver/Makefile
+#	fi
+
+	cd ${WORKDIR}/ivtv/driver
+	make || die "build of driver failed"
+
+	cd ${WORKDIR}/ivtv/utils
+	make ||  die "build of utils failed"
+}
+
+src_install() {
+	cd ${WORKDIR}/ivtv/utils
+	cp ${DISTDIR}/pvr250_17_21288.exe .
+	dodir /lib/modules
+	touch ${D}/lib/modules/ivtv-{enc,dec}-fw.bin
+	./ivtvfwextract.pl pvr250_17_21288.exe \
+		${D}/lib/modules/ivtv-fw-enc.bin \
+		${D}/lib/modules/ivtv-fw-dec.bin
+
+	cd ${WORKDIR}/ivtv
+	dodoc README doc/*
+
+	cd ${WORKDIR}/ivtv/utils
+	dobin test_ioctl ivtvfbctl ivtvplay ptune-ui.pl ptune.pl record-v4l2.pl
+	dobin radio vbi mpegindex
+	newdoc README README.utils
+	dodoc README.mythtv-ivtv README.ptune README.radio README.vbi zvbi.diff
+	dodoc lircd-g.conf lircd.conf lircrc
+
+	cd ${WORKDIR}/ivtv/driver
+	make DESTDIR=${D} install || die "installation of driver failed"
+
+	dodir /etc/modules.d
+
+	echo <<-myEOF >>${D}/etc/modules.d/ivtv
+	alias char-major-81     videodev
+	alias char-major-81-0   ivtv
+	options ivtv debug=1
+	options tuner type=2
+	options saa7127 enable_output=1 output_select=0
+	options msp3400 once=1 simple=1
+	add below ivtv msp3400 saa7115 tuner
+	post-install ivtv /usr/local/bin/test_ioctl -d /dev/video0 -u 0x3000
+	myEOF
+
+	if [ `has app-misc/lirc` ] || [ `use lirc` ] ; then
+		echo "alias char-major-61 lirc_i2c" >> ${D}/etc/modules.d/ivtv
+		echo "add above ivtv lirc_dev lirc_i2c" >> ${D}/etc/modules.d/ivtv
+	else
+		einfo "Not enabling lirc support. emerge lirc to get it."
+	fi
+
+}
+
+pkg_postinst() {
+	depmod -ae
+
+	einfo "You now have the driver for the Hauppauge PVR-[23]50 cards."
+	einfo "Add ivtv to /etc/modules.autoload.d/kernel-2.X"
+	einfo "You'll now need an application to watch tv. MythTV is the only choice at"
+	einfo "the moment. To get the ir remote working, you'll need to emerge lirc"
+	einfo "with the following env variable set:"
+	einfo "LIRC_OPTS=\"--with-x --with-driver=hauppauge --with-major=61"
+	einfo "	--with-port=none --with-irq=none\""
+	einfo "see http://ivtv.sourceforge.net for more info"
+	einfo "to use vbi, you'll need a few other things, check README.vbi in the docs dir"
+}
diff --git a/media-tv/ivtv/metadata.xml b/media-tv/ivtv/metadata.xml
new file mode 100644
index 000000000000..b4469516f7b2
--- /dev/null
+++ b/media-tv/ivtv/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <herd>media-tv</herd>
+  <maintainer>
+    <email>iggy@gentoo.org</email>
+    <name>Brian Jackson</name>
+    <description>Actively maintained</description>
+  </maintainer>
+  <longdescription>
+    Driver for ivtv based tv tuner cards, currently supports Hauppauge 
+    PVR-[23]50 cards
+  </longdescription>
+</pkgmetadata>