From c0295544292d2cebde7fba49e1866cb9fdacfbc4 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 17 Oct 2006 16:31:20 +0000 Subject: Additional checks since people like bug #151357 play around with kernel settings without understanding them. Re-wrote most of the ebuild. (Portage version: 2.1.2_pre3-r2) --- media-tv/ivtv/ChangeLog | 6 +++++- media-tv/ivtv/ivtv-0.8.0.ebuild | 47 +++++++++++++++++------------------------ 2 files changed, 24 insertions(+), 29 deletions(-) (limited to 'media-tv/ivtv') diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog index ce11c968a6b7..f760387b9431 100644 --- a/media-tv/ivtv/ChangeLog +++ b/media-tv/ivtv/ChangeLog @@ -1,6 +1,10 @@ # 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.52 2006/10/06 00:09:27 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.53 2006/10/17 16:31:20 cardoe Exp $ + + 17 Oct 2006; Doug Goldstein ivtv-0.8.0.ebuild: + Additional checks since people like bug #151357 play around with kernel + settings without understanding them. Re-wrote most of the ebuild. *ivtv-0.8.0 (06 Oct 2006) *ivtv-0.7.1 (06 Oct 2006) diff --git a/media-tv/ivtv/ivtv-0.8.0.ebuild b/media-tv/ivtv/ivtv-0.8.0.ebuild index 40fb3ffe9e92..4b92177431fa 100644 --- a/media-tv/ivtv/ivtv-0.8.0.ebuild +++ b/media-tv/ivtv/ivtv-0.8.0.ebuild @@ -1,6 +1,6 @@ # 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.8.0.ebuild,v 1.1 2006/10/06 00:09:27 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.8.0.ebuild,v 1.2 2006/10/17 16:31:20 cardoe Exp $ inherit eutils linux-mod @@ -12,56 +12,47 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~x86 ~ppc" IUSE="" -BUILD_TARGETS="all" -BUILD_PARAMS="KDIR=${KERNEL_DIR}" - RDEPEND="sys-apps/hotplug" DEPEND="app-arch/unzip" PDEPEND="media-tv/pvr-firmware" +MODULE_NAMES="ivtv(extra:${S}/driver) \ + saa717x(extra:${S}/i2c-drivers)" +BUILD_TARGETS="all" +CONFIG_CHECK="EXPERIMENTAL KMOD VIDEO_DEV I2C VIDEO_V4L1_COMPAT VIDEO_V4L2 FW_LOADER" +CONFIG_CHECK="${CONFIG_CHECK} VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER" +CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_CX2341X VIDEO_SAA7127 VIDEO_TVEEPROM" +#CONFIG_CHECK="${CONFIG_CHECK} VIDEO_UPD64083" + pkg_setup() { linux-mod_pkg_setup - MODULE_NAMES="ivtv(extra:${S}/driver) \ - saa717x(extra:${S}/i2c-drivers)" - if kernel_is 2 6 18; then - CONFIG_CHECK="EXPERIMENTAL VIDEO_DEV I2C VIDEO_V4L1 VIDEO_V4L2 FW_LOADER" - CONFIG_CHECK="${CONFIG_CHECK} VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER" - CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_SAA7127 VIDEO_TVEEPROM" - else + if ! kernel_is 2 6 18; then die "This only works on 2.6.18 kernels" fi linux_chkconfig_present FB && \ MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)" - linux-mod_pkg_setup -} - -src_unpack() { - unpack ${A} - cd ${S} - sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \ - -i ${S}/driver/Makefile || die "sed failed" + BUILD_PARAMS="KDIR=${KV_DIR}" } src_compile() { - cd ${S}/driver - linux-mod_src_compile || die "failed to build driver " + cd "${S}/driver" + linux-mod_src_compile || die "failed to build driver" - cd ${S}/utils - emake || die "failed to build utils " + cd "${S}/utils" + emake INCDIR="${KV_DIR}/include" || die "failed to build utils " } src_install() { - cd ${S}/utils - make KERNELDIR="${KERNEL_DIR}" DESTDIR="${D}" PREFIX=/usr install \ - || die"failed to install utils" + cd "${S}/utils" + make DESTDIR="${D}" PREFIX="/usr" install || die "failed to install utils" - cd ${S} + cd "${S}" dodoc README doc/* utils/README.X11 - cd ${S}/driver + cd "${S}/driver" linux-mod_src_install || die "failed to install modules" # Add the aliases -- cgit v1.2.3-65-gdbad