Update of /cvsroot/leaf/src/bering-uclibc/contrib/lirc
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15683
Added Files:
buildtool.cfg buildtool.mk lirc-0.8.0.tar.gz
lirc-headers.patch lirc-substitute.patch lirc.init
Log Message:
Linux Infra Red Controller.
--- NEW FILE: lirc-headers.patch ---
diff -ur lirc-0.8.0.orig/daemons/hw_hiddev.c lirc-0.8.0/daemons/hw_hiddev.c
--- lirc-0.8.0.orig/daemons/hw_hiddev.c 2005-08-31 20:13:25.000000000 +0200
+++ lirc-0.8.0/daemons/hw_hiddev.c 2006-08-14 16:13:40.117141269 +0200
@@ -20,6 +20,7 @@
#include <sys/fcntl.h>
#include <linux/types.h>
+#define HID_MAX_USAGES 1024
#include <linux/hiddev.h>
#include "hardware.h"
--- NEW FILE: lirc-0.8.0.tar.gz ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: buildtool.mk ---
include $(MASTERMAKEFILE)
LIRC_DIR:=lirc-0.8.0
LIRC_TARGET_DIR:=$(BT_BUILD_DIR)/lirc
LIRC_DRIVERS:=atiusb bt829 cmdir dev gpio i2c igorplugusb imon it87 mceusb
parallel sasem serial sir streamzap
$(LIRC_DIR)/.source:
zcat $(LIRC_SOURCE) | tar -xvf -
cat $(LIRC_PATCH1) | patch -d $(LIRC_DIR) -p1
cat $(LIRC_PATCH2) | patch -d $(LIRC_DIR) -p1
touch $(LIRC_DIR)/.source
$(LIRC_DIR)/.configured: $(LIRC_DIR)/.source
cd $(LIRC_DIR); CFLAGS="$(BT_COPT_FLAGS)" CC=$(TARGET_CC) ./configure \
--build=i386-pc-linux-gnu \
--host=i386-pc-linux-gnu \
--prefix=/usr \
--without-x \
--with-driver=userspace \
--with-kerneldir=$(BT_LINUX_DIR) \
--with-moduledir=/lib/modules/$(BT_KERNEL_RELEASE)/misc \
--enable-dyncodes \
--enable-sandboxed
touch $(LIRC_DIR)/.configured
source: $(LIRC_DIR)/.source
$(LIRC_DIR)/.build: $(LIRC_DIR)/.configured
mkdir -p $(LIRC_TARGET_DIR)
mkdir -p $(BT_STAGING_DIR)/etc/init.d
mkdir -p $(BT_STAGING_DIR)/usr/lib
mkdir -p $(BT_STAGING_DIR)/usr/include
mkdir -p $(BT_STAGING_DIR)/usr/sbin
mkdir -p $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc
$(MAKE) DESTDIR=$(LIRC_TARGET_DIR) -C $(LIRC_DIR) install
for drv in $(LIRC_DRIVERS); do \
$(MAKE) DESTDIR=$(BT_STAGING_DIR) -C
$(LIRC_DIR)/drivers/lirc_$$drv install ;\
done
-$(BT_STRIP) $(BT_STRIP_BINOPTS) $(LIRC_TARGET_DIR)/usr/sbin/*
-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(LIRC_TARGET_DIR)/usr/lib/*
-$(BT_STRIP) --strip-debug
$(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc/lirc_*.o
cp -a -f $(LIRC_INIT) $(BT_STAGING_DIR)/etc/init.d/lirc
cp -a -f $(LIRC_TARGET_DIR)/usr/lib/liblirc_client*
$(BT_STAGING_DIR)/usr/lib/
cp -a -f $(LIRC_TARGET_DIR)/usr/include/lirc
$(BT_STAGING_DIR)/usr/include/
cp -a -f $(LIRC_TARGET_DIR)/usr/sbin/lircd $(BT_STAGING_DIR)/usr/sbin/
$(BT_DEPMOD) -ae -b $(BT_STAGING_DIR) -r -F
$(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/build/System.map
$(BT_KERNEL_RELEASE)
touch $(LIRC_DIR)/.build
build: $(LIRC_DIR)/.build
clean:
-rm $(LIRC_DIR)/.build $(LIRC_DIR)/.configured
rm -rf $(LIRC_TARGET_DIR)
-$(MAKE) -C $(LIRC_DIR) distclean
rm -f $(BT_STAGING_DIR)/etc/init.d/lirc
rm -f $(BT_STAGING_DIR)/usr/lib/liblirc_client*
rm -rf $(BT_STAGING_DIR)/usr/include/lirc
rm -f $(BT_STAGING_DIR)/usr/sbin/lircd
rm -f $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc/lirc_*.o
-rmdir $(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/misc
$(BT_DEPMOD) -ae -b $(BT_STAGING_DIR) -r -F
$(BT_STAGING_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/build/System.map
$(BT_KERNEL_RELEASE)
srcclean: clean
rm -rf $(LIRC_DIR)
--- NEW FILE: lirc.init ---
#!/bin/sh
#/etc/init.d/lirc: start LIRC daemon.
RCDLINKS="0,K19 1,K19 2,S19 3,S19 4,S19 5,S19 6,K19"
DAEMON=/usr/sbin/lircd
PIDFILE=/var/run/lircd.pid
test -x $DAEMON || exit 0
case "$1" in
start)
echo -n "Starting LIRC daemon... "
if start-stop-daemon --start --quiet --exec $DAEMON --pidfile $PIDFILE
then
echo done.
else
echo failed.
fi
;;
stop)
echo -n "Stopping LIRC daemon..."
if start-stop-daemon --stop --quiet --oknodo --exec $DAEMON --pidfile
$PIDFILE
then
echo done.
else
echo failed.
fi
;;
*)
echo "Usage: /etc/init.d/lirc {start|stop}"
exit 1
esac
exit 0
--- NEW FILE: buildtool.cfg ---
<File buildtool.mk>
Server = cvs-contrib-sourceforge
Directory = lirc
Revision = HEAD
</File>
<File lirc-0.8.0.tar.gz>
Server = cvs-contrib-sourceforge
Directory = lirc
Revision = HEAD
envname = LIRC_SOURCE
</File>
<File lirc-substitute.patch>
Server = cvs-contrib-sourceforge
Directory = lirc
Revision = HEAD
envname = LIRC_PATCH1
</File>
<File lirc-headers.patch>
Server = cvs-contrib-sourceforge
Directory = lirc
Revision = HEAD
envname = LIRC_PATCH2
</File>
<File lirc.init>
Server = cvs-contrib-sourceforge
Directory = lirc
Revision = HEAD
envname = LIRC_INIT
</File>
<Package>
<lirc>
Version = 0.8.0
Revision = 1
Help <<EOF
Linux Infra Red Controller daemon.
Homepage: http://www.lirc.org/
LEAF package by __PACKAGER__, __BUILDDATE__
EOF
<Permissions>
Files = 644
Directories = 755
</Permissions>
<Owner>
Files = root:root
Directories = root:root
</Owner>
<Contents>
<File>
Source = usr/sbin/lircd
Filename = usr/sbin/lircd
Type = binary
Permissions = 755
</File>
<File>
Source = usr/lib/liblirc_client.so.*
Filename = usr/lib
Type = binary
Permissions = 755
</File>
<File>
Filename = dev/lirc
Type = device
devtype = c
major = 61
minor = 0
</File>
<File>
Source = etc/init.d/lirc
Filename = etc/init.d/lirc
Type = binary
Permissions = 755
</File>
<File>
Filename = etc/lircd.conf
Type = conf
Type = list
</File>
</Contents>
</lirc>
</Package>
--- NEW FILE: lirc-substitute.patch ---
diff -ur lirc-0.8.0.orig/tools/lirc_client.c lirc-0.8.0/tools/lirc_client.c
--- lirc-0.8.0.orig/tools/lirc_client.c 2006-01-08 19:32:58.000000000 +0100
+++ lirc-0.8.0/tools/lirc_client.c 2006-04-03 12:37:46.000000000 +0200
@@ -615,6 +615,10 @@
{
flags|=startup_mode;
}
+ else if(strcasecmp(s,"substitute")==0)
+ {
+ flags|=substitute;
+ }
else
{
lirc_printf("%s: unknown flag \"%s\"\n",lirc_prog,s);
@@ -1630,9 +1638,11 @@
char *s=NULL;
struct lirc_config_entry *scan;
int quit_happened;
+ unsigned long long ncode;
+ static char substitute_string[255];
*string=NULL;
- if(sscanf(code,"%*x %x %*s %*s\n",&rep)==1)
+ if(sscanf(code,"%llx %x %*s %*s\n",&ncode,&rep)==2)
{
backup=strdup(code);
if(backup==NULL) return(-1);
@@ -1665,6 +1674,12 @@
{
*prog = scan->prog;
}
+ if(s != NULL && scan->flags&substitute)
+ {
+ sprintf(substitute_string,s,(int)ncode);
+ s=substitute_string;
+
+ }
if(scan->flags&quit)
{
quit_happened=1;
diff -ur lirc-0.8.0.orig/tools/lirc_client.h lirc-0.8.0/tools/lirc_client.h
--- lirc-0.8.0.orig/tools/lirc_client.h 2005-12-27 13:05:27.000000000 +0100
+++ lirc-0.8.0/tools/lirc_client.h 2006-04-03 12:22:38.000000000 +0200
@@ -30,7 +30,8 @@
quit=0x02,
mode=0x04,
ecno=0x08,
- startup_mode=0x10
+ startup_mode=0x10,
+ substitute=0x20
};
struct lirc_list
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
