diff options
| author | pingc <pingc> | 2008-04-11 22:08:44 +0000 |
|---|---|---|
| committer | pingc <pingc> | 2008-04-11 22:08:44 +0000 |
| commit | 5a64f27cb18dc17a1bed05bbf007e09acbed364e (patch) | |
| tree | 8131f87be64a7dbbaf2f7a83e9981b5e3b084a46 | |
| parent | 70d3dd054e8702767089d1cf5d21ca4ed052ed39 (diff) | |
| download | xf86-input-wacom-5a64f27cb18dc17a1bed05bbf007e09acbed364e.tar.gz | |
Minor fixes in wacomcpl and kernelrelease-0.7.9-11
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 28 | ||||
| -rw-r--r-- | src/include/xdrv-config.h.in | 3 | ||||
| -rwxr-xr-x | src/xdrv/xf86Wacom.c | 3 |
4 files changed, 38 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2008-04-11 Ping Cheng <pingc@wacom.com> + * Excluded dixScreenOrigins call for Xorg 6.8.x + * Synchronized databases + * Updated webpages + * Label 0.7.9-11 + 2008-04-03 Ping Cheng <pingc@wacom.com> * Minor fixes in kernel and wacomcpl * Removed debug statement in wcmSerial.c diff --git a/configure.in b/configure.in index 91e93ca..d731c62 100644 --- a/configure.in +++ b/configure.in @@ -401,6 +401,18 @@ fi if test "$WCM_ENV_XFREE86" = yes; then AM_CONDITIONAL(WCM_ENV_XFREE86, true) AC_DEFINE(WCM_XFREE86,1,[Compiling for XFree86]) + AC_MSG_CHECKING([if XFREE86 defines dixScreenOrigins]) + save_CFLAGS="$CFLAGS" + CFLAGS="-I$WCM_XFREE86_DIR $CFLAGS" + AC_TRY_COMPILE([#include <globals.h>], [return dixScreenOrigins[0].x;], + [WCM_HAVE_DIXSCREENORIGINS=yes], [WCM_HAVE_DIXSCREENORIGINS=no]) + CFLAGS="$save_CFLAGS" + AC_MSG_RESULT($WCM_HAVE_DIXSCREENORIGINS) + if test "$WCM_HAVE_DIXSCREENORIGINS" = "yes"; then + WCM_XDRIVER_QUIRKS="$WCM_XDRIVER_QUIRKS dixScreenOrigins" + AC_DEFINE(WCM_HAVE_DIXSCREENORIGINS,1, + [Later XFree86 version uses dixScreenOrigins for screen positions and sizes]) + fi else AM_CONDITIONAL(WCM_ENV_XFREE86, false) fi @@ -505,9 +517,23 @@ if test "$WCM_ENV_XFREE86" != yes; then AC_MSG_CHECKING([if Xorg SDK defines dixScreenOrigins]) save_CFLAGS="$CFLAGS" - CFLAGS="-I$WCM_XORGSDK_DIR $CFLAGS" + CFLAGS="-I$WCM_XORGSDK_DIR $XSERVER_CFLAGS $CFLAGS" AC_TRY_COMPILE([#include <globals.h>], [return dixScreenOrigins[0].x;], [WCM_HAVE_DIXSCREENORIGINS=yes], [WCM_HAVE_DIXSCREENORIGINS=no]) + AC_TRY_COMPILE([ +#include <xorg-server.h> +#include <xorgVersion.h> +#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(0, 0, 0, 0, 0) +# error "Invalid X.org version" +#elif XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(8, 0, 0, 0, 0) +# error "Invalid X.org version" +#endif +], , [WCM_INVALID_ORIGINS=no], [WCM_INVALID_ORIGINS=yes]) + # Xorg 6.8.x doesn't support dixScreenOrigins. But globals.h included it. + # And its XORG_VERSION_CURRENT is invalid somehow. + if test "$WCM_INVALID_ORIGINS" = "yes"; then + WCM_HAVE_DIXSCREENORIGINS=no + fi CFLAGS="$save_CFLAGS" AC_MSG_RESULT($WCM_HAVE_DIXSCREENORIGINS) if test "$WCM_HAVE_DIXSCREENORIGINS" = "yes"; then diff --git a/src/include/xdrv-config.h.in b/src/include/xdrv-config.h.in index f0b79a0..5d9acf0 100644 --- a/src/include/xdrv-config.h.in +++ b/src/include/xdrv-config.h.in @@ -27,4 +27,7 @@ /* The X-driver can send key events for a button */ #undef WCM_KEY_SENDING_SUPPORT +/* Later X.org version uses dixScreenOrigins for screen positions and sizes */ +#undef WCM_HAVE_DIXSCREENORIGINS + #endif /* _XDRV_CONFIG_H_ */ diff --git a/src/xdrv/xf86Wacom.c b/src/xdrv/xf86Wacom.c index 761fd7a..fa414f3 100755 --- a/src/xdrv/xf86Wacom.c +++ b/src/xdrv/xf86Wacom.c @@ -67,9 +67,10 @@ * 2008-01-17 47-pc0.7.9-7 - Preparing for hotplug-aware driver * 2008-02-27 47-pc0.7.9-8 - Support Cintiq 20 * 2008-03-07 47-pc0.7.9-9 - Support keystrokes in wacomcpl + * 2008-04-07 47-pc0.7.9-11 - Synchronized databases */ -static const char identification[] = "$Identification: 47-0.7.9-9 $"; +static const char identification[] = "$Identification: 47-0.7.9-11 $"; /****************************************************************************/ |