rev bump to rc3k to support 2.6.12 kernels.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 138 insertions, 3 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 79242ae7dab7..f843b5f272d9 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.25 2005/04/27 21:29:36 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.26 2005/06/25 22:29:52 cardoe Exp $
+
+*ivtv-0.2.0_rc3-r5 (25 Jun 2005)
+
+  25 Jun 2005; Doug Goldstein <cardoe@gentoo.org> +ivtv-0.2.0_rc3-r5.ebuild:
+  rev bump to rc3k to support 2.6.12 kernels. bug #97013
 
   27 Apr 2005; Brian Jackson <iggy@gentoo.org> ivtv-0.2.0_rc3-r4.ebuild:
   a few fixes from bug #90535, thanks to Andreas Weder
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 2a2e18e8c452..72c39b3980ba 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,12 +1,14 @@
-MD5 c1070d89cfbf47d91e5cb4fca07f10e6 ivtv-0.2.0_rc3-r3.ebuild 3050
+MD5 437f3d22f213b8569b6cb5403f8ddfbf ChangeLog 3770
 MD5 3478ada446b86ea433b13c9ae7163607 ivtv-0.2.0_rc2.ebuild 3655
 MD5 e3054c36ac41502ac2502af8511ad8f4 ivtv-0.2.0_rc3-r2.ebuild 2830
+MD5 c1070d89cfbf47d91e5cb4fca07f10e6 ivtv-0.2.0_rc3-r3.ebuild 3050
 MD5 373e45eda85ba28bdc65b95136beddab ivtv-0.2.0_rc3-r4.ebuild 3955
 MD5 fe955abf36e3c4816288e3b7b8fedc46 ivtv-0.2.0_rc3.ebuild 3698
-MD5 ecb1f681f2acf409892be2449d22d144 ChangeLog 3599
 MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465
+MD5 6ab5dde51ab386d176b6b25c348b0da4 ivtv-0.2.0_rc3-r5.ebuild 3957
 MD5 f58ee9b309859204cc863b08568d4e24 files/digest-ivtv-0.2.0_rc2 127
 MD5 8af31e29d594effa9af1bf2f135b7536 files/digest-ivtv-0.2.0_rc3 133
 MD5 b9e5dc4af8f84b925e0821829ce7e1ba files/digest-ivtv-0.2.0_rc3-r2 134
 MD5 b9e5dc4af8f84b925e0821829ce7e1ba files/digest-ivtv-0.2.0_rc3-r3 134
 MD5 994d47620b6a826a5d2cf84b3cb1bc5c files/digest-ivtv-0.2.0_rc3-r4 134
+MD5 5458ad51769cecb853e0afb00ab63930 files/digest-ivtv-0.2.0_rc3-r5 134
diff --git a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3-r5 b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3-r5
new file mode 100644
index 000000000000..4696a085ef15
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3-r5
@@ -0,0 +1,2 @@
+MD5 392fc959ca8c4f76919c617c169e0672 ivtv-0.2.0-rc3k.tgz 600006
+MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr_1.18.21.22168_inf.zip 676578
diff --git a/media-tv/ivtv/ivtv-0.2.0_rc3-r5.ebuild b/media-tv/ivtv/ivtv-0.2.0_rc3-r5.ebuild
new file mode 100644
index 000000000000..c1aa504b3dbb
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.2.0_rc3-r5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2005 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_rc3-r5.ebuild,v 1.1 2005/06/25 22:29:52 cardoe Exp $
+
+# TODO: make this thing 0.3.x friendly so people will stop asking me to put 0.3 in portage
+
+inherit eutils linux-mod
+
+DESCRIPTION="ivtv driver for Hauppauge PVR[23]50 cards"
+HOMEPAGE="http://ivtv.writeme.ch"
+
+MY_P="${P/_/-}k"
+FW_VER="pvr_1.18.21.22168_inf.zip"
+
+SRC_URI="http://www.ivtv.tv/releases/ivtv-0.2/${MY_P}.tgz
+	http://www.ivtv.tv/releases/ivtv-0.2/ivtv-0.2.0-rc/${MY_P}.tgz
+	ftp://ftp.shspvr.com/download/wintv-pvr_250-350/inf/${FW_VER}"
+
+RESTRICT="nomirror"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+IUSE=""
+S="${WORKDIR}/${MY_P}"
+
+BUILD_TARGETS="all"
+BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+CONFIG_CHECK="I2C_ALGOBIT VIDEO_DEV"
+
+DEPEND="app-arch/unzip"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	MODULE_NAMES="ivtv(extra:${S}/driver)
+		msp3400(extra:${S}/driver)
+		saa7115(extra:${S}/driver)
+		tveeprom(extra:${S}/driver)
+		saa7127(extra:${S}/driver)"
+	linux_chkconfig_present FB && MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)" && einfo "Enabling ivtv-fb support"
+}
+
+src_unpack() {
+	unpack ${MY_P}.tgz
+
+	sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \
+		-i ${S}/driver/Makefile || die "sed failed"
+	sed -e "s:^KERNVER = .*:KERNVER = ${KV_FULL}:g" \
+		-i ${S}/driver/Makefile2.* || die "sed failed"
+
+	convert_to_m ${S}/driver/Makefile2.6
+}
+
+src_compile() {
+	cd ${S}/driver
+	linux-mod_src_compile || die "failed to build kernel modules"
+
+	cd ${S}/utils
+	# the Makefile uses KERNELDIR only to find the .config, so we use KV_OUT_DIR
+	make KERNELDIR=${KV_OUT_DIR} ||  die "build of utils failed"
+}
+
+src_install() {
+	cd ${S}/utils
+	dodir /lib/modules
+	./ivtvfwextract.pl ${DISTDIR}/${FW_VER} \
+		${D}/lib/modules/ivtv-fw-enc.bin \
+		${D}/lib/modules/ivtv-fw-dec.bin
+
+	cd ${S}
+	dodoc README doc/*
+	cd ${S}/utils
+	newdoc README README.utils
+	dodoc README.mythtv-ivtv README.X11
+	dodoc lircd-g.conf lircd.conf lircrc
+
+	cd ${S}/utils
+	#should work... no idea why its not
+	#make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} INSTALLDIR=/usr/bin install-sane || die "failed to install"
+	newbin encoder ivtv-encoder
+	newbin fwapi ivtv-fwapi
+	newbin radio ivtv-radio
+	newbin vbi ivtv-vbi
+	newbin mpegindex ivtv-mpegindex
+	dobin ivtvfbctl ivtvplay ivtvctl
+
+	cd ${S}/driver
+	linux-mod_src_install || die "failed to install modules"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo "You now have the driver for the Hauppauge PVR-[23]50 cards."
+	echo
+	einfo "In general, the following instructions suffice to conclude the"
+	einfo "installation. For more detailed instructions, please refer to the"
+	einfo "ivtv wiki listed as the home page of this ebuild."
+	echo
+	einfo "1) Ignore the above commands, only add 'ivtv' to /etc/modules.autoload.d/kernel-2.X"
+	echo
+	einfo "2) Also add a files called 'ivtv' to /etc/modules.d which contains"
+	einfo "   the two lines:"
+	einfo "     alias char-major-81 videodev"
+	einfo "     alias char-major-81-0 ivtv"
+	echo
+	einfo "3) Then perform a 'update-modules'."
+	echo
+	einfo "To get the ir remote working, you'll need to emerge lirc"
+	einfo "with the following set:"
+	einfo "LIRC_OPTS=\"--with-x --with-driver=hauppauge --with-major=61 "
+	einfo "	--with-port=none --with-irq=none\" emerge lirc"
+	echo
+	einfo "You can also add the above LIRC_OPTS line to /etc/make.conf for"
+	einfo "it to remain there for future updates."
+	echo
+	einfo "To use vbi, you'll need a few other things, check README.vbi in the docs dir"
+	echo
+	einfo "The ptune* scripts have moved to media-tv/ivtv-ptune, emerge that to use those scripts"
+	echo
+
+	if [ -f "${ROOT}/lib/modules/${KV_FULL}/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 'update-modules'"
+	fi
+}