Make lirc compile against linux-2.6.26, thanks to enkil <enkil@cvmx.org> for the patch, Bug #231867.

Package-Manager: portage-2.1.4.4

4 files changed, 138 insertions, 15 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 22578a38d7d7..b585ef7e0fd6 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.182 2008/07/17 09:59:20 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.183 2008/07/26 11:32:18 zzam Exp $
+
+  26 Jul 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/lirc-0.8.3-kernel-2.6.26.diff, lirc-0.8.3-r2.ebuild:
+  Make lirc compile against linux-2.6.26, thanks to enkil <enkil@cvmx.org> for
+  the patch, Bug #231867.
 
   17 Jul 2008; Christian Faulhammer <opfer@gentoo.org> lirc-0.8.3-r2.ebuild:
   stable x86, bug 230792
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 1311e1d5d55d..b5f5d8dce8ce 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX irexec-confd 280 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 SHA1 c6decc19a273d98d451de137a2ffbe16d5df28ae SHA256 c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79
 AUX irexec-initd 808 RMD160 06b02232f892ab032e2bf8b35bb2945a623a2610 SHA1 5c5630e5434c2430b9a74b725fc5350e29adaede SHA256 9325419aa45d80c205bc1cd47fe839b178da74bca5dd928cbe3ae17423b92493
 AUX lirc-0.8.0-conf-pixelview_bt878.diff 378 RMD160 e70daba96eb7097b20b73807a76ebd562ebb09dc SHA1 96b1976089c7a4e63d9435fb4f8bf8a19c53f4c6 SHA256 343c473210ad6fed27df49d8a93ced7e91fe0d5fc8d652b45b1ef7a7c3125ed6
@@ -19,6 +16,7 @@ AUX lirc-0.8.1-kernel-2.6.20.diff 5003 RMD160 89d3073e0f0c049c16ece750c06ba4f046
 AUX lirc-0.8.2-kernel-2.6.22.patch 550 RMD160 789e168d93a1f7c6c329cd0c6f858efef1d13e10 SHA1 03273362cd230f96beb1d0e1978b51cd582f5fa4 SHA256 1e934d597c2f6a918fabe8f54ee4afb4362da778d38a2f5ded0ac5104b906a4d
 AUX lirc-0.8.2-kernel-2.6.23.patch 1224 RMD160 6e780550ddeb24d2ef58702b01c263d6ab7b1695 SHA1 e90c105626a00f724b9444eae57250328154663d SHA256 7a3af1f27df60fdd6f281ea4064cd603e4e429f9989218bce262e954e709dcce
 AUX lirc-0.8.3-imon-pad2keys.patch 11556 RMD160 89a050f7099593000a40b15c46de6137f3b10dfa SHA1 019b1aa3d72df9e4b28796c173fb4fa1fc3e457d SHA256 347c6195d971f8d1a3f4c29a1ff4750d04cea297d16679aeda7529ac1720d42e
+AUX lirc-0.8.3-kernel-2.6.26.diff 3798 RMD160 994aefe121bf4c3199fe92ff2853073440d6e67f SHA1 4207b47bb1d8a97f5a6d4fe930e306295d76a9d6 SHA256 61757f98e1638a08a2286d6167a590684a76e4684ca32bcaf5bfc1cce7eaede2
 AUX lirc-0.8.3-pa19.patch 1954 RMD160 bb90abc0c35fd5e9827ca993bca51d3075ccb3b8 SHA1 7cae24797dd132a226293bd1e47d87505be4c37a SHA256 d5c4959c78a4f83bc494788c45da2ec5fe7d5c1362f82136233068cc2e87ca8e
 AUX lirc-0.8.3_pre1-imon-pad2keys.patch 10312 RMD160 6f61031cd3035289b2d52797dd02d027f593873d SHA1 c59aab62c9b59e27b93d5613e050438fcf2c6eed SHA256 2f79f223d5d2e998321284c50edea044ad26ab8607eae1e9e79e7c0ea6a8f2cd
 AUX lirc-0.8.3_pre1-kernel-2.6.24.diff 3183 RMD160 f13264a2b4df668ad378a22258f911303da0ef47 SHA1 b9c3b3872841138a0bb484bdebcdedd5fd2b2db8 SHA256 7ef22b75da7740ef51ad2ae94571611684fce49953e32c4a58c7c9a17331716b
@@ -48,16 +46,9 @@ EBUILD lirc-0.8.2-r2.ebuild 8282 RMD160 627a3bb4a947ea89fd90a4c93cac12f1358976ff
 EBUILD lirc-0.8.2.ebuild 7749 RMD160 15289a7b2c51dcf4c32c399b16861f5e73c30965 SHA1 9338e58f0351a7eab10837b07253c4b5be6eeb6d SHA256 de6312c8bc46974d99c73f958843f2c143994ed68c18cc964d30aa1405c94998
 EBUILD lirc-0.8.2_pre2.ebuild 7768 RMD160 2437273d778a5ba426026aaafab4e2528c4619e6 SHA1 ad1d97b3110636f3733c46318cd54fc1f08a8549 SHA256 b35bdae2c7011fb84d2279d12de811dbc128266d197f83e4bb70bb9e5c8ec67b
 EBUILD lirc-0.8.3-r1.ebuild 8698 RMD160 b108d0316377d6a4e11fd5d9fab4cc5e02e65662 SHA1 438475aa6bc91aa204c0156ed9c0341bd7ca6804 SHA256 c70eae35c30e23c2433147a0d68aa24ae0737355735eae204ce4372bb07f3cbd
-EBUILD lirc-0.8.3-r2.ebuild 8808 RMD160 41d59f5e60569198635379b6d5a5ddf090729024 SHA1 76a21f8361436d1c1cc30253791948562488e8d8 SHA256 fa2cf7e5cfb776b4ec2e011798db9393d584498e66d709599ab22638daa2381d
+EBUILD lirc-0.8.3-r2.ebuild 8906 RMD160 b4d2e8477f56bcb2b125648a9c576ae98435ec9b SHA1 8e57027cbacb8f58746a6b7088ba7f229b986e3f SHA256 42ce50f22dca8942ebb5b5b7a32812902539d9b7d35e1df5f7761f2ff744f790
 EBUILD lirc-0.8.3.ebuild 8652 RMD160 fdc60c58f390233998f6ec6e1d6fd6086816f270 SHA1 e1aeadecc5e690b5bcd08c547c93e03c715c0524 SHA256 c8270e080d2b5f1cea016b5a9cf12589c11ce1e18d4480a981a93c6d94fdb844
 EBUILD lirc-0.8.3_pre1.ebuild 8413 RMD160 5c1aad354c21af1c0e59a7664a618b4f845e4807 SHA1 b60cfb14611ba87df67cde41070f7c3b90e467a5 SHA256 aa2c154981ed8998d701e74744a73f84a758c2cfb69b2a4a07e2b6d42d75e932
 EBUILD lirc-0.8.3_pre3.ebuild 8326 RMD160 126919dbe2680331d22682df852b5e5636c8709b SHA1 77751b8e0dc6b5661e4def741c7118aeef19baf8 SHA256 6669f8b4a107c1952c28bc56173540a4e2075eb652d8b7c81e7c99afac11dd2c
-MISC ChangeLog 28324 RMD160 f8eba901c942cf0b00379675e089704dfdeaa9db SHA1 1143217c810d723dbce97b506b2788e285a3f089 SHA256 0d42d9f2552d8bb105d91a99eac5bba51a5b1b41e942f2de6835d92eccf17c96
+MISC ChangeLog 28544 RMD160 8bcfc045ebdf336c50fc35d06041579f13c4167d SHA1 c725c8ec0efe6d7b5059a98eb9f1ba6640b3109d SHA256 3a2c5eb08dd51ae7c9fa28b245eed3c7c472166cbfdf45600f5ff39a02867bdc
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkh/GAcACgkQNQqtfCuFneM9WACeKkke/yfUU/7Y0v1ajmdE0Q2n
-KOgAniKLxOH1TUUwykIpqPs3CZa1fk3v
-=DWYN
------END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.26.diff b/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.26.diff
new file mode 100644
index 000000000000..91f4db7dd1bb
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.26.diff
@@ -0,0 +1,122 @@
+--- a/drivers/kcompat.h	2008-01-13 11:26:28.000000000 +0100
++++ b/drivers/kcompat.h	2008-05-14 18:37:49.000000000 +0200
+@@ -1,4 +1,4 @@
+-/*      $Id: lirc-0.8.3-kernel-2.6.26.diff,v 1.1 2008/07/26 11:32:18 zzam Exp $      */
++/*      $Id: lirc-0.8.3-kernel-2.6.26.diff,v 1.1 2008/07/26 11:32:18 zzam Exp $      */
+ 
+ #ifndef _KCOMPAT_H
+ #define _KCOMPAT_H
+@@ -36,10 +36,10 @@
+ 	class_simple_destroy(cls);
+ }
+ 
+-#define lirc_class_device_create(cs, parent, dev, device, fmt, args...) \
+-	class_simple_device_add(cs, dev, device, fmt, ## args)
++#define lirc_device_create(cs, parent, dev, fmt, args...) \
++	class_simple_device_add(cs, dev, parent, fmt, ## args)
+ 
+-static inline void class_device_destroy(lirc_class_t *cls, dev_t devt)
++static inline void lirc_device_destroy(lirc_class_t *cls, dev_t devt)
+ {
+ 	class_simple_device_remove(devt);
+ }
+@@ -48,20 +48,40 @@
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
+ 
+-#define lirc_class_device_create(cs, parent, dev, device, fmt, args...) \
+-	class_device_create(cs, dev, device, fmt, ## args)
++#define lirc_device_create(cs, parent, dev, fmt, args...) \
++	class_device_create(cs, dev, parent, fmt, ## args)
+ 
+ #else /* >= 2.6.15 */
+ 
+-#define lirc_class_device_create class_device_create
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
++
++#define lirc_device_create(cs, parent, dev, fmt, args...) \
++	class_device_create(cs, NULL, dev, parent, fmt, ## args)
++
++#else /* >= 2.6.26 */
++
++#define lirc_device_create device_create
++
++#endif /* >= 2.6.26 */
++
+ #define LIRC_DEVFS_PREFIX
+ 
+-#endif
++#endif /* >= 2.6.15 */
+ 
+ typedef struct class lirc_class_t;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
++
++#define lirc_device_destroy class_device_destroy
++
++#else
++
++#define lirc_device_destroy device_destroy
++
+ #endif
+ 
++#endif /* >= 2.6.13 */
++
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
+ #define LIRC_HAVE_DEVFS
+ #define LIRC_HAVE_DEVFS_24
+@@ -133,8 +153,8 @@
+ #ifndef LIRC_HAVE_SYSFS
+ #define class_destroy(x) do { } while (0)
+ #define class_create(x, y) NULL
+-#define class_device_destroy(x, y) do { } while (0)
+-#define lirc_class_device_create(x, y, z, xx, yy, zz) 0
++#define lirc_class_destroy(x, y) do { } while (0)
++#define lirc_class_create(x, y, z, xx, yy, zz) 0
+ #define IS_ERR(x) 0
+ typedef struct class_simple
+ {
+--- a/drivers/lirc_dev/lirc_dev.c	2008-01-13 11:45:02.000000000 +0100
++++ b/drivers/lirc_dev/lirc_dev.c	2008-05-14 18:37:49.000000000 +0200
+@@ -17,7 +17,7 @@
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  *
+- * $Id: lirc-0.8.3-kernel-2.6.26.diff,v 1.1 2008/07/26 11:32:18 zzam Exp $
++ * $Id: lirc-0.8.3-kernel-2.6.26.diff,v 1.1 2008/07/26 11:32:18 zzam Exp $
+  *
+  */
+ 
+@@ -145,7 +145,8 @@
+ #ifdef LIRC_HAVE_DEVFS_26
+ 	devfs_remove(DEV_LIRC "/%u", ir->p.minor);
+ #endif
+-	class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
++	lirc_device_destroy(lirc_class,
++			    MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
+ 
+ 	if (ir->buf != ir->p.rbuf) {
+ 		lirc_buffer_free(ir->buf);
+@@ -400,9 +401,9 @@
+ 			S_IFCHR|S_IRUSR|S_IWUSR,
+ 			DEV_LIRC "/%u", ir->p.minor);
+ #endif
+-	(void) lirc_class_device_create(lirc_class, NULL,
+-					MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
+-					ir->p.dev, "lirc%u", ir->p.minor);
++	(void) lirc_device_create(lirc_class, ir->p.dev,
++				  MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
++				  "lirc%u", ir->p.minor);
+ 
+ 	if (p->sample_rate || p->get_queue) {
+ 		/* try to fire up polling thread */
+@@ -441,7 +442,8 @@
+ 	return minor;
+ 
+ out_sysfs:
+-	class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
++	lirc_device_destroy(lirc_class,
++			    MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
+ #ifdef LIRC_HAVE_DEVFS_24
+ 	devfs_unregister(ir->devfs_handle);
+ #endif
diff --git a/app-misc/lirc/lirc-0.8.3-r2.ebuild b/app-misc/lirc/lirc-0.8.3-r2.ebuild
index 76732164d43b..76abce968559 100644
--- a/app-misc/lirc/lirc-0.8.3-r2.ebuild
+++ b/app-misc/lirc/lirc-0.8.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3-r2.ebuild,v 1.4 2008/07/17 09:59:20 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3-r2.ebuild,v 1.5 2008/07/26 11:32:18 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -240,6 +240,8 @@ src_unpack() {
 	# Rip out dos CRLF
 	edos2unix contrib/lirc.rules
 
+	epatch "${FILESDIR}/${P}-kernel-2.6.26.diff"
+
 	# Apply patches needed for some special device-types
 	epatch "${FILESDIR}"/${P}-imon-pad2keys.patch
 	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
@@ -259,7 +261,10 @@ src_unpack() {
 	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
 
 	# setting default device-node
-	sed -i -e '/#define LIRC_DRIVER_DEVICE/d' configure.ac acconfig.h
+	local f
+	for f in configure.ac acconfig.h; do
+		[[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
+	done
 	echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
 
 	if has_version "=media-libs/portaudio-19*"; then