version bump

4 files changed, 130 insertions, 11 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 1045ba6a8bb6..cb6ebb634fca 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.15 2004/10/26 20:49:46 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.16 2004/10/29 03:09:52 iggy Exp $
+
+*ivtv-0.2.0_rc2 (28 Oct 2004)
+
+  28 Oct 2004; <iggy@gentoo.org> +ivtv-0.2.0_rc2.ebuild:
+  version bump
 
   26 Oct 2004; <iggy@gentoo.org> :
   bump to make sure everybody gets the fixes
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index c0a7951d8e4a..15b8cd3df2be 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 9f7bdbb974311f1b1963d32bf43b8b4e ivtv-0.2.0_rc2.ebuild 3637
 MD5 9da8b81328dd2fba10b93b1d2c6b14ae ivtv-0.2.0_rc1-r1.ebuild 3710
 MD5 9ae322027f63420b0508cae24306924c ivtv-0.1.9-r4.ebuild 3493
 MD5 68c5303bfb74087e97261a843f7da938 ivtv-0.2.0_rc1.ebuild 3707
 MD5 fd24d29e71f1d0a5228008f0dcba4a91 ChangeLog 2106
 MD5 212f198236ed9fef7b10b46f8cb80c63 metadata.xml 446
 MD5 706947f1027708969a61f7b5dcfb3727 files/digest-ivtv-0.2.0_rc1 127
+MD5 f58ee9b309859204cc863b08568d4e24 files/digest-ivtv-0.2.0_rc2 127
 MD5 c30318ac79a607f6ad308208a5987c3b files/digest-ivtv-0.1.9-r4 129
 MD5 706947f1027708969a61f7b5dcfb3727 files/digest-ivtv-0.2.0_rc1-r1 127
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBfrhuMSkoRwEucGERApZgAJ4oeE0U2p0W/y2qeH9jd3csCqUe9gCg1wxI
-s8YwVy+JDnX5pidzFVNjNvY=
-=bea+
------END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc2 b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc2
new file mode 100644
index 000000000000..c3f055fd5c34
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc2
@@ -0,0 +1,2 @@
+MD5 f35f6eb2a98c633d5441b99041c9d5b9 ivtv-0.2.0-rc2f.tgz 520727
+MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr250_18a_inf.zip 676578
diff --git a/media-tv/ivtv/ivtv-0.2.0_rc2.ebuild b/media-tv/ivtv/ivtv-0.2.0_rc2.ebuild
new file mode 100644
index 000000000000..117824daeb89
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.2.0_rc2.ebuild
@@ -0,0 +1,120 @@
+# 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.2.0_rc2.ebuild,v 1.1 2004/10/29 03:09:52 iggy Exp $
+
+# TODO
+# the "Gentoo way" is to use /usr/src/linux, not the running kernel
+# check for other msp3400 modules
+# add a few notes to the postinst output about what's needed (bttv/tuner, etc.)
+
+inherit eutils
+
+DESCRIPTION="ivtv driver for Hauppauge PVR[23]50 cards"
+HOMEPAGE="http://ivtv.sourceforge.net"
+
+# stupidly named tarballs
+MY_P="${P/_/-}f"
+
+SRC_URI="http://67.18.1.101/~ckennedy/ivtv/${MY_P}.tgz
+	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="app-arch/unzip
+	lirc? ( app-misc/lirc )"
+
+src_unpack() {
+	unpack ${MY_P}.tgz
+	cd ${WORKDIR}/${MY_P}/driver
+	sed -i -e 's:$(MODDIR):$(DESTDIR)/$(MODDIR):g' \
+		-e 's:$(INCLUDEDIR):$(DESTDIR)/$(INCLUDEDIR):g' \
+		Makefile2.4 || die "sed failed"
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	cd ${WORKDIR}/${MY_P}/driver
+	make || die "build of driver failed"
+
+	cd ${WORKDIR}/${MY_P}/utils
+	make ||  die "build of utils failed"
+}
+
+src_install() {
+	cd ${WORKDIR}/${MY_P}/utils
+	cp ${DISTDIR}/pvr250_18a_inf.zip .
+	dodir /lib/modules
+	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}/${MY_P}
+	dodoc README doc/*
+
+	cd ${WORKDIR}/${MY_P}/utils
+	newbin encoder ivtv-encoder
+	newbin fwapi ivtv-fwapi
+	newbin radio ivtv-radio
+	newbin vbi ivtv-vbi
+	newbin mpegindex ivtv-mpegindex
+	dobin ivtvfbctl ivtvplay ivtvctl
+	newdoc README README.utils
+	dodoc README.mythtv-ivtv README.radio README.vbi zvbi.diff
+	dodoc lircd-g.conf lircd.conf lircrc
+
+	# for whatever reason, the Makefile doesn't make the dirs we need
+	# fixes bug # 68110
+	dodir /usr/include/linux
+	dodir /lib/modules/`uname -r`/extra
+	cd ${WORKDIR}/${MY_P}/driver
+	make DESTDIR=${D} INSTALL_MOD_PATH=${D} \
+		install || die "installation of driver failed"
+
+	set_arch_to_portage
+
+	dodir /etc/modules.d
+
+	echo "alias char-major-81     videodev" >>${D}/etc/modules.d/ivtv
+	echo "alias char-major-81-0   ivtv" >>${D}/etc/modules.d/ivtv
+
+	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. "
+	einfo "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"
+	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"
+	echo
+	einfo "The ptune* scripts have moved to media-tv/ivtv-ptune, emerge that to use those scripts"
+
+	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
+}