Hello community,
here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory
checked in at Fri Aug 7 21:51:51 CEST 2009.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-08-03 11:10:22.000000000 +0200
+++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-08-07 11:04:09.000000000 +0200
@@ -1,0 +2,23 @@
+Fri Aug 7 11:00:08 CEST 2009 - sndirsch@suse.de
+
+- xf86-input-vmmouse 12.6.5
+ * Compile with INPUT ABI 7.
+ * Remove ModuleInfoRec and associated bits.
+ * Needed by newer X servers, otherwise the module data is
+ invisible and a dlopen error occurs.
+ * Turn off built-in fallback-to-mouse-driver mechanism.
+
+-------------------------------------------------------------------
+Thu Aug 6 15:19:34 CEST 2009 - sndirsch@suse.de
+
+- xf86-input-evdev 2.2.4
+ * Fixing a regression introduced with 2.2.3. The fix to
+ Bug #21832 in 2.2.3 prevented Alps touchpads from working
+ with the evdev driver. These touchpads announce both
+ relative and absolute axes, events from the latter get
+ ignored with the fix to 21832. The fix special-cases
+ touchpad initialization to give absolute axes precedence
+ over relative if a touchpad or touchscreen is found. For
+ more info see Bug #23126
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-input-evdev-2.2.3.tar.bz2
xf86-input-vmmouse-12.6.4.tar.bz2
New:
----
xf86-input-evdev-2.2.4.tar.bz2
xf86-input-vmmouse-12.6.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.K1Vpdl/_old 2009-08-07 21:50:26.000000000 +0200
+++ /var/tmp/diff_new_pack.K1Vpdl/_new 2009-08-07 21:50:26.000000000 +0200
@@ -24,7 +24,7 @@
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 34
+Release: 35
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -62,11 +62,11 @@
Source23: xf86-input-summa-1.2.0.tar.bz2
Source24: xf86-input-tek4957-1.2.0.tar.bz2
Source25: xf86-input-ur98-X11R7.1-1.1.0.tar.bz2
-Source26: xf86-input-vmmouse-12.6.4.tar.bz2
+Source26: xf86-input-vmmouse-12.6.5.tar.bz2
Source27: xf86-input-void-1.2.0.tar.bz2
Source28: xf86-input-diamondtouch-0.3.0.tar.bz2
Source29: xf86-input-synaptics-1.1.3.tar.bz2
-Source30: xf86-input-evdev-2.2.3.tar.bz2
+Source30: xf86-input-evdev-2.2.4.tar.bz2
Source31: 11-x11-synaptics.fdi
Source32: 11-mouse.fdi
Patch2: xf86-input-jamstudio.diff
++++++ xf86-input-evdev-2.2.3.tar.bz2 -> xf86-input-evdev-2.2.4.tar.bz2 ++++++
++++ 3117 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.3/ChangeLog new/xf86-input-evdev-2.2.4/ChangeLog
--- old/xf86-input-evdev-2.2.3/ChangeLog 2009-07-30 03:16:47.000000000 +0200
+++ new/xf86-input-evdev-2.2.4/ChangeLog 2009-08-06 06:18:05.000000000 +0200
@@ -1,3 +1,45 @@
+commit bf356d939925b537921e1f82559f92baa3a76bcc
+Author: Peter Hutterer
+Date: Thu Aug 6 14:08:55 2009 +1000
+
+ evdev 2.2.4
+
+commit 4c1c4f2c830dbfc34503d8ee4996f5bcd5547b6a
+Author: Michael Witten
+Date: Tue Aug 4 03:11:49 2009 -0500
+
+ evdev.c: Fix/improve discrimination of rel/abs axes
+
+ The relevant comment from evdev.c:
+
+ We don't allow relative and absolute axes on the same device. The
+ reason is that some devices (MS Optical Desktop 2000) register both
+ rel and abs axes for x/y.
+
+ The abs axes register min/max; this min/max then also applies to the
+ relative device (the mouse) and caps it at 0..255 for both axes.
+ So, unless you have a small screen, you won't be enjoying it much;
+ consequently, absolute axes are generally ignored.
+
+ However, currenly only a device with absolute axes can be registered
+ as a touch{pad,screen}. Thus, given such a device, absolute axes are
+ used and relative axes are ignored.
+
+ The code for initializing abs/rel axes has been abstracted out into
+ 3 functions, so that initialization in EvdevInit(device) is as easy
+ as:
+
+ if (pEvdev->flags & (EVDEV_TOUCHPAD | EVDEV_TOUCHSCREEN))
+ EvdevInitTouchDevice(device, pEvdev);
+ else if (pEvdev->flags & EVDEV_RELATIVE_EVENTS)
+ EvdevInitRelClass(device, pEvdev);
+ else if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)
+ EvdevInitAbsClass(device, pEvdev);
+
+ Signed-off-by: Michael Witten
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit f352598e45be86f9e24d9dba88c657f03f3b168e)
+
commit c0bee1b4d6d3664322b2f35775675ac84354f702
Author: Peter Hutterer
Date: Thu Jul 30 11:08:59 2009 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.3/configure.ac new/xf86-input-evdev-2.2.4/configure.ac
--- old/xf86-input-evdev-2.2.3/configure.ac 2009-07-30 03:08:55.000000000 +0200
+++ new/xf86-input-evdev-2.2.4/configure.ac 2009-08-06 06:08:49.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-evdev],
- 2.2.3,
+ 2.2.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-evdev)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.3/src/evdev.c new/xf86-input-evdev-2.2.4/src/evdev.c
--- old/xf86-input-evdev-2.2.3/src/evdev.c 2009-07-30 03:08:41.000000000 +0200
+++ new/xf86-input-evdev-2.2.4/src/evdev.c 2009-08-06 06:08:35.000000000 +0200
@@ -1163,6 +1163,64 @@
}
+static void
+EvdevInitAbsClass(DeviceIntPtr device, EvdevPtr pEvdev)
+{
+ if (EvdevAddAbsClass(device) == Success) {
+
+ xf86Msg(X_INFO,"%s: initialized for absolute axes.\n", device->name);
+
+ } else {
+
+ xf86Msg(X_ERROR,"%s: failed to initialize for absolute axes.\n",
+ device->name);
+
+ pEvdev->flags &= ~EVDEV_ABSOLUTE_EVENTS;
+
+ }
+}
+
+static void
+EvdevInitRelClass(DeviceIntPtr device, EvdevPtr pEvdev)
+{
+ int has_abs_axes = pEvdev->flags & EVDEV_ABSOLUTE_EVENTS;
+
+ if (EvdevAddRelClass(device) == Success) {
+
+ xf86Msg(X_INFO,"%s: initialized for relative axes.\n", device->name);
+
+ if (has_abs_axes) {
+
+ xf86Msg(X_WARNING,"%s: ignoring absolute axes.\n", device->name);
+ pEvdev->flags &= ~EVDEV_ABSOLUTE_EVENTS;
+ }
+
+ } else {
+
+ xf86Msg(X_ERROR,"%s: failed to initialize for relative axes.\n",
+ device->name);
+
+ pEvdev->flags &= ~EVDEV_RELATIVE_EVENTS;
+
+ if (has_abs_axes)
+ EvdevInitAbsClass(device, pEvdev);
+ }
+}
+
+static void
+EvdevInitTouchDevice(DeviceIntPtr device, EvdevPtr pEvdev)
+{
+ if (pEvdev->flags & EVDEV_RELATIVE_EVENTS) {
+
+ xf86Msg(X_WARNING,"%s: touchpads and touchscreens ignore relative "
+ "axes.\n", device->name);
+
+ pEvdev->flags &= ~EVDEV_RELATIVE_EVENTS;
+ }
+
+ EvdevInitAbsClass(device, pEvdev);
+}
+
static int
EvdevInit(DeviceIntPtr device)
{
@@ -1181,28 +1239,27 @@
EvdevAddKeyClass(device);
if (pEvdev->flags & EVDEV_BUTTON_EVENTS)
EvdevAddButtonClass(device);
- /* We don't allow relative and absolute axes on the same device. Reason
- Reason being that some devices (MS Optical Desktop 2000) register both
- rel and abs axes for x/y.
- The abs axes register min/max, this min/max then also applies to the
- relative device (the mouse) and caps it at 0..255 for both axis.
- So unless you have a small screen, you won't be enjoying it much.
- FIXME: somebody volunteer to fix this.
+ /* We don't allow relative and absolute axes on the same device. The
+ * reason is that some devices (MS Optical Desktop 2000) register both
+ * rel and abs axes for x/y.
+ *
+ * The abs axes register min/max; this min/max then also applies to the
+ * relative device (the mouse) and caps it at 0..255 for both axes.
+ * So, unless you have a small screen, you won't be enjoying it much;
+ * consequently, absolute axes are generally ignored.
+ *
+ * However, currenly only a device with absolute axes can be registered
+ * as a touch{pad,screen}. Thus, given such a device, absolute axes are
+ * used and relative axes are ignored.
*/
- if (pEvdev->flags & EVDEV_RELATIVE_EVENTS) {
- if (EvdevAddRelClass(device) == Success)
- {
- if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)
- xf86Msg(X_INFO,"%s: relative axes found, ignoring absolute "
- "axes.\n", device->name);
- pEvdev->flags &= ~EVDEV_ABSOLUTE_EVENTS;
- } else
- pEvdev->flags &= ~EVDEV_RELATIVE_EVENTS;
- }
- if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)
- EvdevAddAbsClass(device);
+ if (pEvdev->flags & (EVDEV_TOUCHPAD | EVDEV_TOUCHSCREEN))
+ EvdevInitTouchDevice(device, pEvdev);
+ else if (pEvdev->flags & EVDEV_RELATIVE_EVENTS)
+ EvdevInitRelClass(device, pEvdev);
+ else if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS)
+ EvdevInitAbsClass(device, pEvdev);
#ifdef HAVE_PROPERTIES
/* We drop the return value, the only time we ever want the handlers to
++++++ xf86-input-vmmouse-12.6.4.tar.bz2 -> xf86-input-vmmouse-12.6.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-vmmouse-12.6.4/aclocal.m4 new/xf86-input-vmmouse-12.6.5/aclocal.m4
--- old/xf86-input-vmmouse-12.6.4/aclocal.m4 2009-05-11 19:00:36.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.5/aclocal.m4 2009-07-29 20:11:12.000000000 +0200
@@ -6811,6 +6811,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
+dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl
@@ -6847,27 +6848,24 @@
# your configure.ac with the minimum required version, such as:
# XORG_MACROS_VERSION(1.1)
#
-# To force at least a version with this macro defined, also add:
-# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+# To ensure that this macro is defined, also add:
+# m4_ifndef([XORG_MACROS_VERSION],
+# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
#
#
# See the "minimum version" comment for each macro you use to see what
# version you require.
-AC_DEFUN([XORG_MACROS_VERSION],[
- [XORG_MACROS_needed_version=$1
- XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
- XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
- AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.6
- XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
- XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
- if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
- AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
- fi
- if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
- AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
- fi
- AC_MSG_RESULT([yes, $XORG_MACROS_version])
+m4_defun([XORG_MACROS_VERSION],[
+m4_define([vers_have], [1.2.2])
+m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
+m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
+m4_if(m4_cmp(maj_have, maj_needed), 0,,
+ [m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
+m4_if(m4_version_compare(vers_have, [$1]), -1,
+ [m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
+m4_undefine([vers_have])
+m4_undefine([maj_have])
+m4_undefine([maj_needed])
]) # XORG_MACROS_VERSION
# XORG_PROG_RAWCPP()
@@ -6892,6 +6890,10 @@
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
RAWCPPFLAGS=-undef
AC_MSG_RESULT([yes])
+ # under Cygwin unix is still defined even with -undef
+ elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+ RAWCPPFLAGS="-undef -ansi"
+ AC_MSG_RESULT([yes, with -ansi])
else
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
fi
@@ -7004,7 +7006,9 @@
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
-XORG_SGML_PATH=$prefix/share/sgml
+if test x$XORG_SGML_PATH = x ; then
+ XORG_SGML_PATH=$prefix/share/sgml
+fi
HAVE_DEFS_ENT=
if test x"$cross_compiling" = x"yes" ; then
@@ -7060,7 +7064,9 @@
# indicates whether the necessary tools and files are found and, if set,
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
AC_DEFUN([XORG_CHECK_DOCBOOK],[
-XORG_SGML_PATH=$prefix/share/sgml
+if test x$XORG_SGML_PATH = x ; then
+ XORG_SGML_PATH=$prefix/share/sgml
+fi
HAVE_DEFS_ENT=
BUILDTXTDOC=no
BUILDPDFDOC=no
@@ -7237,55 +7243,31 @@
]) # XORG_LINT_LIBRARY
-dnl Copyright 2005 Red Hat, Inc
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
-
-# XORG_DRIVER_CHECK_EXT()
-# --------------------------
-# Checks for the $1 define in xorg-server.h (from the sdk). If it
-# is defined, then add $1 to $REQUIRED_MODULES.
-
-AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include "xorg-server.h"
-#if !defined $1
-#error $1 not defined
-#endif
- ]])],
- [_EXT_CHECK=yes],
- [_EXT_CHECK=no])
- CFLAGS="$SAVE_CFLAGS"
- AC_MSG_CHECKING([if $1 is defined])
- AC_MSG_RESULT([$_EXT_CHECK])
- if test "$_EXT_CHECK" != no; then
- REQUIRED_MODULES="$REQUIRED_MODULES $2"
- fi
-])
-
+# XORG_CWARNFLAGS
+# ---------------
+# Minimum version: 1.2.0
+#
+# Defines CWARNFLAGS to enable C compiler warnings.
+#
+AC_DEFUN([XORG_CWARNFLAGS], [
+AC_REQUIRE([AC_PROG_CC])
+if test "x$GCC" = xyes ; then
+ CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast"
+ case `$CC -dumpversion` in
+ 3.4.* | 4.*)
+ CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
+ ;;
+ esac
+else
+ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+ if test "x$SUNCC" = "xyes"; then
+ CWARNFLAGS="-v"
+ fi
+fi
+AC_SUBST(CWARNFLAGS)
+]) # XORG_CWARNFLAGS
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -7348,6 +7330,72 @@
[Patch version of this package])
])
+# XORG_CHANGELOG()
+# ----------------
+# Minimum version: 1.2.0
+#
+# Defines the variable CHANGELOG_CMD as the command to generate
+# ChangeLog from git.
+#
+# Arrange that distcleancheck ignores ChangeLog left over by distclean.
+#
+AC_DEFUN([XORG_CHANGELOG], [
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
+mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
+AC_SUBST([CHANGELOG_CMD])
+AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
+]) # XORG_CHANGELOG
+
+dnl Copyright 2005 Red Hat, Inc
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl
+
+# XORG_DRIVER_CHECK_EXT()
+# --------------------------
+# Checks for the $1 define in xorg-server.h (from the sdk). If it
+# is defined, then add $1 to $REQUIRED_MODULES.
+
+AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include "xorg-server.h"
+#if !defined $1
+#error $1 not defined
+#endif
+ ]])],
+ [_EXT_CHECK=yes],
+ [_EXT_CHECK=no])
+ CFLAGS="$SAVE_CFLAGS"
+ AC_MSG_CHECKING([if $1 is defined])
+ AC_MSG_RESULT([$_EXT_CHECK])
+ if test "$_EXT_CHECK" != no; then
+ REQUIRED_MODULES="$REQUIRED_MODULES $2"
+ fi
+])
+
# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-vmmouse-12.6.4/config.h.in new/xf86-input-vmmouse-12.6.5/config.h.in
--- old/xf86-input-vmmouse-12.6.4/config.h.in 2008-10-18 02:06:14.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.5/config.h.in 2009-07-29 20:11:14.000000000 +0200
@@ -41,6 +41,9 @@
/* Has version 1.1.0 or greater of the Xserver */
#undef HAVE_XORG_SERVER_1_1_0
+/* Do not include built-in mouse module fallback */
+#undef NO_MOUSE_MODULE
+
/* Name of package */
#undef PACKAGE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-vmmouse-12.6.4/configure new/xf86-input-vmmouse-12.6.5/configure
--- old/xf86-input-vmmouse-12.6.4/configure 2009-05-11 19:00:38.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.5/configure 2009-07-29 20:11:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xf86-input-vmmouse 12.6.4.
+# Generated by GNU Autoconf 2.63 for xf86-input-vmmouse 12.6.5.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -750,8 +750,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-input-vmmouse'
PACKAGE_TARNAME='xf86-input-vmmouse'
-PACKAGE_VERSION='12.6.4'
-PACKAGE_STRING='xf86-input-vmmouse 12.6.4'
+PACKAGE_VERSION='12.6.5'
+PACKAGE_STRING='xf86-input-vmmouse 12.6.5'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1509,7 +1509,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-vmmouse 12.6.4 to adapt to many kinds of systems.
+\`configure' configures xf86-input-vmmouse 12.6.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1580,7 +1580,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-vmmouse 12.6.4:";;
+ short | recursive ) echo "Configuration of xf86-input-vmmouse 12.6.5:";;
esac
cat <<\_ACEOF
@@ -1703,7 +1703,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-vmmouse configure 12.6.4
+xf86-input-vmmouse configure 12.6.5
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1717,7 +1717,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-vmmouse $as_me 12.6.4, which was
+It was created by xf86-input-vmmouse $as_me 12.6.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2435,7 +2435,7 @@
# Define the identity of the package.
PACKAGE='xf86-input-vmmouse'
- VERSION='12.6.4'
+ VERSION='12.6.5'
cat >>confdefs.h <<_ACEOF
@@ -21207,6 +21207,18 @@
_ACEOF
fi
+if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.6.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.6.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MOUSE_MODULE 1
+_ACEOF
+
+fi
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
@@ -21960,7 +21972,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-vmmouse $as_me 12.6.4, which was
+This file was extended by xf86-input-vmmouse $as_me 12.6.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22023,7 +22035,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xf86-input-vmmouse config.status 12.6.4
+xf86-input-vmmouse config.status 12.6.5
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-vmmouse-12.6.4/configure.ac new/xf86-input-vmmouse-12.6.5/configure.ac
--- old/xf86-input-vmmouse-12.6.4/configure.ac 2009-05-11 18:59:48.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.5/configure.ac 2009-07-29 20:11:04.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.6.4,
+ 12.6.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
@@ -115,6 +115,9 @@
PKG_CHECK_EXISTS([xorg-server > 1.4.0.90],
[AC_DEFINE([ABS_VALUATOR_AXES], 1,
[Define absolute valuator axes])])
+PKG_CHECK_EXISTS([xorg-server >= 1.6.0],
+ [AC_DEFINE([NO_MOUSE_MODULE], 1,
+ [Do not include built-in mouse module fallback])])
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-input-vmmouse-12.6.4/src/vmmouse.c new/xf86-input-vmmouse-12.6.5/src/vmmouse.c
--- old/xf86-input-vmmouse-12.6.4/src/vmmouse.c 2009-05-11 18:59:48.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.5/src/vmmouse.c 2009-08-06 19:23:09.000000000 +0200
@@ -68,6 +68,10 @@
#include "xf86OSmouse.h"
#include "compiler.h"
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+#include
+#endif
+
#include "xisb.h"
#include "mipointer.h"
@@ -95,7 +99,7 @@
*/
#define VMMOUSE_MAJOR_VERSION 12
#define VMMOUSE_MINOR_VERSION 6
-#define VMMOUSE_PATCHLEVEL 4
+#define VMMOUSE_PATCHLEVEL 5
#define VMMOUSE_DRIVER_VERSION \
(VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL)
#define VMMOUSE_DRIVER_VERSION_STRING \
@@ -116,9 +120,6 @@
/*****************************************************************************
* static function header
****************************************************************************/
-#ifdef XFree86LOADER
-static const OptionInfoRec *VMMouseAvailableOptions(void *unused);
-#endif
static InputInfoPtr VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags);
static void VMMouseUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
static void MouseCommonOptions(InputInfoPtr pInfo);
@@ -202,68 +203,6 @@
0
};
-typedef enum {
- OPTION_ALWAYS_CORE,
- OPTION_SEND_CORE_EVENTS,
- OPTION_CORE_POINTER,
- OPTION_SEND_DRAG_EVENTS,
- OPTION_HISTORY_SIZE,
- OPTION_DEVICE,
- OPTION_PROTOCOL,
- OPTION_BUTTONS,
- OPTION_EMULATE_3_BUTTONS,
- OPTION_EMULATE_3_TIMEOUT,
- OPTION_CHORD_MIDDLE,
- OPTION_FLIP_XY,
- OPTION_INV_X,
- OPTION_INV_Y,
- OPTION_ANGLE_OFFSET,
- OPTION_Z_AXIS_MAPPING,
- OPTION_SAMPLE_RATE,
- OPTION_RESOLUTION,
- OPTION_EMULATE_WHEEL,
- OPTION_EMU_WHEEL_BUTTON,
- OPTION_EMU_WHEEL_INERTIA,
- OPTION_X_AXIS_MAPPING,
- OPTION_Y_AXIS_MAPPING,
- OPTION_AUTO_SOFT,
- OPTION_DRAGLOCKBUTTONS
-} MouseOpts;
-
-/*
- * Define the acceptable mouse options
- * Currently not all of those options are supported
- *
- */
-static const OptionInfoRec mouseOptions[] = {
- { OPTION_ALWAYS_CORE, "AlwaysCore", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_SEND_CORE_EVENTS, "SendCoreEvents", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_CORE_POINTER, "CorePointer", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_SEND_DRAG_EVENTS, "SendDragEvents", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_HISTORY_SIZE, "HistorySize", OPTV_INTEGER, {0}, FALSE },
- { OPTION_DEVICE, "Device", OPTV_STRING, {0}, FALSE },
- { OPTION_PROTOCOL, "Protocol", OPTV_STRING, {0}, FALSE },
- { OPTION_BUTTONS, "Buttons", OPTV_INTEGER, {0}, FALSE },
- { OPTION_EMULATE_3_BUTTONS, "Emulate3Buttons",OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_EMULATE_3_TIMEOUT, "Emulate3Timeout",OPTV_INTEGER, {0}, FALSE },
- { OPTION_CHORD_MIDDLE, "ChordMiddle", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_FLIP_XY, "FlipXY", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_INV_X, "InvX", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_INV_Y, "InvY", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_ANGLE_OFFSET, "AngleOffset", OPTV_INTEGER, {0}, FALSE },
- { OPTION_Z_AXIS_MAPPING, "ZAxisMapping", OPTV_STRING, {0}, FALSE },
- { OPTION_SAMPLE_RATE, "SampleRate", OPTV_INTEGER, {0}, FALSE },
- { OPTION_RESOLUTION, "Resolution", OPTV_INTEGER, {0}, FALSE },
- { OPTION_EMULATE_WHEEL, "EmulateWheel", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_EMU_WHEEL_BUTTON, "EmulateWheelButton", OPTV_INTEGER, {0}, FALSE },
- { OPTION_EMU_WHEEL_INERTIA, "EmulateWheelInertia", OPTV_INTEGER, {0}, FALSE },
- { OPTION_X_AXIS_MAPPING, "XAxisMapping", OPTV_STRING, {0}, FALSE },
- { OPTION_Y_AXIS_MAPPING, "YAxisMapping", OPTV_STRING, {0}, FALSE },
- { OPTION_AUTO_SOFT, "AutoSoft", OPTV_BOOLEAN, {0}, FALSE },
- { OPTION_DRAGLOCKBUTTONS, "DragLockButtons",OPTV_STRING, {0}, FALSE },
- { -1, NULL, OPTV_NONE, {0}, FALSE }
-};
-
static char reverseMap[32] = { 0, 4, 2, 6, 1, 5, 3, 7,
8, 12, 10, 14, 9, 13, 11, 15,
16, 20, 18, 22, 17, 21, 19, 23,
@@ -297,6 +236,9 @@
InputInfoPtr pInfo;
MouseDevPtr pMse;
VMMousePrivPtr mPriv;
+
+#ifndef NO_MOUSE_MODULE
+{
OSMouseInfoPtr osInfo = NULL;
/*
@@ -305,6 +247,8 @@
osInfo = xf86OSMouseInit(0);
if (!osInfo)
return FALSE;
+}
+#endif
mPriv = xcalloc (1, sizeof (VMMousePrivRec));
@@ -416,14 +360,6 @@
return pInfo;
}
-#ifdef XFree86LOADER
-static const OptionInfoRec *
-VMMouseAvailableOptions(void *unused)
-{
- return (mouseOptions);
-}
-#endif
-
/*
*----------------------------------------------------------------------
@@ -776,6 +712,10 @@
VMMousePrivPtr mPriv;
unsigned char map[MSE_MAXBUTTONS + 1];
int i;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ Atom btn_labels[MSE_MAXBUTTONS] = {0};
+ Atom axes_labels[2] = { 0, 0 };
+#endif
pInfo = device->public.devicePrivate;
pMse = pInfo->private;
@@ -791,9 +731,30 @@
*/
for (i = 0; i < MSE_MAXBUTTONS; i++)
map[i + 1] = i + 1;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+ btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+ btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+ btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+ btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+ btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+ btn_labels[7] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+ /* other buttons are unknown */
+
+#ifdef ABS_VALUATOR_AXES
+ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+#else
+ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+#endif /* ABS_VALUATOR_AXES */
+#endif
InitPointerDeviceStruct((DevicePtr)device, map,
min(pMse->buttons, MSE_MAXBUTTONS),
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ btn_labels,
+#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
miPointerGetMotionEvents,
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
@@ -805,20 +766,39 @@
#else
GetMotionHistorySize(), 2
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ , axes_labels
+#endif
);
/* X valuator */
#ifdef ABS_VALUATOR_AXES
- xf86InitValuatorAxisStruct(device, 0, 0, 65535, 10000, 0, 10000);
+ xf86InitValuatorAxisStruct(device, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels[0],
+#endif
+ 0, 65535, 10000, 0, 10000);
#else
- xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels[0],
+#endif
+ 0, -1, 1, 0, 1);
#endif
xf86InitValuatorDefaults(device, 0);
/* Y valuator */
#ifdef ABS_VALUATOR_AXES
- xf86InitValuatorAxisStruct(device, 1, 0, 65535, 10000, 0, 10000);
+ xf86InitValuatorAxisStruct(device, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels[1],
+#endif
+ 0, 65535, 10000, 0, 10000);
#else
- xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels[1],
+#endif
+ 0, -1, 1, 0, 1);
#endif
xf86InitValuatorDefaults(device, 1);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
@@ -1146,14 +1126,6 @@
#ifdef XFree86LOADER
-ModuleInfoRec VMMouseInfo = {
- 1,
- "VMMOUSE",
- NULL,
- 0,
- VMMouseAvailableOptions,
-};
-
/*
*----------------------------------------------------------------------
@@ -1202,7 +1174,6 @@
int *errmin)
{
static Bool Initialised = FALSE;
- char *name;
xf86LoaderReqSymLists(reqSymbols, NULL);
@@ -1212,6 +1183,9 @@
xf86Msg(X_INFO, "VMWARE(0): VMMOUSE module was loaded\n");
xf86AddInputDriver(&VMMOUSE, module, 0);
+#ifndef NO_MOUSE_MODULE
+{
+ char *name;
/*
* Load the normal mouse module as submodule
* If we fail in PreInit later, this allows us to fall back to normal mouse module
@@ -1227,6 +1201,8 @@
LoaderErrorMsg(NULL, name, *errmaj, *errmin);
}
xfree(name);
+}
+#endif
return module;
}
@@ -1247,7 +1223,7 @@
/*
* The variable contains the necessary information to load and initialize the module
*/
-XF86ModuleData vmmouseModuleData = {
+_X_EXPORT XF86ModuleData vmmouseModuleData = {
&VMMouseVersionRec,
VMMousePlug,
VMMouseUnplug
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org