commit xorg-x11-driver-input - openSUSE Commits

29 Oct 2008

Hello community,
here is the log from the commit of package xorg-x11-driver-input
checked in at Wed Oct 29 11:12:49 CET 2008.
--------

--- xorg-x11-driver-input/xorg-x11-driver-input.changes	2008-10-18 06:56:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes	2008-10-28 22:39:14.100604158 +0100
@@ -1,0 +2,5 @@
+Tue Oct 28 22:38:42 CET 2008 - sndirsch@suse.de
+
+- back to xf86-input-vmmouse 12.5.1 (bnc #439664) 
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
  xf86-input-vmmouse-12.5.2.tar.bz2
New:
----
  xf86-input-vmmouse-12.5.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.U23149/_old	2008-10-29 11:12:16.000000000 +0100
+++ /var/tmp/diff_new_pack.U23149/_new	2008-10-29 11:12:16.000000000 +0100
@@ -23,7 +23,7 @@
 BuildRequires:  Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
 Url:            http://xorg.freedesktop.org/
 Version:        7.4
-Release:        7
+Release:        8
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -55,7 +55,7 @@
 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.5.2.tar.bz2
+Source26:       xf86-input-vmmouse-12.5.1.tar.bz2
 Source27:       xf86-input-void-1.1.1.tar.bz2
 Source28:       xf86-input-diamondtouch-0.3.0.tar.bz2
 # extra sources
@@ -155,6 +155,8 @@
 %{_mandir}/man4/*
%changelog
+* Tue Oct 28 2008 sndirsch@suse.de
+- back to xf86-input-vmmouse 12.5.1 (bnc #439664)
 * Sat Oct 18 2008 sndirsch@suse.de
 - xf86-input-vmmouse 12.5.2
   * Remove useless call to xf86AddModuleInfo
@@ -225,7 +227,7 @@
 * Thu Jul 03 2008 sndirsch@suse.de
 - updated xf86-input-magictouch to git commit 7f90f6a; required for
   xorg-server 1.5
-* Thu Jun 26 2008 sndirsch@suse.de
+* Wed Jun 25 2008 sndirsch@suse.de
 - xf86-input-diamondtouch 0.3.0
   * "This driver is not part of the X.Org distribution. In the
   process of tying up loose ends, the DiamondTouch driver has
@@ -273,7 +275,7 @@
 * Sat Apr 19 2008 sndirsch@suse.de
 - xf86-input-evdev-commit-eeb3727.diff
   * Don't flush buttons on init (bfo #12630, bnc #381543)
-* Sun Mar 23 2008 sndirsch@suse.de
+* Sat Mar 22 2008 sndirsch@suse.de
 - xf86-input-calcomp 1.1.2
   xf86-input-digitaledge 1.1.1
   xf86-input-dmc 1.1.2
@@ -574,7 +576,7 @@
 - removed Requires: xorg-x11-server, since xorg-x11-input-input is
   already required by xorg-x11-server, which resulted in a fatal
   dependancy cycle
-* Sun Aug 06 2006 sndirsch@suse.de
+* Sat Aug 05 2006 sndirsch@suse.de
 - p_mouse_misc.diff:
   * patch to fix X server crashes with synaptics driver (Bug #61702)
 - p_kbd.diff:
++++++ xf86-input-vmmouse-12.5.2.tar.bz2 -> xf86-input-vmmouse-12.5.1.tar.bz2 ++++++
++++ 15466 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-vmmouse-12.5.2/config.h.in new/xf86-input-vmmouse-12.5.1/config.h.in
--- old/xf86-input-vmmouse-12.5.2/config.h.in	2008-10-18 02:06:14.000000000 +0200
+++ new/xf86-input-vmmouse-12.5.1/config.h.in	2008-05-22 22:25:50.000000000 +0200
@@ -2,9 +2,6 @@
#include "xorg-server.h"
-/* Define absolute valuator axes */
-#undef ABS_VALUATOR_AXES
-
 /* Call conversion_proc from within the driver, as Xserver doesn't */
 #undef CALL_CONVERSION_PROC
@@ -59,15 +56,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
-/* Major version of this package */
-#undef PACKAGE_VERSION_MAJOR
-
-/* Minor version of this package */
-#undef PACKAGE_VERSION_MINOR
-
-/* Patch version of this package */
-#undef PACKAGE_VERSION_PATCHLEVEL
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
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-vmmouse-12.5.2/configure.ac new/xf86-input-vmmouse-12.5.1/configure.ac
--- old/xf86-input-vmmouse-12.5.2/configure.ac	2008-10-18 04:41:46.000000000 +0200
+++ new/xf86-input-vmmouse-12.5.1/configure.ac	2008-05-21 07:41:20.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
 AC_INIT([xf86-input-vmmouse],
-        12.5.2,
+        12.5.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-input-vmmouse)
@@ -86,9 +86,6 @@
                  [AC_DEFINE([CALL_CONVERSION_PROC], 1,
                             [Call conversion_proc from within the driver, as
                              Xserver doesn't])])
-PKG_CHECK_EXISTS([xorg-server > 1.4.0.90],
-		 [AC_DEFINE([ABS_VALUATOR_AXES], 1,
-			    [Define absolute valuator axes])])
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
 AC_SUBST([CFLAGS])
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-vmmouse-12.5.2/missing new/xf86-input-vmmouse-12.5.1/missing
--- old/xf86-input-vmmouse-12.5.2/missing	2007-02-27 20:35:39.000000000 +0100
+++ new/xf86-input-vmmouse-12.5.1/missing	2008-04-18 01:27:09.000000000 +0200
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard pinard@iro.umontreal.ca, 1996.
@@ -33,6 +33,8 @@
 fi
run=:
+sed_output='s/.* --output[ =]([^ ]*).*/\1/p'
+sed_minuso='s/.* -o ([^ ]*).*/\1/p'
# In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@
   aclocal      touch file `aclocal.m4'
   autoconf     touch file `configure'
   autoheader   touch file `config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all `Makefile.in' files
   bison        create `y.tab.[ch]', if possible, from existing .[ch]
   flex         create `lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: `$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
    			       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
          You can get `$1' as part of `Autoconf' from any GNU
          archive site."
-    file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
    touch $file
     else
@@ -214,25 +217,25 @@
          in order for those modifications to take effect.  You can get
          `Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
    *.y)
        SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
             cp "$SRCFILE" y.tab.c
        fi
        SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
             cp "$SRCFILE" y.tab.h
        fi
      ;;
    esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
    echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
    echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@
          in order for those modifications to take effect.  You can get
          `Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
    *.l)
        SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
             cp "$SRCFILE" lex.yy.c
        fi
      ;;
    esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
    echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@
     `Help2man' package in order for those modifications to take
     effect.  You can get `Help2man' from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
    touch $file
     else
    test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
          DU, IRIX).  You might want to install the `Texinfo' package or
          the `GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* ([^ ]*) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -317,13 +324,13 @@
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
    *o*)
        firstarg=`echo "$firstarg" | sed s/o//`
        tar "$firstarg" "$@" && exit 0
        ;;
    esac
-	case "$firstarg" in
+	case $firstarg in
    *h*)
        firstarg=`echo "$firstarg" | sed s/h//`
        tar "$firstarg" "$@" && exit 0
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-vmmouse-12.5.2/src/vmmouse.c new/xf86-input-vmmouse-12.5.1/src/vmmouse.c
--- old/xf86-input-vmmouse-12.5.2/src/vmmouse.c	2008-10-18 04:56:49.000000000 +0200
+++ new/xf86-input-vmmouse-12.5.1/src/vmmouse.c	2008-05-21 07:41:20.000000000 +0200
@@ -95,7 +95,7 @@
  */
 #define VMMOUSE_MAJOR_VERSION 12
 #define VMMOUSE_MINOR_VERSION 5
-#define VMMOUSE_PATCHLEVEL 2
+#define VMMOUSE_PATCHLEVEL 1
 #define VMMOUSE_DRIVER_VERSION \
    (VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL)
 #define VMMOUSE_DRIVER_VERSION_STRING \
@@ -675,7 +675,7 @@
    /*
     * Process option for ZAxisMapping
     */
-   s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
+   s = xf86SetStrOption(pInfo->options, "ZAxisMapping", NULL);
    if (s) {
       int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
       char *msg = NULL;
@@ -795,7 +795,7 @@
    		      min(pMse->buttons, MSE_MAXBUTTONS),
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
    			miPointerGetMotionEvents,
-#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+#else
                                 GetMotionHistory,
 #endif
                                 pMse->Ctrl,
@@ -807,18 +807,10 @@
                                 );
/* X valuator */
-#ifdef ABS_VALUATOR_AXES
-      xf86InitValuatorAxisStruct(device, 0, 0, 65535, 10000, 0, 10000);
-#else
       xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
-#endif
       xf86InitValuatorDefaults(device, 0);
       /* Y valuator */
-#ifdef ABS_VALUATOR_AXES
-      xf86InitValuatorAxisStruct(device, 1, 0, 65535, 10000, 0, 10000);
-#else
       xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
-#endif
       xf86InitValuatorDefaults(device, 1);
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
       xf86MotionHistoryAllocate(pInfo);
@@ -1188,8 +1180,13 @@
xf86LoaderReqSymLists(reqSymbols, NULL);
-   if (!Initialised)
+   if (!Initialised) {
       Initialised = TRUE;
+#ifndef REMOVE_LOADER_CHECK_MODULE_INFO
+      if (xf86LoaderCheckSymbol("xf86AddModuleInfo"))
+#endif
+	 xf86AddModuleInfo(&VMMouseInfo, module);
+   }
xf86Msg(X_INFO, "VMWARE(0): VMMOUSE module was loaded\n");
    xf86AddInputDriver(&VMMOUSE, module, 0);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    