rev bump for 0.4.x and 0.6.x series

(Portage version: 2.1_rc2-r3)

6 files changed, 317 insertions, 1 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index d8a2672fa80b..ed54fbe9b559 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2006/02/14 04:36:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.42 2006/05/27 02:04:36 cardoe Exp $
+
+*ivtv-0.6.2 (27 May 2006)
+*ivtv-0.4.5 (27 May 2006)
+
+  27 May 2006; Doug Goldstein <cardoe@gentoo.org>
+  +files/ivtv-0.6.2-ppc-fix.patch, +ivtv-0.4.5.ebuild, +ivtv-0.6.2.ebuild:
+  rev bump for 0.4.x and 0.6.x series
 
   14 Feb 2006; Doug Goldstein <cardoe@gentoo.org> ivtv-0.4.2.ebuild:
   Added hotplug to RDEPEND
diff --git a/media-tv/ivtv/files/digest-ivtv-0.4.5 b/media-tv/ivtv/files/digest-ivtv-0.4.5
new file mode 100644
index 000000000000..872a6029ca00
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.4.5
@@ -0,0 +1,5 @@
+MD5 2310979e0bc6b0a6e0a1861b818c80b4 ivtv-0.4.5.tar.gz 502679
+RMD160 8b6c1bf532797ec19ec148a26515fd38a0d983e7 ivtv-0.4.5.tar.gz 502679
+SHA256 a600339247f16f0b3028581f3f84154e6b352f166b238b0c5c282a11fc1a603d ivtv-0.4.5.tar.gz 502679
+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/digest-ivtv-0.6.2 b/media-tv/ivtv/files/digest-ivtv-0.6.2
new file mode 100644
index 000000000000..687d17b4b90d
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.6.2
@@ -0,0 +1,5 @@
+MD5 93ce8acbb3008956486ee30ff21f7e14 ivtv-0.6.2.tar.gz 432308
+RMD160 69d64a40bd861902aab982c2e047372ebbcf217c ivtv-0.6.2.tar.gz 432308
+SHA256 3cdae3e8f7d2e67e2c8be3474130e4d6fea2f7576ac62823d7e47eb7475c6756 ivtv-0.6.2.tar.gz 432308
+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.6.2-ppc-fix.patch b/media-tv/ivtv/files/ivtv-0.6.2-ppc-fix.patch
new file mode 100644
index 000000000000..c3ce8d249c71
--- /dev/null
+++ b/media-tv/ivtv/files/ivtv-0.6.2-ppc-fix.patch
@@ -0,0 +1,47 @@
+Index: /ivtv/branches/0.6/utils/Makefile
+===================================================================
+--- utils/Makefile (revision 3212)
++++ utils/Makefile (revision 3284)
+@@ -3,7 +3,10 @@
+ HDRDIR = /usr/include/linux
+ 
+-EXES := ivtvctl ivtvfbctl ivtvplay ivtv-detect ivtv-radio \
+-        ivtv-mpegindex ivtv-encoder
++EXES := ivtvctl ivtv-detect ivtv-radio 
++EXES := $(shell if echo - | $(CC) -E -dM - | grep __powerpc__ > /dev/null; \
++	then echo $(EXES); else \
++	echo $(EXES) ivtvfbctl ivtvplay ivtv-mpegindex ivtv-encoder; fi)
+ BIN := $(EXES) ivtv-tune/ivtv-tune cx25840ctl/cx25840ctl
++
+ 
+ HEADERS := ../driver/ivtv.h
+Index: /ivtv/branches/0.6/driver/ivtv-driver.h
+===================================================================
+--- driver/ivtv-driver.h (revision 3263)
++++ driver/ivtv-driver.h (revision 3284)
+@@ -186,6 +186,9 @@
+ /* ========================== START USER SETTABLE DMA VARIABLES =========== */
+ /* ======================================================================== */
+-
++#ifdef __powerpc__
++#define DYNAMIC_MEMORY_ALLOC	0 /* PowerPC doesn't work with DMA currently */
++#else
+ #define DYNAMIC_MEMORY_ALLOC 	1 /* Allocate memory each stream use */
++#endif
+ 
+ /* DMA Buffers Sizes */
+@@ -211,7 +214,14 @@
+ 
+ /* Decoder DMA or PIO, 1=PIO, 0=DMA */
++/* PowerPC does not work with DMA currently */
++#ifdef __powerpc__
++#define IVTV_VBI_PIO		1
++#define IVTV_ENC_PIO		1
++#define IVTV_DEC_PIO		1
++#else
+ #define IVTV_VBI_PIO		0
+ #define IVTV_ENC_PIO		0
+ #define IVTV_DEC_PIO		0
++#endif
+ /* This sometimes times out, seems to  kill
+ 					   encoding sometimes */
diff --git a/media-tv/ivtv/ivtv-0.4.5.ebuild b/media-tv/ivtv/ivtv-0.4.5.ebuild
new file mode 100644
index 000000000000..fe567052ff61
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.4.5.ebuild
@@ -0,0 +1,129 @@
+# 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.1 2006/05/27 02:04:36 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="~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)"
+
+	if [ ${KV_PATCH} -le 14 ]; then
+		MODULE_NAMES="${MODULE_NAMES}
+		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)"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_DECODER VIDEO_AUDIO_DECODER VIDEO_BT848"
+	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}
+
+	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
+}
+
+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"
+
+	if [ ${KV_PATCH} -le 14 ]; then
+		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
+	fi
+}
diff --git a/media-tv/ivtv/ivtv-0.6.2.ebuild b/media-tv/ivtv/ivtv-0.6.2.ebuild
new file mode 100644
index 000000000000..3f5bb3aacfd3
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.6.2.ebuild
@@ -0,0 +1,123 @@
+# 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.2.ebuild,v 1.1 2006/05/27 02:04:36 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.6.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)"
+
+	if [ ${KV_PATCH} -eq 14 ]; then
+		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_DECODER VIDEO_AUDIO_DECODER VIDEO_BT848"
+	else
+		die "This only works on 2.6.16 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}
+	epatch ${FILESDIR}/${P}-ppc-fix.patch
+
+	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
+}
+
+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"
+
+	if [ ${KV_PATCH} -le 14 ]; then
+		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
+	fi
+}