Change in the Makefile was making it install to /usr/local/bin. More PPC changes.

(Portage version: 2.0.53_rc3)

7 files changed, 39 insertions, 145 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 5a34f0472e6c..d27a376abe3b 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.36 2005/10/10 17:45:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.37 2005/10/12 03:44:24 cardoe Exp $
+
+*ivtv-0.4.0-r2 (12 Oct 2005)
+
+  12 Oct 2005; Doug Goldstein <cardoe@gentoo.org>
+  files/ivtv-0.4.0-ppc-odw.patch, -ivtv-0.4.0.ebuild, -ivtv-0.4.0-r1.ebuild,
+  +ivtv-0.4.0-r2.ebuild:
+  Change in the Makefile was making it install to /usr/local/bin. More PPC
+  changes.
 
 *ivtv-0.4.0-r1 (10 Oct 2005)
 
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 9b7ee616b3f2..38bca917a8a6 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f820a57ce5546bd3ba6d8d14af18bb36 ChangeLog 6039
+MD5 e8a2ca0737c8c5171766282ae1317f01 ChangeLog 6308
 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 a529b1c00d670c04992ac90539a93400 files/digest-ivtv-0.4.0-r2 197
 MD5 d65e92582fe36eaf61516b4772eafca7 files/ivtv 151
-MD5 0c2febc3043b83118ea334845ed84c3d files/ivtv-0.4.0-ppc-odw.patch 587
+MD5 ccbc6a2572b5e7f2798bfd77e6e23f67 files/ivtv-0.4.0-ppc-odw.patch 1467
 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 71125db56e4280d18e8f4a28d4f360eb ivtv-0.4.0-r2.ebuild 3832
 MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDSq3ABtvusYtCZMsRAhEdAJ9ttfI+qepcRRp+dIKIuUNGvCARJQCffW8Q
-ai4ryM2C9kwJUHE2Tv3XopE=
-=3YRR
------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
deleted file mode 100644
index ab9f88ff72fa..000000000000
--- a/media-tv/ivtv/files/digest-ivtv-0.4.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-ivtv-0.4.0 b/media-tv/ivtv/files/digest-ivtv-0.4.0-r2
index ab9f88ff72fa..ab9f88ff72fa 100644
--- a/media-tv/ivtv/files/digest-ivtv-0.4.0
+++ b/media-tv/ivtv/files/digest-ivtv-0.4.0-r2
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
index 790cb413eff3..e38d44df69f3 100644
--- a/media-tv/ivtv/files/ivtv-0.4.0-ppc-odw.patch
+++ b/media-tv/ivtv/files/ivtv-0.4.0-ppc-odw.patch
@@ -16,3 +16,27 @@
  CXXFLAGS = $(CFLAGS)
  export CFLAGS CXXFLAGS
  
+--- driver/ivtv-driver.h	2005-10-09 06:50:56.000000000 -0400
++++ driver/ivtv-driver.h.new	2005-10-11 23:30:03.000000000 -0400
+@@ -166,7 +166,7 @@
+ /* ========================== START USER SETTABLE DMA VARIABLES =========== */
+ /* ======================================================================== */
+ 
+-#define DYNAMIC_MEMORY_ALLOC 	1 /* Allocate memory each stream use */
++#define DYNAMIC_MEMORY_ALLOC 	0 /* Allocate memory each stream use */
+ 
+ /* DMA Buffers Sizes */
+ #define IVTV_DMA_ENC_BUF_SIZE     0x00008000
+@@ -190,9 +190,9 @@
+ #define IVTV_DMA_SG_OSD_ENT	(2883584/PAGE_SIZE)	/* sg entities */
+ 
+ /* Decoder DMA or PIO, 1=PIO, 0=DMA */
+-#define IVTV_VBI_PIO		0
+-#define IVTV_ENC_PIO		0
+-#define IVTV_DEC_PIO		0
++#define IVTV_VBI_PIO		1
++#define IVTV_ENC_PIO		1
++#define IVTV_DEC_PIO		1
+ /* This sometimes times out, seems to  kill
+ 					   encoding sometimes */
+ 
diff --git a/media-tv/ivtv/ivtv-0.4.0-r1.ebuild b/media-tv/ivtv/ivtv-0.4.0-r2.ebuild
index bc06dedfba3f..18f81b3e4854 100644
--- a/media-tv/ivtv/ivtv-0.4.0-r1.ebuild
+++ b/media-tv/ivtv/ivtv-0.4.0-r2.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-r1.ebuild,v 1.1 2005/10/10 17:45:04 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.0-r2.ebuild,v 1.1 2005/10/12 03:44:24 cardoe Exp $
 
 inherit eutils linux-mod
 
@@ -74,7 +74,7 @@ src_install() {
 		${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"
+	make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} PREFIX=/usr install || die "failed to install"
 
 	insinto /lib/modules
 	newins ${WORKDIR}/HcwMakoA.ROM HcwMakoA.ROM
diff --git a/media-tv/ivtv/ivtv-0.4.0.ebuild b/media-tv/ivtv/ivtv-0.4.0.ebuild
deleted file mode 100644
index 649beb3f55a3..000000000000
--- a/media-tv/ivtv/ivtv-0.4.0.ebuild
+++ /dev/null
@@ -1,123 +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.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_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)"
-	linux_chkconfig_present FB && MODULE_NAMES="${MODULE_NAMES}"
-}
-
-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
-
-	insinto /lib/modules
-	newins ${WORKDIR}/HcwMakoA.ROM HcwMakoA.ROM
-
-	cd ${S}
-	dodoc README doc/* utils/README.X11
-
-	cd ${S}/utils
-	#should work... no idea why its not
-	make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} INSTALLDIR=/usr/bin install || die "failed to install"
-
-	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
-}