[arch-commits] Commit in lirc/repos (3 files)

[Tobias Powalowski]

    Date: Saturday, October 11, 2008 @ 17:05:42
  Author: tpowa
Revision: 14979

Merged revisions 14977 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/lirc/trunk

........
  r14977 | tpowa | 2008-10-11 23:03:53 +0200 (Sa, 11 Okt 2008) | 1 line
  
  upgpkg: lirc 0.8.3-3
........

Modified:
  lirc/repos/testing-x86_64/	(properties)
  lirc/repos/testing-x86_64/PKGBUILD
  lirc/repos/testing-x86_64/kernel-2.6.27.patch

---------------------+
 PKGBUILD            |    8 +++----
 kernel-2.6.27.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)


Property changes on: lirc/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /lirc/trunk:1-14762
   + /lirc/trunk:1-14978

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-10-11 21:04:37 UTC (rev 14978)
+++ testing-x86_64/PKGBUILD	2008-10-11 21:05:42 UTC (rev 14979)
@@ -3,7 +3,7 @@
 
 pkgname=lirc
 pkgver=0.8.3
-pkgrel=2
+pkgrel=3
 _kernver=2.6.27-ARCH
 pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
 arch=(i686 x86_64)
@@ -17,9 +17,6 @@
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \
 	kernel-2.6.26.patch
 	kernel-2.6.27.patch)
-md5sums=('8e78eeded7b31e5ad02e328970437c0f'
-         '1753acd774f50b638e6173d364de53fd'
-         '851a7d2d2bd9b849d84cd5fab51dee24')
 
 build() {
 	# configure
@@ -52,3 +49,6 @@
 	sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
 		$startdir/lirc.install || return 1
 }
+md5sums=('8e78eeded7b31e5ad02e328970437c0f'
+         '1753acd774f50b638e6173d364de53fd'
+         '6f151eb4e81fc7776a06c9063e6ad9a5')

Modified: testing-x86_64/kernel-2.6.27.patch
===================================================================
--- testing-x86_64/kernel-2.6.27.patch	2008-10-11 21:04:37 UTC (rev 14978)
+++ testing-x86_64/kernel-2.6.27.patch	2008-10-11 21:05:42 UTC (rev 14979)
@@ -22,3 +22,57 @@
  
  #include "drivers/kcompat.h"
  #include "drivers/lirc_dev/lirc_dev.h"
+--- lirc-0.8.3.orig/drivers/kcompat.h	2008/05/14 16:37:49	5.36
++++ lirc-0.8.3.orig/drivers/kcompat.h	2008/09/27 08:16:15	5.37
+@@ -36,7 +36,7 @@
+ 	class_simple_destroy(cls);
+ }
+ 
+-#define lirc_device_create(cs, parent, dev, fmt, args...) \
++#define lirc_device_create(cs, parent, dev, drvdata, fmt, args...) \
+ 	class_simple_device_add(cs, dev, parent, fmt, ## args)
+ 
+ static inline void lirc_device_destroy(lirc_class_t *cls, dev_t devt)
+@@ -48,20 +48,29 @@
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
+ 
+-#define lirc_device_create(cs, parent, dev, fmt, args...) \
++#define lirc_device_create(cs, parent, dev, drvdata, fmt, args...) \
+ 	class_device_create(cs, dev, parent, fmt, ## args)
+ 
+ #else /* >= 2.6.15 */
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+ 
+-#define lirc_device_create(cs, parent, dev, fmt, args...) \
++#define lirc_device_create(cs, parent, dev, drvdata, fmt, args...) \
+ 	class_device_create(cs, NULL, dev, parent, fmt, ## args)
+ 
+ #else /* >= 2.6.26 */
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
++
++#define lirc_device_create(cs, parent, dev, drvdata, fmt, args...) \
++	class_device_create(cs, parent, dev, fmt, ## args)
++
++#else /* >= 2.6.27 */
++
+ #define lirc_device_create device_create
+ 
++#endif /* >= 2.6.27 */
++
+ #endif /* >= 2.6.26 */
+ 
+ #define LIRC_DEVFS_PREFIX
+--- lirc-0.8.3.orig/drivers/lirc_dev/lirc_dev.c	2008/09/06 07:30:16	1.60
++++ lirc-0.8.3.orig/drivers/lirc_dev/lirc_dev.c	2008/09/27 08:16:15	1.61
+@@ -397,7 +397,7 @@
+ 			DEV_LIRC "/%u", ir->p.minor);
+ #endif
+ 	(void) lirc_device_create(lirc_class, ir->p.dev,
+-				  MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
++				  MKDEV(IRCTL_DEV_MAJOR, ir->p.minor), NULL,
+ 				  "lirc%u", ir->p.minor);
+ 
+ 	if (p->sample_rate || p->get_queue) {