Added Patch from lirc-cvs to solve issue with Kernel 2.6.17/ivtv driver, see Bug #141841.

Package-Manager: portage-2.1.1_pre4

5 files changed, 362 insertions, 8 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 3673db5fad4f..f35ce3e849c9 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.103 2006/07/27 18:00:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.104 2006/07/31 09:03:18 zzam Exp $
+
+*lirc-0.8.0-r5 (31 Jul 2006)
+
+  31 Jul 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/lirc-0.8.0-i2c-kernel-2.6.17.diff, +lirc-0.8.0-r5.ebuild:
+  Added Patch from lirc-cvs to solve issue with Kernel 2.6.17/ivtv driver, see
+  Bug #141841.
 
   27 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> lirc-0.8.0-r4.ebuild:
   Bugfix, now also apply xbox-patch when xbox-driver was autoselected by
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index c00fb712182e..e83416e01c24 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX lirc-0.8.0-i2c-kernel-2.6.17.diff 1106 RMD160 35093cc1f5a4ea4a4d2130fb032930eb682be00a SHA1 0f66b81109b3086b0d1b19766f3aee8aca46243d SHA256 5e3642bff2b19a7e466887c550b6c008a535ed443c096cd2d70321596f7cc8e4
+MD5 39d293b5672959be3630769c2f7c0ef5 files/lirc-0.8.0-i2c-kernel-2.6.17.diff 1106
+RMD160 35093cc1f5a4ea4a4d2130fb032930eb682be00a files/lirc-0.8.0-i2c-kernel-2.6.17.diff 1106
+SHA256 5e3642bff2b19a7e466887c550b6c008a535ed443c096cd2d70321596f7cc8e4 files/lirc-0.8.0-i2c-kernel-2.6.17.diff 1106
 AUX lirc-0.8.0-imon-pad2keys.patch 8304 RMD160 0634e8a61bb26d01b8ab860d33873842d320b7b9 SHA1 24c0d2f687250e489d0d9d8d649e7d340fb71a55 SHA256 ea6e28ca5af7226410d9ccf544bf476593fafed88aa38dffabd71bf9b843038d
 MD5 d8a7ab1e0afcc759b946010dfe76d2a0 files/lirc-0.8.0-imon-pad2keys.patch 8304
 RMD160 0634e8a61bb26d01b8ab860d33873842d320b7b9 files/lirc-0.8.0-imon-pad2keys.patch 8304
@@ -70,14 +74,18 @@ EBUILD lirc-0.8.0-r4.ebuild 7608 RMD160 e65bb4d4f4e5cee515252176f3c4f09bf6dd6612
 MD5 ac149c668894b50b0469070f3bdb2168 lirc-0.8.0-r4.ebuild 7608
 RMD160 e65bb4d4f4e5cee515252176f3c4f09bf6dd6612 lirc-0.8.0-r4.ebuild 7608
 SHA256 f0140b5b8a421473e0805f4b828b5ba64b7f910323f37a2c91daf55ea3c89f24 lirc-0.8.0-r4.ebuild 7608
+EBUILD lirc-0.8.0-r5.ebuild 7731 RMD160 b4fd0d06b0d591e031d86cbd8d47f814696faa51 SHA1 76a8b43998bc6ba0fd6a144228ab9bd1d7ba2cfd SHA256 2357f29242c98426f3c211f8237d6bfd5417159f5f5e987ff1571b612bb6ab2b
+MD5 9461ba40df6199b112a300a3955fe213 lirc-0.8.0-r5.ebuild 7731
+RMD160 b4fd0d06b0d591e031d86cbd8d47f814696faa51 lirc-0.8.0-r5.ebuild 7731
+SHA256 2357f29242c98426f3c211f8237d6bfd5417159f5f5e987ff1571b612bb6ab2b lirc-0.8.0-r5.ebuild 7731
 EBUILD lirc-0.8.0.ebuild 4639 RMD160 45459bad24c39b109d3c50639be6f5196ceeaedc SHA1 f0fbe4800286039e52c5f4f2f6f1a0331472e543 SHA256 87e95b818aa03c3b15547a43c5c1c44f2b691a70323304b62f0625ba7394ab04
 MD5 c731e1674b70379dfd7e1357b919180d lirc-0.8.0.ebuild 4639
 RMD160 45459bad24c39b109d3c50639be6f5196ceeaedc lirc-0.8.0.ebuild 4639
 SHA256 87e95b818aa03c3b15547a43c5c1c44f2b691a70323304b62f0625ba7394ab04 lirc-0.8.0.ebuild 4639
-MISC ChangeLog 15738 RMD160 c676f92f1345144e37da327878e59f1160858e3d SHA1 22b7f4566d18ad11600b9b482b3bb25a06f1939b SHA256 f127d50c9b0b60d8138d655e8df6206f280eff7a0c1e3de75451252317d7aed0
-MD5 eb4cc124965da6477248f6d614c9ee8c ChangeLog 15738
-RMD160 c676f92f1345144e37da327878e59f1160858e3d ChangeLog 15738
-SHA256 f127d50c9b0b60d8138d655e8df6206f280eff7a0c1e3de75451252317d7aed0 ChangeLog 15738
+MISC ChangeLog 15983 RMD160 1b7967360bb27b50dbbc74289d48f78a47d30a65 SHA1 644357f3724bdfe9fab3709eefcefec1436d5d8f SHA256 6e8653d6dc7140e079384fd09ccd49854ff795ac02cfab3b20ab35124c58af28
+MD5 ce45939c11e1c7c60caafd48fd67a7c9 ChangeLog 15983
+RMD160 1b7967360bb27b50dbbc74289d48f78a47d30a65 ChangeLog 15983
+SHA256 6e8653d6dc7140e079384fd09ccd49854ff795ac02cfab3b20ab35124c58af28 ChangeLog 15983
 MISC metadata.xml 252 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 SHA1 9fdd5da8466c39d7ff3b40412c4dfa77dd2446b7 SHA256 4e8b5c34b3e50b781a18c9be9e6199442f1b0299e00d66ba35024f8b743b9c32
 MD5 abf8a9c4b96bc3bb50f04a48349dae34 metadata.xml 252
 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 metadata.xml 252
@@ -100,10 +108,13 @@ SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/di
 MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r4 235
 RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0-r4 235
 SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0-r4 235
+MD5 17322bfb3604e1c6663bbc5a6fb80e96 files/digest-lirc-0.8.0-r5 235
+RMD160 efdbebbf9c02e761392c245f3ee1df0938778785 files/digest-lirc-0.8.0-r5 235
+SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/digest-lirc-0.8.0-r5 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEyP9Ct2vP6XvVdOcRAtXlAKCqMcY266XauBZB1tUPSEkhUwd4iACeJnJ8
-mEcx6uu9uBHOBW7Vr6nguK8=
-=d6NR
+iD8DBQFEzcdgt2vP6XvVdOcRAvOYAKCbksF8EVxj1e54HMwIWJgxKcDgSgCghYe0
+IK5iIzWGMYNpOwXHKwu9kdQ=
+=6nVK
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/digest-lirc-0.8.0-r5 b/app-misc/lirc/files/digest-lirc-0.8.0-r5
new file mode 100644
index 000000000000..403b24365ee4
--- /dev/null
+++ b/app-misc/lirc/files/digest-lirc-0.8.0-r5
@@ -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-i2c-kernel-2.6.17.diff b/app-misc/lirc/files/lirc-0.8.0-i2c-kernel-2.6.17.diff
new file mode 100644
index 000000000000..435cffa92a7e
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.0-i2c-kernel-2.6.17.diff
@@ -0,0 +1,39 @@
+--- drivers/lirc_i2c/lirc_i2c.c	2006/03/04 23:16:03	1.36
++++ drivers/lirc_i2c/lirc_i2c.c	2006/06/26 23:21:34	1.38
+@@ -430,12 +430,19 @@
+ 		break;
+ 	case 0x18:
+ 	case 0x1a:
+-		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) {
++#ifdef I2C_HW_B_CX2341X
++		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
++		    adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
++#else
++		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
++#endif
++		{
+ 			strcpy(ir->c.name,"Hauppauge IR");
+ 			ir->l.code_length = 13;
+ 			ir->l.add_to_buf=add_to_buf_haup;
+ 		}
+-		else {
++		else /* I2C_HW_B_CX2388x */
++		{
+ 			strcpy(ir->c.name,"Leadtek IR");
+ 			ir->l.code_length = 8;
+ 			ir->l.add_to_buf=add_to_buf_pvr2000;
+@@ -508,7 +515,13 @@
+ 		-1};
+ 	struct i2c_client c; char buf; int i,rc;
+ 
+-	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) {
++#ifdef I2C_HW_B_CX2341X
++	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
++	    adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
++#else
++	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
++#endif
++	{
+ 		memset(&c,0,sizeof(c));
+ 		c.adapter = adap;
+ 		for (i = 0; -1 != probe[i]; i++) {
diff --git a/app-misc/lirc/lirc-0.8.0-r5.ebuild b/app-misc/lirc/lirc-0.8.0-r5.ebuild
new file mode 100644
index 000000000000..1e573577481a
--- /dev/null
+++ b/app-misc/lirc/lirc-0.8.0-r5.ebuild
@@ -0,0 +1,294 @@
+# 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-r5.ebuild,v 1.1 2006/07/31 09:03:18 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"
+			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}"
+
+	export WANT_AUTOCONF=2.5
+	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
+
+	# 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
+
+	# 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
+}
+