From 9f2aaa471058e5c8c121a54130da6946689ef9b9 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Fri, 7 Oct 2005 05:43:43 +0000 Subject: [PATCH] Add patch to compile with newer kernels Package-Manager: portage-2.0.53_rc3 --- media-tv/ivtv/ChangeLog | 10 +- media-tv/ivtv/Manifest | 20 +-- media-tv/ivtv/files/digest-ivtv-0.2.0_rc3-r4 | 2 - media-tv/ivtv/files/ivtv-0.3.8-devname.patch | 26 ++++ media-tv/ivtv/files/ppc-odw.patch | 62 +++++++++ media-tv/ivtv/ivtv-0.2.0_rc3-r4.ebuild | 126 ------------------- media-tv/ivtv/ivtv-0.3.8.ebuild | 6 +- 7 files changed, 112 insertions(+), 140 deletions(-) delete mode 100644 media-tv/ivtv/files/digest-ivtv-0.2.0_rc3-r4 create mode 100644 media-tv/ivtv/files/ivtv-0.3.8-devname.patch create mode 100644 media-tv/ivtv/files/ppc-odw.patch delete mode 100644 media-tv/ivtv/ivtv-0.2.0_rc3-r4.ebuild diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog index b28aeac54783..72c655ee7d5e 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.33 2005/09/15 07:41:40 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.34 2005/10/07 05:43:43 cardoe Exp $ + + 07 Oct 2005; Doug Goldstein + +files/ivtv-0.3.8-devname.patch, +files/ppc-odw.patch, + -ivtv-0.2.0_rc3-r4.ebuild, ivtv-0.3.8.ebuild: + Add patch to compile with new kernels + + 20 Sep 2005; Doug Goldstein -ivtv-0.2.0_rc3-r4.ebuild: + remove some old ebuilds 15 Sep 2005; Doug Goldstein ivtv-0.3.8.ebuild: Updated firmware to include 150/500 firmware. Switched to recommended diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest index 341fe874e051..78c2143d2335 100644 --- a/media-tv/ivtv/Manifest +++ b/media-tv/ivtv/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 af1fc7868e71b09cf449e5da8a9662d5 ChangeLog 5217 -MD5 471613301d44be7bf806d219a1bcdf77 ivtv-0.3.8.ebuild 4434 -MD5 1b5dfd233a54a22de87bcb47627a7265 ivtv-0.2.0_rc3-r4.ebuild 3964 -MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465 -MD5 28b327ad3b268ad20a14a516c72e9908 ivtv-0.2.0_rc3-r5.ebuild 3964 +MD5 9d4e8dcba852c47be6e1a2c3b0f31508 ChangeLog 5517 +MD5 5458ad51769cecb853e0afb00ab63930 files/digest-ivtv-0.2.0_rc3-r5 134 MD5 956acbfe3a222cc4b612da479232d670 files/digest-ivtv-0.3.8 191 MD5 98a1ec166f665108688586fd5b36c05d files/ivtv 89 -MD5 994d47620b6a826a5d2cf84b3cb1bc5c files/digest-ivtv-0.2.0_rc3-r4 134 -MD5 5458ad51769cecb853e0afb00ab63930 files/digest-ivtv-0.2.0_rc3-r5 134 +MD5 42953f1e55ea4e5deeb805ae865cdfbf files/ivtv-0.3.8-devname.patch 798 +MD5 592fe48c2d71a392ff1febb8cd486767 files/ppc-odw.patch 2374 +MD5 28b327ad3b268ad20a14a516c72e9908 ivtv-0.2.0_rc3-r5.ebuild 3964 +MD5 6e498711f948a3703e8bb338aac39b67 ivtv-0.3.8.ebuild 4544 +MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDL0akBtvusYtCZMsRAh2ZAJ9V0V8p5PKLZjhAjWDexAlyUdDtRQCggMuQ -jnqy3a0EBvGdoUhTNOQU00k= -=tewC +iD8DBQFDRguQBtvusYtCZMsRAj0YAJ9X6eyRrj84hCM8HA133CCKg7EuhwCfQZmk +MexLOO5cpbh5mJxvqvzf19E= +=BfXS -----END PGP SIGNATURE----- diff --git a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3-r4 b/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3-r4 deleted file mode 100644 index fb9db99b1692..000000000000 --- a/media-tv/ivtv/files/digest-ivtv-0.2.0_rc3-r4 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 235d08985ec94bcb3f98fe1959493f32 ivtv-0.2.0-rc3j.tgz 600068 -MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr_1.18.21.22168_inf.zip 676578 diff --git a/media-tv/ivtv/files/ivtv-0.3.8-devname.patch b/media-tv/ivtv/files/ivtv-0.3.8-devname.patch new file mode 100644 index 000000000000..ea67dc3f6315 --- /dev/null +++ b/media-tv/ivtv/files/ivtv-0.3.8-devname.patch @@ -0,0 +1,26 @@ +Index: driver/tda9887.c +=================================================================== +--- driver/tda9887.c (revision 2702) ++++ driver/tda9887.c (working copy) +@@ -856,7 +856,7 @@ + }; + static struct i2c_client client_template = + { +- I2C_DEVNAME("tda9887"), ++ .name = "tda9887", + .flags = I2C_CLIENT_ALLOW_USE, + .driver = &driver, + }; +Index: driver/tuner.c +=================================================================== +--- driver/tuner.c (revision 2702) ++++ driver/tuner.c (working copy) +@@ -1854,7 +1854,7 @@ + .command = tuner_command, + }; + static struct i2c_client client_template = { +- I2C_DEVNAME("(tuner unset)"), ++ .name = "tuner unset", + .flags = I2C_CLIENT_ALLOW_USE, + .driver = &driver, + }; diff --git a/media-tv/ivtv/files/ppc-odw.patch b/media-tv/ivtv/files/ppc-odw.patch new file mode 100644 index 000000000000..1bd528f67616 --- /dev/null +++ b/media-tv/ivtv/files/ppc-odw.patch @@ -0,0 +1,62 @@ +diff -urN ivtv-0.3.7-orig/ChangeLog ivtv-0.3.7/ChangeLog +--- ivtv-0.3.7-orig/ChangeLog 2005-07-28 07:53:14.003679936 +0000 ++++ ivtv-0.3.7/ChangeLog 2005-07-28 07:57:25.672420472 +0000 +@@ -1,5 +1,9 @@ + IVTV changes: + ++#0.3.7 - PowerPC patches - Pieter Van den Abeele ++ - disables building of x86 asm utils ++ - force disable DMA, force enable PIO ++ + #0.3.7 - YUV decoder patches. + - powerdown soundchip on cx25840 when not in use. + - i2c index improvements for cx25840 module. +diff -urN ivtv-0.3.7-orig/driver/ivtv-driver.h ivtv-0.3.7/driver/ivtv-driver.h +--- ivtv-0.3.7-orig/driver/ivtv-driver.h 2005-07-28 07:53:13.978683736 +0000 ++++ ivtv-0.3.7/driver/ivtv-driver.h 2005-07-28 07:53:42.342371800 +0000 +@@ -202,7 +202,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 +@@ -230,9 +230,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 -urN ivtv-0.3.7-orig/utils/Makefile ivtv-0.3.7/utils/Makefile +--- ivtv-0.3.7-orig/utils/Makefile 2005-07-28 07:53:14.552596488 +0000 ++++ ivtv-0.3.7/utils/Makefile 2005-07-28 07:55:39.443569712 +0000 +@@ -1,8 +1,8 @@ +-INSTALLDIR = /usr/local/bin ++INSTALLDIR = /usr/bin + HEADERDIR = /usr/include/linux + +-SANEEXES = ivtvctl ivtvfbctl ivtvplay cx25840ctl +-INSANEEXES = mpegindex radio vbi fwapi encoder wss vbi_passthrough test_ioctl ++SANEEXES = ivtvctl cx25840ctl ++INSANEEXES = radio vbi fwapi wss vbi_passthrough test_ioctl + EXES = $(SANEEXES) $(INSANEEXES) + INSTALL_HEADERS = ../driver/ivtv.h + +@@ -10,7 +10,7 @@ + LIB_ZVBI_SRC = /home/src/zvbi/zvbi-0.2.15/src/.libs + INC_ZVBI_SRC = /home/src/zvbi/zvbi-0.2.15/src + +-CFLAGS = -I../driver -D_GNU_SOURCE -O2 -Wall ++CFLAGS = -I../driver -D_GNU_SOURCE -O2 -Wall -fsigned-char + CXXFLAGS = $(CFLAGS) + LDFLAGS = -lm + diff --git a/media-tv/ivtv/ivtv-0.2.0_rc3-r4.ebuild b/media-tv/ivtv/ivtv-0.2.0_rc3-r4.ebuild deleted file mode 100644 index f938df2dae12..000000000000 --- a/media-tv/ivtv/ivtv-0.2.0_rc3-r4.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-r4.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/_/-}j" -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="~x86 ~amd64 -ppc" - -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.3.8.ebuild b/media-tv/ivtv/ivtv-0.3.8.ebuild index 7b9c7623728c..45b23286b31d 100644 --- a/media-tv/ivtv/ivtv-0.3.8.ebuild +++ b/media-tv/ivtv/ivtv-0.3.8.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.3.8.ebuild,v 1.5 2005/09/19 22:57:28 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.3.8.ebuild,v 1.6 2005/10/07 05:43:43 cardoe Exp $ inherit eutils linux-mod @@ -55,6 +55,10 @@ src_unpack() { # 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 } src_compile() { -- 2.26.2