From cebfab41dde3fefac46380848a7b73469c75dd82 Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Tue, 25 Jul 2006 14:29:34 +0000 Subject: Added patch for compatibility with kernel 2.6.18. Set compiled in default device-node depending on activated driver (for e.g. usbirboy), removed older hack for setting device-node. Without set driver use option userspace. Added /etc/modules.d/lirc. (Portage version: 2.1.1_pre3-r4) --- app-misc/lirc/ChangeLog | 12 +- app-misc/lirc/files/digest-lirc-0.8.0-r4 | 3 + app-misc/lirc/files/lirc-0.8.0-kernel-2.6.18.diff | 76 ++++++ app-misc/lirc/files/modulesd.lirc | 22 ++ app-misc/lirc/lirc-0.8.0-r4.ebuild | 285 ++++++++++++++++++++++ 5 files changed, 397 insertions(+), 1 deletion(-) create mode 100644 app-misc/lirc/files/digest-lirc-0.8.0-r4 create mode 100644 app-misc/lirc/files/lirc-0.8.0-kernel-2.6.18.diff create mode 100644 app-misc/lirc/files/modulesd.lirc create mode 100644 app-misc/lirc/lirc-0.8.0-r4.ebuild diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index d9c6cb3d8d2e..67f3ec7fbc7c 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,16 @@ # 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.100 2006/07/23 14:51:40 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.101 2006/07/25 14:29:34 zzam Exp $ + +*lirc-0.8.0-r4 (25 Jul 2006) + + 25 Jul 2006; Matthias Schwarzott + +files/lirc-0.8.0-kernel-2.6.18.diff, +files/modulesd.lirc, + +lirc-0.8.0-r4.ebuild: + Added patch for compatibility with kernel 2.6.18. Set compiled in default + device-node depending on activated driver (for e.g. usbirboy), removed older + hack for setting device-node. Without set driver use option userspace. Added + /etc/modules.d/lirc. 23 Jul 2006; Tobias Scherbaum lirc-0.8.0-r1.ebuild, lirc-0.8.0-r3.ebuild: diff --git a/app-misc/lirc/files/digest-lirc-0.8.0-r4 b/app-misc/lirc/files/digest-lirc-0.8.0-r4 new file mode 100644 index 000000000000..403b24365ee4 --- /dev/null +++ b/app-misc/lirc/files/digest-lirc-0.8.0-r4 @@ -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.18.diff b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.18.diff new file mode 100644 index 000000000000..3902658f246b --- /dev/null +++ b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.18.diff @@ -0,0 +1,76 @@ +diff -ru lirc-0.8.0-orig/drivers/kcompat.h lirc-0.8.0/drivers/kcompat.h +--- lirc-0.8.0-orig/drivers/kcompat.h 2006-07-16 21:09:26.323828798 +0200 ++++ lirc-0.8.0/drivers/kcompat.h 2006-07-16 21:09:45.441698751 +0200 +@@ -15,8 +15,11 @@ + + #include + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) + #define LIRC_HAVE_DEVFS + #define LIRC_HAVE_DEVFS_26 ++#endif ++ + #define LIRC_HAVE_SYSFS + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +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-07-16 21:09:26.327829190 +0200 ++++ lirc-0.8.0/drivers/lirc_dev/lirc_dev.c 2006-07-16 21:09:45.441698751 +0200 +@@ -49,16 +49,18 @@ + #endif + #define __KERNEL_SYSCALLS__ + #include ++ ++#include "drivers/kcompat.h" ++ + /* DevFS header */ +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) ++#if defined(LIRC_HAVE_DEVFS) + #include + #endif + /* SysFS header */ +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++#if defined(LIRC_HAVE_SYSFS) + #include + #endif + +-#include "drivers/kcompat.h" + #include "drivers/lirc.h" + #include "lirc_dev.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-07-16 21:09:26.327829190 +0200 ++++ lirc-0.8.0/drivers/lirc_imon/lirc_imon.c 2006-07-16 21:11:14.542390676 +0200 +@@ -58,10 +58,13 @@ + #include + #include + #include ++#include "drivers/kcompat.h" ++ ++#if defined(LIRC_HAVE_DEVFS) + #include ++#endif + + #include "drivers/lirc.h" +-#include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.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-07-16 21:09:26.323828798 +0200 ++++ lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c 2006-07-16 21:12:21.700919590 +0200 +@@ -67,10 +67,13 @@ + #include + #include + #include ++ ++#include "drivers/kcompat.h" ++#if defined(LIRC_HAVE_DEVFS) + #include ++#endif + + #include "drivers/lirc.h" +-#include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.h" + + diff --git a/app-misc/lirc/files/modulesd.lirc b/app-misc/lirc/files/modulesd.lirc new file mode 100644 index 000000000000..d1838c53cc00 --- /dev/null +++ b/app-misc/lirc/files/modulesd.lirc @@ -0,0 +1,22 @@ +# +# For first serial receivers: +# +#options lirc_serial irq=4 io=0x3f8 +#options lirc_sir irq=4 io=0x3f8 + +# +# Detach first serial port from serial-driver. +# Use this when you have your serial-port-driver statically +# compiled into your kernel, or as a module but loaded before +# the lirc-module. +# +#pre-install lirc_serial setserial /dev/ttyS0 uart none +# +#pre-install lirc_sir setserial /dev/ttyS0 uart none + + +# +# For parallel receivers: +# +#options lirc_parallel irq=7 io=0x3bc + diff --git a/app-misc/lirc/lirc-0.8.0-r4.ebuild b/app-misc/lirc/lirc-0.8.0-r4.ebuild new file mode 100644 index 000000000000..257a1ff04a2c --- /dev/null +++ b/app-misc/lirc/lirc-0.8.0-r4.ebuild @@ -0,0 +1,285 @@ +# 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-r4.ebuild,v 1.1 2006/07/25 14:29:34 zzam Exp $ + +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="alsa debug doc X usb hardware-carrier transmitter udev" +KEYWORDS="~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" +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 + sys-devel/autoconf + sys-devel/libtool" + + +# adding only run-time depends +RDEPEND="${RDEPEND} + lirc_devices_usbirboy? ( app-misc/usbirboy )" + + + +# 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" + 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" + 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}" + + export WANT_AUTOCONF=2.5 + filter-flags -Wl,-O1 +} + +src_unpack() { + unpack ${A} + cd ${S} + + 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}/${PN}-udev-094.diff + + use lirc_devices_xboxusb && 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 + + 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 +} + -- cgit v1.2.3-65-gdbad