Add patch to handle possible MAXDEV issue. Mark version stable since 0.2.0 sources aren't available and no longer work with current kernels.

Package-Manager: portage-2.1_pre2

7 files changed, 33 insertions, 150 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 0df53f7ec51e..a49764e19793 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.38 2005/10/14 18:47:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.39 2005/12/30 05:03:53 cardoe Exp $
+
+*ivtv-0.4.0-r3 (30 Dec 2005)
+
+  30 Dec 2005; Doug Goldstein <cardoe@gentoo.org>
+  +files/ivtv-0.4.0-maxdev.patch, -ivtv-0.2.0_rc3-r5.ebuild,
+  -ivtv-0.4.0-r2.ebuild, +ivtv-0.4.0-r3.ebuild:
+  Add patch to handle possible MAXDEV issue. Mark version stable since 0.2.0
+  sources aren't available and no longer work with current kernels.
 
   14 Oct 2005; Doug Goldstein <cardoe@gentoo.org> ivtv-0.4.0-r2.ebuild:
   Re-adding ~amd64
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 281dcc4f194c..f49e4e089f4d 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f741bc2e13a105c7aba85b02af0b4af7 ChangeLog 6400
-MD5 5458ad51769cecb853e0afb00ab63930 files/digest-ivtv-0.2.0_rc3-r5 134
-MD5 a529b1c00d670c04992ac90539a93400 files/digest-ivtv-0.4.0-r2 197
+MD5 f9e80245a9b9ff67b7c28533973e0bcc ChangeLog 6735
+MD5 a529b1c00d670c04992ac90539a93400 files/digest-ivtv-0.4.0-r3 197
 MD5 161f909fd1d12453ef38f5eb6771b154 files/ivtv 152
+MD5 8ccfcecf9527619b30e3c48c940d79c5 files/ivtv-0.4.0-maxdev.patch 320
 MD5 ccbc6a2572b5e7f2798bfd77e6e23f67 files/ivtv-0.4.0-ppc-odw.patch 1467
-MD5 28b327ad3b268ad20a14a516c72e9908 ivtv-0.2.0_rc3-r5.ebuild 3964
-MD5 6e7a1bae308fbd63a4d70b33963d6683 ivtv-0.4.0-r2.ebuild 3839
+MD5 acfa32317b341f8ae7590e9ad188aac5 ivtv-0.4.0-r3.ebuild 3958
 MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDUycNBtvusYtCZMsRAjbgAKCG8oynXofcicIfZhT0BUP62xV4ggCfVYxF
-aYIw1p/fEZ7Tt2uB2mNKksM=
-=1QbA
------END PGP SIGNATURE-----
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
deleted file mode 100644
index 4696a085ef15..000000000000
--- a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-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/files/digest-ivtv-0.4.0-r2 b/media-tv/ivtv/files/digest-ivtv-0.4.0-r3
index ab9f88ff72fa..ab9f88ff72fa 100644
--- a/media-tv/ivtv/files/digest-ivtv-0.4.0-r2
+++ b/media-tv/ivtv/files/digest-ivtv-0.4.0-r3
diff --git a/media-tv/ivtv/files/ivtv-0.4.0-maxdev.patch b/media-tv/ivtv/files/ivtv-0.4.0-maxdev.patch
new file mode 100644
index 000000000000..7e51a7dcf51a
--- /dev/null
+++ b/media-tv/ivtv/files/ivtv-0.4.0-maxdev.patch
@@ -0,0 +1,11 @@
+--- utils/ivtv-detect.c	2005-12-03 19:25:43.000000000 +0100
++++ utils/ivtv-detect.c.new	2005-12-03 19:25:12.000000000 +0100
+@@ -32,7 +32,7 @@
+ 
+ // device -1 is a special code for the device names without a number
+ #define MINDEV -1
+-#define MAXDEV 15
++#define MAXDEV 63
+ 
+ struct stream_info {
+         char name[100];
diff --git a/media-tv/ivtv/ivtv-0.2.0_rc3-r5.ebuild b/media-tv/ivtv/ivtv-0.2.0_rc3-r5.ebuild
deleted file mode 100644
index c555521e11cc..000000000000
--- a/media-tv/ivtv/ivtv-0.2.0_rc3-r5.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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.3 2005/07/28 08:47:09 pvdabeel 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="~amd64 -ppc ~x86"
-
-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
-}
diff --git a/media-tv/ivtv/ivtv-0.4.0-r2.ebuild b/media-tv/ivtv/ivtv-0.4.0-r3.ebuild
index e43b09dd670c..027fd00ff5c9 100644
--- a/media-tv/ivtv/ivtv-0.4.0-r2.ebuild
+++ b/media-tv/ivtv/ivtv-0.4.0-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2005/10/14 18:47:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.0-r3.ebuild,v 1.1 2005/12/30 05:03:53 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 x86 ppc"
 
 IUSE=""
 
@@ -49,14 +49,17 @@ src_unpack() {
 	unpack ${FW_VER_ENC}
 
 	sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \
-		-i ${S}/driver/Makefile || die "sed failed"
+		-i "${S}"/driver/Makefile || die "sed failed"
 
-	cd ${S}
+	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
+	use ppc && epatch "${FILESDIR}"/${P}-ppc-odw.patch
+
+	# patch to make it stop seg faulting because it uses wrong MAXDEV size
+	epatch "${FILESDIR}"/${P}-maxdev.patch
 }
 
 src_compile() {
@@ -74,7 +77,7 @@ src_install() {
 		${D}/lib/modules/ivtv-fw-enc.bin \
 		${D}/lib/modules/ivtv-fw-dec.bin
 
-	make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} PREFIX=/usr install || die "failed to install"
+	make KERNELDIR=${KERNEL_DIR} DESTDIR="${D}" PREFIX=/usr install || die "failed to install"
 
 	insinto /lib/modules
 	newins ${WORKDIR}/HcwMakoA.ROM HcwMakoA.ROM