[arch-commits] Commit in lirc/trunk (4 files)
Tobias Powalowski
tpowa at archlinux.org
Mon Apr 6 14:23:28 UTC 2009
Date: Monday, April 6, 2009 @ 10:23:28
Author: tpowa
Revision: 34073
upgpkg: lirc 0.8.5pre2-1
Modified:
lirc/trunk/PKGBUILD
lirc/trunk/lirc.install
Deleted:
lirc/trunk/kernel-2.6.26.patch
lirc/trunk/kernel-2.6.27.patch
---------------------+
PKGBUILD | 14 ++---
kernel-2.6.26.patch | 122 --------------------------------------------------
kernel-2.6.27.patch | 78 -------------------------------
lirc.install | 6 +-
4 files changed, 10 insertions(+), 210 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-04-06 13:12:56 UTC (rev 34072)
+++ PKGBUILD 2009-04-06 14:23:28 UTC (rev 34073)
@@ -2,25 +2,25 @@
# Maintainer: Paul Mattal <paul at archlinux.org>
pkgname=lirc
-pkgver=0.8.4
+pkgver=0.8.5pre2
pkgrel=1
-_kernver=2.6.28-ARCH
+_kernver=2.6.29-ARCH
pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
arch=(i686 x86_64)
url="http://www.lirc.org/"
license=('GPL')
-depends=('lirc-utils=0.8.4' 'kernel26>=2.6.28' 'kernel26<2.6.29')
+depends=('lirc-utils=0.8.5pre2' 'kernel26>=2.6.29' 'kernel26<2.6.30')
makedepends=('help2man')
replaces=('lirc+pctv')
options=('!makeflags')
install=$pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(http://lirc.org/software/snapshots/$pkgname-$pkgver.tar.bz2
+ #http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+)
build() {
# configure
cd $startdir/src/lirc-$pkgver || return 1
-# patch -Np1 -i ../kernel-2.6.26.patch || return 1
-# patch -Np1 -i ../kernel-2.6.27.patch || return 1
./configure --enable-sandboxed --prefix=/usr \
--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
@@ -47,4 +47,4 @@
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
$startdir/lirc.install || return 1
}
-md5sums=('8f3ba7eb57529992f3991d6981a3feb6')
+md5sums=('0cd8119e54806be2a7245933f0d51b54')
Deleted: kernel-2.6.26.patch
===================================================================
--- kernel-2.6.26.patch 2009-04-06 13:12:56 UTC (rev 34072)
+++ kernel-2.6.26.patch 2009-04-06 14:23:28 UTC (rev 34073)
@@ -1,122 +0,0 @@
---- 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: kcompat.h,v 5.34 2008/01/13 10:26:28 lirc Exp $ */
-+/* $Id: kcompat.h,v 5.36 2008/05/14 16:37:49 lirc 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_dev.c,v 1.56 2008/01/13 10:45:02 lirc Exp $
-+ * $Id: lirc_dev.c,v 1.58 2008/05/14 16:37:49 lirc 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
Deleted: kernel-2.6.27.patch
===================================================================
--- kernel-2.6.27.patch 2009-04-06 13:12:56 UTC (rev 34072)
+++ kernel-2.6.27.patch 2009-04-06 14:23:28 UTC (rev 34073)
@@ -1,78 +0,0 @@
-diff -Nur lirc-0.8.3.orig/drivers/lirc_dev/lirc_dev.c lirc-0.8.3/drivers/lirc_dev/lirc_dev.c
---- lirc-0.8.3.orig/drivers/lirc_dev/lirc_dev.c 2008-01-13 11:45:02.000000000 +0100
-+++ lirc-0.8.3/drivers/lirc_dev/lirc_dev.c 2008-10-10 16:29:15.000000000 +0200
-@@ -49,7 +49,7 @@
- #include <linux/uaccess.h>
- #include <linux/errno.h>
- #endif
--#include <asm/semaphore.h>
-+#include <linux/semaphore.h>
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
- #include <linux/wrapper.h>
- #endif
-diff -Nur lirc-0.8.3.orig/drivers/lirc_i2c/lirc_i2c.c lirc-0.8.3/drivers/lirc_i2c/lirc_i2c.c
---- lirc-0.8.3.orig/drivers/lirc_i2c/lirc_i2c.c 2008-05-04 15:49:53.000000000 +0200
-+++ lirc-0.8.3/drivers/lirc_i2c/lirc_i2c.c 2008-10-10 16:29:00.000000000 +0200
-@@ -54,7 +54,7 @@
- #include <linux/i2c.h>
- #include <linux/i2c-algo-bit.h>
-
--#include <asm/semaphore.h>
-+#include <linux/semaphore.h>
-
- #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) {
Modified: lirc.install
===================================================================
--- lirc.install 2009-04-06 13:12:56 UTC (rev 34072)
+++ lirc.install 2009-04-06 14:23:28 UTC (rev 34073)
@@ -10,7 +10,7 @@
post_install() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.28-ARCH
+ KERNEL_VERSION=2.6.29-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
/bin/true
}
@@ -26,7 +26,7 @@
post_upgrade() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.28-ARCH
+ KERNEL_VERSION=2.6.29-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
/bin/true
}
@@ -40,7 +40,7 @@
post_remove() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.28-ARCH
+ KERNEL_VERSION=2.6.29-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
/bin/true
}
More information about the arch-commits
mailing list