Forgot to install ivtv-fb driver and mpeg init firmware for PVR-350

Package-Manager: portage-2.0.53_rc3

4 files changed, 139 insertions, 5 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index ab3bdee96c21..5a34f0472e6c 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.35 2005/10/10 05:55:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.36 2005/10/10 17:45:04 cardoe Exp $
+
+*ivtv-0.4.0-r1 (10 Oct 2005)
+
+  10 Oct 2005; Doug Goldstein <cardoe@gentoo.org> +ivtv-0.4.0-r1.ebuild:
+  Forgot to install ivtv-fb driver and mpeg init firmware for PVR-350
 
 *ivtv-0.4.0 (10 Oct 2005)
 
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 1745f877e29d..c17b1258a249 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 48920bd7037a7aab1a4095a63e59f46a ChangeLog 5865
+MD5 f820a57ce5546bd3ba6d8d14af18bb36 ChangeLog 6039
 MD5 5458ad51769cecb853e0afb00ab63930 files/digest-ivtv-0.2.0_rc3-r5 134
 MD5 a529b1c00d670c04992ac90539a93400 files/digest-ivtv-0.4.0 197
+MD5 a529b1c00d670c04992ac90539a93400 files/digest-ivtv-0.4.0-r1 197
 MD5 d65e92582fe36eaf61516b4772eafca7 files/ivtv 151
 MD5 93822cc27f1e4d1b13df58f5790387c8 files/ivtv-0.4.0-ppc-odw.patch 432
 MD5 28b327ad3b268ad20a14a516c72e9908 ivtv-0.2.0_rc3-r5.ebuild 3964
+MD5 64a202b4ae58264c2208fe9ff3a6aa21 ivtv-0.4.0-r1.ebuild 3840
 MD5 f4bc1a43cccf36cd39fbe846c3b6c959 ivtv-0.4.0.ebuild 3778
 MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDSonmBtvusYtCZMsRAiCGAJ9AydbtJe7kU3ZesTNL8WQl65Cf3wCfc6r6
-zeewp4wBZIgEqRd76E+11Eo=
-=OwrQ
+iD8DBQFDSqi6BtvusYtCZMsRAjmIAJ4zMG2uWeKRtWJcrSq78Z6NR/oL2QCeKTZf
+/wIe6chyLnG8jnJxcKq6wzE=
+=oZDM
 -----END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/files/digest-ivtv-0.4.0-r1 b/media-tv/ivtv/files/digest-ivtv-0.4.0-r1
new file mode 100644
index 000000000000..ab9f88ff72fa
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.4.0-r1
@@ -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/ivtv-0.4.0-r1.ebuild b/media-tv/ivtv/ivtv-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..bc06dedfba3f
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.4.0-r1.ebuild
@@ -0,0 +1,124 @@
+# 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.4.0-r1.ebuild,v 1.1 2005/10/10 17:45:04 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.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"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+IUSE=""
+
+BUILD_TARGETS="all"
+BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+CONFIG_CHECK="I2C_ALGOBIT VIDEO_DEV I2C_CHARDEV I2C"
+
+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)
+		cx25840(extra:${S}/driver)
+		tuner(extra:${S}/driver)
+		wm8775(extra:${S}/driver)
+		tda9887(extra:${S}/driver)
+		cs53l32a(extra:${S}/driver)"
+	linux_chkconfig_present FB && \
+	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	unpack ${FW_VER_ENC}
+
+	sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \
+		-i ${S}/driver/Makefile || die "sed failed"
+
+	cd ${S}
+	# This powerpc patch patches the source of the driver to disable DMA on ppc,
+	# instead PIO is used. Also, it force enables -fsigned-char and does not
+	# build some modules that contain x86 asm.
+
+	use ppc && epatch ${FILESDIR}/${P}-ppc-odw.patch
+}
+
+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/modules
+	./ivtvfwextract.pl ${DISTDIR}/${FW_VER_DEC} \
+		${D}/lib/modules/ivtv-fw-enc.bin \
+		${D}/lib/modules/ivtv-fw-dec.bin
+
+	make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} INSTALLDIR=/usr/bin install || die "failed to install"
+
+	insinto /lib/modules
+	newins ${WORKDIR}/HcwMakoA.ROM HcwMakoA.ROM
+	newins ${S}/ivtv_init_mpeg.bin ivtv_init_mpeg.bin
+
+	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
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# The MCE versions of the PVR cards come without remote control because (I
+	# assume) a remote control is included in Windows Media Center Edition. It
+	# is probably a good idea to just say that if your package comes with a
+	# remote then emerge lirc. Lirc should build all drivers anyway.
+	#
+	# 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
+
+	# Similar checks are performed by the make install in the drivers directory.
+	BADMODS="msp3400 tda9887 tuner tveeprom saa7115 saa7127 cx25840 wm8775"
+
+	for MODNAME in ${BADMODS}; do
+		if [ -f "${ROOT}/lib/modules/${KV_FULL}/kernel/drivers/media/video/${MODNAME}.ko" ] ; then
+			ewarn "You have the ${MODNAME} 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'"
+			ewarn "The file to remove is ${ROOT}/lib/modules/${KV_FULL}/kernel/drivers/media/video/${MODNAME}.ko"
+			echo
+		fi
+	done
+}