Adding 2.6.17 compatible rev bump ebuild. Mark 0.4.5, 0.6.3 as stable for x86 and amd64 to match current stable kernels

Package-Manager: portage-2.1.1_pre2-r4

5 files changed, 109 insertions, 5 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 9d9dfb4c63a7..a29ca58546f7 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.48 2006/06/27 02:54:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.49 2006/07/08 04:23:51 cardoe Exp $
+
+*ivtv-0.7.0 (08 Jul 2006)
+
+  08 Jul 2006; Doug Goldstein <cardoe@gentoo.org> +ivtv-0.7.0.ebuild:
+  Adding 2.6.17 compatible rev bump ebuild. Mark 0.4.5, 0.6.3 as stable for
+  x86 and amd64 to match current stable kernels
 
 *ivtv-0.6.3 (27 Jun 2006)
 
diff --git a/media-tv/ivtv/files/digest-ivtv-0.7.0 b/media-tv/ivtv/files/digest-ivtv-0.7.0
new file mode 100644
index 000000000000..29a4e7f95979
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.7.0
@@ -0,0 +1,9 @@
+MD5 1ebda4debcdd9dfa588f3671b1196b91 ivtv-0.7.0.tar.gz 422347
+RMD160 d9f3a698c5ba5796f33920e7372315ffca346ddc ivtv-0.7.0.tar.gz 422347
+SHA256 16a19bdc3ddd053800ae7ce41f119551469004c0d7e57d2b43e2f688da517978 ivtv-0.7.0.tar.gz 422347
+MD5 f48ad2cda962879bc093cc6867dc86d2 pvr_1.18.21.22254_inf.zip 593441
+RMD160 9549dddfddacf6bee3c73def508a2c347c5e25f2 pvr_1.18.21.22254_inf.zip 593441
+SHA256 156c0cfaa2cb3f482b48f95b94a9247690e4ed2d0cb8962a52db8846c683bff1 pvr_1.18.21.22254_inf.zip 593441
+MD5 dc84a41b3b296b856da3d0f9edbb7a08 pvr_2.0.24.23035.zip 281620
+RMD160 fbd439efa5793e9a65fd6fac2093c523cd458027 pvr_2.0.24.23035.zip 281620
+SHA256 2387e7a042342f7b401222aac7f99a19b733fded8118339edd402a58279e5f95 pvr_2.0.24.23035.zip 281620
diff --git a/media-tv/ivtv/ivtv-0.4.5.ebuild b/media-tv/ivtv/ivtv-0.4.5.ebuild
index c76ad0c3b578..fd5c4ff41db4 100644
--- a/media-tv/ivtv/ivtv-0.4.5.ebuild
+++ b/media-tv/ivtv/ivtv-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.5.ebuild,v 1.3 2006/06/13 10:25:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.5.ebuild,v 1.4 2006/07/08 04:23:51 cardoe Exp $
 
 inherit eutils linux-mod
 
@@ -18,7 +18,7 @@ SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/0.4.x/${P}.tar.gz
 RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE=""
 
diff --git a/media-tv/ivtv/ivtv-0.6.3.ebuild b/media-tv/ivtv/ivtv-0.6.3.ebuild
index 93d624a430ad..89134e575c73 100644
--- a/media-tv/ivtv/ivtv-0.6.3.ebuild
+++ b/media-tv/ivtv/ivtv-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.6.3.ebuild,v 1.1 2006/06/27 02:54:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.6.3.ebuild,v 1.2 2006/07/08 04:23:51 cardoe Exp $
 
 inherit eutils linux-mod
 
@@ -18,7 +18,7 @@ SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/0.6.x/${P}.tar.gz
 RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE=""
 
diff --git a/media-tv/ivtv/ivtv-0.7.0.ebuild b/media-tv/ivtv/ivtv-0.7.0.ebuild
new file mode 100644
index 000000000000..597f5b42ff00
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.7.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.7.0.ebuild,v 1.1 2006/07/08 04:23:51 cardoe Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="ivtv driver for Hauppauge PVR PCI cards"
+HOMEPAGE="http://www.ivtvdriver.org"
+
+FW_VER_DEC="pvr_1.18.21.22254_inf.zip"
+FW_VER_ENC="pvr_2.0.24.23035.zip"
+#Switched to recommended firmware by driver
+
+SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/0.7.x/${P}.tar.gz
+	ftp://ftp.shspvr.com/download/wintv-pvr_150-500/inf/${FW_VER_ENC}
+	ftp://ftp.shspvr.com/download/wintv-pvr_250-350/inf/${FW_VER_DEC}"
+
+RESTRICT="nomirror"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~ppc"
+
+IUSE=""
+
+BUILD_TARGETS="all"
+BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+CONFIG_CHECK="I2C_ALGOBIT VIDEO_DEV I2C_CHARDEV I2C"
+
+RDEPEND="sys-apps/hotplug"
+DEPEND="app-arch/unzip"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	MODULE_NAMES="ivtv(extra:${S}/driver) \
+			saa717x(extra:${S}/i2c-drivers)"
+
+	if kernel_is 2 6 17; then
+		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER"
+		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_SAA7127 VIDEO_BT848 VIDEO_TVEEPROM"
+	else
+		die "This only works on 2.6.17 kernels"
+	fi
+
+	linux_chkconfig_present FB && \
+	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	unpack ${FW_VER_ENC}
+
+	cd ${S}
+	sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \
+		-i ${S}/driver/Makefile || die "sed failed"
+}
+
+src_compile() {
+	cd ${S}/driver
+	linux-mod_src_compile || die "failed to build driver "
+
+	cd ${S}/utils
+	emake ||  die "failed to build utils "
+}
+
+src_install() {
+	cd ${S}/utils
+	dodir /lib/firmware
+	./ivtvfwextract.pl "${DISTDIR}"/${FW_VER_DEC} \
+		"${D}"/lib/firmware/v4l-cx2341x-enc.fw \
+		"${D}"/lib/firmware/v4l-cx2341x-dec.fw
+
+	make KERNELDIR="${KERNEL_DIR}" DESTDIR="${D}" PREFIX=/usr install || die "failed to install"
+
+	insinto /lib/firmware
+	newins "${WORKDIR}"/HcwMakoA.ROM v4l-cx25840.fw
+	newins ${S}/v4l-cx2341x-init.mpg v4l-cx2341x-init.mpg
+
+	cd ${S}
+	dodoc README doc/* utils/README.X11
+
+	cd ${S}/driver
+	linux-mod_src_install || die "failed to install modules"
+
+	# Add the aliases
+	insinto /etc/modules.d
+	newins "${FILESDIR}"/ivtv ivtv
+}