[G15daemon-commits] SF.net SVN: g15daemon: [295] trunk/g15daemon-wip

[<mla...@us...>]

Revision: 295
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=295&view=rev
Author:   mlampard
Date:     2007-09-08 21:37:50 -0700 (Sat, 08 Sep 2007)

Log Message:
-----------
OS-X support from 1.2svn

Modified Paths:
--------------
    trunk/g15daemon-wip/AUTHORS
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/Makefile.am
    trunk/g15daemon-wip/configure.in
    trunk/g15daemon-wip/g15daemon/g15daemon.h
    trunk/g15daemon-wip/g15daemon/main.c
    trunk/g15daemon-wip/plugins/g15_plugin_net.c

Added Paths:
-----------
    trunk/g15daemon-wip/contrib/libusbshield.kext/
    trunk/g15daemon-wip/contrib/libusbshield.kext/Info.plist

Modified: trunk/g15daemon-wip/AUTHORS
===================================================================
--- trunk/g15daemon-wip/AUTHORS	2007-09-08 14:56:48 UTC (rev 294)
+++ trunk/g15daemon-wip/AUTHORS	2007-09-09 04:37:50 UTC (rev 295)
@@ -1,9 +1,19 @@
 
 Mike Lampard <mla...@us...>
 - primary developer
+
 Sven Ludwig 
 - Python bindings
+
 James Green
 - Documentaion updates
+
 Anthony J. Mirabella
 - numerous miscellaneous fixes and improvements to just about everything.
+
+Lars Sanders
+- Clock plugin fixes
+
+Fabrizio Sestito
+- changes required to compile on OS-X
+- OS-X kext file

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2007-09-08 14:56:48 UTC (rev 294)
+++ trunk/g15daemon-wip/ChangeLog	2007-09-09 04:37:50 UTC (rev 295)
@@ -87,11 +87,11 @@
 1.9.0SVN
 - Add plugin API
 - partially rewritten event core 
-- updated g15daemon_xmms_spectrum plugin with new features, now enabled via configure --enable-xmmsplugin
-  xmms devel and glib devel packages will need to be installed prior to attempting ./configure --enable-xmmsplugin
-  Plugin is not compiled by default.
+- updated g15daemon_xmms_spectrum plugin with new features, available in trunk/g15daemon_audio_plugins (SVN)
 - Clock is now a plugin
 - dependency on libdaemon is now removed
 - g15daemon is now dependant on libg15render.
 - Clock now includes analog clock thanks to Rasta Freak <igo...@zg...>
 - Moved g15daemon_xmms_spectrum plugin to separate package
+- Plugins are now installed in ${PREFIX}/lib/g15daemon/${VERSION}/plugins
+- OS-X support thanks to Fabrizio Sestito.

Modified: trunk/g15daemon-wip/Makefile.am
===================================================================
--- trunk/g15daemon-wip/Makefile.am	2007-09-08 14:56:48 UTC (rev 294)
+++ trunk/g15daemon-wip/Makefile.am	2007-09-09 04:37:50 UTC (rev 295)
@@ -13,6 +13,12 @@
 imagedir = $(prefix)/share/g15daemon/splash
 image_DATA = images/g15logo2.wbmp
 
+install-data-hook:
+if KEXT_INSTALL
+         cp -Rf $(top_srcdir)/contrib/libusbshield.kext @KEXT_LOCATION@
+         chown -R root:wheel @KEXT_LOCATION@/libusbshield.kext
+endif
+
 dist-hook:
 	rm -rf `find $(distdir)/debian -name .svn`
 	rm -rf `find $(distdir)/contrib -name .svn`

Modified: trunk/g15daemon-wip/configure.in
===================================================================
--- trunk/g15daemon-wip/configure.in	2007-09-08 14:56:48 UTC (rev 294)
+++ trunk/g15daemon-wip/configure.in	2007-09-09 04:37:50 UTC (rev 295)
@@ -51,11 +51,14 @@
 	  ;;
 	*darwin*)
 	  AC_DEFINE([OSTYPE_DARWIN], [1],[Target OS is Darwin])
+	  AC_SUBST(KEXT_LOCATION,["/System/Library/Extensions/"])
+          install_kext=true
 	  ;;
 	*) 
 	  AC_DEFINE([OSTYPE_OTHER], [1],[Target OS is unknown])
 	  ;;
 esac
+AM_CONDITIONAL([KEXT_INSTALL], [test x$install_kext = xtrue])
 
 CPPFLAGS=$CPPFLAGS_save
 CPPFLAGS="$CPPFLAGS "'-DDATADIR="\"$(datadir)\""'

Added: trunk/g15daemon-wip/contrib/libusbshield.kext/Info.plist
===================================================================
--- trunk/g15daemon-wip/contrib/libusbshield.kext/Info.plist	                        (rev 0)
+++ trunk/g15daemon-wip/contrib/libusbshield.kext/Info.plist	2007-09-09 04:37:50 UTC (rev 295)
@@ -0,0 +1,43 @@
+<plist version="1.0">
+    <dict>
+
+        <key>CFBundleDevelopmentRegion</key> <string>English</string>
+        <key>CFBundleGetInfoString</key> <string>Libusb USB device Shield</string>
+        <key>CFBundleIdentifier</key> <string>com.libusb.USB_Shield</string>
+        <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
+        <key>CFBundleName</key> <string>Libusb USB device Shield</string>
+        <key>CFBundlePackageType</key> <string>KEXT</string>
+        <key>CFBundleSignature</key> <string>????</string>
+        <key>CFBundleVersion</key> <string>6.0</string>
+        <key>IOKitPersonalities</key>
+        <dict>
+            <key>Logitech G15</key>
+                <dict>
+                    <key>CFBundleIdentifier</key>
+                    <string>com.apple.kernel.iokit</string>
+                    <key>IOClass</key>
+                    <string>IOService</string>
+                    <key>IOProbeScore</key>
+                    <integer>106000</integer>
+                    <key>IOProviderClass</key>
+                    <string>IOUSBInterface</string>
+                    <key>bConfigurationValue</key>
+                    <integer>1</integer>
+                    <key>bInterfaceNumber</key>
+                    <integer>0</integer>
+                    <key>bcdDevice</key>
+                    <integer>259</integer>
+                    <key>idProduct</key>
+                    <integer>49698</integer>
+                    <key>idVendor</key>
+                    <integer>1133</integer>
+                </dict>
+        </dict>
+        <key>OSBundleCompatibleVersion</key> <string>1.8</string>
+        <key>OSBundleLibraries</key>
+        <dict>
+            <key>com.apple.kernel.iokit</key> <string>6.0</string>
+        </dict>
+    </dict>
+</plist>
+


Property changes on: trunk/g15daemon-wip/contrib/libusbshield.kext/Info.plist
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/g15daemon-wip/g15daemon/g15daemon.h
===================================================================
--- trunk/g15daemon-wip/g15daemon/g15daemon.h	2007-09-08 14:56:48 UTC (rev 294)
+++ trunk/g15daemon-wip/g15daemon/g15daemon.h	2007-09-09 04:37:50 UTC (rev 295)
@@ -40,6 +40,7 @@
 #include <config.h>
 #endif
 
+#include <pthread.h>
 #include <pwd.h>
 #include <syslog.h> 
 

Modified: trunk/g15daemon-wip/g15daemon/main.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/main.c	2007-09-08 14:56:48 UTC (rev 294)
+++ trunk/g15daemon-wip/g15daemon/main.c	2007-09-09 04:37:50 UTC (rev 295)
@@ -349,6 +349,21 @@
     if(LIBG15_VERSION>=1200)
         libg15Debug(g15daemon_debug);
     
+#ifdef OSTYPE_DARWIN
+     /* OS X: load codeless kext */
+     retval = system("/sbin/kextload " "/System/Library/Extensions/libusbshield.kext");
+		
+     if (WIFEXITED(retval)){
+	if (WEXITSTATUS(retval) !=0){
+		g15daemon_log(LOG_ERR,"Unable to load USB shield kext...exiting");
+		exit(1);
+        }
+     } else {
+	daemon_log(LOG_ERR,"Unable to launch kextload...exiting");
+	exit(1);
+     }
+#endif
+
     /* init stuff here..  */
     if((retval=initLibG15())!=G15_NO_ERROR){
         g15daemon_log(LOG_ERR,"Unable to attach to the G15 Keyboard... exiting");

Modified: trunk/g15daemon-wip/plugins/g15_plugin_net.c
===================================================================
--- trunk/g15daemon-wip/plugins/g15_plugin_net.c	2007-09-08 14:56:48 UTC (rev 294)
+++ trunk/g15daemon-wip/plugins/g15_plugin_net.c	2007-09-09 04:37:50 UTC (rev 295)
@@ -43,6 +43,10 @@
 static int leaving;
 int server_events(plugin_event_t *myevent);
 
+#ifndef SO_PRIORITY
+#define SO_PRIORITY 12
+#endif
+
 /* tcp server defines */
 #define LISTEN_PORT 15550
 #define LISTEN_ADDR "127.0.0.1"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.