rev bump. 0.4.0 is the newest stable. Updated firmware to match latest recommended and used combined firmware to make install easier.

(Portage version: 2.0.53_rc3)

8 files changed, 41 insertions, 92 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 72c655ee7d5e..ab3bdee96c21 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,14 @@
 # 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.34 2005/10/07 05:43:43 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.35 2005/10/10 05:55:01 cardoe Exp $
+
+*ivtv-0.4.0 (10 Oct 2005)
+
+  10 Oct 2005; Doug Goldstein <cardoe@gentoo.org>
+  -files/ivtv-0.3.8-devname.patch, +files/ivtv-0.4.0-ppc-odw.patch,
+  -files/ppc-odw.patch, -ivtv-0.3.8.ebuild, +ivtv-0.4.0.ebuild:
+  rev bump. 0.4.0 is the newest stable. Updated firmware to match latest
+  recommended and used combined firmware to make install easier.
 
   07 Oct 2005; Doug Goldstein <cardoe@gentoo.org>
   +files/ivtv-0.3.8-devname.patch, +files/ppc-odw.patch,
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index cdf629bcf654..2a97cb8f803b 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9d4e8dcba852c47be6e1a2c3b0f31508 ChangeLog 5517
+MD5 74c0adaa3436eedfa70d5f557a7d2501 ChangeLog 5865
 MD5 5458ad51769cecb853e0afb00ab63930 files/digest-ivtv-0.2.0_rc3-r5 134
-MD5 956acbfe3a222cc4b612da479232d670 files/digest-ivtv-0.3.8 191
+MD5 a529b1c00d670c04992ac90539a93400 files/digest-ivtv-0.4.0 197
 MD5 98a1ec166f665108688586fd5b36c05d files/ivtv 89
-MD5 831334865cb46ecade346b32f1686d4a files/ivtv-0.3.8-devname.patch 644
-MD5 45b398aa7ee5b6e55121b8a1b5dc3f3b files/ppc-odw.patch 587
+MD5 93822cc27f1e4d1b13df58f5790387c8 files/ivtv-0.4.0-ppc-odw.patch 432
 MD5 28b327ad3b268ad20a14a516c72e9908 ivtv-0.2.0_rc3-r5.ebuild 3964
-MD5 c6cc948a6f1e78e5a9a02fff65807360 ivtv-0.3.8.ebuild 4553
+MD5 88dc6ffc9051f9aa8264734a72d9a962 ivtv-0.4.0.ebuild 3778
 MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDRqoNBtvusYtCZMsRAucrAKCHjejoMv7rCFCEpjl6l10rx0NdDQCfYoXs
-fe17qirL9FhewGXX8YcPm7g=
-=pxqi
------END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/files/digest-ivtv-0.3.8 b/media-tv/ivtv/files/digest-ivtv-0.3.8
deleted file mode 100644
index 09ddcb6f4a6b..000000000000
--- a/media-tv/ivtv/files/digest-ivtv-0.3.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6b03f5253f70cb9e4e32c3de835708f3 ivtv-0.3.8.tar.gz 484009
-MD5 dff9c5cd9b50140c6bc3180f264557c7 pvr48wdm_1.8.22037.exe 2685760
-MD5 d425127e482adbf79c02f44c1409c507 mce_cd_v27a.zip 5433921
diff --git a/media-tv/ivtv/files/digest-ivtv-0.4.0 b/media-tv/ivtv/files/digest-ivtv-0.4.0
new file mode 100644
index 000000000000..ab9f88ff72fa
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.4.0
@@ -0,0 +1,3 @@
+MD5 6d48e10b25c21ec9b4d478bd6edf2a44 ivtv-0.4.0.tar.gz 475881
+MD5 f48ad2cda962879bc093cc6867dc86d2 pvr_1.18.21.22254_inf.zip 593441
+MD5 dc84a41b3b296b856da3d0f9edbb7a08 pvr_2.0.24.23035.zip 281620
diff --git a/media-tv/ivtv/files/ivtv-0.3.8-devname.patch b/media-tv/ivtv/files/ivtv-0.3.8-devname.patch
deleted file mode 100644
index 2493a1ba948e..000000000000
--- a/media-tv/ivtv/files/ivtv-0.3.8-devname.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- driver/tuner.c	2005-10-07 11:52:14.000000000 -0400
-+++ driver/tuner.c.new	2005-10-07 11:53:30.000000000 -0400
-@@ -1832,7 +1832,7 @@
- 	.command = tuner_command,
- };
- static struct i2c_client client_template = {
--	I2C_DEVNAME("(tuner unset)"),
-+	.name  = "(tuner unset)",
- 	.flags = I2C_CLIENT_ALLOW_USE,
- 	.driver = &driver,
- };
---- driver/tda9887.c	2005-10-07 11:52:14.000000000 -0400
-+++ driver/tda9887.c.new	2005-10-07 11:52:58.000000000 -0400
-@@ -851,7 +851,7 @@
- };
- static struct i2c_client client_template =
- {
--	I2C_DEVNAME("tda9887"),
-+	.name 	   = "tda9887",
- 	.flags     = I2C_CLIENT_ALLOW_USE,
-         .driver    = &driver,
- };
diff --git a/media-tv/ivtv/files/ivtv-0.4.0-ppc-odw.patch b/media-tv/ivtv/files/ivtv-0.4.0-ppc-odw.patch
new file mode 100644
index 000000000000..97ab247cb2bf
--- /dev/null
+++ b/media-tv/ivtv/files/ivtv-0.4.0-ppc-odw.patch
@@ -0,0 +1,13 @@
+--- utils/Makefile	2005-10-04 17:44:12.000000000 -0400
++++ utils/Makefile.new	2005-10-10 01:39:32.000000000 -0400
+@@ -2,8 +2,8 @@
+ BINDIR = $(PREFIX)/bin
+ HDRDIR = /usr/include/linux
+ 
+-EXES := ivtvctl ivtvfbctl ivtvplay cx25840ctl ivtv-detect \
+-        ivtv-radio ivtv-tune/ivtv-tune ivtv-mpegindex ivtv-encoder 
++EXES := ivtvctl cx25840ctl ivtv-detect \
++        ivtv-radio ivtv-tune/ivtv-tune  
+ 
+ HEADERS := ../driver/ivtv.h
+ 
diff --git a/media-tv/ivtv/files/ppc-odw.patch b/media-tv/ivtv/files/ppc-odw.patch
deleted file mode 100644
index a423e99d2594..000000000000
--- a/media-tv/ivtv/files/ppc-odw.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- utils/Makefile	2005-09-11 05:22:17.000000000 -0400
-+++ utils/Makefile.new	2005-10-07 11:59:38.000000000 -0400
-@@ -1,12 +1,12 @@
- INSTALLDIR = /usr/local/bin
- HEADERDIR = /usr/include/linux
- 
--SANEEXES = ivtvctl ivtvfbctl ivtvplay cx25840ctl ivtv-detect ivtv-radio
--INSANEEXES = mpegindex encoder 
-+SANEEXES = ivtvctl cx25840ctl ivtv-detect ivtv-radio
-+INSANEEXES =  
- EXES = $(SANEEXES) $(INSANEEXES)
- INSTALL_HEADERS = ../driver/ivtv.h
- 
--CFLAGS = -I../driver -D_GNU_SOURCE -O2 -Wall
-+CFLAGS = -I../driver -D_GNU_SOURCE -O2 -Wall -fsigned-char
- CXXFLAGS = $(CFLAGS)
- 
- all: $(EXES)
diff --git a/media-tv/ivtv/ivtv-0.3.8.ebuild b/media-tv/ivtv/ivtv-0.4.0.ebuild
index a07251872e09..649beb3f55a3 100644
--- a/media-tv/ivtv/ivtv-0.3.8.ebuild
+++ b/media-tv/ivtv/ivtv-0.4.0.ebuild
@@ -1,20 +1,19 @@
 # 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.3.8.ebuild,v 1.7 2005/10/07 16:08:10 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.0.ebuild,v 1.1 2005/10/10 05:55:01 cardoe Exp $
 
 inherit eutils linux-mod
 
 DESCRIPTION="ivtv driver for Hauppauge PVR PCI cards"
 HOMEPAGE="http://www.ivtvdriver.org"
 
-#FW_VER="pvr_1.18.21.22168_inf.zip" ftp://ftp.shspvr.com/download/wintv-pvr_250-350/inf/${FW_VER}
-FW_VER_150="mce_cd_v27a.zip"
-FW_VER="pvr48wdm_1.8.22037.exe"
+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/${PN}/${P}.tar.gz
-	ftp://ftp.shspvr.com/download/wintv-pvr_250-350/win9x-2k-xp_mpeg_wdm_drv/${FW_VER}
-	http://hauppauge.lightpath.net/software/mce/${FW_VER_150}"
+SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/0.4.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"
@@ -45,7 +44,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	unpack ${FW_VER_150}
+	unpack ${FW_VER_ENC}
 
 	sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \
 		-i ${S}/driver/Makefile || die "sed failed"
@@ -55,11 +54,7 @@ src_unpack() {
 	# instead PIO is used. Also, it force enables -fsigned-char and does not
 	# build some modules that contain x86 asm.
 
-	use ppc && epatch ${FILESDIR}/ppc-odw.patch
-
-	# http://ivtvdriver.org/trac/ticket/25
-	# future kernel compatiblity
-	epatch ${FILESDIR}/${P}-devname.patch
+	use ppc && epatch ${FILESDIR}/${P}-ppc-odw.patch
 }
 
 src_compile() {
@@ -73,20 +68,15 @@ src_compile() {
 src_install() {
 	cd ${S}/utils
 	dodir /lib/modules
-	./ivtvfwextract.pl ${DISTDIR}/${FW_VER} \
-		${D}/lib/modules/ivtv-fw-enc-250-350.bin \
+	./ivtvfwextract.pl ${DISTDIR}/${FW_VER_DEC} \
+		${D}/lib/modules/ivtv-fw-enc.bin \
 		${D}/lib/modules/ivtv-fw-dec.bin
 
 	insinto /lib/modules
-	newins ${WORKDIR}/WinTV-PVR-150500MCE_2_0_30_23074_WHQL/HcwFalcn.rom HcwFalcn.rom
-	newins ${WORKDIR}/WinTV-PVR-150500MCE_2_0_30_23074_WHQL/HcwMakoA.ROM HcwMakoA.ROM
+	newins ${WORKDIR}/HcwMakoA.ROM HcwMakoA.ROM
 
 	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
+	dodoc README doc/* utils/README.X11
 
 	cd ${S}/utils
 	#should work... no idea why its not
@@ -130,15 +120,4 @@ pkg_postinst() {
 			echo
 		fi
 	done
-
-	echo
-	ewarn
-	ewarn
-	ewarn "PVR-250/350 users need to run the following command to setup the firmware:"
-	ewarn "ln -sf /lib/modules/ivtv-fw-enc-250-350.bin /lib/modules/ivtv-fw-enc.bin"
-	ewarn
-	ewarn "PVR-150/500 users need to run the following command to setup the firmware:"
-	ewarn "ln -sf /lib/modules/HcwFalcn.rom /lib/modules/ivtv-fw-enc.bin"
-	ewarn
-	echo
 }