diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2006-11-30 16:59:45 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-11-30 16:59:45 +0000 |
commit | 7e95e422c652092ce7e23f91b127d7c1ab1c51b7 (patch) | |
tree | 79072f15add6cf51f6c4e6f48f8b63fe644c584f /app-misc/lirc | |
parent | Update xerces dep for upcoming 2.6 slotmove. (diff) | |
download | gentoo-2-7e95e422c652092ce7e23f91b127d7c1ab1c51b7.tar.gz gentoo-2-7e95e422c652092ce7e23f91b127d7c1ab1c51b7.tar.bz2 gentoo-2-7e95e422c652092ce7e23f91b127d7c1ab1c51b7.zip |
Makes lirc compatible with kernel-2.6.19
(Portage version: 2.1.2_rc2-r3)
Diffstat (limited to 'app-misc/lirc')
-rw-r--r-- | app-misc/lirc/ChangeLog | 8 | ||||
-rw-r--r-- | app-misc/lirc/files/digest-lirc-0.8.0-r6 | 3 | ||||
-rw-r--r-- | app-misc/lirc/files/lirc-0.8.0-kernel-2.6.19.diff | 177 | ||||
-rw-r--r-- | app-misc/lirc/lirc-0.8.0-r6.ebuild | 302 |
4 files changed, 489 insertions, 1 deletions
diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index 2efd2d612997..39a99a22d3fb 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/lirc # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.117 2006/11/24 23:58:10 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.118 2006/11/30 16:59:45 zzam Exp $ + +*lirc-0.8.0-r6 (30 Nov 2006) + + 30 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> + +files/lirc-0.8.0-kernel-2.6.19.diff, +lirc-0.8.0-r6.ebuild: + Makes lirc compatible with kernel-2.6.19 24 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> lirc-0.8.0-r1.ebuild, lirc-0.8.0-r5.ebuild: diff --git a/app-misc/lirc/files/digest-lirc-0.8.0-r6 b/app-misc/lirc/files/digest-lirc-0.8.0-r6 new file mode 100644 index 000000000000..403b24365ee4 --- /dev/null +++ b/app-misc/lirc/files/digest-lirc-0.8.0-r6 @@ -0,0 +1,3 @@ +MD5 0bf28bf82c7766a462f90927b6bf3af1 lirc-0.8.0.tar.bz2 514359 +RMD160 045c95754820e77891bd0b3baa269ad3f04cba8c lirc-0.8.0.tar.bz2 514359 +SHA256 cc8d7fb41a045278680ea530cffaf05181977f41244b9f0ed64075cd7630b5d2 lirc-0.8.0.tar.bz2 514359 diff --git a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.19.diff b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.19.diff new file mode 100644 index 000000000000..1bd3bba112b1 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.19.diff @@ -0,0 +1,177 @@ +diff -ru lirc-0.8.0-orig/drivers/lirc_atiusb/lirc_atiusb.c lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c +--- lirc-0.8.0-orig/drivers/lirc_atiusb/lirc_atiusb.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c 2006-11-30 17:36:09.521865003 +0100 +@@ -39,7 +39,7 @@ + #error "*******************************************************" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + + #include <linux/kernel.h> + #include <linux/errno.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_bt829/lirc_bt829.c lirc-0.8.0/drivers/lirc_bt829/lirc_bt829.c +--- lirc-0.8.0-orig/drivers/lirc_bt829/lirc_bt829.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_bt829/lirc_bt829.c 2006-11-30 17:36:09.513863048 +0100 +@@ -23,7 +23,7 @@ + #error "This driver needs kernel version 2.4.0 or higher" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + #include <linux/kernel.h> + #include <linux/module.h> + #include <linux/threads.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_cmdir/lirc_cmdir.c lirc-0.8.0/drivers/lirc_cmdir/lirc_cmdir.c +--- lirc-0.8.0-orig/drivers/lirc_cmdir/lirc_cmdir.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_cmdir/lirc_cmdir.c 2006-11-30 17:36:09.513863048 +0100 +@@ -35,7 +35,7 @@ + #error "**********************************************************" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + #include <linux/module.h> + #include <linux/errno.h> + #include <linux/signal.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_dev/lirc_dev.c lirc-0.8.0/drivers/lirc_dev/lirc_dev.c +--- lirc-0.8.0-orig/drivers/lirc_dev/lirc_dev.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_dev/lirc_dev.c 2006-11-30 17:36:09.509862074 +0100 +@@ -32,7 +32,7 @@ + #error "**********************************************************" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + #include <linux/module.h> + #include <linux/kernel.h> + #include <linux/sched.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_igorplugusb/lirc_igorplugusb.c lirc-0.8.0/drivers/lirc_igorplugusb/lirc_igorplugusb.c +--- lirc-0.8.0-orig/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006-11-30 17:36:09.497859140 +0100 +@@ -47,7 +47,7 @@ + #error "*******************************************************" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + #include <linux/module.h> + #include <linux/kernel.h> + #include <linux/kmod.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.0/drivers/lirc_imon/lirc_imon.c +--- lirc-0.8.0-orig/drivers/lirc_imon/lirc_imon.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_imon/lirc_imon.c 2006-11-30 17:36:09.493858163 +0100 +@@ -49,7 +49,7 @@ + #error "*** Sorry, this driver requires kernel version 2.4.22 or higher" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + + #include <linux/errno.h> + #include <linux/init.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_it87/lirc_it87.c lirc-0.8.0/drivers/lirc_it87/lirc_it87.c +--- lirc-0.8.0-orig/drivers/lirc_it87/lirc_it87.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_it87/lirc_it87.c 2006-11-30 17:36:09.489857186 +0100 +@@ -38,7 +38,7 @@ + # include <config.h> + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + + + #include <linux/sched.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_mceusb/lirc_mceusb.c lirc-0.8.0/drivers/lirc_mceusb/lirc_mceusb.c +--- lirc-0.8.0-orig/drivers/lirc_mceusb/lirc_mceusb.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_mceusb/lirc_mceusb.c 2006-11-30 17:36:09.485856208 +0100 +@@ -88,7 +88,7 @@ + * + */ + +-#include <linux/config.h> ++#include <linux/autoconf.h> + #include <linux/kernel.h> + #include <linux/errno.h> + #include <linux/init.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_mceusb2/lirc_mceusb2.c lirc-0.8.0/drivers/lirc_mceusb2/lirc_mceusb2.c +--- lirc-0.8.0-orig/drivers/lirc_mceusb2/lirc_mceusb2.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_mceusb2/lirc_mceusb2.c 2006-11-30 17:36:09.481855231 +0100 +@@ -37,7 +37,7 @@ + #error "*******************************************************" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + + #include <linux/kernel.h> + #include <linux/errno.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_parallel/lirc_parallel.c lirc-0.8.0/drivers/lirc_parallel/lirc_parallel.c +--- lirc-0.8.0-orig/drivers/lirc_parallel/lirc_parallel.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_parallel/lirc_parallel.c 2006-11-30 17:36:09.477854256 +0100 +@@ -40,7 +40,7 @@ + #error "**********************************************************" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + + #ifdef CONFIG_SMP + #error "--- Sorry, this driver is not SMP safe. ---" +@@ -50,7 +50,7 @@ + #include <linux/sched.h> + #include <linux/errno.h> + #include <linux/signal.h> +-#include <linux/config.h> ++#include <linux/autoconf.h> + #include <linux/fs.h> + #include <linux/kernel.h> + #include <linux/ioport.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_sasem/lirc_sasem.c lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c +--- lirc-0.8.0-orig/drivers/lirc_sasem/lirc_sasem.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c 2006-11-30 17:36:09.473853278 +0100 +@@ -58,7 +58,7 @@ + #error "*** Sorry, this driver requires kernel version 2.4.22 or higher" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + + #include <linux/errno.h> + #include <linux/init.h> +diff -ru lirc-0.8.0-orig/drivers/lirc_serial/lirc_serial.c lirc-0.8.0/drivers/lirc_serial/lirc_serial.c +--- lirc-0.8.0-orig/drivers/lirc_serial/lirc_serial.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_serial/lirc_serial.c 2006-11-30 17:36:09.469852301 +0100 +@@ -61,7 +61,7 @@ + #error "**********************************************************" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + + #if defined(CONFIG_SERIAL) || defined(CONFIG_SERIAL_8250) + #warning "******************************************" +diff -ru lirc-0.8.0-orig/drivers/lirc_sir/lirc_sir.c lirc-0.8.0/drivers/lirc_sir/lirc_sir.c +--- lirc-0.8.0-orig/drivers/lirc_sir/lirc_sir.c 2006-11-30 17:34:50.834649582 +0100 ++++ lirc-0.8.0/drivers/lirc_sir/lirc_sir.c 2006-11-30 17:36:09.465851323 +0100 +@@ -46,7 +46,7 @@ + # include <config.h> + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + + #if !defined(LIRC_ON_SA1100) && !defined(CONFIG_SERIAL_MODULE) + #warning "******************************************" +diff -ru lirc-0.8.0-orig/drivers/lirc_streamzap/lirc_streamzap.c lirc-0.8.0/drivers/lirc_streamzap/lirc_streamzap.c +--- lirc-0.8.0-orig/drivers/lirc_streamzap/lirc_streamzap.c 2006-11-30 17:34:50.830648604 +0100 ++++ lirc-0.8.0/drivers/lirc_streamzap/lirc_streamzap.c 2006-11-30 17:36:09.457849368 +0100 +@@ -38,7 +38,7 @@ + #error "*******************************************************" + #endif + +-#include <linux/config.h> ++#include <linux/autoconf.h> + #include <linux/kernel.h> + #include <linux/errno.h> + #include <linux/init.h> diff --git a/app-misc/lirc/lirc-0.8.0-r6.ebuild b/app-misc/lirc/lirc-0.8.0-r6.ebuild new file mode 100644 index 000000000000..507cacb14972 --- /dev/null +++ b/app-misc/lirc/lirc-0.8.0-r6.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r6.ebuild,v 1.1 2006/11/30 16:59:45 zzam Exp $ + +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit eutils linux-mod flag-o-matic autotools + +DESCRIPTION="LIRC is a package that allows you to decode and send infra-red \ + signals of many (but not all) commonly used remote controls." +HOMEPAGE="http://www.lirc.org" + +SLOT="0" +LICENSE="GPL-2" +IUSE="debug doc X hardware-carrier transmitter udev" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +SRC_URI="mirror://sourceforge/lirc/${P/_pre/pre}.tar.bz2" + +S=${WORKDIR}/${P/_pre/pre} + + +IUSE_LIRC_DEVICES_DIRECT=" + all userspace act200l act220l + adaptec alsa_usb animax atilibusb + atiusb audio audio_alsa avermedia avermedia_vdomate + avermedia98 bestbuy bestbuy2 breakoutbox + bte bw6130 caraca chronos cmdir com1 com2 com3 com4 + cph06x creative creative_infracd + devinput digimatrix dsp dvico ea65 + exaudio flyvideo gvbctv5pci hauppauge + hauppauge_dvb hercules_smarttv_stereo + igorplugusb imon imon_pad imon_rsc + irdeo irdeo_remote irman irreal it87 + knc_one kworld leadtek_0007 leadtek_0010 + leadtek_pvr2000 livedrive_midi + livedrive_seq logitech lpt1 lpt2 mceusb + mceusb2 mediafocusI mouseremote + mouseremote_ps2 mp3anywhere nslu2 + packard_bell parallel pcmak pcmak_usb + pctv pixelview_bt878 pixelview_pak + pixelview_pro provideo realmagic + remotemaster sa1100 sasem serial + silitek sir slinke streamzap tekram + tekram_bt829 tira tvbox udp uirt2 + uirt2_raw" + +IUSE_LIRC_DEVICES_SPECIAL=" + imon_pad2keys serial_igor_cesko + xboxusb usbirboy inputlirc" + +IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}" + + + +RDEPEND="virtual/libc + sys-apps/coreutils + X? ( || ( ( x11-libs/libX11 + x11-libs/libSM + x11-libs/libICE ) + virtual/x11 ) ) + lirc_devices_alsa_usb? ( media-libs/alsa-lib ) + lirc_devices_audio? ( media-libs/portaudio ) + lirc_devices_irman? ( media-libs/libirman )" + + +#device-driver which use libusb +LIBUSB_USED_BY_DEV=" + all atiusb sasem igorplugusb imon imon_pad imon_pad2keys + imon_rsc streamzap mceusb mceusb2 xboxusb" + +for dev in ${LIBUSB_USED_BY_DEV}; do + RDEPEND="${RDEPEND} lirc_devices_${dev}? ( dev-libs/libusb )" +done + +# adding only compile-time depends +DEPEND="${RDEPEND} + virtual/linux-sources" + + +# adding only run-time depends +RDEPEND="${RDEPEND} + lirc_devices_usbirboy? ( app-misc/usbirboy ) + lirc_devices_inputlirc? ( app-misc/inputlircd )" + + + +# add all devices to IUSE +for dev in ${IUSE_LIRC_DEVICES}; do + IUSE="${IUSE} lirc_devices_${dev}" +done + + +add_device() { + : $(( lirc_device_count++ )) + + if [[ ${lirc_device_count} -eq 2 ]]; then + ewarn + #ewarn "When selecting multiple devices for lirc to be supported," + #ewarn "it can not be garanteed that the drivers play nice together." + ewarn "lirc does at the moment support only one driver be compiled at a time." + ewarn "Please reduce LIRC_DEVICES to one item." + die "Multiple drivers selected for lirc." + fi + + + local dev="${1}" + local desc="device ${dev}" + if [[ -n "${2}" ]]; then + desc="${2}" + fi + + einfo "Compiling support for ${desc}" + MY_OPTS="${MY_OPTS} --with-driver=${dev}" +} + +pkg_setup() { + linux-mod_pkg_setup + + # set default configure options + MY_OPTS="" + lirc_driver_count=0 + + LIRC_DRIVER_DEVICE="/dev/lirc/0" + + local dev + + if use lirc_devices_all; then + # compile in drivers for a lot of devices + add_device all "a lot of devices" + else + # compile in only requested drivers + for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do + if use lirc_devices_${dev}; then + add_device ${dev} + fi + done + + if use lirc_devices_serial_igor_cesko; then + add_device serial "serial with Igor Cesko design" + MY_OPTS="${MY_OPTS} --with-igor" + fi + + if use lirc_devices_imon_pad2keys; then + add_device imon_pad "device imon_pad (with converting pad input to keyspresses)" + fi + + if use lirc_devices_xboxusb; then + add_device atiusb "device xboxusb" + NEED_XBOX_PATCH=1 + fi + + if use lirc_devices_usbirboy; then + add_device userspace "device usbirboy" + LIRC_DRIVER_DEVICE="/dev/usbirboy" + fi + + if [[ "${MY_OPTS}" == "" ]]; then + if [[ "${PROFILE_ARCH}" == "xbox" ]]; then + # on xbox: use special driver + add_device atiusb "device xboxusb" + NEED_XBOX_PATCH=1 + else + # no driver requested + einfo + einfo "Compiling only the lirc-applications, but no drivers." + einfo "Enable drivers with LIRC_DEVICES if you need them." + MY_OPTS="--with-driver=userspace" + fi + fi + fi + + use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier" + use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter" + + + if [[ -n "${LIRC_OPTS}" ]] ; then + ewarn + ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on." + ewarn + ewarn "Please use LIRC_DEVICES from now on." + ewarn "e.g. LIRC_DEVICES=\"serial sir\"" + ewarn + ewarn "Flags are now set per use-flags." + ewarn "e.g. transmitter, hardware-carrier" + + local opt + local unsupported_opts="" + + # test for allowed options for LIRC_OPTS + for opt in ${LIRC_OPTS}; do + case ${opt} in + --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*) + MY_OPTS="${MY_OPTS} ${opt}" + ;; + *) + unsupported_opts="${unsupported_opts} ${opt}" + ;; + esac + done + if [[ -n ${unsupported_opts} ]]; then + ewarn "These options are no longer allowed to be set" + ewarn "with LIRC_OPTS: ${unsupported_opts}" + die "LIRC_OPTS is no longer recommended." + fi + fi + + + # Setup parameter for linux-mod.eclass + MODULE_NAMES="lirc(misc:${S})" + BUILD_TARGETS="all" + + ECONF_PARAMS=" --localstatedir=/var + --with-syslog=LOG_DAEMON + --enable-sandboxed + --with-kerneldir=${KV_DIR} + --with-moduledir=/lib/modules/${KV_FULL}/misc + $(use_enable debug) + $(use_with X) + ${MY_OPTS}" + + einfo + einfo "lirc-configure-opts: ${MY_OPTS}" + einfo "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" + + filter-flags -Wl,-O1 +} + +src_unpack() { + unpack ${A} + cd ${S} + + # Apply kernel compatibility patches + epatch ${FILESDIR}/${P}-kernel-2.6.16.diff + epatch ${FILESDIR}/${P}-kernel-2.6.17.diff + epatch ${FILESDIR}/${P}-kernel-2.6.18.diff + epatch ${FILESDIR}/${P}-kernel-2.6.19.diff + + # Work with udev-094 and greater + epatch ${FILESDIR}/${PN}-udev-094.diff + + # Bugfix for i2c-driver in combination with newer ivtv and Kernel 2.6.17 + epatch ${FILESDIR}/${P}-i2c-kernel-2.6.17.diff + + # Wrong config-filename for LIRC_DEVICES=pixelview_bt878 + epatch ${FILESDIR}/${P}-conf-pixelview_bt878.diff + + # Apply patches needed for some special device-types + [[ ${NEED_XBOX_PATCH:-0} == 1 ]] && epatch ${FILESDIR}/lirc-0.8.0pre4-xbox-remote.diff + use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${P}-imon-pad2keys.patch + + # remove parallel driver on SMP systems + if linux_chkconfig_present SMP ; then + sed -i -e "s:lirc_parallel::" drivers/Makefile.in + fi + + # respect CFLAGS + sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in + + # setting default device-node + sed -i -e '/#define LIRC_DRIVER_DEVICE/d' acconfig.h + echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h + + eautoreconf || die "autoreconf failed" +} + + +src_install() { + make DESTDIR=${D} install || die "make install failed" + + newinitd ${FILESDIR}/lircd lircd + newinitd ${FILESDIR}/lircmd lircmd + newconfd ${FILESDIR}/lircd.conf lircd + + insinto /etc/modules.d/ + newins ${FILESDIR}/modulesd.lirc lirc + + if use udev; then + insinto /etc/udev/rules.d/; + newins ${S}/contrib/lirc.rules 10-lirc.rules + fi + + if use doc ; then + dohtml doc/html/*.html + insinto /usr/share/doc/${PF}/images + doins doc/images/* + fi +} + +pkg_preinst() { + linux-mod_pkg_preinst + [[ -f "${ROOT}/etc/lircd.conf" ]] && cp ${ROOT}/etc/lircd.conf ${IMAGE}/etc +} + +pkg_postinst() { + linux-mod_pkg_postinst + echo + einfo "The lirc Linux Infrared Remote Control Package has been" + einfo "merged, please read the documentation at http://www.lirc.org" + echo +} + |