diff options
| -rw-r--r-- | media-video/isight-firmware-tools/ChangeLog | 11 | ||||
| -rw-r--r-- | media-video/isight-firmware-tools/files/isight-firmware-tools-1.4.2-hal-disable.patch | 100 | ||||
| -rw-r--r-- | media-video/isight-firmware-tools/isight-firmware-tools-1.2-r1.ebuild | 58 | ||||
| -rw-r--r-- | media-video/isight-firmware-tools/isight-firmware-tools-1.4.2.ebuild (renamed from media-video/isight-firmware-tools/isight-firmware-tools-1.4.1.ebuild) | 24 |
4 files changed, 123 insertions, 70 deletions
diff --git a/media-video/isight-firmware-tools/ChangeLog b/media-video/isight-firmware-tools/ChangeLog index 7f35b487e982..5f391d01a2a3 100644 --- a/media-video/isight-firmware-tools/ChangeLog +++ b/media-video/isight-firmware-tools/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-video/isight-firmware-tools # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/ChangeLog,v 1.8 2009/02/15 19:46:08 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/ChangeLog,v 1.9 2009/06/28 21:18:41 eva Exp $ + +*isight-firmware-tools-1.4.2 (28 Jun 2009) + + 28 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org> + -isight-firmware-tools-1.2-r1.ebuild, -isight-firmware-tools-1.4.1.ebuild, + +isight-firmware-tools-1.4.2.ebuild, + +files/isight-firmware-tools-1.4.2-hal-disable.patch: + Bump to 1.4.2. Make it buildable without hal installed, bug #259015. Use + virtual/libusb:0, bug #270039. *isight-firmware-tools-1.4.1 (15 Feb 2009) diff --git a/media-video/isight-firmware-tools/files/isight-firmware-tools-1.4.2-hal-disable.patch b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.4.2-hal-disable.patch new file mode 100644 index 000000000000..8ab87d3647cc --- /dev/null +++ b/media-video/isight-firmware-tools/files/isight-firmware-tools-1.4.2-hal-disable.patch @@ -0,0 +1,100 @@ +From 7a2d0d63c3b6e0e394ab70dae9d6fb70eceb544d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 28 Jun 2009 21:31:46 +0200 +Subject: [PATCH] Simplify udev/hal (des)activation + + * Only check for HAL if we actually want to build its support. + * Really on autoconf defined variables/behavior. +--- + configure.ac | 56 ++++++++++++++++++++------------------------------------ + 1 files changed, 20 insertions(+), 36 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2eb7e86..dbd560f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -23,35 +23,29 @@ PKG_CHECK_MODULES(LOAD, [libusb]) + AC_SUBST(LOAD_CFLAGS) + AC_SUBST(LOAD_LIBS) + +-PKG_CHECK_MODULES(HAL, [hal]) +-AC_SUBST(HAL_CFLAGS) +-AC_SUBST(HAL_LIBS) +- + dnl whether to provide udev rules and loader + AC_ARG_ENABLE(udev, +- [AC_HELP_STRING([--disable-udev],[Disable udev firmware loader])], +- [if test $enableval = "yes" ; then +- SUPPORT_UDEV=1 +- else +- SUPPORT_UDEV=0 +- fi], +- [SUPPORT_UDEV=1]) +-AM_CONDITIONAL(SUPPORT_UDEV, [test ${SUPPORT_UDEV} = 1]) +-if test ${SUPPORT_UDEV} = 1 ; then ++ AS_HELP_STRING([--disable-udev],[Disable udev firmware loader])], ++ , [enable_udev=yes]) ++ ++AM_CONDITIONAL(SUPPORT_UDEV, [test $enable_udev = yes]) ++if test $enable_udev = yes ; then + udevdir=${libdir}/udev + AC_SUBST(udevdir) + fi + + dnl whether to provide hal callout + AC_ARG_ENABLE(hal, +- [AC_HELP_STRING([--enable-hal],[Enable HAL callout])], +- [if test $enableval = "yes" ; then +- SUPPORT_HAL=1 +- else +- SUPPORT_HAL=0 +- fi], +- [SUPPORT_HAL=0]) +-AM_CONDITIONAL(SUPPORT_HAL, [test ${SUPPORT_HAL} = 1]) ++ [AS_HELP_STRING([--enable-hal],[Enable HAL callout])], ++ , [enable_hal=no]) ++ ++if test $enable_hal = yes; then ++ PKG_CHECK_MODULES(HAL, [hal]) ++ AC_SUBST(HAL_CFLAGS) ++ AC_SUBST(HAL_LIBS) ++fi ++ ++AM_CONDITIONAL(SUPPORT_HAL, [test $enable_hal = yes]) + + dnl GETTEXT + GETTEXT_PACKAGE=AC_PACKAGE_NAME +@@ -64,24 +58,14 @@ AM_GLIB_GNU_GETTEXT + + IT_PROG_INTLTOOL([0.35]) + +- +-dnl OUTPUT + AC_OUTPUT + +- +-yes_no () { +- if test $1 = 0 ; then +- echo "no"; +- else +- echo "yes" +- fi +-} +- + echo +-echo "HAL callout : " $(yes_no $SUPPORT_HAL) +-echo "udev rules : " $(yes_no $SUPPORT_UDEV) ++echo "HAL callout : " $enable_hal ++echo "udev rules : " $enable_udev + echo +-if test $SUPPORT_UDEV = 1 -a $SUPPORT_HAL = 1 ; then ++ ++if test $enable_udev = yes -a $enable_hal = yes ; then + echo `tput smso` "/!\ WARNING: avoid installing both UDEV rules and HAL callout!" `tput rmso`; + echo +-fi +\ No newline at end of file ++fi +-- +1.6.3.3 + diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.2-r1.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.2-r1.ebuild deleted file mode 100644 index b9ba7b133c60..000000000000 --- a/media-video/isight-firmware-tools/isight-firmware-tools-1.2-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/isight-firmware-tools-1.2-r1.ebuild,v 1.1 2008/12/24 11:49:21 eva Exp $ - -inherit autotools eutils multilib - -DESCRIPTION="Extract, load or export firmware for the iSight webcams" -HOMEPAGE="http://bersace03.free.fr/ift/" -SRC_URI="http://launchpad.net/${PN}/main/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/glib - dev-libs/libusb - dev-libs/libgcrypt" -# >=sys-apps/hal-0.5.9" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35.5 - sys-apps/texinfo" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Fix forced as-needed build, bug #247904 - epatch "${FILESDIR}/${P}-ift-ldadd.patch" - - # Fix udev rules for firmware loading - epatch "${FILESDIR}/${P}-rules.patch" - - sed "s:/lib/firmware:/$(get_libdir)/firmware:" \ - -i src/isight.rules.in || die "sed failed" - - eautomake -} - -src_compile() { - # https://bugs.launchpad.net/isight-firmware-tools/+bug/243255 - econf --enable-udev --disable-hal --docdir=/usr/share/doc/${P} - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - mv "${D}"/etc/udev/rules.d/isight.rules "${D}"/etc/udev/rules.d/70-isight.rules - rm -f "${D}/usr/share/doc/${P}/HOWTO" - dodoc AUTHORS ChangeLog HOWTO NEWS README -} - -pkg_postinst() { - elog "You need to extract your firmware prior to being able to loading it" - elog "ift-extract --apple-driver /macos/System/Library/Extensions/IOUSBFamily.kext/Contents/PlugIns/AppleUSBVideoSupport.kext/Contents/MacOS/AppleUSBVideoSupport" - elog "If you do not have OSX you can get AppleUSBVideoSupport from" - elog "http://www.mediafire.com/?81xtkqyttjt" -} diff --git a/media-video/isight-firmware-tools/isight-firmware-tools-1.4.1.ebuild b/media-video/isight-firmware-tools/isight-firmware-tools-1.4.2.ebuild index 048adebfd512..32aa794fac11 100644 --- a/media-video/isight-firmware-tools/isight-firmware-tools-1.4.1.ebuild +++ b/media-video/isight-firmware-tools/isight-firmware-tools-1.4.2.ebuild @@ -1,6 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/isight-firmware-tools-1.4.1.ebuild,v 1.1 2009/02/15 19:46:08 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/isight-firmware-tools/isight-firmware-tools-1.4.2.ebuild,v 1.1 2009/06/28 21:18:41 eva Exp $ + +EAPI="2" +WANT_AUTOMAKE="1.10" inherit autotools eutils multilib versionator @@ -15,37 +18,36 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=">=dev-libs/glib-2.14 - dev-libs/libusb + virtual/libusb:0 dev-libs/libgcrypt" -# >=sys-apps/hal-0.5.9" DEPEND="${RDEPEND} >=dev-util/intltool-0.35.5 sys-apps/texinfo" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { # Fix forced as-needed build, bug #247904 epatch "${FILESDIR}/${PN}-1.2-ift-ldadd.patch" + # Fix build without hal, bug #259015 + epatch "${FILESDIR}/${PN}-1.4.2-hal-disable.patch" + sed "s:/lib/firmware:/$(get_libdir)/firmware:" \ -i src/isight.rules.in.in || die "sed failed" - eautomake + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf } -src_compile() { +src_configure() { # https://bugs.launchpad.net/isight-firmware-tools/+bug/243255 econf --enable-udev --disable-hal --docdir="${ROOT}/usr/share/doc/${P}" - emake || die "emake failed" } src_install() { emake DESTDIR="${D}" install || die "emake install failed" mv "${D}"/etc/udev/rules.d/isight.rules "${D}"/etc/udev/rules.d/70-isight.rules rm -f "${D}/usr/share/doc/${P}/HOWTO" - dodoc AUTHORS ChangeLog HOWTO NEWS README + dodoc AUTHORS ChangeLog HOWTO NEWS README || die "dodoc failed" } pkg_postinst() { |