diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2010-11-01 09:11:29 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2010-11-01 09:11:29 +0000 |
| commit | 4ab2c8dcef4985525d65c317746cf734fc037f93 (patch) | |
| tree | a0051a0b6fd2dcd491eace2c4c2415015a0df195 /app-misc/lirc | |
| parent | drop ppc64 for bug 275872 (diff) | |
| download | gentoo-2-4ab2c8dcef4985525d65c317746cf734fc037f93.tar.gz gentoo-2-4ab2c8dcef4985525d65c317746cf734fc037f93.tar.bz2 gentoo-2-4ab2c8dcef4985525d65c317746cf734fc037f93.zip | |
clean up, also for bug 343199
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-misc/lirc')
| -rw-r--r-- | app-misc/lirc/ChangeLog | 14 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.3-imon-pad2keys.patch | 291 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.3-kernel-2.6.26.diff | 107 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.3-kernel-2.6.27.diff | 38 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.3-pa19.patch | 68 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.3_pre1-imon-pad2keys.patch | 257 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff | 110 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.3_pre3-imon-pad2keys.patch | 291 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.6-i2c.patch | 77 | ||||
| -rw-r--r-- | app-misc/lirc/files/lircd | 16 | ||||
| -rw-r--r-- | app-misc/lirc/files/xbox-lircd.conf | 55 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.8.3-r2.ebuild | 331 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.8.3_pre1.ebuild | 310 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.8.4.ebuild | 326 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.8.4a.ebuild | 332 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.8.6-r3.ebuild | 365 |
16 files changed, 13 insertions, 2975 deletions
diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index b2a53b97361f..5cba661aef36 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-misc/lirc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.217 2010/11/01 09:00:14 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.218 2010/11/01 09:11:28 fauli Exp $ + + 01 Nov 2010; Christian Faulhammer <fauli@gentoo.org> + -lirc-0.8.3_pre1.ebuild, -lirc-0.8.3-r2.ebuild, + -files/lirc-0.8.3-imon-pad2keys.patch, + -files/lirc-0.8.3-kernel-2.6.26.diff, + -files/lirc-0.8.3-kernel-2.6.27.diff, -files/lirc-0.8.3-pa19.patch, + -files/lirc-0.8.3_pre1-imon-pad2keys.patch, + -files/lirc-0.8.3_pre1-kernel-2.6.24.diff, + -files/lirc-0.8.3_pre3-imon-pad2keys.patch, -lirc-0.8.4.ebuild, + -lirc-0.8.4a.ebuild, -lirc-0.8.6-r3.ebuild, -files/lirc-0.8.6-i2c.patch, + -files/lircd, -files/xbox-lircd.conf: + clean up, also for bug 343199 01 Nov 2010; Christian Faulhammer <fauli@gentoo.org> lirc-0.8.3_pre1.ebuild, lirc-0.8.3-r2.ebuild, lirc-0.8.4.ebuild, diff --git a/app-misc/lirc/files/lirc-0.8.3-imon-pad2keys.patch b/app-misc/lirc/files/lirc-0.8.3-imon-pad2keys.patch deleted file mode 100644 index 578489db446f..000000000000 --- a/app-misc/lirc/files/lirc-0.8.3-imon-pad2keys.patch +++ /dev/null @@ -1,291 +0,0 @@ -diff -ruN lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c ---- lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c 2008-04-28 22:15:54.281654857 +0200 -+++ lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c 2008-04-28 22:16:51.381649620 +0200 -@@ -73,9 +73,9 @@ - - - #define MOD_AUTHOR "Venky Raju <dev@venky.ws>" --#define MOD_DESC "Driver for Soundgraph iMON MultiMedia IR/VFD" -+#define MOD_DESC "Driver for Soundgraph iMON MultiMedia IR/VFD w/imon pad2keys patch" - #define MOD_NAME "lirc_imon" --#define MOD_VERSION "0.3" -+#define MOD_VERSION "0.3p2k" - - #define VFD_MINOR_BASE 144 /* Same as LCD */ - #define DEVFS_MODE (S_IFCHR | S_IRUSR | S_IWUSR | \ -@@ -91,6 +91,7 @@ - #define TRUE 1 - #define FALSE 0 - -+#define CURSOR_LIMIT 16 - - /* ------------------------------------------------------------ - * P R O T O T Y P E S -@@ -177,6 +178,10 @@ - atomic_t busy; /* write in progress */ - int status; /* status of tx completion */ - } tx; -+ -+ int key_x; -+ int key_y; -+ int last_count; /* number of times pressed */ - }; - - #define LOCK_CONTEXT down(&context->sem) -@@ -248,6 +253,9 @@ - static int is_lcd; /* If LIRC_IMON_LCD not defined, default to non-LCD */ - #endif - -+/* pad2keys module parameter. pad2keys patch active? */ -+static int pad2keys_active = 0; -+ - #if !defined(KERNEL_2_5) - - #define MAX_DEVICES 4 /* In case there's more than one iMON device */ -@@ -271,6 +279,7 @@ - - MODULE_AUTHOR(MOD_AUTHOR); - MODULE_DESCRIPTION(MOD_DESC); -+MODULE_VERSION(MOD_VERSION); /* MBr: was missing */ - MODULE_LICENSE("GPL"); - MODULE_DEVICE_TABLE(usb, imon_usb_id_table); - -@@ -287,6 +296,9 @@ - "1=yes (default:no)"); - #endif - -+module_param (pad2keys_active, int, 0); -+MODULE_PARM_DESC (pad2keys_active, "pad2keys patch active: 0=no, 1=yes (default: no)"); -+ - static inline void delete_context(struct imon_context *context) - { - if (context->vfd_supported) -@@ -766,6 +778,11 @@ - context->rx.initial_space = 1; - context->rx.prev_bit = 0; - -+ /* init pad context for pad2keys */ -+ context ->key_x = 0; -+ context ->key_y = 0; -+ context ->last_count = 0; -+ - usb_fill_int_urb(context->rx_urb, context->dev, - usb_rcvintpipe(context->dev, - context->rx_endpoint->bEndpointAddress), -@@ -915,6 +932,94 @@ - - if (context->ir_onboard_decode) { - /* The signals have been decoded onboard the iMON controller */ -+ -+ if (pad2keys_active) -+ { -+ /* imon pad2keys patch -+ * -+ * make PAD and mouse buttons available for use with VDR, -+ * based on pad-mouse-emu patch from venky's forum -+ * -+ * last change: M.Brakemeier 2007-10-14 -+ * -+ * generated PAD key codes: -+ * Mouse_N 0x690281B7 -+ * Mouse_S 0x688291B7 -+ * Mouse_W 0x6A8281B7 -+ * Mouse_E 0x688A81B7 -+ * -+ * mouse buttons (non-synthetic): -+ * MouseRightClick 0x688481B7 -+ * MouseLeftClick 0x688301B7 -+ */ -+ if((buf[0] & 0x40) && -+ !(buf[1] & 0x01 || buf[1] >> 2 & 0x01)) -+ { -+ int rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 | (buf[1] & 0x20) >> 4 | (buf[1] & 0x40) >> 6; -+ int rel_y = (buf[2] & 0x08) | (buf[2] & 0x10) >> 2 | (buf[2] & 0x20) >> 4 | (buf[2] & 0x40) >> 6; -+ -+ if(buf[0] & 0x02) -+ rel_x |= ~0x10+1; -+ if(buf[0] & 0x01) -+ rel_y |= ~0x10+1; -+ -+ /* keyboard direction key emulation */ -+ if( context->last_count > 32 ) -+ { /* Hopefully eliminate drift*/ -+ context->last_count=0; -+ context->key_y=0; -+ context->key_x=0; -+ } -+ context->last_count++; -+ -+ /* limit decoded events */ -+ if(abs(context->key_x) > CURSOR_LIMIT || abs(context->key_y) > CURSOR_LIMIT ) -+ { -+ if(abs(context->key_y ) > abs(context->key_x)) -+ { /* mouse s/n */ -+ if(context->key_y > 0 && rel_y > 0) -+ { /* mouse s */ -+ buf[0] = 0x68; -+ buf[1] = 0x82; -+ buf[2] = 0x91; -+ } -+ else if(context->key_y < 0 && rel_y < 0) -+ { /* mouse n */ -+ buf[0] = 0x69; -+ buf[1] = 0x02; -+ buf[2] = 0x81; -+ } -+ } -+ else -+ { /* mouse e/w*/ -+ if(context->key_x > 0 && rel_x > 0 ) -+ { /* mouse e */ -+ buf[0] = 0x68; -+ buf[1] = 0x8A; -+ buf[2] = 0x81; -+ } -+ else if(context->key_x < 0 && rel_x < 0 ) -+ { /* mouse w */ -+ buf[0] = 0x6A; -+ buf[1] = 0x82; -+ buf[2] = 0x81; -+ } -+ } -+ } -+ else -+ { -+ context->key_x += rel_x; -+ context->key_y += rel_y; -+ -+ return; /* discard those key codes */ -+ } -+ } -+ /* a key was pressed, reset count */ -+ context->key_x = 0; -+ context->key_y = 0; -+ context->last_count = 0; -+ } -+ - lirc_buffer_write_1(context->plugin->rbuf, buf); - wake_up(&context->plugin->rbuf->wait_poll); - return; -diff -ruN lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c.rej lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c.rej ---- lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c.rej 1970-01-01 01:00:00.000000000 +0100 -+++ lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c.rej 2008-04-28 22:16:02.941653915 +0200 -@@ -0,0 +1,26 @@ -+*************** -+*** 271,280 **** -+ -+ MODULE_AUTHOR(MOD_AUTHOR); -+ MODULE_DESCRIPTION(MOD_DESC); -+ MODULE_LICENSE("GPL"); -+ MODULE_DEVICE_TABLE(usb, imon_usb_id_table); -+ module_param(debug, int, 0); -+ MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)"); -+ -+ static inline void delete_context(struct imon_context *context) -+ { -+--- 279,291 ---- -+ -+ MODULE_AUTHOR(MOD_AUTHOR); -+ MODULE_DESCRIPTION(MOD_DESC); -++ MODULE_VERSION(MOD_VERSION); /* MBr: was missing */ -+ MODULE_LICENSE("GPL"); -+ MODULE_DEVICE_TABLE(usb, imon_usb_id_table); -+ module_param(debug, int, 0); -+ MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)"); -++ module_param (pad2keys_active, int, 0); -++ MODULE_PARM_DESC (pad2keys_active, "pad2keys patch active: 0=no, 1=yes (default: no)"); -+ -+ static inline void delete_context(struct imon_context *context) -+ { -diff -ruN lirc-0.8.3pre3-orig/remotes/imon/lircd.conf.imon-pad2keys lirc-0.8.3pre3/remotes/imon/lircd.conf.imon-pad2keys ---- lirc-0.8.3pre3-orig/remotes/imon/lircd.conf.imon-pad2keys 1970-01-01 01:00:00.000000000 +0100 -+++ lirc-0.8.3pre3/remotes/imon/lircd.conf.imon-pad2keys 2008-04-28 22:16:02.941653915 +0200 -@@ -0,0 +1,88 @@ -+# Please make this file available to others
-+# by sending it to <lirc@bartelmus.de>
-+#
-+# this config file was generated
-+# using lirc-0.8.3pre1 (imon w/pad2keys patch)
-+#
-+# contributed by M.Brakemeier
-+#
-+# brand: SoundGraph
-+# model no. of remote control: iMON-PAD
-+# devices being controlled by this remote:
-+#
-+
-+begin remote
-+
-+ name iMON-PAD
-+ bits 32
-+ eps 30
-+ aeps 100
-+
-+ one 0 0
-+ zero 0 0
-+ gap 235965
-+ min_repeat 1
-+ toggle_bit 0
-+
-+ begin codes
-+ AppExit 0x288195B7
-+ Power 0x289115B7
-+ Record 0x298115B7
-+ Play 0x2A8115B7
-+ Open 0x29B1D5B7
-+ Rewind 0x2A8195B7
-+ Pause 0x2A9115B7
-+ FastForward 0x2B8115B7
-+ PrevChapter 0x2B9115B7
-+ Stop 0x2B9715B7
-+ NextChapter 0x298195B7
-+ Esc 0x2BB715B7
-+ Eject 0x299395B7
-+ AppLauncher 0x29B715B7
-+ MultiMon 0x2AB195B7
-+ TaskSwitcher 0x2A9395B7
-+ Mute 0x2B9595B7
-+ Vol+ 0x28A395B7
-+ Vol- 0x28A595B7
-+ Ch+ 0x289395B7
-+ Ch- 0x288795B7
-+ Timer 0x2B8395B7
-+ 1 0x28B595B7
-+ 2 0x2BB195B7
-+ 3 0x28B195B7
-+ 4 0x2A8595B7
-+ 5 0x299595B7
-+ 6 0x2AA595B7
-+ 7 0x2B9395B7
-+ 8 0x2A8515B7
-+ 9 0x2AA115B7
-+ 0 0x2BA595B7
-+ ShiftTab 0x28B515B7
-+ Tab 0x29A115B7
-+ Red 0x2B8515B7 # MyMovie
-+ Green 0x299195B7 # MyMusic
-+ Blue 0x2BA115B7 # MyPhoto
-+ Yellow 0x28A515B7 # MyTV
-+ Bookmark 0x288515B7
-+ Thumbnail 0x2AB715B7
-+ AspectRatio 0x29A595B7
-+ FullScreen 0x2AA395B7
-+ Purple 0x29A395B7 # MyDVD
-+ Menu 0x2BA395B7
-+ Caption 0x298595B7
-+ Language 0x2B8595B7
-+ MouseKeyboard 0x299115B7
-+ SelectSpace 0x2A9315B7
-+ MouseMenu 0x28B715B7
-+ MouseRightClick 0x688481B7
-+ Enter 0x28A195B7
-+ MouseLeftClick 0x688301B7
-+ WindowsKey 0x2B8195B7
-+ Backspace 0x28A115B7
-+ Mouse_N 0x690281B7
-+ Mouse_S 0x688291B7
-+ Mouse_W 0x6A8281B7
-+ Mouse_E 0x688A81B7
-+ end codes
-+
-+end remote
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 deleted file mode 100644 index 130b6cbaeb1d..000000000000 --- a/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.26.diff +++ /dev/null @@ -1,107 +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 -@@ -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 -@@ -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/files/lirc-0.8.3-kernel-2.6.27.diff b/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.27.diff deleted file mode 100644 index c9149737100c..000000000000 --- a/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.27.diff +++ /dev/null @@ -1,38 +0,0 @@ -Index: drivers/lirc_dev/lirc_dev.c -=================================================================== -RCS file: /cvsroot/lirc/lirc/drivers/lirc_dev/lirc_dev.c,v -retrieving revision 1.58 -diff -u -p -u -p -r1.58 lirc_dev.c ---- drivers/lirc_dev/lirc_dev.c 14 May 2008 16:37:49 -0000 1.58 -+++ drivers/lirc_dev/lirc_dev.c 4 Aug 2008 14:54:04 -0000 -@@ -49,7 +49,11 @@ - #include <linux/uaccess.h> - #include <linux/errno.h> - #endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) - #include <asm/semaphore.h> -+#else -+#include <linux/semaphore.h> -+#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/wrapper.h> - #endif -Index: drivers/lirc_i2c/lirc_i2c.c -=================================================================== -RCS file: /cvsroot/lirc/lirc/drivers/lirc_i2c/lirc_i2c.c,v -retrieving revision 1.46 -diff -u -p -u -p -r1.46 lirc_i2c.c ---- drivers/lirc_i2c/lirc_i2c.c 4 May 2008 13:49:53 -0000 1.46 -+++ drivers/lirc_i2c/lirc_i2c.c 4 Aug 2008 14:54:04 -0000 -@@ -54,7 +54,11 @@ - #include <linux/i2c.h> - #include <linux/i2c-algo-bit.h> - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) - #include <asm/semaphore.h> -+#else -+#include <linux/semaphore.h> -+#endif - - #include "drivers/kcompat.h" - #include "drivers/lirc_dev/lirc_dev.h" diff --git a/app-misc/lirc/files/lirc-0.8.3-pa19.patch b/app-misc/lirc/files/lirc-0.8.3-pa19.patch deleted file mode 100644 index 31cae2bb8e6c..000000000000 --- a/app-misc/lirc/files/lirc-0.8.3-pa19.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- daemons/hw_audio.c.orig 2008-06-13 22:24:40.000000000 +0200 -+++ daemons/hw_audio.c 2008-06-13 22:17:31.000000000 +0200 -@@ -66,7 +66,7 @@ - } - paTestData; - --PortAudioStream *stream; -+PaStream *stream; - - - extern struct ir_remote *repeat_remote; -@@ -90,7 +90,9 @@ - - static int recordCallback( void *inputBuffer, void *outputBuffer, - unsigned long framesPerBuffer, -- PaTimestamp outTime, void *userData ) -+ PaStreamCallbackTimeInfo outTime, -+ PaStreamCallbackFlags status, -+ void *userData ) - { - paTestData *data = (paTestData*)userData; - SAMPLE *rptr = (SAMPLE*)inputBuffer; -@@ -215,6 +217,7 @@ - int audio_init() - { - -+ PaStreamParameters inputParameters; - PaError err; - int flags; - struct termios t; -@@ -237,22 +240,27 @@ - err = Pa_Initialize(); - if( err != paNoError ) goto error; - -+ inputParameters.device = Pa_GetDefaultInputDevice(); /* default input device */ -+ if (inputParameters.device == paNoDevice) { -+ logprintf(LOG_ERR, "No default input device"); -+ goto error; -+ } -+ inputParameters.channelCount = NUM_CHANNELS; /* stereo input */ -+ inputParameters.sampleFormat = PA_SAMPLE_TYPE; -+ inputParameters.suggestedLatency = -+ Pa_GetDeviceInfo( inputParameters.device )->defaultLowInputLatency; -+ inputParameters.hostApiSpecificStreamInfo = NULL; -+ -+ - // Record some audio. -------------------------------------------- - err = Pa_OpenStream - ( - &stream, -- Pa_GetDefaultInputDeviceID(), -- NUM_CHANNELS, // stereo input -- PA_SAMPLE_TYPE, -- NULL, -- paNoDevice, -- 0, -- PA_SAMPLE_TYPE, -- NULL, -+ &inputParameters, -+ NULL, // output parameters - SAMPLE_RATE, - 512, // frames per buffer -- 0, // number of buffers, if zero then use default minimum -- 0, // flags -+ 0, // flags - recordCallback, - &data ); - diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-imon-pad2keys.patch b/app-misc/lirc/files/lirc-0.8.3_pre1-imon-pad2keys.patch deleted file mode 100644 index 59ed4c9a1ea4..000000000000 --- a/app-misc/lirc/files/lirc-0.8.3_pre1-imon-pad2keys.patch +++ /dev/null @@ -1,257 +0,0 @@ -diff -NuBbwr lirc-0.8.3pre1-orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.3pre1/drivers/lirc_imon/lirc_imon.c ---- lirc-0.8.3pre1-orig/drivers/lirc_imon/lirc_imon.c 2007-09-30 11:58:45.000000000 +0200 -+++ lirc-0.8.3pre1/drivers/lirc_imon/lirc_imon.c 2007-10-14 14:20:07.000000000 +0200 -@@ -69,9 +69,9 @@ - - - #define MOD_AUTHOR "Venky Raju <dev@venky.ws>" --#define MOD_DESC "Driver for Soundgraph iMON MultiMedia IR/VFD" -+#define MOD_DESC "Driver for Soundgraph iMON MultiMedia IR/VFD w/imon pad2keys patch" - #define MOD_NAME "lirc_imon" --#define MOD_VERSION "0.3" -+#define MOD_VERSION "0.3p2k" - - #define VFD_MINOR_BASE 144 /* Same as LCD */ - #define DEVFS_MODE (S_IFCHR | S_IRUSR | S_IWUSR | \ -@@ -87,6 +87,7 @@ - #define TRUE 1 - #define FALSE 0 - -+#define CURSOR_LIMIT 16 - - /* ------------------------------------------------------------ - * P R O T O T Y P E S -@@ -169,6 +170,10 @@ - atomic_t busy; /* write in progress */ - int status; /* status of tx completion */ - } tx; -+ -+ int key_x; -+ int key_y; -+ int last_count; /* number of times pressed */ - }; - - #define LOCK_CONTEXT down(&context->sem) -@@ -235,6 +240,9 @@ - - static int debug; - -+/* pad2keys module parameter. pad2keys patch active? */ -+static int pad2keys_active = 0; -+ - #if !defined(KERNEL_2_5) - - #define MAX_DEVICES 4 /* In case there's more than one iMON device */ -@@ -258,10 +266,13 @@ - - MODULE_AUTHOR(MOD_AUTHOR); - MODULE_DESCRIPTION(MOD_DESC); -+MODULE_VERSION(MOD_VERSION); /* MBr: was missing */ - MODULE_LICENSE("GPL"); - MODULE_DEVICE_TABLE(usb, imon_usb_id_table); - module_param(debug, int, 0); - MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)"); -+module_param (pad2keys_active, int, 0); -+MODULE_PARM_DESC (pad2keys_active, "pad2keys patch active: 0=no, 1=yes (default: no)"); - - static inline void delete_context(struct imon_context *context) - { -@@ -684,6 +695,11 @@ - context->rx.initial_space = 1; - context->rx.prev_bit = 0; - -+ /* init pad context for pad2keys */ -+ context ->key_x = 0; -+ context ->key_y = 0; -+ context ->last_count = 0; -+ - usb_fill_int_urb(context->rx_urb, context->dev, - usb_rcvintpipe(context->dev, - context->rx_endpoint->bEndpointAddress), -@@ -834,6 +850,94 @@ - - if (context->ir_onboard_decode) { - /* The signals have been decoded onboard the iMON controller */ -+ -+ if (pad2keys_active) -+ { -+ /* imon pad2keys patch -+ * -+ * make PAD and mouse buttons available for use with VDR, -+ * based on pad-mouse-emu patch from venky's forum -+ * -+ * last change: M.Brakemeier 2007-10-14 -+ * -+ * generated PAD key codes: -+ * Mouse_N 0x690281B7 -+ * Mouse_S 0x688291B7 -+ * Mouse_W 0x6A8281B7 -+ * Mouse_E 0x688A81B7 -+ * -+ * mouse buttons (non-synthetic): -+ * MouseRightClick 0x688481B7 -+ * MouseLeftClick 0x688301B7 -+ */ -+ if((buf[0] & 0x40) && -+ !(buf[1] & 0x01 || buf[1] >> 2 & 0x01)) -+ { -+ int rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 | (buf[1] & 0x20) >> 4 | (buf[1] & 0x40) >> 6; -+ int rel_y = (buf[2] & 0x08) | (buf[2] & 0x10) >> 2 | (buf[2] & 0x20) >> 4 | (buf[2] & 0x40) >> 6; -+ -+ if(buf[0] & 0x02) -+ rel_x |= ~0x10+1; -+ if(buf[0] & 0x01) -+ rel_y |= ~0x10+1; -+ -+ /* keyboard direction key emulation */ -+ if( context->last_count > 32 ) -+ { /* Hopefully eliminate drift*/ -+ context->last_count=0; -+ context->key_y=0; -+ context->key_x=0; -+ } -+ context->last_count++; -+ -+ /* limit decoded events */ -+ if(abs(context->key_x) > CURSOR_LIMIT || abs(context->key_y) > CURSOR_LIMIT ) -+ { -+ if(abs(context->key_y ) > abs(context->key_x)) -+ { /* mouse s/n */ -+ if(context->key_y > 0 && rel_y > 0) -+ { /* mouse s */ -+ buf[0] = 0x68; -+ buf[1] = 0x82; -+ buf[2] = 0x91; -+ } -+ else if(context->key_y < 0 && rel_y < 0) -+ { /* mouse n */ -+ buf[0] = 0x69; -+ buf[1] = 0x02; -+ buf[2] = 0x81; -+ } -+ } -+ else -+ { /* mouse e/w*/ -+ if(context->key_x > 0 && rel_x > 0 ) -+ { /* mouse e */ -+ buf[0] = 0x68; -+ buf[1] = 0x8A; -+ buf[2] = 0x81; -+ } -+ else if(context->key_x < 0 && rel_x < 0 ) -+ { /* mouse w */ -+ buf[0] = 0x6A; -+ buf[1] = 0x82; -+ buf[2] = 0x81; -+ } -+ } -+ } -+ else -+ { -+ context->key_x += rel_x; -+ context->key_y += rel_y; -+ -+ return; /* discard those key codes */ -+ } -+ } -+ /* a key was pressed, reset count */ -+ context->key_x = 0; -+ context->key_y = 0; -+ context->last_count = 0; -+ } -+ - lirc_buffer_write_1(context->plugin->rbuf, buf); - wake_up(&context->plugin->rbuf->wait_poll); - return; -diff -NuBbwr lirc-0.8.3pre1-orig/remotes/imon/lircd.conf.imon-pad2keys lirc-0.8.3pre1/remotes/imon/lircd.conf.imon-pad2keys ---- lirc-0.8.3pre1-orig/remotes/imon/lircd.conf.imon-pad2keys 1970-01-01 01:00:00.000000000 +0100 -+++ lirc-0.8.3pre1/remotes/imon/lircd.conf.imon-pad2keys 2007-10-14 14:13:01.000000000 +0200 -@@ -0,0 +1,88 @@ -+# Please make this file available to others
-+# by sending it to <lirc@bartelmus.de>
-+#
-+# this config file was generated
-+# using lirc-0.8.3pre1 (imon w/pad2keys patch)
-+#
-+# contributed by M.Brakemeier
-+#
-+# brand: SoundGraph
-+# model no. of remote control: iMON-PAD
-+# devices being controlled by this remote:
-+#
-+
-+begin remote
-+
-+ name iMON-PAD
-+ bits 32
-+ eps 30
-+ aeps 100
-+
-+ one 0 0
-+ zero 0 0
-+ gap 235965
-+ min_repeat 1
-+ toggle_bit 0
-+
-+ begin codes
-+ AppExit 0x288195B7
-+ Power 0x289115B7
-+ Record 0x298115B7
-+ Play 0x2A8115B7
-+ Open 0x29B1D5B7
-+ Rewind 0x2A8195B7
-+ Pause 0x2A9115B7
-+ FastForward 0x2B8115B7
-+ PrevChapter 0x2B9115B7
-+ Stop 0x2B9715B7
-+ NextChapter 0x298195B7
-+ Esc 0x2BB715B7
-+ Eject 0x299395B7
-+ AppLauncher 0x29B715B7
-+ MultiMon 0x2AB195B7
-+ TaskSwitcher 0x2A9395B7
-+ Mute 0x2B9595B7
-+ Vol+ 0x28A395B7
-+ Vol- 0x28A595B7
-+ Ch+ 0x289395B7
-+ Ch- 0x288795B7
-+ Timer 0x2B8395B7
-+ 1 0x28B595B7
-+ 2 0x2BB195B7
-+ 3 0x28B195B7
-+ 4 0x2A8595B7
-+ 5 0x299595B7
-+ 6 0x2AA595B7
-+ 7 0x2B9395B7
-+ 8 0x2A8515B7
-+ 9 0x2AA115B7
-+ 0 0x2BA595B7
-+ ShiftTab 0x28B515B7
-+ Tab 0x29A115B7
-+ Red 0x2B8515B7 # MyMovie
-+ Green 0x299195B7 # MyMusic
-+ Blue 0x2BA115B7 # MyPhoto
-+ Yellow 0x28A515B7 # MyTV
-+ Bookmark 0x288515B7
-+ Thumbnail 0x2AB715B7
-+ AspectRatio 0x29A595B7
-+ FullScreen 0x2AA395B7
-+ Purple 0x29A295B7 # MyDVD
-+ Menu 0x2BA385B7
-+ Caption 0x298595B7
-+ Language 0x2B8595B7
-+ MouseKeyboard 0x299115B7
-+ SelectSpace 0x2A9315B7
-+ MouseMenu 0x28B715B7
-+ MouseRightClick 0x688481B7
-+ Enter 0x28A195B7
-+ MouseLeftClick 0x688301B7
-+ WindowsKey 0x2B8195B7
-+ Backspace 0x28A115B7
-+ Mouse_N 0x690281B7
-+ Mouse_S 0x688291B7
-+ Mouse_W 0x6A8281B7
-+ Mouse_E 0x688A81B7
-+ end codes
-+
-+end remote
diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff b/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff deleted file mode 100644 index 7206d04823c6..000000000000 --- a/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff +++ /dev/null @@ -1,110 +0,0 @@ -#bug 200508 - ---- a/lirc-0.8.3pre1/drivers/lirc_dev/lirc_dev.c 2007-09-27 15:47:20.000000000 -0400 -+++ b/lirc-0.8.3pre1/drivers/lirc_dev/lirc_dev.c 2007-11-27 11:06:41.000000000 -0500 -@@ -41,6 +41,7 @@ - #include <linux/fs.h> - #include <linux/poll.h> - #include <linux/smp_lock.h> -+#include <linux/completion.h> - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) - #include <linux/uaccess.h> - #include <linux/errno.h> -@@ -86,8 +87,8 @@ - struct lirc_buffer *buf; - - int tpid; -- struct semaphore *t_notify; -- struct semaphore *t_notify2; -+ struct completion *t_notify; -+ struct completion *t_notify2; - int shutdown; - long jiffies_to_wait; - -@@ -193,7 +194,7 @@ - daemonize("lirc_dev"); - - if (ir->t_notify != NULL) -- up(ir->t_notify); -+ complete(ir->t_notify); - - dprintk(LOGHEAD "poll thread started\n", ir->p.name, ir->p.minor); - -@@ -218,11 +219,11 @@ - } while (!ir->shutdown); - - if (ir->t_notify2 != NULL) -- down(ir->t_notify2); -+ wait_for_completion(ir->t_notify2); - - ir->tpid = -1; - if (ir->t_notify != NULL) -- up(ir->t_notify); -+ complete(ir->t_notify); - - dprintk(LOGHEAD "poll thread ended\n", ir->p.name, ir->p.minor); - -@@ -238,7 +239,7 @@ - #ifdef LIRC_HAVE_DEVFS_24 - char name[16]; - #endif -- DECLARE_MUTEX_LOCKED(tn); -+ DECLARE_COMPLETION(tn); - - if (!p) { - printk(KERN_ERR "lirc_dev: lirc_register_plugin: " -@@ -389,7 +390,7 @@ - err = -ECHILD; - goto out_sysfs; - } -- down(&tn); -+ wait_for_completion(&tn); - ir->t_notify = NULL; - } - ir->attached = 1; -@@ -425,8 +426,8 @@ - int lirc_unregister_plugin(int minor) - { - struct irctl *ir; -- DECLARE_MUTEX_LOCKED(tn); -- DECLARE_MUTEX_LOCKED(tn2); -+ DECLARE_COMPLETION(tn); -+ DECLARE_COMPLETION(tn2); - - if (minor < 0 || minor >= MAX_IRCTL_DEVICES) { - printk(KERN_ERR "lirc_dev: lirc_unregister_plugin: " -@@ -462,8 +463,8 @@ - /* 2.2.x does not export wake_up_process() */ - wake_up_interruptible(ir->p.get_queue(ir->p.data)); - #endif -- up(&tn2); -- down(&tn); -+ complete(&tn2); -+ wait_for_completion(&tn); - ir->t_notify = NULL; - ir->t_notify2 = NULL; - } -diff -Naur lirc-0.8.3pre1.orig/drivers/lirc_serial/lirc_serial.c lirc-0.8.3pre1/drivers/lirc_serial/lirc_serial.c ---- lirc-0.8.3pre1.orig/drivers/lirc_serial/lirc_serial.c 2007-12-27 01:27:36.143803257 +0100 -+++ lirc-0.8.3pre1/drivers/lirc_serial/lirc_serial.c 2007-12-27 01:29:38.149303268 +0100 -@@ -961,7 +961,7 @@ - do_gettimeofday(&lasttv); - - result = request_irq(irq, irq_handler, -- SA_INTERRUPT | (share_irq ? SA_SHIRQ:0), -+ IRQF_DISABLED | (share_irq ? IRQF_SHARED:0), - LIRC_DRIVER_NAME, (void *)&hardware); - - switch (result) { -diff -Naur lirc-0.8.3pre1.orig/drivers/lirc_sir/lirc_sir.c lirc-0.8.3pre1/drivers/lirc_sir/lirc_sir.c ---- lirc-0.8.3pre1.orig/drivers/lirc_sir/lirc_sir.c 2007-12-28 15:11:48.142285437 +0100 -+++ lirc-0.8.3pre1/drivers/lirc_sir/lirc_sir.c 2007-12-28 15:13:05.561290741 +0100 -@@ -1025,7 +1025,7 @@ - return -EBUSY; - } - #endif -- retval = request_irq(irq, sir_interrupt, SA_INTERRUPT, -+ retval = request_irq(irq, sir_interrupt, IRQF_DISABLED, - LIRC_DRIVER_NAME, NULL); - if (retval < 0) { - # ifndef LIRC_ON_SA1100 diff --git a/app-misc/lirc/files/lirc-0.8.3_pre3-imon-pad2keys.patch b/app-misc/lirc/files/lirc-0.8.3_pre3-imon-pad2keys.patch deleted file mode 100644 index 828c4eeb8d9e..000000000000 --- a/app-misc/lirc/files/lirc-0.8.3_pre3-imon-pad2keys.patch +++ /dev/null @@ -1,291 +0,0 @@ -diff -ruN lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c ---- lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c 2008-04-28 22:15:54.281654857 +0200 -+++ lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c 2008-04-28 22:16:51.381649620 +0200 -@@ -73,9 +73,9 @@ - - - #define MOD_AUTHOR "Venky Raju <dev@venky.ws>" --#define MOD_DESC "Driver for Soundgraph iMON MultiMedia IR/VFD" -+#define MOD_DESC "Driver for Soundgraph iMON MultiMedia IR/VFD w/imon pad2keys patch" - #define MOD_NAME "lirc_imon" --#define MOD_VERSION "0.3" -+#define MOD_VERSION "0.3p2k" - - #define VFD_MINOR_BASE 144 /* Same as LCD */ - #define DEVFS_MODE (S_IFCHR | S_IRUSR | S_IWUSR | \ -@@ -91,6 +91,7 @@ - #define TRUE 1 - #define FALSE 0 - -+#define CURSOR_LIMIT 16 - - /* ------------------------------------------------------------ - * P R O T O T Y P E S -@@ -177,6 +178,10 @@ - atomic_t busy; /* write in progress */ - int status; /* status of tx completion */ - } tx; -+ -+ int key_x; -+ int key_y; -+ int last_count; /* number of times pressed */ - }; - - #define LOCK_CONTEXT down(&context->sem) -@@ -248,6 +253,9 @@ - static int is_lcd; /* If LIRC_IMON_LCD not defined, default to non-LCD */ - #endif - -+/* pad2keys module parameter. pad2keys patch active? */ -+static int pad2keys_active = 0; -+ - #if !defined(KERNEL_2_5) - - #define MAX_DEVICES 4 /* In case there's more than one iMON device */ -@@ -271,6 +279,7 @@ - - MODULE_AUTHOR(MOD_AUTHOR); - MODULE_DESCRIPTION(MOD_DESC); -+MODULE_VERSION(MOD_VERSION); /* MBr: was missing */ - MODULE_LICENSE("GPL"); - MODULE_DEVICE_TABLE(usb, imon_usb_id_table); - -@@ -287,6 +296,9 @@ - "1=yes (default:no)"); - #endif - -+module_param (pad2keys_active, int, 0); -+MODULE_PARM_DESC (pad2keys_active, "pad2keys patch active: 0=no, 1=yes (default: no)"); -+ - static inline void delete_context(struct imon_context *context) - { - if (context->vfd_supported) -@@ -766,6 +778,11 @@ - context->rx.initial_space = 1; - context->rx.prev_bit = 0; - -+ /* init pad context for pad2keys */ -+ context ->key_x = 0; -+ context ->key_y = 0; -+ context ->last_count = 0; -+ - usb_fill_int_urb(context->rx_urb, context->dev, - usb_rcvintpipe(context->dev, - context->rx_endpoint->bEndpointAddress), -@@ -915,6 +932,94 @@ - - if (context->ir_onboard_decode) { - /* The signals have been decoded onboard the iMON controller */ -+ -+ if (pad2keys_active) -+ { -+ /* imon pad2keys patch -+ * -+ * make PAD and mouse buttons available for use with VDR, -+ * based on pad-mouse-emu patch from venky's forum -+ * -+ * last change: M.Brakemeier 2007-10-14 -+ * -+ * generated PAD key codes: -+ * Mouse_N 0x690281B7 -+ * Mouse_S 0x688291B7 -+ * Mouse_W 0x6A8281B7 -+ * Mouse_E 0x688A81B7 -+ * -+ * mouse buttons (non-synthetic): -+ * MouseRightClick 0x688481B7 -+ * MouseLeftClick 0x688301B7 -+ */ -+ if((buf[0] & 0x40) && -+ !(buf[1] & 0x01 || buf[1] >> 2 & 0x01)) -+ { -+ int rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 | (buf[1] & 0x20) >> 4 | (buf[1] & 0x40) >> 6; -+ int rel_y = (buf[2] & 0x08) | (buf[2] & 0x10) >> 2 | (buf[2] & 0x20) >> 4 | (buf[2] & 0x40) >> 6; -+ -+ if(buf[0] & 0x02) -+ rel_x |= ~0x10+1; -+ if(buf[0] & 0x01) -+ rel_y |= ~0x10+1; -+ -+ /* keyboard direction key emulation */ -+ if( context->last_count > 32 ) -+ { /* Hopefully eliminate drift*/ -+ context->last_count=0; -+ context->key_y=0; -+ context->key_x=0; -+ } -+ context->last_count++; -+ -+ /* limit decoded events */ -+ if(abs(context->key_x) > CURSOR_LIMIT || abs(context->key_y) > CURSOR_LIMIT ) -+ { -+ if(abs(context->key_y ) > abs(context->key_x)) -+ { /* mouse s/n */ -+ if(context->key_y > 0 && rel_y > 0) -+ { /* mouse s */ -+ buf[0] = 0x68; -+ buf[1] = 0x82; -+ buf[2] = 0x91; -+ } -+ else if(context->key_y < 0 && rel_y < 0) -+ { /* mouse n */ -+ buf[0] = 0x69; -+ buf[1] = 0x02; -+ buf[2] = 0x81; -+ } -+ } -+ else -+ { /* mouse e/w*/ -+ if(context->key_x > 0 && rel_x > 0 ) -+ { /* mouse e */ -+ buf[0] = 0x68; -+ buf[1] = 0x8A; -+ buf[2] = 0x81; -+ } -+ else if(context->key_x < 0 && rel_x < 0 ) -+ { /* mouse w */ -+ buf[0] = 0x6A; -+ buf[1] = 0x82; -+ buf[2] = 0x81; -+ } -+ } -+ } -+ else -+ { -+ context->key_x += rel_x; -+ context->key_y += rel_y; -+ -+ return; /* discard those key codes */ -+ } -+ } -+ /* a key was pressed, reset count */ -+ context->key_x = 0; -+ context->key_y = 0; -+ context->last_count = 0; -+ } -+ - lirc_buffer_write_1(context->plugin->rbuf, buf); - wake_up(&context->plugin->rbuf->wait_poll); - return; -diff -ruN lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c.rej lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c.rej ---- lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c.rej 1970-01-01 01:00:00.000000000 +0100 -+++ lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c.rej 2008-04-28 22:16:02.941653915 +0200 -@@ -0,0 +1,26 @@ -+*************** -+*** 271,280 **** -+ -+ MODULE_AUTHOR(MOD_AUTHOR); -+ MODULE_DESCRIPTION(MOD_DESC); -+ MODULE_LICENSE("GPL"); -+ MODULE_DEVICE_TABLE(usb, imon_usb_id_table); -+ module_param(debug, int, 0); -+ MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)"); -+ -+ static inline void delete_context(struct imon_context *context) -+ { -+--- 279,291 ---- -+ -+ MODULE_AUTHOR(MOD_AUTHOR); -+ MODULE_DESCRIPTION(MOD_DESC); -++ MODULE_VERSION(MOD_VERSION); /* MBr: was missing */ -+ MODULE_LICENSE("GPL"); -+ MODULE_DEVICE_TABLE(usb, imon_usb_id_table); -+ module_param(debug, int, 0); -+ MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)"); -++ module_param (pad2keys_active, int, 0); -++ MODULE_PARM_DESC (pad2keys_active, "pad2keys patch active: 0=no, 1=yes (default: no)"); -+ -+ static inline void delete_context(struct imon_context *context) -+ { -diff -ruN lirc-0.8.3pre3-orig/remotes/imon/lircd.conf.imon-pad2keys lirc-0.8.3pre3/remotes/imon/lircd.conf.imon-pad2keys ---- lirc-0.8.3pre3-orig/remotes/imon/lircd.conf.imon-pad2keys 1970-01-01 01:00:00.000000000 +0100 -+++ lirc-0.8.3pre3/remotes/imon/lircd.conf.imon-pad2keys 2008-04-28 22:16:02.941653915 +0200 -@@ -0,0 +1,88 @@ -+# Please make this file available to others
-+# by sending it to <lirc@bartelmus.de>
-+#
-+# this config file was generated
-+# using lirc-0.8.3pre1 (imon w/pad2keys patch)
-+#
-+# contributed by M.Brakemeier
-+#
-+# brand: SoundGraph
-+# model no. of remote control: iMON-PAD
-+# devices being controlled by this remote:
-+#
-+
-+begin remote
-+
-+ name iMON-PAD
-+ bits 32
-+ eps 30
-+ aeps 100
-+
-+ one 0 0
-+ zero 0 0
-+ gap 235965
-+ min_repeat 1
-+ toggle_bit 0
-+
-+ begin codes
-+ AppExit 0x288195B7
-+ Power 0x289115B7
-+ Record 0x298115B7
-+ Play 0x2A8115B7
-+ Open 0x29B1D5B7
-+ Rewind 0x2A8195B7
-+ Pause 0x2A9115B7
-+ FastForward 0x2B8115B7
-+ PrevChapter 0x2B9115B7
-+ Stop 0x2B9715B7
-+ NextChapter 0x298195B7
-+ Esc 0x2BB715B7
-+ Eject 0x299395B7
-+ AppLauncher 0x29B715B7
-+ MultiMon 0x2AB195B7
-+ TaskSwitcher 0x2A9395B7
-+ Mute 0x2B9595B7
-+ Vol+ 0x28A395B7
-+ Vol- 0x28A595B7
-+ Ch+ 0x289395B7
-+ Ch- 0x288795B7
-+ Timer 0x2B8395B7
-+ 1 0x28B595B7
-+ 2 0x2BB195B7
-+ 3 0x28B195B7
-+ 4 0x2A8595B7
-+ 5 0x299595B7
-+ 6 0x2AA595B7
-+ 7 0x2B9395B7
-+ 8 0x2A8515B7
-+ 9 0x2AA115B7
-+ 0 0x2BA595B7
-+ ShiftTab 0x28B515B7
-+ Tab 0x29A115B7
-+ Red 0x2B8515B7 # MyMovie
-+ Green 0x299195B7 # MyMusic
-+ Blue 0x2BA115B7 # MyPhoto
-+ Yellow 0x28A515B7 # MyTV
-+ Bookmark 0x288515B7
-+ Thumbnail 0x2AB715B7
-+ AspectRatio 0x29A595B7
-+ FullScreen 0x2AA395B7
-+ Purple 0x29A295B7 # MyDVD
-+ Menu 0x2BA385B7
-+ Caption 0x298595B7
-+ Language 0x2B8595B7
-+ MouseKeyboard 0x299115B7
-+ SelectSpace 0x2A9315B7
-+ MouseMenu 0x28B715B7
-+ MouseRightClick 0x688481B7
-+ Enter 0x28A195B7
-+ MouseLeftClick 0x688301B7
-+ WindowsKey 0x2B8195B7
-+ Backspace 0x28A115B7
-+ Mouse_N 0x690281B7
-+ Mouse_S 0x688291B7
-+ Mouse_W 0x6A8281B7
-+ Mouse_E 0x688A81B7
-+ end codes
-+
-+end remote
diff --git a/app-misc/lirc/files/lirc-0.8.6-i2c.patch b/app-misc/lirc/files/lirc-0.8.6-i2c.patch deleted file mode 100644 index 933fabcc8474..000000000000 --- a/app-misc/lirc/files/lirc-0.8.6-i2c.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- drivers/lirc_i2c/lirc_i2c.c 2009/08/30 16:59:53 1.70 -+++ drivers/lirc_i2c/lirc_i2c.c 2009/12/28 15:29:03 1.72 -@@ -1,4 +1,4 @@ --/* $Id: lirc-0.8.6-i2c.patch,v 1.1 2010/05/21 02:32:36 beandog Exp $ */ -+/* $Id: lirc-0.8.6-i2c.patch,v 1.1 2010/05/21 02:32:36 beandog Exp $ */ - - /* - * lirc_i2c.c -@@ -399,8 +399,8 @@ - .name = "i2c ir driver", - }, - #endif -- .id = I2C_DRIVERID_EXP3, /* FIXME */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) -+ .id = I2C_DRIVERID_EXP3, /* FIXME */ - .attach_adapter = ir_probe, - .detach_client = ir_remove, - #else -@@ -492,20 +492,23 @@ - ir->l.add_to_buf = add_to_buf_pv951; - break; - case 0x71: --#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)) { -+ -+ -+ -+#ifdef I2C_HW_B_CX2388x -+ /* Leadtek Winfast PVR2000 or Hauppauge HVR-1300 */ -+ if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2388x)) -+ strlcpy(ir->c.name, "Hauppauge HVR1300", I2C_NAME_SIZE); -+ else - #endif -+ { - /* - * The PVR150 IR receiver uses the same protocol as - * other Hauppauge cards, but the data flow is - * different, so we need to deal with it by its own. - */ - strlcpy(ir->c.name, "Hauppauge PVR150", I2C_NAME_SIZE); -- } else /* I2C_HW_B_CX2388x */ -- strlcpy(ir->c.name, "Hauppauge HVR1300", I2C_NAME_SIZE); -+ } - ir->l.code_length = 13; - ir->l.add_to_buf = add_to_buf_haup_pvr150; - break; -@@ -516,19 +519,18 @@ - break; - case 0x18: - case 0x1a: --#ifdef I2C_HW_B_CX2341X -- if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) || -- adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X)) { -+#ifdef I2C_HW_B_CX2388x -+ if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2388x)) { -+ strlcpy(ir->c.name, "Leadtek IR", I2C_NAME_SIZE); -+ ir->l.code_length = 8; -+ ir->l.add_to_buf = add_to_buf_pvr2000; -+ } else { - #else -- if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) { -+ { - #endif - strlcpy(ir->c.name, "Hauppauge IR", I2C_NAME_SIZE); - ir->l.code_length = 13; - ir->l.add_to_buf = add_to_buf_haup; -- } else { /* I2C_HW_B_CX2388x */ -- strlcpy(ir->c.name, "Leadtek IR", I2C_NAME_SIZE); -- ir->l.code_length = 8; -- ir->l.add_to_buf = add_to_buf_pvr2000; - } - break; - case 0x30: - diff --git a/app-misc/lirc/files/lircd b/app-misc/lirc/files/lircd deleted file mode 100644 index 370b61abdfaf..000000000000 --- a/app-misc/lirc/files/lircd +++ /dev/null @@ -1,16 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/files/lircd,v 1.6 2004/09/26 21:27:07 lanius Exp $ - -start() { - ebegin "Starting lircd" - start-stop-daemon --start --quiet --exec /usr/sbin/lircd -- ${LIRCD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping lircd" - start-stop-daemon --stop --quiet --exec /usr/sbin/lircd - eend $? -} diff --git a/app-misc/lirc/files/xbox-lircd.conf b/app-misc/lirc/files/xbox-lircd.conf deleted file mode 100644 index d16e9931034e..000000000000 --- a/app-misc/lirc/files/xbox-lircd.conf +++ /dev/null @@ -1,55 +0,0 @@ -# -# LIRCD configuration file for Xbox DVD Kit -# -# Marko Friedemann <mfr@bmx-chemnitz.de> -# -# -# brand: Microsoft -# model: Xbox DVD Remote -# supported devices: Xbox DVD Remote via xpad-ir driver -# -# comment: EXPERIMENTAL -# - -begin remote - - name XboxDVDDongle - bits 8 - - begin codes - - SELECT 0x0b - UP 0xa6 - DOWN 0xa7 - RIGHT 0xa8 - LEFT 0xa9 - INFO 0xc3 - - 9 0xc6 - 8 0xc7 - 7 0xc8 - 6 0xc9 - 5 0xca - 4 0xcb - 3 0xcc - 2 0xcd - 1 0xce - 0 0xcf - - DISPLAY 0xd5 - BACK 0xd8 - SKIP+ 0xdd - SKIP- 0xdf - STOP 0xe0 - REVERSE 0xe2 - FORWARD 0xe3 - TITLE 0xe5 - PAUSE 0xe6 - PLAY 0xea - MENU 0xf7 - - end codes - -end remote - - diff --git a/app-misc/lirc/lirc-0.8.3-r2.ebuild b/app-misc/lirc/lirc-0.8.3-r2.ebuild deleted file mode 100644 index 8f560438fd52..000000000000 --- a/app-misc/lirc/lirc-0.8.3-r2.ebuild +++ /dev/null @@ -1,331 +0,0 @@ -# Copyright 1999-2010 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.10 2010/11/01 09:00:14 fauli Exp $ - -inherit eutils linux-mod flag-o-matic autotools - -DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" -HOMEPAGE="http://www.lirc.org/" - -MY_P=${PN}-${PV/_/} - -if [[ "${PV/_pre/}" = "${PV}" ]]; then - SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" -else - SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug doc X hardware-carrier transmitter" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - X? ( - x11-libs/libX11 - x11-libs/libSM - x11-libs/libICE - ) - lirc_devices_alsa_usb? ( media-libs/alsa-lib ) - lirc_devices_audio? ( media-libs/portaudio ) - lirc_devices_irman? ( media-libs/libirman )" - -# This are drivers with names matching the -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_DIRECT=" - all userspace accent act200l act220l - adaptec alsa_usb animax asusdh atilibusb - atiusb audio audio_alsa avermedia avermedia_vdomate - avermedia98 bestbuy bestbuy2 breakoutbox - bte bw6130 caraca chronos cmdir - cph06x creative creative_infracd - devinput digimatrix dsp dvico ea65 - exaudio flyvideo gvbctv5pci hauppauge - hauppauge_dvb hercules_smarttv_stereo - igorplugusb imon imon_knob imon_lcd imon_pad imon_rsc - irdeo irdeo_remote irman irreal it87 - knc_one kworld leadtek_0007 leadtek_0010 - leadtek_pvr2000 livedrive_midi - livedrive_seq logitech macmini 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 sb0540 serial - silitek sir slinke streamzap tekram - tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2 - uirt2_raw usb_uirt_raw usbx" - -# drivers that need special handling and -# must have another name specified for -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_SPECIAL=" - imon_pad2keys serial_igor_cesko - remote_wonder_plus xboxusb usbirboy inputlirc" - -IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}" - -#device-driver which use libusb -LIBUSB_USED_BY_DEV=" - all atilibusb sasem igorplugusb imon imon_lcd 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" - -# adding only run-time depends -RDEPEND="${RDEPEND} - lirc_devices_usbirboy? ( app-misc/usbirboy ) - lirc_devices_inputlirc? ( app-misc/inputlircd )" - -# add all devices to IUSE -for dev in ${IUSE_LIRC_DEVICES}; do - IUSE="${IUSE} lirc_devices_${dev}" -done - -add_device() { - : ${lirc_device_count:=0} - ((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 - ewarn "If this is not intended, then abort emerge now with Ctrl-C," - ewarn "Set LIRC_DEVICES and restart emerge." - ewarn - epause - fi - - local dev="${1}" - local desc="device ${dev}" - if [[ -n "${2}" ]]; then - desc="${2}" - fi - - elog "Compiling support for ${desc}" - MY_OPTS="${MY_OPTS} --with-driver=${dev}" -} - -pkg_setup() { - - ewarn "If your LIRC device requires modules, you'll need MODULE_UNLOAD" - ewarn "support in your kernel." - - linux-mod_pkg_setup - - # set default configure options - MY_OPTS="" - LIRC_DRIVER_DEVICE="/dev/lirc0" - - 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 - local dev - for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do - if use lirc_devices_${dev}; then - add_device ${dev} - fi - done - - if use lirc_devices_remote_wonder_plus; then - add_device atiusb "device Remote Wonder Plus (atiusb-based)" - fi - - 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)" - ewarn "You need to set the option pad2keys_active=1" - ewarn "when loading the module lirc_imon" - 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 - elog - elog "Compiling only the lirc-applications, but no drivers." - elog "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 x) - ${MY_OPTS}" - - einfo - einfo "lirc-configure-opts: ${MY_OPTS}" - elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" - - filter-flags -Wl,-O1 - - # force non-parallel make, Bug 196134 - MAKEOPTS="${MAKEOPTS} -j1" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Rip out dos CRLF - edos2unix contrib/lirc.rules - - epatch "${FILESDIR}/${P}-kernel-2.6.26.diff" - epatch "${FILESDIR}/${P}-kernel-2.6.27.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 - - # remove parallel driver on SMP systems - if linux_chkconfig_present SMP ; then - sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am - fi - - # Bug #187418 - if kernel_is ge 2 6 22 ; then - ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+" - sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am - fi - - # respect CFLAGS - sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac - - # setting default device-node - 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 - epatch "${FILESDIR}"/${P}-pa19.patch - fi - - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}"/lircd-0.8.3 lircd - newinitd "${FILESDIR}"/lircmd lircmd - newconfd "${FILESDIR}"/lircd.conf.2 lircd - - insinto /etc/modprobe.d/ - newins "${FILESDIR}"/modprobed.lirc lirc - - newinitd "${FILESDIR}"/irexec-initd irexec - newconfd "${FILESDIR}"/irexec-confd irexec - - if use doc ; then - dohtml doc/html/*.html - insinto /usr/share/doc/${PF}/images - doins doc/images/* - fi - - insinto /usr/share/lirc/remotes - doins -r remotes/* -} - -pkg_preinst() { - linux-mod_pkg_preinst - - # stop portage from deleting this file - if [[ -f ${ROOT}/etc/lircd.conf && ! -f ${D}/etc/lircd.conf ]]; then - cp "${ROOT}"/etc/lircd.conf "${D}"/etc/lircd.conf - fi -} - -pkg_postinst() { - linux-mod_pkg_postinst - echo - elog "The lirc Linux Infrared Remote Control Package has been" - elog "merged, please read the documentation at http://www.lirc.org" - echo - - if kernel_is ge 2 6 22 ; then - # Bug #187418 - ewarn - ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+" - ewarn "You need to switch over to /dev/input/event? if you need gpio" - ewarn "This device can than then be used via lirc's dev/input driver." - ewarn - fi - - elog - elog "lirc now uses normal config-protection for lircd.conf." - elog "If you need any other lircd.conf you may have a look at" - elog "the directory /usr/share/lirc/remotes" -} diff --git a/app-misc/lirc/lirc-0.8.3_pre1.ebuild b/app-misc/lirc/lirc-0.8.3_pre1.ebuild deleted file mode 100644 index 383f2b3d88f1..000000000000 --- a/app-misc/lirc/lirc-0.8.3_pre1.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 1999-2010 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_pre1.ebuild,v 1.16 2010/11/01 09:00:14 fauli Exp $ - -inherit eutils linux-mod flag-o-matic autotools - -DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" -HOMEPAGE="http://www.lirc.org/" - -MY_P=${PN}-${PV/_/} - -if [[ "${PV/_pre/}" = "${PV}" ]]; then - SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" -else - SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug doc X hardware-carrier transmitter" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - X? ( - x11-libs/libX11 - x11-libs/libSM - x11-libs/libICE - ) - lirc_devices_alsa_usb? ( media-libs/alsa-lib ) - lirc_devices_audio? ( media-libs/portaudio ) - lirc_devices_irman? ( media-libs/libirman )" - -# This are drivers with names matching the -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_DIRECT=" - all userspace accent act200l act220l - adaptec alsa_usb animax asusdh atilibusb - atiusb audio audio_alsa avermedia avermedia_vdomate - avermedia98 bestbuy bestbuy2 breakoutbox - bte bw6130 caraca chronos cmdir - 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 macmini 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 sb0540 serial - silitek sir slinke streamzap tekram - tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2 - uirt2_raw usb_uirt_raw usbx" - -# drivers that need special handling and -# must have another name specified for -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_SPECIAL=" - imon_pad2keys serial_igor_cesko - remote_wonder_plus xboxusb usbirboy inputlirc" - -IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}" - -#device-driver which use libusb -LIBUSB_USED_BY_DEV=" - all atilibusb 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" - -# adding only run-time depends -RDEPEND="${RDEPEND} - lirc_devices_usbirboy? ( app-misc/usbirboy ) - lirc_devices_inputlirc? ( app-misc/inputlircd )" - -# add all devices to IUSE -for dev in ${IUSE_LIRC_DEVICES}; do - IUSE="${IUSE} lirc_devices_${dev}" -done - -add_device() { - : ${lirc_device_count:=0} - ((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 - ewarn "If this is not intended, then abort emerge now with Ctrl-C," - ewarn "Set LIRC_DEVICES and restart emerge." - ewarn - epause - fi - - local dev="${1}" - local desc="device ${dev}" - if [[ -n "${2}" ]]; then - desc="${2}" - fi - - elog "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_DEVICE="/dev/lirc0" - - 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 - local dev - for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do - if use lirc_devices_${dev}; then - add_device ${dev} - fi - done - - if use lirc_devices_remote_wonder_plus; then - add_device atiusb "device Remote Wonder Plus (atiusb-based)" - fi - - 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)" - ewarn "You need to set the option pad2keys_active=1" - ewarn "when loading the module lirc_imon" - 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 - elog - elog "Compiling only the lirc-applications, but no drivers." - elog "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 x) - ${MY_OPTS}" - - einfo - einfo "lirc-configure-opts: ${MY_OPTS}" - elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" - - filter-flags -Wl,-O1 - - # force non-parallel make, Bug 196134 - MAKEOPTS="${MAKEOPTS} -j1" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Rip out dos CRLF - edos2unix contrib/lirc.rules - - # 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 - - # remove parallel driver on SMP systems - if linux_chkconfig_present SMP ; then - sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am - fi - - # Bug #187418 - if kernel_is ge 2 6 22 ; then - ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+" - sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am - fi - - # Bug #200508 - if kernel_is ge 2 6 24 ; then - epatch "${FILESDIR}"/${P}-kernel-2.6.24.diff - fi - - # respect CFLAGS - 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 - echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h - - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}"/lircd lircd - newinitd "${FILESDIR}"/lircmd lircmd - newconfd "${FILESDIR}"/lircd.conf.2 lircd - - insinto /etc/modules.d/ - newins "${FILESDIR}"/modulesd.lirc lirc - - newinitd "${FILESDIR}"/irexec-initd irexec - newconfd "${FILESDIR}"/irexec-confd irexec - - 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 "${D}"/etc/ -} - -pkg_postinst() { - linux-mod_pkg_postinst - echo - elog "The lirc Linux Infrared Remote Control Package has been" - elog "merged, please read the documentation at http://www.lirc.org" - echo - - if kernel_is ge 2 6 22 ; then - # Bug #187418 - ewarn - ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+" - ewarn "You need to switch over to /dev/input/event? if you need gpio" - ewarn "This device can than then be used via lirc's dev/input driver." - ewarn - fi -} diff --git a/app-misc/lirc/lirc-0.8.4.ebuild b/app-misc/lirc/lirc-0.8.4.ebuild deleted file mode 100644 index f079194c1682..000000000000 --- a/app-misc/lirc/lirc-0.8.4.ebuild +++ /dev/null @@ -1,326 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.4.ebuild,v 1.8 2010/11/01 09:00:14 fauli Exp $ - -inherit eutils linux-mod flag-o-matic autotools - -DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" -HOMEPAGE="http://www.lirc.org/" - -MY_P=${PN}-${PV/_/} - -if [[ "${PV/_pre/}" = "${PV}" ]]; then - SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" -else - SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug doc X hardware-carrier transmitter" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - X? ( - x11-libs/libX11 - x11-libs/libSM - x11-libs/libICE - ) - lirc_devices_alsa_usb? ( media-libs/alsa-lib ) - lirc_devices_audio? ( media-libs/portaudio ) - lirc_devices_irman? ( media-libs/libirman )" - -# This are drivers with names matching the -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_DIRECT=" - all userspace accent act200l act220l - adaptec alsa_usb animax asusdh atilibusb - atiusb audio audio_alsa avermedia avermedia_vdomate - avermedia98 bestbuy bestbuy2 breakoutbox - bte bw6130 caraca chronos cmdir - cph06x creative creative_infracd - devinput digimatrix dsp dvico ea65 - exaudio flyvideo gvbctv5pci hauppauge - hauppauge_dvb hercules_smarttv_stereo - igorplugusb imon imon_knob imon_lcd imon_pad imon_rsc - irdeo irdeo_remote irman irreal it87 - knc_one kworld leadtek_0007 leadtek_0010 - leadtek_pvr2000 livedrive_midi - livedrive_seq logitech macmini 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 sb0540 serial - silitek sir slinke streamzap tekram - tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2 - uirt2_raw usb_uirt_raw usbx - irlink commandir ite8709 samsung" - -# drivers that need special handling and -# must have another name specified for -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_SPECIAL=" - imon_pad2keys serial_igor_cesko - remote_wonder_plus xboxusb usbirboy inputlirc" - -IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}" - -#device-driver which use libusb -LIBUSB_USED_BY_DEV=" - all atilibusb sasem igorplugusb imon imon_lcd imon_pad imon_pad2keys - imon_rsc streamzap mceusb mceusb2 xboxusb irlink commandir" - -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" - -# adding only run-time depends -RDEPEND="${RDEPEND} - lirc_devices_usbirboy? ( app-misc/usbirboy ) - lirc_devices_inputlirc? ( app-misc/inputlircd )" - -# add all devices to IUSE -for dev in ${IUSE_LIRC_DEVICES}; do - IUSE="${IUSE} lirc_devices_${dev}" -done - -add_device() { - : ${lirc_device_count:=0} - ((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 - ewarn "If this is not intended, then abort emerge now with Ctrl-C," - ewarn "Set LIRC_DEVICES and restart emerge." - ewarn - epause - fi - - local dev="${1}" - local desc="device ${dev}" - if [[ -n "${2}" ]]; then - desc="${2}" - fi - - elog "Compiling support for ${desc}" - MY_OPTS="${MY_OPTS} --with-driver=${dev}" -} - -pkg_setup() { - - ewarn "If your LIRC device requires modules, you'll need MODULE_UNLOAD" - ewarn "support in your kernel." - - linux-mod_pkg_setup - - # set default configure options - MY_OPTS="" - LIRC_DRIVER_DEVICE="/dev/lirc0" - - 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 - local dev - for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do - if use lirc_devices_${dev}; then - add_device ${dev} - fi - done - - if use lirc_devices_remote_wonder_plus; then - add_device atiusb "device Remote Wonder Plus (atiusb-based)" - fi - - 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)" - ewarn "You need to set the option pad2keys_active=1" - ewarn "when loading the module lirc_imon" - 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 - elog - elog "Compiling only the lirc-applications, but no drivers." - elog "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 x) - ${MY_OPTS}" - - einfo - einfo "lirc-configure-opts: ${MY_OPTS}" - elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" - - filter-flags -Wl,-O1 - - # force non-parallel make, Bug 196134 - MAKEOPTS="${MAKEOPTS} -j1" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Rip out dos CRLF - edos2unix contrib/lirc.rules - - # Apply patches needed for some special device-types - epatch "${FILESDIR}"/${PN}-0.8.3-imon-pad2keys.patch - use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch - use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch - - # remove parallel driver on SMP systems - if linux_chkconfig_present SMP ; then - sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am - fi - - # Bug #187418 - if kernel_is ge 2 6 22 ; then - ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+" - sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am - fi - - # respect CFLAGS - sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac - - # setting default device-node - 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 - - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}"/lircd-0.8.3 lircd - newinitd "${FILESDIR}"/lircmd lircmd - newconfd "${FILESDIR}"/lircd.conf.2 lircd - - insinto /etc/modprobe.d/ - newins "${FILESDIR}"/modprobed.lirc lirc - - newinitd "${FILESDIR}"/irexec-initd irexec - newconfd "${FILESDIR}"/irexec-confd irexec - - if use doc ; then - dohtml doc/html/*.html - insinto /usr/share/doc/${PF}/images - doins doc/images/* - fi - - insinto /usr/share/lirc/remotes - doins -r remotes/* -} - -pkg_preinst() { - linux-mod_pkg_preinst - - # stop portage from deleting this file - if [[ -f ${ROOT}/etc/lircd.conf && ! -f ${D}/etc/lircd.conf ]]; then - cp "${ROOT}"/etc/lircd.conf "${D}"/etc/lircd.conf - fi -} - -pkg_postinst() { - linux-mod_pkg_postinst - echo - elog "The lirc Linux Infrared Remote Control Package has been" - elog "merged, please read the documentation at http://www.lirc.org" - echo - - if kernel_is ge 2 6 22 ; then - # Bug #187418 - ewarn - ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+" - ewarn "You need to switch over to /dev/input/event? if you need gpio" - ewarn "This device can than then be used via lirc's dev/input driver." - ewarn - fi - - elog - elog "lirc now uses normal config-protection for lircd.conf." - elog "If you need any other lircd.conf you may have a look at" - elog "the directory /usr/share/lirc/remotes" -} diff --git a/app-misc/lirc/lirc-0.8.4a.ebuild b/app-misc/lirc/lirc-0.8.4a.ebuild deleted file mode 100644 index a149d2d0cde5..000000000000 --- a/app-misc/lirc/lirc-0.8.4a.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.4a.ebuild,v 1.7 2010/11/01 09:00:14 fauli Exp $ - -inherit eutils linux-mod flag-o-matic autotools - -DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" -HOMEPAGE="http://www.lirc.org/" - -MY_P=${PN}-${PV/_/} - -if [[ "${PV/_pre/}" = "${PV}" ]]; then - SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" -else - SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc X hardware-carrier transmitter" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - X? ( - x11-libs/libX11 - x11-libs/libSM - x11-libs/libICE - ) - lirc_devices_alsa_usb? ( media-libs/alsa-lib ) - lirc_devices_audio? ( >media-libs/portaudio-18 ) - lirc_devices_irman? ( media-libs/libirman )" - -# This are drivers with names matching the -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_DIRECT=" - all userspace accent act200l act220l - adaptec alsa_usb animax asusdh atilibusb - atiusb audio audio_alsa avermedia avermedia_vdomate - avermedia98 bestbuy bestbuy2 breakoutbox - bte bw6130 caraca chronos cmdir - cph06x creative creative_infracd - devinput digimatrix dsp dvico ea65 - exaudio flyvideo gvbctv5pci hauppauge - hauppauge_dvb hercules_smarttv_stereo - igorplugusb imon imon_knob imon_lcd imon_pad imon_rsc - irdeo irdeo_remote irman irreal it87 - knc_one kworld leadtek_0007 leadtek_0010 - leadtek_pvr2000 livedrive_midi - livedrive_seq logitech macmini 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 sb0540 serial - silitek sir slinke streamzap tekram - tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2 - uirt2_raw usb_uirt_raw usbx - irlink commandir ite8709 samsung" - -# drivers that need special handling and -# must have another name specified for -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_SPECIAL=" - imon_pad2keys serial_igor_cesko - remote_wonder_plus xboxusb usbirboy inputlirc" - -IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}" - -#device-driver which use libusb -LIBUSB_USED_BY_DEV=" - all atilibusb sasem igorplugusb imon imon_lcd imon_pad imon_pad2keys - imon_rsc streamzap mceusb mceusb2 xboxusb irlink commandir" - -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" - -# adding only run-time depends -RDEPEND="${RDEPEND} - lirc_devices_usbirboy? ( app-misc/usbirboy ) - lirc_devices_inputlirc? ( app-misc/inputlircd )" - -# add all devices to IUSE -for dev in ${IUSE_LIRC_DEVICES}; do - IUSE="${IUSE} lirc_devices_${dev}" -done - -add_device() { - : ${lirc_device_count:=0} - ((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 - ewarn "If this is not intended, then abort emerge now with Ctrl-C," - ewarn "Set LIRC_DEVICES and restart emerge." - ewarn - epause - fi - - local dev="${1}" - local desc="device ${dev}" - if [[ -n "${2}" ]]; then - desc="${2}" - fi - - elog "Compiling support for ${desc}" - MY_OPTS="${MY_OPTS} --with-driver=${dev}" -} - -pkg_setup() { - - ewarn "If your LIRC device requires modules, you'll need MODULE_UNLOAD" - ewarn "support in your kernel." - - linux-mod_pkg_setup - - # set default configure options - MY_OPTS="" - LIRC_DRIVER_DEVICE="/dev/lirc0" - - 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 - local dev - for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do - if use lirc_devices_${dev}; then - add_device ${dev} - fi - done - - if use lirc_devices_remote_wonder_plus; then - add_device atiusb "device Remote Wonder Plus (atiusb-based)" - fi - - 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)" - ewarn "You need to set the option pad2keys_active=1" - ewarn "when loading the module lirc_imon" - 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 - elog - elog "Compiling only the lirc-applications, but no drivers." - elog "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 x) - ${MY_OPTS}" - - einfo - einfo "lirc-configure-opts: ${MY_OPTS}" - elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" - - filter-flags -Wl,-O1 - - # force non-parallel make, Bug 196134 - MAKEOPTS="${MAKEOPTS} -j1" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Rip out dos CRLF - edos2unix contrib/lirc.rules - - # Apply patches needed for some special device-types - epatch "${FILESDIR}"/${PN}-0.8.3-imon-pad2keys.patch - use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch - use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch - - # remove parallel driver on SMP systems - if linux_chkconfig_present SMP ; then - sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am - fi - - # Bug #187418 - if kernel_is ge 2 6 22 ; then - ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+" - sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am - fi - - # respect CFLAGS - sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac - - # setting default device-node - 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 - - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}"/lircd-0.8.3 lircd - newinitd "${FILESDIR}"/lircmd lircmd - newconfd "${FILESDIR}"/lircd.conf.2 lircd - - insinto /etc/modprobe.d/ - newins "${FILESDIR}"/modprobed.lirc lirc.conf - - newinitd "${FILESDIR}"/irexec-initd irexec - newconfd "${FILESDIR}"/irexec-confd irexec - - if use doc ; then - dohtml doc/html/*.html - insinto /usr/share/doc/${PF}/images - doins doc/images/* - fi - - insinto /usr/share/lirc/remotes - doins -r remotes/* -} - -pkg_preinst() { - linux-mod_pkg_preinst - - local dir="${ROOT}/etc/modprobe.d" - if [[ -a ${dir}/lirc && ! -a ${dir}/lirc.conf ]]; then - elog "Renaming ${dir}/lirc to lirc.conf" - mv -f "${dir}/lirc" "${dir}/lirc.conf" - fi - - # stop portage from deleting this file - if [[ -f ${ROOT}/etc/lircd.conf && ! -f ${D}/etc/lircd.conf ]]; then - cp "${ROOT}"/etc/lircd.conf "${D}"/etc/lircd.conf - fi -} - -pkg_postinst() { - linux-mod_pkg_postinst - echo - elog "The lirc Linux Infrared Remote Control Package has been" - elog "merged, please read the documentation at http://www.lirc.org" - echo - - if kernel_is ge 2 6 22 ; then - # Bug #187418 - ewarn - ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+" - ewarn "You need to switch over to /dev/input/event? if you need gpio" - ewarn "This device can than then be used via lirc's dev/input driver." - ewarn - fi - - elog - elog "lirc now uses normal config-protection for lircd.conf." - elog "If you need any other lircd.conf you may have a look at" - elog "the directory /usr/share/lirc/remotes" -} diff --git a/app-misc/lirc/lirc-0.8.6-r3.ebuild b/app-misc/lirc/lirc-0.8.6-r3.ebuild deleted file mode 100644 index 984b40b050e7..000000000000 --- a/app-misc/lirc/lirc-0.8.6-r3.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.6-r3.ebuild,v 1.2 2010/11/01 09:00:14 fauli Exp $ - -inherit eutils linux-mod flag-o-matic autotools - -DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" -HOMEPAGE="http://www.lirc.org/" - -MY_P=${PN}-${PV/_/} - -if [[ "${PV/_pre/}" = "${PV}" ]]; then - SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" -else - SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc X hardware-carrier transmitter" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - X? ( - x11-libs/libX11 - x11-libs/libSM - x11-libs/libICE - ) - lirc_devices_alsa_usb? ( media-libs/alsa-lib ) - lirc_devices_audio? ( >media-libs/portaudio-18 ) - lirc_devices_irman? ( media-libs/libirman )" - -# This are drivers with names matching the -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_DIRECT=" - all userspace accent act200l act220l - adaptec alsa_usb animax asusdh atilibusb - atiusb audio audio_alsa avermedia avermedia_vdomate - avermedia98 awlibusb bestbuy bestbuy2 breakoutbox - bte bw6130 caraca chronos commandir - cph06x creative creative_infracd - devinput digimatrix dsp dvico ea65 ene0100 - exaudio flyvideo ftdi gvbctv5pci hauppauge - hauppauge_dvb hercules_smarttv_stereo i2cuser - igorplugusb iguanaIR imon imon_24g imon_knob - imon_lcd imon_pad imon_rsc irdeo irdeo_remote - irlink irman irreal it87 ite8709 - knc_one kworld leadtek_0007 leadtek_0010 - leadtek_pvr2000 livedrive_midi - livedrive_seq logitech macmini mceusb - mediafocusI mouseremote - mouseremote_ps2 mp3anywhere mplay nslu2 - packard_bell parallel pcmak pcmak_usb - pctv pixelview_bt878 pixelview_pak - pixelview_pro provideo realmagic - remotemaster sa1100 samsung sasem sb0540 serial - silitek sir slinke streamzap tekram - tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2 - uirt2_raw usb_uirt_raw usbx wpc8769l" - -# drivers that need special handling and -# must have another name specified for -# parameter --with-driver=NAME -IUSE_LIRC_DEVICES_SPECIAL=" - serial_igor_cesko - remote_wonder_plus xboxusb usbirboy inputlirc" - -IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}" - -#device-driver which use libusb -LIBUSB_USED_BY_DEV=" - all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad - imon_rsc streamzap mceusb xboxusb irlink commandir" - -for dev in ${LIBUSB_USED_BY_DEV}; do - DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-libs/libusb )" -done - -# adding only compile-time depends -DEPEND="${RDEPEND} ${DEPEND} - virtual/linux-sources - lirc_devices_ftdi? ( dev-embedded/libftdi ) - lirc_devices_all? ( dev-embedded/libftdi )" - -# adding only run-time depends -RDEPEND="${RDEPEND} - lirc_devices_usbirboy? ( app-misc/usbirboy ) - lirc_devices_inputlirc? ( app-misc/inputlircd ) - lirc_devices_iguanaIR? ( app-misc/iguanaIR )" - -# add all devices to IUSE -for dev in ${IUSE_LIRC_DEVICES}; do - IUSE="${IUSE} lirc_devices_${dev}" -done - -add_device() { - : ${lirc_device_count:=0} - ((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 guaranteed that the drivers play nice together." - ewarn - ewarn "If this is not intended, then abort emerge now with Ctrl-C," - ewarn "Set LIRC_DEVICES and restart emerge." - ewarn - epause - fi - - local dev="${1}" - local desc="device ${dev}" - if [[ -n "${2}" ]]; then - desc="${2}" - fi - - elog "Compiling support for ${desc}" - MY_OPTS="${MY_OPTS} --with-driver=${dev}" -} - -pkg_setup() { - - if use lirc_devices_mceusb2 - then - ewarn "The mceusb2 driver has been merged into the mceusb." - ewarn "Please only use the latter now." - fi - - ewarn "If your LIRC device requires modules, you'll need MODULE_UNLOAD" - ewarn "support in your kernel." - - linux-mod_pkg_setup - - # set default configure options - MY_OPTS="" - LIRC_DRIVER_DEVICE="/dev/lirc0" - - 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 - local dev - for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do - if use lirc_devices_${dev}; then - add_device ${dev} - fi - done - - if use lirc_devices_remote_wonder_plus; then - add_device atiusb "device Remote Wonder Plus (atiusb-based)" - fi - - 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_pad; then - ewarn "The imon_pad driver has incorporated the previous pad2keys patch" - ewarn "and removed the pad2keys_active option for the lirc_imon module" - ewarn "because it is always active." - ewarn "If you have an older imon VFD device, you may need to add the module" - ewarn "option display_type=1 to override autodetection and force VFD mode." - 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 - elog - elog "Compiling only the lirc-applications, but no drivers." - elog "Enable drivers with LIRC_DEVICES if you need them." - MY_OPTS="--with-driver=none" - 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 x) - ${MY_OPTS}" - - einfo - einfo "lirc-configure-opts: ${MY_OPTS}" - elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" - - filter-flags -Wl,-O1 - - # force non-parallel make, Bug 196134 - MAKEOPTS="${MAKEOPTS} -j1" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Rip out dos CRLF - edos2unix contrib/lirc.rules - - # Apply patches needed for some special device-types - use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch - use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch - - # Don't wig out with evdev input, bug 299030 - epatch "${FILESDIR}"/${P}-send-evsyn.diff - - # bug 296739 - epatch "${FILESDIR}"/${P}-i2c.patch - - # remove parallel driver on SMP systems - if linux_chkconfig_present SMP ; then - sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am - fi - - # Bug #187418 - if kernel_is ge 2 6 22 ; then - ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+" - sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am - fi - - # respect CFLAGS - sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac - - # setting default device-node - 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 - - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - newinitd "${FILESDIR}"/lircd-0.8.6 lircd - newinitd "${FILESDIR}"/lircmd lircmd - newconfd "${FILESDIR}"/lircd.conf.2 lircd - - insinto /etc/modprobe.d/ - newins "${FILESDIR}"/modprobed.lirc lirc.conf - - newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec - newconfd "${FILESDIR}"/irexec-confd irexec - - if use doc ; then - dohtml doc/html/*.html - insinto /usr/share/doc/${PF}/images - doins doc/images/* - fi - - insinto /usr/share/lirc/remotes - doins -r remotes/* - - keepdir /var/run/lirc /etc/lirc - if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then - newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example - fi -} - -pkg_preinst() { - linux-mod_pkg_preinst - - local dir="${ROOT}/etc/modprobe.d" - if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then - elog "Renaming ${dir}/lirc to lirc.conf" - mv -f "${dir}/lirc" "${dir}/lirc.conf" - fi - - # copy the first file that can be found - if [[ -f "${ROOT}"/etc/lirc/lircd.conf ]]; then - cp "${ROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf - elif [[ -f "${ROOT}"/etc/lircd.conf ]]; then - cp "${ROOT}"/etc/lircd.conf "${T}"/lircd.conf - MOVE_OLD_LIRCD_CONF=1 - elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then - cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf - fi - - # stop portage from touching the config file - if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then - rm -f "${D}"/etc/lirc/lircd.conf - fi -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # copy config file to new location - # without portage knowing about it - # so it will not delete it on unmerge or ever touch it again - if [[ -e "${T}"/lircd.conf ]]; then - cp "${T}"/lircd.conf "${ROOT}"/etc/lirc/lircd.conf - if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then - elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf" - rm -f "${ROOT}"/etc/lircd.conf - fi - fi - - ewarn - ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+" - ewarn "You need to switch over to /dev/input/event? if you need gpio" - ewarn "This device can than then be used via lirc's dev/input driver." - ewarn - ewarn "The new default location for lircd.conf is inside of" - ewarn "/etc/lirc/ directory" - -} |