new rev, based off of -ck71d, compiles on 2.6.8, have fun

5 files changed, 50 insertions, 37 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index ad872cda713f..415591aadc7b 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.8 2004/06/25 00:31:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.9 2004/08/26 03:41:39 iggy Exp $
+
+  25 Aug 2004; <iggy@gentoo.org> -ivtv-0.1.9-r1.ebuild:
+  new rev, based off of -ck71d, compiles on 2.6.8, have fun
 
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> ivtv-0.1.9-r1.ebuild,
   ivtv-0.1.9-r3.ebuild:
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 7489db4820b3..ef89a3ff0b69 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,6 +1,6 @@
-MD5 8aa0ddaaf1ad7199004f860eb4a276d1 ivtv-0.1.9-r1.ebuild 3211
-MD5 3b6942c95de4032b985fcd467a63fb55 ChangeLog 1312
+MD5 68f37153fa237cf4e2ea7991c4d922db ivtv-0.1.9-r4.ebuild 3433
+MD5 8175c9fd4902ff9c5d4d609418b6aa45 ChangeLog 1425
 MD5 1992ed55b53c47d18457afada6ec3445 ivtv-0.1.9-r3.ebuild 3297
 MD5 212f198236ed9fef7b10b46f8cb80c63 metadata.xml 446
-MD5 5f8ee4e434626f37d191131c01e61bf2 files/digest-ivtv-0.1.9-r1 191
 MD5 0b541d724c1b04481ef21b872a7631c9 files/digest-ivtv-0.1.9-r3 191
+MD5 c30318ac79a607f6ad308208a5987c3b files/digest-ivtv-0.1.9-r4 129
diff --git a/media-tv/ivtv/files/digest-ivtv-0.1.9-r1 b/media-tv/ivtv/files/digest-ivtv-0.1.9-r1
deleted file mode 100644
index 8943c7fb0bbc..000000000000
--- a/media-tv/ivtv/files/digest-ivtv-0.1.9-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ff350ebc9f3f593031085e63381ca362 ivtv-0.1.9.tar.gz 168331
-MD5 c34803bc1ca86567076ac7dc0df91076 pvr250_17_21288.exe 2615322
-MD5 30cbbc40ded9fc30431001e2ee31924b ivtv-0.1.9-r1.patch 160604
diff --git a/media-tv/ivtv/files/digest-ivtv-0.1.9-r4 b/media-tv/ivtv/files/digest-ivtv-0.1.9-r4
new file mode 100644
index 000000000000..8b8857dd2f18
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.1.9-r4
@@ -0,0 +1,2 @@
+MD5 d3ca3cdbb9a637ac99382307abfb25cc ivtv-0.1.9-r4.tar.bz2 380229
+MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr250_18a_inf.zip 676578
diff --git a/media-tv/ivtv/ivtv-0.1.9-r1.ebuild b/media-tv/ivtv/ivtv-0.1.9-r4.ebuild
index 524cd3ef9932..a1e4284dfa7e 100644
--- a/media-tv/ivtv/ivtv-0.1.9-r1.ebuild
+++ b/media-tv/ivtv/ivtv-0.1.9-r4.ebuild
@@ -1,74 +1,77 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.7 2004/06/25 00:31:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.1.9-r4.ebuild,v 1.1 2004/08/26 03:41:39 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
+# removed ptune*.pl, need to make a seperate package for it
 
-inherit eutils
+# hackish I know
+ETYPE="headers"
+
+inherit eutils kernel
 
 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"
+SRC_URI="mirror://gentoo/${P}-${PR}.tar.bz2
+	http://hauppauge.lightpath.net/software/pvr250/pvr250_18a_inf.zip"
 
 RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
+[ "`echo ${KV} | cut -f2 -d.`" == 6 ] && SANDBOX_DISABLED="1"
+
 IUSE="lirc"
 
-DEPEND="lirc? ( app-misc/lirc )"
+DEPEND="lirc? ( app-misc/lirc )
+	app-arch/unzip"
 
 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
+	unpack ${P}-${PR}.tar.bz2
 }
 
 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
+	set_arch_to_kernel
+
+	cd ${WORKDIR}/${P}-${PR}/driver
 	make || die "build of driver failed"
 
-	cd ${WORKDIR}/ivtv/utils
+	cd ${WORKDIR}/${P}-${PR}/utils
 	make ||  die "build of utils failed"
 }
 
 src_install() {
-	cd ${WORKDIR}/ivtv/utils
-	cp ${DISTDIR}/pvr250_17_21288.exe .
+	cd ${WORKDIR}/${P}-${PR}/utils
+	cp ${DISTDIR}/pvr250_18a_inf.zip .
 	dodir /lib/modules
-	touch ${D}/lib/modules/ivtv-{enc,dec}-fw.bin
-	./ivtvfwextract.pl pvr250_17_21288.exe \
+	touch ${D}/lib/modules/ivtv-fw-{enc,dec}.bin
+	./ivtvfwextract.pl pvr250_18a_inf.zip \
 		${D}/lib/modules/ivtv-fw-enc.bin \
 		${D}/lib/modules/ivtv-fw-dec.bin
 
-	cd ${WORKDIR}/ivtv
+	cd ${WORKDIR}/${P}-${PR}
 	dodoc README doc/*
 
-	cd ${WORKDIR}/ivtv/utils
-	dobin test_ioctl ivtvfbctl ivtvplay ptune-ui.pl ptune.pl record-v4l2.pl
-	dobin radio vbi mpegindex
+	cd ${WORKDIR}/${P}-${PR}/utils
+	newbin test_ioctl ivtvctl
+	newbin encoder ivtv-encoder
+	newbin fwapi ivtv-fwapi
+	newbin radio ivtv-radio
+	newbin vbi ivtv-vbi
+	newbin mpegindex ivtv-mpegindex
+	dobin ivtvfbctl ivtvplay
 	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
+	cd ${WORKDIR}/${P}-${PR}/driver
 	make DESTDIR=${D} install || die "installation of driver failed"
 
+	set_arch_to_portage
+
 	dodir /etc/modules.d
 
 	echo <<-myEOF >>${D}/etc/modules.d/ivtv
@@ -102,5 +105,13 @@ pkg_postinst() {
 	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"
+	echo
 	einfo "to use vbi, you'll need a few other things, check README.vbi in the docs dir"
+	echo
+	einfo "you'll also need to add 'LIRCD_OPTS=\"--device=/dev/lirc/0\"' to /etc/conf.d/lircd"
+
+	if [ -f "/lib/modules/`uname -r`/kernel/drivers/media/video/msp3400.ko" ] ; then
+		ewarn "You have the msp3400 module that comes with the kernel. It isn't compatible"
+		ewarn "with ivtv. You need to back it up to somewhere else, then run depmod -ae again"
+	fi
 }