Author: pebender
Date: Wed Jun 17 16:19:21 2009
New Revision: 4968
Added:
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-ioctl_ui_set_phys.patch
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-libm.patch
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-rootdir.patch
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-wait_forever_sleep.patch
Removed:
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-183-ioctl_ui_set_phys.patch
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-183-libm.patch
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-183-rootdir.patch
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-183-wait_forever_sleep.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/utils/cwiid/Makefile
trunk/gar-minimyth/script/utils/cwiid/checksums
Log:
- Updated package utils/cwiid.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Jun 17
16:19:21 2009
@@ -84,6 +84,7 @@
Updated system/lcdproc.
Updated system/lirc.
Updated system/zoneinfo.
+ Updated utils/cwiid.
Updated utils/findutils.
Updated utils/util-linux-ng.
Updated xorg-7.4/dri2proto.
Modified: trunk/gar-minimyth/script/utils/cwiid/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/cwiid/Makefile (original)
+++ trunk/gar-minimyth/script/utils/cwiid/Makefile Wed Jun 17 16:19:21 2009
@@ -1,5 +1,5 @@
GARNAME = cwiid
-GARVERSION = 183
+GARVERSION = 192
CATEGORIES = utils
#MASTER_SITES = http://abstrakraft.org/cwiid/downloads/
MASTER_SITES = svn://abstrakraft.org/cwiid/svn/trunk/
Modified: trunk/gar-minimyth/script/utils/cwiid/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/cwiid/checksums (original)
+++ trunk/gar-minimyth/script/utils/cwiid/checksums Wed Jun 17 16:19:21 2009
@@ -1,4 +1,4 @@
-7cdc7e7320c45060893dbcdc54a7d313 download/cwiid-183-libm.patch
-a0d5a066a9e9b0f3d774f504b6a9a7b1 download/cwiid-183-rootdir.patch
-cfd4405a1e80243e0eecabe25ea29496
download/cwiid-183-ioctl_ui_set_phys.patch
-afdc7c7df1453a063a8950198d266121
download/cwiid-183-wait_forever_sleep.patch
+3658bd5d3fc0b6d99191987086e2c6d2 download/cwiid-192-libm.patch
+60f2f373b4c73730d0741acdf7113d3e download/cwiid-192-rootdir.patch
+b6de499543840de207c1e27e53a46c88
download/cwiid-192-ioctl_ui_set_phys.patch
+09042ae5f27dec51a4db81b6fa2d4fe7
download/cwiid-192-wait_forever_sleep.patch
Added:
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-ioctl_ui_set_phys.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-ioctl_ui_set_phys.patch
Wed Jun 17 16:19:21 2009
@@ -0,0 +1,81 @@
+diff -Naur cwiid-192-old/wminput/conf.h cwiid-192-new/wminput/conf.h
+--- cwiid-192-old/wminput/conf.h 2009-06-17 15:01:35.000000000 -0700
++++ cwiid-192-new/wminput/conf.h 2009-06-17 15:04:13.000000000 -0700
+@@ -51,6 +51,8 @@
+ #include <linux/input.h>
+ #include <linux/uinput.h>
+
++#include <bluetooth/bluetooth.h>
++
+ #include "cwiid.h"
+ #include "wmplugin.h"
+ #include "y.tab.h"
+@@ -179,6 +181,7 @@
+ YYLTYPE yyloc_stack[CONF_MAX_INCLUDE_DEPTH];
+ uint8_t rpt_mode_flags;
+ struct uinput_user_dev dev;
++ bdaddr_t bdaddr;
+ unsigned char ff;
+ struct btn_map wiimote_bmap[CONF_WM_BTN_COUNT];
+ struct btn_map nunchuk_bmap[CONF_NC_BTN_COUNT];
+diff -Naur cwiid-192-old/wminput/main.c cwiid-192-new/wminput/main.c
+--- cwiid-192-old/wminput/main.c 2009-06-17 15:01:35.000000000 -0700
++++ cwiid-192-new/wminput/main.c 2009-06-17 15:04:13.000000000 -0700
+@@ -237,11 +237,6 @@
+ config_search_dirs[2] = plugin_search_dirs[2] = NULL;
+ }
+
+- if (conf_load(&conf, config_filename, config_search_dirs,
+- plugin_search_dirs)) {
+- return -1;
+- }
+-
+ /* Determine BDADDR */
+ /* priority: command-line option, environment variable, BDADDR_ANY */
+ if (optind < argc) {
+@@ -253,7 +248,6 @@
+ if (optind < argc) {
+ wminput_err("invalid command-line");
+ print_usage();
+- conf_unload(&conf);
+ return -1;
+ }
+ }
+@@ -266,6 +260,12 @@
+ else {
+ bdaddr = *BDADDR_ANY;
+ }
++ bacpy(&conf.bdaddr, &bdaddr);
++
++ if (conf_load(&conf, config_filename, config_search_dirs,
++ plugin_search_dirs)) {
++ return -1;
++ }
+
+ sigemptyset(&sigset);
+ sigaddset(&sigset, SIGTERM);
+diff -Naur cwiid-192-old/wminput/uinput.c cwiid-192-new/wminput/uinput.c
+--- cwiid-192-old/wminput/uinput.c 2009-06-17 15:01:35.000000000 -0700
++++ cwiid-192-new/wminput/uinput.c 2009-06-17 15:04:13.000000000 -0700
+@@ -54,6 +54,7 @@
+ unsigned int i;
+ int j;
+ int request;
++ char addr[18];
+
+ /* Open uinput device */
+ for (i=0; i < UINPUT_FILENAME_COUNT; i++) {
+@@ -72,6 +73,13 @@
+ return -1;
+ }
+
++ ba2str(&conf->bdaddr, addr);
++ if (ioctl(conf->fd, UI_SET_PHYS, addr) < 0) {
++ wminput_err("error uinput ioctl: UI_SET_PHYS: %s", addr);
++ close(conf->fd);
++ return -1;
++ }
++
+ if (conf->ff) {
+ if (ioctl(conf->fd, UI_SET_EVBIT, EV_FF) < 0) {
+ wminput_err("error on uinput ioctl");
Added: trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-libm.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-libm.patch Wed
Jun 17 16:19:21 2009
@@ -0,0 +1,22 @@
+diff -Naur cwiid-192-old/wminput/plugins/ir_ptr/Makefile.in
cwiid-192-new/wminput/plugins/ir_ptr/Makefile.in
+--- cwiid-192-old/wminput/plugins/ir_ptr/Makefile.in 2009-06-17
14:56:28.000000000 -0700
++++ cwiid-192-new/wminput/plugins/ir_ptr/Makefile.in 2009-06-17
15:01:06.000000000 -0700
+@@ -5,6 +5,7 @@
+ PLUGIN_NAME = ir_ptr
+ SOURCES = ir_ptr.c
+ CFLAGS += -...@top_builddir@/wminput -...@top_builddir@/libcwiid
++LDLIBS += -lm
+ INST_DIR = $(CWIID_PLUGINS_DIR)
+
+ include $(COMMON)/include/plugin.mak
+diff -Naur cwiid-192-old/wminput/plugins/led/Makefile.in
cwiid-192-new/wminput/plugins/led/Makefile.in
+--- cwiid-192-old/wminput/plugins/led/Makefile.in 2009-06-17
14:56:29.000000000 -0700
++++ cwiid-192-new/wminput/plugins/led/Makefile.in 2009-06-17
15:01:06.000000000 -0700
+@@ -5,6 +5,7 @@
+ PLUGIN_NAME = led
+ SOURCES = led.c
+ CFLAGS += -...@top_builddir@/wminput -...@top_builddir@/libcwiid
++LDLIBS += -lm
+ INST_DIR = $(CWIID_PLUGINS_DIR)
+
+ include $(COMMON)/include/plugin.mak
Added: trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-rootdir.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-rootdir.patch Wed
Jun 17 16:19:21 2009
@@ -0,0 +1,138 @@
+diff -Naur cwiid-192-old/defs.mak.in cwiid-192-new/defs.mak.in
+--- cwiid-192-old/defs.mak.in 2009-06-17 15:00:54.000000000 -0700
++++ cwiid-192-new/defs.mak.in 2009-06-17 15:01:58.000000000 -0700
+@@ -28,8 +28,8 @@
+ ROOTDIR = $(DESTDIR:%/=%)
+ endif
+
+-CWIID_CONFIG_DIR = $(ROOTDIR)@CWIID_CONFIG_DIR@
+-CWIID_PLUGINS_DIR = $(ROOTDIR)@CWIID_PLUGINS_DIR@
++CWIID_CONFIG_DIR = @CWIID_CONFIG_DIR@
++CWIID_PLUGINS_DIR = @CWIID_PLUGINS_DIR@
+
+ DEBUGFLAGS = -g
+ WARNFLAGS = -Wall -W
+diff -Naur cwiid-192-old/Makefile.in cwiid-192-new/Makefile.in
+--- cwiid-192-old/Makefile.in 2009-06-17 15:00:54.000000000 -0700
++++ cwiid-192-new/Makefile.in 2009-06-17 15:01:58.000000000 -0700
+@@ -26,27 +26,27 @@
+ endif
+
+ ifeq ($(MAKECMDGOALS),install)
+-$(BIN_DIRS) $(LIB_DIRS): $(CWIID_CONFIG_DIR) $(CWIID_PLUGINS_DIR)
++$(BIN_DIRS) $(LIB_DIRS): $(ROOTDIR)$(CWIID_CONFIG_DIR)
$(ROOTDIR)$(CWIID_PLUGINS_DIR)
+ endif
+
+ $(SUB_DIRS):
+ $(MAKE) $(TARGET) -C $@
+
+-$(CWIID_CONFIG_DIR):
+- install -d $(CWIID_CONFIG_DIR)
++$(ROOTDIR)$(CWIID_CONFIG_DIR):
++ install -d $(ROOTDIR)$(CWIID_CONFIG_DIR)
+
+-$(CWIID_PLUGINS_DIR):
+- install -d $(CWIID_PLUGINS_DIR)
++$(ROOTDIR)$(CWIID_PLUGINS_DIR):
++ install -d $(ROOTDIR)$(CWIID_PLUGINS_DIR)
+
+ distclean:
+ rm -rf Makefile config.log config.status autom4te.cache \
+ defs.mak $(COMMON)/include/lib.mak $(COMMON)/include/config.h
+
+ uninstall:
+- rm -r $(CWIID_PLUGINS_DIR); true
++ rm -r $(ROOTDIR)$(CWIID_PLUGINS_DIR); true
+
+ uninstall_config:
+- rm -rf $(CWIID_CONFIG_DIR)
++ rm -rf $(ROOTDIR)$(CWIID_CONFIG_DIR)
+
+ .PHONY: all install clean distclean uninstall uninstall_config $(SUB_DIRS)
+
+diff -Naur cwiid-192-old/wminput/Makefile.in
cwiid-192-new/wminput/Makefile.in
+--- cwiid-192-old/wminput/Makefile.in 2009-06-17 15:00:54.000000000 -0700
++++ cwiid-192-new/wminput/Makefile.in 2009-06-17 15:01:58.000000000 -0700
+@@ -41,16 +41,16 @@
+ $(MAKE) $(MAKECMDGOALS) -C plugins
+
+ install_configs:
+- install -d $(WMINPUT_CONFIG_DIR)
+- install configs/* $(WMINPUT_CONFIG_DIR)
+- ln -sf acc_led $(WMINPUT_CONFIG_DIR)/default
++ install -d $(ROOTDIR)$(WMINPUT_CONFIG_DIR)
++ install configs/* $(ROOTDIR)$(WMINPUT_CONFIG_DIR)
++ ln -sf acc_led $(ROOTDIR)$(WMINPUT_CONFIG_DIR)/default
+
+ #uninstall_configs:
+-# rm -f $(WMINPUT_CONFIG_DIR)/default
++# rm -f $(ROOTDIR)$(WMINPUT_CONFIG_DIR)/default
+ # for c in `ls configs`; do \
+-# rm -f $(WMINPUT_CONFIG_DIR)/$$c; \
++# rm -f $(ROOTDIR)$(WMINPUT_CONFIG_DIR)/$$c; \
+ # done
+-# rmdir $(WMINPUT_CONFIG_DIR); true
++# rmdir $(ROOTDIR)$(WMINPUT_CONFIG_DIR); true
+
+ action_enum.c: action_enum.awk action_enum.txt
+ $(AWK) -f action_enum.awk action_enum.txt > action_enum.c
+diff -Naur cwiid-192-old/wminput/plugins/acc/Makefile.in
cwiid-192-new/wminput/plugins/acc/Makefile.in
+--- cwiid-192-old/wminput/plugins/acc/Makefile.in 2009-06-17
15:00:54.000000000 -0700
++++ cwiid-192-new/wminput/plugins/acc/Makefile.in 2009-06-17
15:01:58.000000000 -0700
+@@ -6,7 +6,7 @@
+ SOURCES = acc.c
+ CFLAGS += -...@top_builddir@/wminput -...@top_builddir@/libcwiid
+ LDLIBS += -lm
+-INST_DIR = $(CWIID_PLUGINS_DIR)
++INST_DIR = $(ROOTDIR)$(CWIID_PLUGINS_DIR)
+
+ include $(COMMON)/include/plugin.mak
+
+diff -Naur cwiid-192-old/wminput/plugins/ir_ptr/Makefile.in
cwiid-192-new/wminput/plugins/ir_ptr/Makefile.in
+--- cwiid-192-old/wminput/plugins/ir_ptr/Makefile.in 2009-06-17
15:01:06.000000000 -0700
++++ cwiid-192-new/wminput/plugins/ir_ptr/Makefile.in 2009-06-17
15:01:58.000000000 -0700
+@@ -6,7 +6,7 @@
+ SOURCES = ir_ptr.c
+ CFLAGS += -...@top_builddir@/wminput -...@top_builddir@/libcwiid
+ LDLIBS += -lm
+-INST_DIR = $(CWIID_PLUGINS_DIR)
++INST_DIR = $(ROOTDIR)$(CWIID_PLUGINS_DIR)
+
+ include $(COMMON)/include/plugin.mak
+
+diff -Naur cwiid-192-old/wminput/plugins/led/Makefile.in
cwiid-192-new/wminput/plugins/led/Makefile.in
+--- cwiid-192-old/wminput/plugins/led/Makefile.in 2009-06-17
15:01:06.000000000 -0700
++++ cwiid-192-new/wminput/plugins/led/Makefile.in 2009-06-17
15:01:58.000000000 -0700
+@@ -6,7 +6,7 @@
+ SOURCES = led.c
+ CFLAGS += -...@top_builddir@/wminput -...@top_builddir@/libcwiid
+ LDLIBS += -lm
+-INST_DIR = $(CWIID_PLUGINS_DIR)
++INST_DIR = $(ROOTDIR)$(CWIID_PLUGINS_DIR)
+
+ include $(COMMON)/include/plugin.mak
+
+diff -Naur cwiid-192-old/wminput/plugins/nunchuk_acc/Makefile.in
cwiid-192-new/wminput/plugins/nunchuk_acc/Makefile.in
+--- cwiid-192-old/wminput/plugins/nunchuk_acc/Makefile.in 2009-06-17
15:00:54.000000000 -0700
++++ cwiid-192-new/wminput/plugins/nunchuk_acc/Makefile.in 2009-06-17
15:01:58.000000000 -0700
+@@ -6,7 +6,7 @@
+ SOURCES = nunchuk_acc.c
+ CFLAGS += -...@top_builddir@/wminput -...@top_builddir@/libcwiid
+ LDLIBS += -lm
+-INST_DIR = $(CWIID_PLUGINS_DIR)
++INST_DIR = $(ROOTDIR)$(CWIID_PLUGINS_DIR)
+
+ include $(COMMON)/include/plugin.mak
+
+diff -Naur cwiid-192-old/wminput/plugins/nunchuk_stick2btn/Makefile.in
cwiid-192-new/wminput/plugins/nunchuk_stick2btn/Makefile.in
+--- cwiid-192-old/wminput/plugins/nunchuk_stick2btn/Makefile.in
2009-06-17
15:00:54.000000000 -0700
++++ cwiid-192-new/wminput/plugins/nunchuk_stick2btn/Makefile.in
2009-06-17
15:01:58.000000000 -0700
+@@ -6,7 +6,7 @@
+ SOURCES = nunchuk_stick2btn.c
+ CFLAGS += -...@top_builddir@/wminput -...@top_builddir@/libcwiid
+ LDLIBS += -lm
+-INST_DIR = $(CWIID_PLUGINS_DIR)
++INST_DIR = $(ROOTDIR)$(CWIID_PLUGINS_DIR)
+
+ include $(COMMON)/include/plugin.mak
+
Added:
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-wait_forever_sleep.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/utils/cwiid/files/cwiid-192-wait_forever_sleep.patch
Wed Jun 17 16:19:21 2009
@@ -0,0 +1,12 @@
+diff -Naur cwiid-192-old/wminput/main.c cwiid-192-new/wminput/main.c
+--- cwiid-192-old/wminput/main.c 2009-06-17 15:04:13.000000000 -0700
++++ cwiid-192-new/wminput/main.c 2009-06-17 15:04:45.000000000 -0700
+@@ -289,7 +289,7 @@
+ }
+ /* TODO: avoid continuously calling cwiid_open */
+ cwiid_set_err(cwiid_err_connect);
+- while (!(wiimote = cwiid_open(¤t_bdaddr,
CWIID_FLAG_MESG_IFC)));
++ while (!(wiimote = cwiid_open(¤t_bdaddr,
CWIID_FLAG_MESG_IFC)))
sleep(1);
+ cwiid_set_err(cwiid_err_default);
+ }
+ else {
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
