Hello community,
here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory
checked in at Mon Sep 12 10:38:05 CEST 2011.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2011-09-01 15:43:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2011-09-11 02:47:09.000000000 +0200
@@ -1,0 +2,32 @@
+Sun Sep 11 00:46:18 UTC 2011 - sndirsch@suse.com
+
+- set INPUT_ABI_VERSION = 12
+
+-------------------------------------------------------------------
+Wed Sep 7 10:52:48 UTC 2011 - sndirsch@suse.com
+
+- xf86-input-vmmouse-12.7.0
+ * The 12.7.0 release is a stable release that provides support
+ for input ABI major version 12 which is required by X server
+ releases > 1.9
+
+-------------------------------------------------------------------
+Wed Sep 7 08:54:12 UTC 2011 - sndirsch@suse.com
+
+- driver updates required for new input ABI 12
+ * xf86-input-acecad 1.5.0
+ * xf86-input-aiptek 1.4.1
+ * xf86-input-elographics 1.3.0
+ * xf86-input-fpit 1.4.0 (obsoletes xf86-input-fpit.diff)
+ * xf86-input-hyperpen 1.4.1 (obsoletes xf86-input-hyperpen.diff)
+ * xf86-input-joystick 1.6.0
+ * xf86-input-keyboard 1.6.0
+ * xf86-input-mouse 1.7.1
+ * xf86-input-mutouch 1.3.0 (obsoletes xf86-input-mutouch.diff)
+ * xf86-input-penmount 1.5.0
+ * xf86-input-synaptics-1.5.0
+ * xf86-input-void 1.4.0
+- disabled Takashi's synaptics driver patches for now
+- removed xf86-input-wacom-no-n-trig.diff (bnc #686498, comment #18)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-input-acecad-1.4.0.tar.bz2
xf86-input-aiptek-1.3.1.tar.bz2
xf86-input-elographics-1.2.4.tar.bz2
xf86-input-fpit-1.3.0.tar.bz2
xf86-input-fpit.diff
xf86-input-hyperpen-1.3.0.tar.bz2
xf86-input-hyperpen.diff
xf86-input-joystick-1.5.0.tar.bz2
xf86-input-keyboard-1.5.0.tar.bz2
xf86-input-mouse-1.6.0.tar.bz2
xf86-input-mutouch-1.2.1.tar.bz2
xf86-input-mutouch.diff
xf86-input-penmount-1.4.1.tar.bz2
xf86-input-synaptics-1.3.0.tar.bz2
xf86-input-vmmouse-12.6.99.901.tar.bz2
xf86-input-void-1.3.1.tar.bz2
xf86-input-wacom-no-n-trig.diff
New:
----
xf86-input-acecad-1.5.0.tar.bz2
xf86-input-aiptek-1.4.1.tar.bz2
xf86-input-elographics-1.3.0.tar.bz2
xf86-input-fpit-1.4.0.tar.bz2
xf86-input-hyperpen-1.4.1.tar.bz2
xf86-input-joystick-1.6.0.tar.bz2
xf86-input-keyboard-1.6.0.tar.bz2
xf86-input-mouse-1.7.1.tar.bz2
xf86-input-mutouch-1.3.0.tar.bz2
xf86-input-penmount-1.5.0.tar.bz2
xf86-input-synaptics-1.5.0.tar.bz2
xf86-input-vmmouse-12.7.0.tar.bz2
xf86-input-void-1.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.bzV1NT/_old 2011-09-12 10:37:57.000000000 +0200
+++ /var/tmp/diff_new_pack.bzV1NT/_new 2011-09-12 10:37:57.000000000 +0200
@@ -23,31 +23,31 @@
BuildRequires: Mesa-devel libudev-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.6
-Release: 36
+Release: 38
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
Requires: xkeyboard-config >= 1.5 udev
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/mouse_drv.so x11-input-synaptics x11-input-wacom x11-input-wacom-devel x11-input-wacom-tools
-Requires: INPUT_ABI_VERSION = 11
+Requires: INPUT_ABI_VERSION = 12
Obsoletes: x11-input-synaptics x11-input-wacom x11-input-wacom-devel x11-input-wacom-tools
Supplements: xorg-x11-server
Summary: X.Org input drivers
ExcludeArch: s390 s390x
-Source0: xf86-input-acecad-1.4.0.tar.bz2
-Source1: xf86-input-aiptek-1.3.1.tar.bz2
-Source8: xf86-input-elographics-1.2.4.tar.bz2
-Source10: xf86-input-fpit-1.3.0.tar.bz2
-Source11: xf86-input-hyperpen-1.3.0.tar.bz2
+Source0: xf86-input-acecad-1.5.0.tar.bz2
+Source1: xf86-input-aiptek-1.4.1.tar.bz2
+Source8: xf86-input-elographics-1.3.0.tar.bz2
+Source10: xf86-input-fpit-1.4.0.tar.bz2
+Source11: xf86-input-hyperpen-1.4.1.tar.bz2
Source12: xf86-input-jamstudio-1.2.0.tar.bz2
-Source13: xf86-input-joystick-1.5.0.tar.bz2
-Source14: xf86-input-keyboard-1.5.0.tar.bz2
-Source18: xf86-input-mouse-1.6.0.tar.bz2
-Source19: xf86-input-mutouch-1.2.1.tar.bz2
-Source21: xf86-input-penmount-1.4.1.tar.bz2
-Source26: xf86-input-vmmouse-12.6.99.901.tar.bz2
-Source27: xf86-input-void-1.3.1.tar.bz2
-Source29: xf86-input-synaptics-1.3.0.tar.bz2
+Source13: xf86-input-joystick-1.6.0.tar.bz2
+Source14: xf86-input-keyboard-1.6.0.tar.bz2
+Source18: xf86-input-mouse-1.7.1.tar.bz2
+Source19: xf86-input-mutouch-1.3.0.tar.bz2
+Source21: xf86-input-penmount-1.5.0.tar.bz2
+Source26: xf86-input-vmmouse-12.7.0.tar.bz2
+Source27: xf86-input-void-1.4.0.tar.bz2
+Source29: xf86-input-synaptics-1.5.0.tar.bz2
Source30: xf86-input-evdev-2.6.0.tar.bz2
Source33: xf86-input-wacom-0.11.1.tar.bz2
Source42: 11-mouse.conf
@@ -55,9 +55,6 @@
Patch2: xf86-input-jamstudio.diff
Patch23: xf86-input-synaptics-wait.diff
Patch24: xf86-input-synaptics-settings.diff
-Patch39: xf86-input-fpit.diff
-Patch40: xf86-input-hyperpen.diff
-Patch41: xf86-input-mutouch.diff
Patch47: xf86-input-vmmouse-iopl.diff
Patch48: xf86-input-synaptics-xorg.conf.d_snippet.diff
Patch49: xf86-input-synaptics-add-clickpad-support.diff
@@ -69,7 +66,6 @@
Patch55: xf86-input-synaptics-clickpad-threshold.diff
Patch56: xf86-input-synaptics-move-threshold.diff
Patch57: xf86-input-synaptics-filter-bogus-coord.diff
-Patch58: xf86-input-wacom-no-n-trig.diff
Patch59: U_xf86-input-synaptics_Drain-XRecord-connection-of-any-events-after-handlin.patch
%description
@@ -92,30 +88,22 @@
pushd xf86-input-jamstudio-*
%patch2
popd
-pushd xf86-input-synaptics-*
-%patch23 -p0
-%patch24 -p0
-%patch48 -p0
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch59 -p1
-popd
-pushd xf86-input-fpit-*
-%patch39 -p1
-popd
-pushd xf86-input-hyperpen-*
-%patch40 -p1
-popd
-pushd xf86-input-mutouch-*
-%patch41 -p1
-popd
+### Takashi's patches disabled for now due to driver update 1.3.0 --> 1.5.0
+#pushd xf86-input-synaptics-*
+#%patch23 -p0
+#%patch24 -p0
+#%patch48 -p0
+#%patch49 -p1
+#%patch50 -p1
+#%patch51 -p1
+#%patch52 -p1
+#%patch53 -p1
+#%patch54 -p1
+#%patch55 -p1
+#%patch56 -p1
+#%patch57 -p1
+#%patch59 -p1
+#popd
%ifnarch %ix86 x86_64
rm -rf xf86-input-vmmouse*
%else
@@ -123,9 +111,6 @@
%patch47 -p1
popd
%endif
-pushd xf86-input-wacom-*
-%patch58 -p1
-popd
%build
for dir in $(ls); do
++++++ xf86-input-acecad-1.4.0.tar.bz2 -> xf86-input-acecad-1.5.0.tar.bz2 ++++++
++++ 31015 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-acecad-1.4.0/ChangeLog new/xf86-input-acecad-1.5.0/ChangeLog
--- old/xf86-input-acecad-1.4.0/ChangeLog 2009-09-11 03:58:35.000000000 +0200
+++ new/xf86-input-acecad-1.5.0/ChangeLog 2011-05-05 00:56:34.000000000 +0200
@@ -1,3 +1,416 @@
+commit ba7205b258a92886e2b2b269bd92a607b50a9984
+Author: Cyril Brulebois
+Date: Thu May 5 00:23:24 2011 +0200
+
+ acecad 1.5.0
+
+ Signed-off-by: Cyril Brulebois
+
+commit f8e87eaf4031774ad319bff3756494728614d73d
+Author: Peter Hutterer
+Date: Thu Dec 2 10:44:20 2010 +1000
+
+ The driver doesn't need libXext
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Gaetan Nadon
+
+commit db1153d0d463da2e1e894beebbcb293141fa3ac5
+Author: Peter Hutterer
+Date: Thu Dec 2 10:36:48 2010 +1000
+
+ Bump to 1.4.99
+
+ Signed-off-by: Peter Hutterer
+
+commit 802dd194dc8a571f600e05a93505681ae1ce13c7
+Author: Peter Hutterer
+Date: Thu Nov 25 13:01:53 2010 +1000
+
+ Add mode field to InitValuatorAxisStruct
+
+ Signed-off-by: Peter Hutterer
+
+commit f85c4b580c074f7054eac98753d1f4e91f08305e
+Author: Peter Hutterer
+Date: Fri Sep 10 10:26:47 2010 +1000
+
+ Adjust to new PreInit for ABI 12.
+
+ Most of the init is now handled by the server, not by the driver.
+
+ Signed-off-by: Peter Hutterer
+
+commit ca93073692a4b8fab32945d76a1d1d16a435c800
+Author: Peter Hutterer
+Date: Fri Sep 10 10:33:01 2010 +1000
+
+ Use a local variable for history_size.
+
+ Field was removed from InputInfoRec in ABI and the server hasn't actually
+ accessed this field for quite a while.
+
+ Signed-off-by: Peter Hutterer
+
+commit 053f56d3086082f8335cef906baba23ef8482a73
+Author: Peter Hutterer
+Date: Fri Sep 10 10:23:19 2010 +1000
+
+ Purge close_proc, hasn't been called by the server for ages.
+
+ Signed-off-by: Peter Hutterer
+
+commit b4e69d500dc0087bedafd7221abcb8e62800b84a
+Author: Peter Hutterer
+Date: Fri Sep 10 10:20:00 2010 +1000
+
+ Move default_options up, preparation work for ABI 12.
+
+ Signed-off-by: Peter Hutterer
+
+commit eab975ab3e576a6d223df07f0d9501e7bed317f0
+Author: Peter Hutterer
+Date: Fri Sep 10 10:10:08 2010 +1000
+
+ Remove libc wrapper usage for xcalloc, xfree, etc.
+
+ Signed-off-by: Peter Hutterer
+
+commit a48b52684e184cac7979247c4a5af4250a9aa809
+Author: Peter Hutterer
+Date: Fri Sep 10 10:08:41 2010 +1000
+
+ Replace LocalDevicePtr with InputInfoPtr.
+
+ LocalDevicePtr was removed with input ABI 12, but InputInfoPtr has been
+ around for years anyway.
+
+ Signed-off-by: Peter Hutterer
+
+commit 4e8963e7b157aa61331824e57c16f467b2570c6b
+Author: Peter Hutterer
+Date: Fri Sep 10 10:04:41 2010 +1000
+
+ Remove usage of XI86_POINTER_CAPABLE.
+
+ Flag was a write-only flag in both the server and the driver has now been
+ removed from the server.
+
+ Signed-off-by: Peter Hutterer
+
+commit e282087cfe70917232ff520929ccbdbe6b4c521e
+Author: Alan Coopersmith
+Date: Wed Oct 27 22:19:19 2010 -0700
+
+ Remove refcnt field from InputDriverRec.
+
+ Wasn't used in the server and is now removed.
+
+ Fixes compiler error:
+ "acecad.c", line 111: too many struct/union initializers
+
+ Signed-off-by: Alan Coopersmith
+
+commit 96a383c95f8d97b966249eccb31734375df2c295
+Author: Gaetan Nadon
+Date: Wed Jun 9 16:34:03 2010 -0400
+
+ config: requires RANDR through xf86.h
+
+ The xf86.h file contains external declarations specific to RANDR
+ Will not compile if this extension is not installed.
+ Because this is an optional extension, XORG_DRIVER_CHECK_EXT
+ must be used.
+
+ Signed-off-by: Gaetan Nadon
+
+commit af91ec0384790896ccece958fbd6aeb192102691
+Author: Gaetan Nadon
+Date: Wed Jun 9 16:32:39 2010 -0400
+
+ config: requires xext, kb and input extensions through xf86.h
+
+ The xf86.h file includes headers from these protocols.
+ Will not compile if these extensions are not installed.
+ Because these extensions are always defined in the server, XORG_DRIVER_CHECK_EXT
+ should not be used.
+
+ Signed-off-by: Gaetan Nadon
+
+commit e0ae1a1068508dabe046c124c480591371573b31
+Author: Gaetan Nadon
+Date: Thu May 27 19:26:56 2010 -0400
+
+ config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
+
+ It depends on util-macros 1.8
+ The existing statement can now be removed from the configuration file.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 23d6e6ad46a4636bf47be127eb770458d45904db
+Author: Gaetan Nadon
+Date: Thu May 27 19:25:22 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use Automake recommened $() for makefile variables.
+
+ Signed-off-by: Gaetan Nadon
+
+commit bb15c68091a78871196aa9366b22c00589601fb4
+Author: Gaetan Nadon
+Date: Mon May 10 20:40:45 2010 -0400
+
+ config: acecad does not use the input protocol
+
+ There is no need to PKG_CHECK_MODULES inputproto
+
+ Signed-off-by: Gaetan Nadon
+
+commit 25cf54dc5973be1427daf33e9bc6d907ccebc596
+Author: Gaetan Nadon
+Date: Mon May 10 21:17:43 2010 -0400
+
+ config: AC_PROG_SED is required explicitly on Solaris
+
+ It sets the SED env variable with an appropriate sed program path
+
+ Signed-off-by: Gaetan Nadon
+
+commit 72b78672b172453f14811a3c1877a88292b496b3
+Author: Gaetan Nadon
+Date: Sat Apr 17 19:04:02 2010 -0400
+
+ man: Use Autoconf provided $(AM_V_GEN)$(SED)
+
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Gaetan Nadon
+
+commit e2795bba90fb0b332d6ba8c3f453e4f6359fb24e
+Author: Gaetan Nadon
+Date: Fri Apr 16 15:09:19 2010 -0400
+
+ config: optional extension check for inputproto not required
+
+ The check should be in PKG_CHECK_MODULES permanently.
+
+ The XORG_DRIVER_CHECK_EXT will add inputproto to PKG_CHECK_MODULES
+ only if the extension is available. By definition, this extension
+ is always available and the acecad driver cannot function without it.
+
+ This is evidenced by the absence of XINPUT conditional code.
+
+ Acked-by: Peter Hutterer
+ Signed-off-by: Gaetan Nadon
+
+commit 6751ab441bd35916926e24607599509a610a00be
+Author: Gaetan Nadon
+Date: Thu Apr 15 20:01:51 2010 -0400
+
+ config: remove extension check for unused RANDR extension
+
+ The randr protocol is not used, no randr*.h are included.
+
+ Acked-by: Peter Hutterer
+ Signed-off-by: Gaetan Nadon
+
+commit a86cb44b1dfe5ccfb05879ca49caf4288df540e4
+Author: Gaetan Nadon
+Date: Thu Apr 15 16:41:35 2010 -0400
+
+ config: fix checking for extensions section
+
+ A hidden dependency on statement order was discovered.
+ The REQUIRE_MODULES variable was removed but needed.
+ Comments added to clarify the situation.
+
+ Signed-off-by: Gaetan Nadon
+
+commit e9770dfe4e54993c2c53922fe9b37976e4e147cd
+Author: Gaetan Nadon
+Date: Mon Apr 12 16:42:08 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Acked-by: Peter Hutterer
+ Signed-off-by: Gaetan Nadon
+
+commit 35fd1d69c7377d26eae631033b93bccd1b7fd1d7
+Author: Gaetan Nadon
+Date: Sat Apr 10 22:13:17 2010 -0400
+
+ config: fix warnings and layout
+
+ Minor upgrades. Layout and comment statements.
+ Remove AC_PROG_CC as it overrides AC_PROG_C_C99 from
+ XORG_STRICT_OPTION.
+
+ Acked-by: Peter Hutterer
+ Signed-off-by: Gaetan Nadon
+
+commit 47dc3a9b851de8dd4b915ca8da43e7c744ee1730
+Author: Gaetan Nadon
+Date: Thu Apr 15 08:41:27 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements at the top.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 9071703d43771a57bab00e33238fd0f99e9ce302
+Author: Gaetan Nadon
+Date: Sat Apr 10 20:41:06 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Acked-by: Peter Hutterer
+ Signed-off-by: Gaetan Nadon
+
+commit 0b601a14627538877ee89492e4b884da8152ff4c
+Author: Gaetan Nadon
+Date: Sat Apr 10 19:46:47 2010 -0400
+
+ config: simplify configuration regarding sysfs headers and library.
+
+ Replace deprecated AC_HEADER_CHECK with AC_CHECK_HEADERS
+ AC_CHECK_LIB ensures sysfs library is present and adds -lsysfs
+ AC_CHECK_HEADERS verifies sysfs and linux input headers are present
+
+ Acked-by: Peter Hutterer
+ Signed-off-by: Gaetan Nadon
+
+commit 64a899b00564fd16250068da1eab1e3dacdd3477
+Author: Gaetan Nadon
+Date: Mon Apr 12 09:13:39 2010 -0400
+
+ config: add conditional inclusion of config.h
+
+ Acked-by: Peter Hutterer
+ Signed-off-by: Gaetan Nadon
+
+commit d0a76a2343f8e3c07db3de7874fc8c2f38f98f09
+Author: Gaetan Nadon
+Date: Fri Apr 9 14:12:28 2010 -0400
+
+ config: remove AH_TOP autoheader statement
+
+ The generated config.h does not need to include xorg-server.h
+ for the content it provides.
+ Add #include in .[hc] files as needed.
+
+ Acked-by: Peter Hutterer
+ Signed-off-by: Gaetan Nadon
+
+commit b64d7594acf3e41f8ac0868d972be0e75fdcb35b
+Author: Gaetan Nadon
+Date: Thu Feb 11 10:08:07 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 1119b9057b41435cfdde6822e3a637a2c18e7ca1
+Author: Alan Coopersmith
+Date: Fri Jan 15 15:13:24 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith
+
+commit cf02cd53e7152c4effe036abb8b2849b88f4f54b
+Author: Gaetan Nadon
+Date: Tue Dec 15 22:01:02 2009 -0500
+
+ configure.ac: remove unused sdkdir=$(pkg-config...) statement
+
+ The sdkdir variable isn't use, so remove the statement.
+
+ Acked-by: Dan Nicholson
+
+ Signed-off-by: Gaetan Nadon
+
+commit 276cfbdc35ec63da046391a07a760a6844f9db6b
+Author: Gaetan Nadon
+Date: Mon Nov 23 09:25:05 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 258301f0346a343b27ea716ff60099eddd1a02ad
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:41:08 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Automake 'foreign' option is specified in configure.ac.
+ Remove from Makefile.am
+
+commit cb547fb807f05a7e0a45ebfabaf5d02802296788
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:09 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 3f64aba434c97ee7c6433994375b3038201d805a
+Author: Gaetan Nadon
+Date: Mon Oct 26 12:54:20 2009 -0400
+
+ Several driver modules do not have a ChangeLog target in Makefile.am #23814
+
+ The git generated ChangeLog replaces the hand written one.
+ Update configure.ac to xorg-macros level 1.3.
+ Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
+ Update Makefile.am to add ChangeLog target if missing
+ Remove ChangeLog from EXTRA_DIST or *CLEAN variables
+ This is a pre-req for the INSTALL_CMD
+
+commit 934a53decdb9d0d8890e7d6d6b67d4c0c64fbc4f
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:16 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 0f7ea63f28fb5314a58f9179bab6269f5184579f
+Author: Peter Hutterer
+Date: Fri Sep 11 12:06:19 2009 +1000
+
+ Remove some unused crap from configure
+
+ Signed-off-by: Peter Hutterer
+
commit da1d7acc20a1b9ef4450b40781f1f207d9fa4e3d
Author: Peter Hutterer
Date: Wed Sep 9 12:44:10 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-acecad-1.4.0/INSTALL new/xf86-input-acecad-1.5.0/INSTALL
--- old/xf86-input-acecad-1.4.0/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-input-acecad-1.5.0/INSTALL 2011-05-05 00:56:34.000000000 +0200
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
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-acecad-1.4.0/Makefile.am new/xf86-input-acecad-1.5.0/Makefile.am
--- old/xf86-input-acecad-1.4.0/Makefile.am 2009-07-30 01:08:30.000000000 +0200
+++ new/xf86-input-acecad-1.5.0/Makefile.am 2011-05-05 00:17:22.000000000 +0200
@@ -18,14 +18,15 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-EXTRA_DIST = ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
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-acecad-1.4.0/config.h.in new/xf86-input-acecad-1.5.0/config.h.in
--- old/xf86-input-acecad-1.4.0/config.h.in 2009-09-11 03:58:10.000000000 +0200
+++ new/xf86-input-acecad-1.5.0/config.h.in 2011-05-05 00:56:10.000000000 +0200
@@ -1,13 +1,17 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-#include "xorg-server.h"
-
/* Define to 1 if you have the header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the `sysfs' library (-lsysfs). */
+#undef HAVE_LIBSYSFS
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_LINUX_INPUT_H
+
/* Define to 1 if you have the header file. */
#undef HAVE_MEMORY_H
@@ -23,6 +27,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYSFS_LIBSYSFS_H
+
/* Define to 1 if you have the header file. */
#undef HAVE_SYS_STAT_H
@@ -32,12 +39,6 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
-/* Using the Linux input subsystem */
-#undef LINUX_INPUT
-
-/* Using sysfs to probe devices */
-#undef LINUX_SYSFS
-
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
@@ -57,6 +58,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
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-acecad-1.4.0/configure.ac new/xf86-input-acecad-1.5.0/configure.ac
--- old/xf86-input-acecad-1.4.0/configure.ac 2009-09-11 03:57:40.000000000 +0200
+++ new/xf86-input-acecad-1.5.0/configure.ac 2011-05-05 00:21:08.000000000 +0200
@@ -20,80 +20,56 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+# Initialize Autoconf
+AC_PREREQ([2.60])
AC_INIT([xf86-input-acecad],
- 1.4.0,
+ [1.5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-input-acecad)
+ [xf86-input-acecad])
AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-AM_CONFIG_HEADER([config.h])
-
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
+
+# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AH_TOP([#include "xorg-server.h"])
+# Checks for libraries.
+AC_CHECK_LIB([sysfs], [sysfs_close_bus])
-#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
-#
-#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
-# [Build XInput support (default: yes)]),
-# [XINPUT=$enableval],[XINPUT=yes])
-#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
-#if test "x$XINPUT" = "xyes" ; then
-# AC_DEFINE(XINPUT,1,[Enable XInput support])
-#fi
-#
-#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
-# [Build XKB support (default: yes)]),
-# [XKB=$enableval],[XKB=yes])
-#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
-#if test "x$XKB" = "xyes" ; then
-# AC_DEFINE(XKB,1,[Enable XKB support])
-#fi
+# Checks for header files.
+AC_CHECK_HEADERS([linux/input.h sysfs/libsysfs.h])
+
+# Store the list of server defined optional extensions in REQUIRED_MODULES
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+# Obtain compiler/linker options from server and required extensions
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto kbproto inputproto $REQUIRED_MODULES)
+
+# Define a configure option for an alternate input module directory
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
inputdir=${moduledir}/input
AC_SUBST(inputdir)
-# Checks for extensions
-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
-
-# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_HEADER_CHECK([linux/input.h],
- [AC_DEFINE([LINUX_INPUT], [1], [Using the Linux input subsystem])]
- )
-AC_CHECK_HEADER(sysfs/libsysfs.h, HAVE_LIBSYSFS=yes, HAVE_LIBSYSFS=no)
-if test x$HAVE_LIBSYSFS = xyes; then
- AC_DEFINE(LINUX_SYSFS, 1, [Using sysfs to probe devices])
-fi
-AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes)
-
DRIVER_NAME=acecad
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([Makefile src/Makefile man/Makefile])
+AC_CONFIG_FILES([Makefile
+ man/Makefile
+ src/Makefile])
+AC_OUTPUT
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-acecad-1.4.0/man/Makefile.am new/xf86-input-acecad-1.5.0/man/Makefile.am
--- old/xf86-input-acecad-1.4.0/man/Makefile.am 2009-07-30 01:08:30.000000000 +0200
+++ new/xf86-input-acecad-1.5.0/man/Makefile.am 2011-05-05 00:17:22.000000000 +0200
@@ -1,59 +1,39 @@
# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
#
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME@.man
+driverman_PRE = $(DRIVER_NAME).man
-driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
+driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST = @DRIVER_NAME@.man
+EXTRA_DIST = $(DRIVER_NAME).man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
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-acecad-1.4.0/src/Makefile.am new/xf86-input-acecad-1.5.0/src/Makefile.am
--- old/xf86-input-acecad-1.4.0/src/Makefile.am 2009-07-30 01:08:30.000000000 +0200
+++ new/xf86-input-acecad-1.5.0/src/Makefile.am 2011-05-05 00:17:22.000000000 +0200
@@ -24,15 +24,11 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = $(XORG_CFLAGS)
+
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-
-if HAVE_LIBSYSFS
-@DRIVER_NAME@_drv_la_LIBADD = -lsysfs
-endif
-
@DRIVER_NAME@_drv_ladir = @inputdir@
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c @DRIVER_NAME@.h
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-acecad-1.4.0/src/acecad.c new/xf86-input-acecad-1.5.0/src/acecad.c
--- old/xf86-input-acecad-1.4.0/src/acecad.c 2009-09-09 04:33:24.000000000 +0200
+++ new/xf86-input-acecad-1.5.0/src/acecad.c 2011-05-05 00:55:22.000000000 +0200
@@ -24,8 +24,11 @@
*
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
+#include
#include
#define XORG_VERSION_BOTCHED XORG_VERSION_NUMERIC(1,4,0,0,0)
#if XORG_VERSION_CURRENT >= XORG_VERSION_BOTCHED
@@ -38,7 +41,7 @@
* Standard Headers
****************************************************************************/
-#ifdef LINUX_INPUT
+#ifdef HAVE_LINUX_INPUT_H
#include
#include
#ifndef EV_SYN
@@ -68,9 +71,9 @@
#include
#include
-#ifdef LINUX_INPUT
+#ifdef HAVE_LINUX_INPUT_H
#include
-#ifdef LINUX_SYSFS
+#ifdef HAVE_SYSFS_LIBSYSFS_H
#include
#include
#endif
@@ -103,6 +106,18 @@
/* max number of input events to read in one read call */
#define MAX_EVENTS 50
+static const char *default_options[] =
+{
+ "BaudRate", "9600",
+ "StopBits", "1",
+ "DataBits", "8",
+ "Parity", "Odd",
+ "Vmin", "1",
+ "Vtime", "10",
+ "FlowControl", "Xoff",
+ NULL
+};
+
_X_EXPORT InputDriverRec ACECAD =
{
1,
@@ -111,7 +126,9 @@
AceCadPreInit,
NULL,
NULL,
- 0
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ default_options
+#endif
};
static XF86ModuleVersionInfo VersionRec =
@@ -154,19 +171,7 @@
{
}
-static const char *default_options[] =
-{
- "BaudRate", "9600",
- "StopBits", "1",
- "DataBits", "8",
- "Parity", "Odd",
- "Vmin", "1",
- "Vtime", "10",
- "FlowControl", "Xoff",
- NULL
-};
-
-#ifdef LINUX_INPUT
+#ifdef HAVE_LINUX_INPUT_H
static int
IsUSBLine(int fd)
{
@@ -207,13 +212,13 @@
static char ace_name_default[7] = "acecad";
-#ifdef LINUX_SYSFS
+#ifdef HAVE_SYSFS_LIBSYSFS_H
static char usb_bus_name[4] = "usb";
static char acecad_driver_name[11] = "usb_acecad";
#endif
static Bool
-AceCadAutoDevProbe(LocalDevicePtr local, int verb)
+AceCadAutoDevProbe(InputInfoPtr local, int verb)
{
/* We are trying to find the right eventX device */
int i = 0;
@@ -224,7 +229,7 @@
char fname[EV_DEV_NAME_MAXLEN];
int np;
-#ifdef LINUX_SYSFS
+#ifdef HAVE_SYSFS_LIBSYSFS_H
struct sysfs_bus *usb_bus = NULL;
struct sysfs_driver *acecad_driver = NULL;
struct sysfs_device *candidate = NULL;
@@ -326,28 +331,25 @@
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+static int NewAceCadPreInit(InputDriverPtr drv, InputInfoPtr dev, int flags);
+
static InputInfoPtr
AceCadPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
{
- LocalDevicePtr local = xf86AllocateInput(drv, 0);
- AceCadPrivatePtr priv = xcalloc (1, sizeof(AceCadPrivateRec));
- int speed;
- int msgtype;
- char *s;
+ InputInfoPtr local = xf86AllocateInput(drv, 0);
+ AceCadPrivatePtr priv = calloc (1, sizeof(AceCadPrivateRec));
- if ((!local) || (!priv))
+ if ((!local))
goto SetupProc_fail;
- memset(priv, 0, sizeof(AceCadPrivateRec));
-
local->name = dev->identifier;
local->type_name = XI_TABLET;
- local->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
+ local->flags = XI86_SEND_DRAG_EVENTS;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
local->motion_history_proc = xf86GetMotionEvents;
#endif
local->control_proc = NULL;
- local->close_proc = CloseProc;
local->switch_mode = NULL;
local->conversion_proc = ConvertProc;
local->reverse_conversion_proc = ReverseConvertProc;
@@ -355,18 +357,43 @@
local->private = priv;
local->private_flags = 0;
local->conf_idev = dev;
- local->device_control = DeviceControl;
/*local->always_core_feedback = 0;*/
xf86CollectInputOptions(local, default_options, NULL);
xf86OptionListReport(local->options);
+ if (NewAceCadPreInit(drv, local, flags) == Success)
+ return local;
+
+SetupProc_fail:
+ return NULL;
+}
+
+static int
+NewAceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
+#else
+static int
+AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
+#endif
+{
+ AceCadPrivatePtr priv = calloc (1, sizeof(AceCadPrivateRec));
+ int speed;
+ int msgtype;
+ char *s;
+
+ if (!priv)
+ return BadAlloc;
+
+ memset(priv, 0, sizeof(AceCadPrivateRec));
+
+ local->device_control = DeviceControl;
+
priv->acecadInc = xf86SetIntOption(local->options, "Increment", 0 );
s = xf86FindOptionValue(local->options, "Device");
if (!s || (s && (xf86NameCmp(s, "auto-dev") == 0))) {
-#ifdef LINUX_INPUT
+#ifdef HAVE_LINUX_INPUT_H
priv->flags |= AUTODEV_FLAG;
if (!AceCadAutoDevProbe(local, 0))
{
@@ -387,7 +414,7 @@
}
xf86ErrorFVerb( 6, "tty port opened successfully\n" );
-#ifdef LINUX_INPUT
+#ifdef HAVE_LINUX_INPUT_H
if (IsUSBLine(local->fd)) {
priv->flags |= USB_FLAG;
@@ -456,11 +483,11 @@
xf86Msg(msgtype, "%s is in %s mode\n", local->name, (priv->flags & ABSOLUTE_FLAG) ? "absolute" : "relative");
DBG (9, XisbTrace (priv->buffer, 1));
- local->history_size = xf86SetIntOption(local->options , "HistorySize", 0);
-
xf86ProcessCommonOptions(local, local->options);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
local->flags |= XI86_CONFIGURED;
+#endif
if (local->fd != -1)
{
@@ -474,7 +501,7 @@
}
RemoveEnabledDevice (local->fd);
local->fd = -1;
- return local;
+ return Success;
/*
* If something went wrong, cleanup and return NULL
@@ -485,12 +512,12 @@
if ((priv) && (priv->buffer))
XisbFree (priv->buffer);
if (priv) {
- xfree (priv);
+ free (priv);
if (local)
local->private = NULL;
}
xf86DeleteInput(local, 0);
- return NULL;
+ return BadAlloc;
}
static Bool
@@ -524,7 +551,7 @@
DeviceOn (DeviceIntPtr dev)
{
char buffer[256];
- LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
+ InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
xf86MsgVerb(X_INFO, 4, "%s Device On\n", local->name);
@@ -534,7 +561,7 @@
{
xf86Msg(X_WARNING, "%s: cannot open input device %s: %s\n", local->name, xf86FindOptionValue(local->options, "Device"), strerror(errno));
priv->flags &= ~AVAIL_FLAG;
-#ifdef LINUX_INPUT
+#ifdef HAVE_LINUX_INPUT_H
if ((priv->flags & AUTODEV_FLAG) && AceCadAutoDevProbe(local, 4))
local->fd = xf86OpenSerial(local->options);
if (local->fd == -1)
@@ -567,7 +594,7 @@
static Bool
DeviceOff (DeviceIntPtr dev)
{
- LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
+ InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
xf86MsgVerb(X_INFO, 4, "%s Device Off\n", local->name);
@@ -592,7 +619,7 @@
static Bool
DeviceClose (DeviceIntPtr dev)
{
- LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
+ InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
xf86MsgVerb(X_INFO, 4, "%s Device Close\n", local->name);
@@ -602,7 +629,7 @@
static void
ControlProc(DeviceIntPtr dev, PtrCtrl *ctrl)
{
- LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
+ InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
xf86MsgVerb(X_INFO, 4, "%s Control Proc\n", local->name);
}
@@ -611,9 +638,10 @@
DeviceInit (DeviceIntPtr dev)
{
int rx, ry;
- LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
+ InputInfoPtr local = (InputInfoPtr) dev->public.devicePrivate;
AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
unsigned char map[] = {0, 1, 2, 3};
+ int history_size;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Atom btn_labels[3];
Atom axes_labels[3];
@@ -659,6 +687,7 @@
return !Success;
}
+ history_size = xf86SetIntOption(local->options , "HistorySize", 0);
/* 3 axes */
if (InitValuatorClassDeviceStruct (dev, 3,
@@ -668,7 +697,7 @@
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents,
#endif
- local->history_size,
+ history_size,
((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity)
== FALSE)
{
@@ -691,7 +720,11 @@
#endif
1000, /* resolution */
0, /* min_res */
- 1000); /* max_res */
+ 1000 /* max_res */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ , Absolute
+#endif
+ );
InitValuatorAxisStruct(dev,
1,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
@@ -705,7 +738,11 @@
#endif
1000, /* resolution */
0, /* min_res */
- 1000); /* max_res */
+ 1000 /* max_res */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ , Absolute
+#endif
+ );
InitValuatorAxisStruct(dev,
2,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
@@ -715,7 +752,11 @@
priv->acecadMaxZ, /* max val */
1000, /* resolution */
0, /* min_res */
- 1000); /* max_res */
+ 1000 /* max_res */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ , Absolute
+#endif
+ );
}
@@ -752,7 +793,7 @@
}
static void
-ReadInput (LocalDevicePtr local)
+ReadInput (InputInfoPtr local)
{
int x, y, z;
int prox, buttons;
@@ -851,10 +892,10 @@
/*xf86Msg(X_INFO, "ACECAD Tablet Sortie Read Input\n");*/
}
-#ifdef LINUX_INPUT
+#ifdef HAVE_LINUX_INPUT_H
#define set_bit(byte,nb,bit) (bit ? byte | (1<private;
unsigned long bit[EV_MAX][NBITS(KEY_MAX)];
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-acecad-1.4.0/src/acecad.h new/xf86-input-acecad-1.5.0/src/acecad.h
--- old/xf86-input-acecad-1.4.0/src/acecad.h 2009-09-09 04:28:00.000000000 +0200
+++ new/xf86-input-acecad-1.5.0/src/acecad.h 2011-05-05 00:55:22.000000000 +0200
@@ -100,21 +100,23 @@
static Bool DeviceOff (DeviceIntPtr);
static Bool DeviceClose (DeviceIntPtr);
static Bool DeviceInit (DeviceIntPtr);
-static void ReadInput (LocalDevicePtr);
-static void CloseProc (LocalDevicePtr);
-static Bool ConvertProc (LocalDevicePtr, int, int, int, int, int, int, int, int, int *, int *);
-static Bool ReverseConvertProc(LocalDevicePtr , int , int , int*);
+static void ReadInput (InputInfoPtr);
+static Bool ConvertProc (InputInfoPtr, int, int, int, int, int, int, int, int, int *, int *);
+static Bool ReverseConvertProc(InputInfoPtr , int , int , int*);
static Bool QueryHardware (AceCadPrivatePtr);
static void NewPacket (AceCadPrivatePtr priv);
static Bool AceCadGetPacket (AceCadPrivatePtr);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
static InputInfoPtr AceCadPreInit(InputDriverPtr, IDevPtr , int);
-#ifdef LINUX_INPUT
-static void USBReadInput (LocalDevicePtr);
-static Bool USBQueryHardware (LocalDevicePtr);
+#else
+static int AceCadPreInit(InputDriverPtr, InputInfoPtr , int);
+#endif
+#ifdef HAVE_LINUX_INPUT_H
+static void USBReadInput (InputInfoPtr);
+static Bool USBQueryHardware (InputInfoPtr);
static int IsUSBLine(int);
static Bool fd_query_acecad(int, char*);
-static Bool AceCadAutoDevProbe(LocalDevicePtr, int);
+static Bool AceCadAutoDevProbe(InputInfoPtr, int);
#endif
-
#endif
++++++ xf86-input-aiptek-1.3.1.tar.bz2 -> xf86-input-aiptek-1.4.1.tar.bz2 ++++++
++++ 30147 lines of diff (skipped)
++++++ xf86-input-elographics-1.2.4.tar.bz2 -> xf86-input-elographics-1.3.0.tar.bz2 ++++++
++++ 18265 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-elographics-1.2.4/ChangeLog new/xf86-input-elographics-1.3.0/ChangeLog
--- old/xf86-input-elographics-1.2.4/ChangeLog 2010-06-09 04:19:23.000000000 +0200
+++ new/xf86-input-elographics-1.3.0/ChangeLog 2011-06-27 06:52:23.000000000 +0200
@@ -1,3 +1,97 @@
+commit 7c324ede65c17e5c747b28f40b9fd19f21b79d9d
+Author: Peter Hutterer
+Date: Mon Jun 27 14:48:11 2011 +1000
+
+ elographics 1.3.0
+
+ Signed-off-by: Peter Hutterer
+
+commit 6c9a801a5c1d7e694ff7f4f097599f2b96357982
+Author: Peter Hutterer
+Date: Mon Jun 27 14:47:32 2011 +1000
+
+ Require server 1.10
+
+ And remove the manual input ABI check.
+
+ Signed-off-by: Peter Hutterer
+
+commit 6fd22a9d64f07a480d177e877189a3a3ebf7cb90
+Author: Peter Hutterer
+Date: Fri Dec 3 09:34:46 2010 +1000
+
+ Support input ABI 12
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 3dac6ffa77c046b3d754f0a1105fe8ecc7377911
+Author: Peter Hutterer
+Date: Fri Dec 3 09:33:55 2010 +1000
+
+ Remove refcount field, dropped from the server
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 447f547fbb7d11ec56ea578292908192175b3828
+Author: Peter Hutterer
+Date: Fri Dec 3 09:29:36 2010 +1000
+
+ Drop close_proc, conversion_proc, reverse_conversion_proc
+
+ All three are not called by the server anymore.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 61b249e75e357fc8974e3892517f251ecf36fda5
+Author: Peter Hutterer
+Date: Fri Dec 3 09:27:24 2010 +1000
+
+ Drop driver-specific motion history size handling.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 8d90c971582b90c96901036203841064cb9f7a84
+Author: Peter Hutterer
+Date: Fri Dec 3 09:27:05 2010 +1000
+
+ Require server 1.9, drop earlier ABI support
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 7f35fe7d26c48622896fec8cab475f510601802b
+Author: Peter Hutterer
+Date: Fri Dec 3 09:23:15 2010 +1000
+
+ Replace LocalDevicePtr with InputInfoPtr
+
+ Both describe the same struct, LocalDevicePtr has been removed from the
+ server.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 0f3df8923d4d48b24b565becefa12d676c48a61a
+Author: Peter Hutterer
+Date: Fri Dec 3 09:21:23 2010 +1000
+
+ unifdef XFree86LOADER
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 787c1a94dec338da8585b7fad37f1b5fc973b2ad
+Author: Peter Hutterer
+Date: Fri Dec 3 09:35:06 2010 +1000
+
+ Bump to 1.2.99
+
+ Signed-off-by: Peter Hutterer
+
commit 607aed76023e71509b260dc23da7c150c1eff825
Author: Peter Hutterer
Date: Wed Jun 9 12:18:14 2010 +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-elographics-1.2.4/configure.ac new/xf86-input-elographics-1.3.0/configure.ac
--- old/xf86-input-elographics-1.2.4/configure.ac 2010-06-09 04:18:06.000000000 +0200
+++ new/xf86-input-elographics-1.3.0/configure.ac 2011-06-27 06:47:12.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 1.2.4,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
@@ -58,7 +58,7 @@
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10.0] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
XORG_CFLAGS="$CWARNFLAGS $XORG_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-elographics-1.2.4/src/xf86Elo.c new/xf86-input-elographics-1.3.0/src/xf86Elo.c
--- old/xf86-input-elographics-1.2.4/src/xf86Elo.c 2010-06-09 04:17:12.000000000 +0200
+++ new/xf86-input-elographics-1.3.0/src/xf86Elo.c 2011-06-27 06:47:22.000000000 +0200
@@ -50,20 +50,13 @@
#include "xorgVersion.h"
-#ifndef XFree86LOADER
-#include
-#include
-#endif
-
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Xinput.h"
#include "exevents.h"
-#ifdef XFree86LOADER
#include "xf86Module.h"
-#endif
/**
* models to be treated specially.
@@ -310,73 +303,6 @@
}
}
-/*
- ***************************************************************************
- *
- * xf86EloConvert --
- * Convert extended valuators to x and y suitable for core motion
- * events. Return True if ok and False if the requested conversion
- * can't be done for the specified valuators.
- *
- ***************************************************************************
- */
-static Bool
-xf86EloConvert(LocalDevicePtr local,
- int first,
- int num,
- int v0,
- int v1,
- int v2,
- int v3,
- int v4,
- int v5,
- int *x,
- int *y)
-{
- EloPrivatePtr priv = (EloPrivatePtr) local->private;
- int width = priv->max_x - priv->min_x;
- int height = priv->max_y - priv->min_y;
- int input_x, input_y;
-
- if (first != 0 || num != 2) {
- return FALSE;
- }
-
- DBG(3, ErrorF("EloConvert: Screen(%d) - v0(%d), v1(%d)\n", priv->screen_no, v0, v1));
-
- if (width == 0) width = 1;
- if (height == 0) height = 1;
-
- if (priv->swap_axes) {
- input_x = v1;
- input_y = v0;
- }
- else {
- input_x = v0;
- input_y = v1;
- }
- *x = (priv->screen_width * (input_x - priv->min_x)) / width;
- *y = (priv->screen_height -
- (priv->screen_height * (input_y - priv->min_y)) / height);
-
- /*
- * MHALAS: Based on the description in xf86XInputSetScreen
- * this code must be called from ReadInput BEFORE any events
- * are posted but this method is called FROM xf86PostMotionEvent
- * Therefore I have moved this method into xf86EloReadInput
- */
- /*
- * Need to check if still on the correct screen.
- * This call is here so that this work can be done after
- * calib and before posting the event.
- */
-/* xf86XInputSetScreen(local, priv->screen_no, *x, *y); */
-
- DBG(3, ErrorF("EloConvert: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, *x, *y));
-
- return TRUE;
-}
-
/*
***************************************************************************
@@ -404,21 +330,11 @@
***************************************************************************
*/
static void
-xf86EloReadInput(LocalDevicePtr local)
+xf86EloReadInput(InputInfoPtr pInfo)
{
- EloPrivatePtr priv = (EloPrivatePtr)(local->private);
+ EloPrivatePtr priv = (EloPrivatePtr)(pInfo->private);
int cur_x, cur_y;
int state;
-#if GET_ABI_MAJOR(XINPUT_ABI) == 0
- int first = 0; /* since convert is expecting 0 */
- int num = 2; /* since convert is expecting 0 */
- int v0 = 0; /* = cur_x - based on the debug output this is what v0 is */
- int v1 = 0; /* = cur_y based on the debug output this is what v0 is */
- int v2 = 0; /* not used in convert */
- int v3 = 0; /* not used in convert */
- int v4 = 0; /* not used in convert */
- int v5 = 0; /* not used in convert */
-#endif
DBG(4, ErrorF("Entering ReadInput\n"));
@@ -430,7 +346,7 @@
if(xf86EloGetPacket(priv->packet_buf,
&priv->packet_buf_p,
&priv->checksum,
- local->fd) != Success)
+ pInfo->fd) != Success)
continue;
/*
@@ -443,31 +359,6 @@
cur_x = WORD_ASSEMBLY(priv->packet_buf[3], priv->packet_buf[4]);
cur_y = WORD_ASSEMBLY(priv->packet_buf[5], priv->packet_buf[6]);
state = priv->packet_buf[2] & 0x07;
-#if GET_ABI_MAJOR(XINPUT_ABI) == 0
- /*
- * MHALAS: Based on the description in xf86XInputSetScreen
- * this code must be called from ReadInput BEFORE any events
- * are posted but this method is called FROM xf86PostMotionEvent
- * Therefore I have moved this method into xf86EloReadInput
- */
- /*
- * Need to check if still on the correct screen.
- * This call is here so that this work can be done after
- * calib and before posting the event.
- */
-
- DBG(3, ErrorF("EloConvert Before Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y));
- v0 = cur_x; /* based on the debug output this is what v0 is */
- v1 = cur_y; /* based on the debug output this is what v1 is */
- /*
- * Use the conversion method to send correct coordinates
- * since it contains all necessary logic
- */
- xf86EloConvert(local, first, num, v0, v1, v2, v3, v4, v5, &cur_x, &cur_y);
- DBG(3, ErrorF("EloConvert During Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y));
- xf86XInputSetScreen(local, priv->screen_no, cur_x, cur_y);
- DBG(3, ErrorF("EloConvert After Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y));
-#endif
/*
* Send events.
@@ -476,13 +367,13 @@
* location has changed as DIX assumes this. This is why we always
* emit a motion, regardless of the kind of packet processed.
*/
- xf86PostMotionEvent(local->dev, TRUE, 0, 2, cur_x, cur_y);
+ xf86PostMotionEvent(pInfo->dev, TRUE, 0, 2, cur_x, cur_y);
/*
* Emit a button press or release.
*/
if (state == ELO_PRESS || state == ELO_RELEASE) {
- xf86PostButtonEvent(local->dev, TRUE, 1, state == ELO_PRESS, 0, 2, cur_x, cur_y);
+ xf86PostButtonEvent(pInfo->dev, TRUE, 1, state == ELO_PRESS, 0, 2, cur_x, cur_y);
}
DBG(3, ErrorF("TouchScreen: x(%d), y(%d), %s\n",
@@ -490,7 +381,7 @@
(state == ELO_PRESS) ? "Press" : ((state == ELO_RELEASE) ? "Release" : "Stream")));
}
}
- while (xf86WaitForInput(local->fd, 0) > 0); /* don't wait, just check */
+ while (xf86WaitForInput(pInfo->fd, 0) > 0); /* don't wait, just check */
}
@@ -778,15 +669,13 @@
xf86EloControl(DeviceIntPtr dev,
int mode)
{
- LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
- EloPrivatePtr priv = (EloPrivatePtr)(local->private);
+ InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
+ EloPrivatePtr priv = (EloPrivatePtr)(pInfo->private);
unsigned char map[] = { 0, 1 };
unsigned char req[ELO_PACKET_SIZE];
unsigned char reply[ELO_PACKET_SIZE];
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Atom btn_label;
Atom axis_labels[2] = { 0, 0 };
-#endif
switch(mode) {
@@ -804,11 +693,7 @@
/*
* Device reports button press for up to 1 button.
*/
- if (InitButtonClassDeviceStruct(dev, 1,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
- &btn_label,
-#endif
- map) == FALSE) {
+ if (InitButtonClassDeviceStruct(dev, 1, &btn_label, map) == FALSE) {
ErrorF("Unable to allocate Elographics touchscreen ButtonClassDeviceStruct\n");
return !Success;
}
@@ -828,35 +713,27 @@
* max and min values scaled from the approximate size of the
* screen to fit one meter.
*/
- if (InitValuatorClassDeviceStruct(dev, 2,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
- axis_labels,
-#endif
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- xf86GetMotionEvents,
-#endif
- local->history_size, Absolute) == FALSE) {
+ if (InitValuatorClassDeviceStruct(dev, 2, axis_labels,
+ GetMotionHistorySize(), Absolute) == FALSE) {
ErrorF("Unable to allocate Elographics touchscreen ValuatorClassDeviceStruct\n");
return !Success;
}
else {
/* I will map coordinates myself */
InitValuatorAxisStruct(dev, 0,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
axis_labels[0],
-#endif
-1, -1,
9500,
0 /* min_res */,
- 9500 /* max_res */);
+ 9500 /* max_res */,
+ Absolute);
InitValuatorAxisStruct(dev, 1,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
axis_labels[1],
-#endif
-1, -1,
10500,
0 /* min_res */,
- 10500 /* max_res */);
+ 10500 /* max_res */,
+ Absolute);
}
if (InitFocusClassDeviceStruct(dev) == FALSE) {
@@ -866,7 +743,7 @@
/*
* Allocate the motion events buffer.
*/
- xf86MotionHistoryAllocate(local);
+ xf86MotionHistoryAllocate(pInfo);
DBG(2, ErrorF("Done.\n"));
@@ -876,11 +753,11 @@
case DEVICE_ON:
DBG(2, ErrorF("Elographics touchscreen on...\n"));
- if (local->fd < 0) {
+ if (pInfo->fd < 0) {
DBG(2, ErrorF("Elographics touchscreen opening : %s\n", priv->input_dev));
- local->fd = xf86OpenSerial(local->options);
- if (local->fd < 0) {
+ pInfo->fd = xf86OpenSerial(pInfo->options);
+ if (pInfo->fd < 0) {
Error("Unable to open Elographics touchscreen device");
return !Success;
}
@@ -893,7 +770,7 @@
*/
memset(req, 0, ELO_PACKET_SIZE);
req[1] = tolower(ELO_PARAMETER);
- if (xf86EloSendQuery(req, reply, local->fd) != Success) {
+ if (xf86EloSendQuery(req, reply, pInfo->fd) != Success) {
priv->is_a_2310 = 1;
ErrorF("Not at the specified rate or model 2310, will continue\n");
}
@@ -903,7 +780,7 @@
*/
memset(req, 0, ELO_PACKET_SIZE);
req[1] = tolower(ELO_ID);
- if (xf86EloSendQuery(req, reply, local->fd) == Success) {
+ if (xf86EloSendQuery(req, reply, pInfo->fd) == Success) {
xf86EloPrintIdent(reply, priv);
}
else {
@@ -918,7 +795,7 @@
req[1] = ELO_MODE;
req[3] = ELO_TOUCH_MODE | ELO_STREAM_MODE | ELO_UNTOUCH_MODE;
req[4] = ELO_TRACKING_MODE;
- if (xf86EloSendControl(req, local->fd) != Success) {
+ if (xf86EloSendControl(req, pInfo->fd) != Success) {
DBG(2, ErrorF("Unable to change Elographics touchscreen operating mode... Maybe it's GeneralTouch touchscreen...\n"));
}
@@ -929,11 +806,11 @@
req[1] = ELO_REPORT;
req[2] = priv->untouch_delay;
req[3] = priv->report_delay;
- if (xf86EloSendControl(req, local->fd) != Success) {
+ if (xf86EloSendControl(req, pInfo->fd) != Success) {
DBG(2, ErrorF("Unable to change Elographics touchscreen reports timings... Maybe it's GeneralTouch touchscreen...\n"));
}
}
- xf86AddEnabledDevice(local);
+ xf86AddEnabledDevice(pInfo);
dev->public.on = TRUE;
}
@@ -948,11 +825,11 @@
case DEVICE_OFF:
DBG(2, ErrorF("Elographics touchscreen off...\n"));
dev->public.on = FALSE;
- if (local->fd >= 0) {
- xf86RemoveEnabledDevice(local);
+ if (pInfo->fd >= 0) {
+ xf86RemoveEnabledDevice(pInfo);
}
- SYSCALL(close(local->fd));
- local->fd = -1;
+ SYSCALL(close(pInfo->fd));
+ pInfo->fd = -1;
DBG(2, ErrorF("Done\n"));
return Success;
@@ -963,11 +840,11 @@
case DEVICE_CLOSE:
DBG(2, ErrorF("Elographics touchscreen close...\n"));
dev->public.on = FALSE;
- if (local->fd >= 0) {
- xf86RemoveEnabledDevice(local);
+ if (pInfo->fd >= 0) {
+ xf86RemoveEnabledDevice(pInfo);
}
- SYSCALL(close(local->fd));
- local->fd = -1;
+ SYSCALL(close(pInfo->fd));
+ pInfo->fd = -1;
DBG(2, ErrorF("Done\n"));
return Success;
@@ -984,22 +861,14 @@
*
***************************************************************************
*/
-static LocalDevicePtr
-xf86EloAllocate(InputDriverPtr drv, IDevPtr dev)
+static int
+xf86EloAllocate(InputDriverPtr drv, InputInfoPtr pInfo)
{
- LocalDevicePtr local;
EloPrivatePtr priv;
priv = malloc(sizeof(EloPrivateRec));
if (!priv)
- return NULL;
-
- local = xf86AllocateInput(drv, 0);
-
- if (!local) {
- free(priv);
- return NULL;
- }
+ return BadAlloc;
priv->input_dev = strdup(ELO_PORT);
priv->min_x = 0;
@@ -1017,40 +886,32 @@
priv->packet_buf_p = 0;
priv->swap_axes = 0;
- local->name = xstrdup(dev->identifier);
- local->flags = 0 /* XI86_NO_OPEN_ON_INIT */;
- local->device_control = xf86EloControl;
- local->read_input = xf86EloReadInput;
- local->control_proc = NULL;
- local->close_proc = NULL;
- local->switch_mode = NULL;
- local->conversion_proc = xf86EloConvert;
- local->reverse_conversion_proc = NULL;
- local->fd = -1;
- local->atom = 0;
- local->dev = NULL;
- local->private = priv;
- local->type_name = "Elographics TouchScreen";
- local->history_size = 0;
+ pInfo->flags = 0 /* XI86_NO_OPEN_ON_INIT */;
+ pInfo->device_control = xf86EloControl;
+ pInfo->read_input = xf86EloReadInput;
+ pInfo->control_proc = NULL;
+ pInfo->switch_mode = NULL;
+ pInfo->private = priv;
+ pInfo->type_name = "Elographics TouchScreen";
- return local;
+ return Success;
}
static void
xf86EloUninit(InputDriverPtr drv,
- LocalDevicePtr local,
+ InputInfoPtr pInfo,
int flags)
{
- EloPrivatePtr priv = (EloPrivatePtr) local->private;
+ EloPrivatePtr priv = (EloPrivatePtr) pInfo->private;
free(priv->input_dev);
free(priv);
- local->private = NULL;
- xf86DeleteInput(local, 0);
+ pInfo->private = NULL;
+ xf86DeleteInput(pInfo, 0);
}
-static const char *default_options[] = {
+static char *default_options[] = {
"BaudRate", "9600",
"StopBits", "1",
"DataBits", "8",
@@ -1059,46 +920,41 @@
NULL
};
-static InputInfoPtr
+static int
xf86EloInit(InputDriverPtr drv,
- IDevPtr dev,
+ InputInfoPtr pInfo,
int flags)
{
- LocalDevicePtr local=NULL;
EloPrivatePtr priv=NULL;
char *str;
int portrait = 0;
int height, width;
char *opt_model;
Model* model;
+ int rc;
+
+ rc = xf86EloAllocate(drv, pInfo);
+ if (rc != Success)
+ return rc;
- local = xf86EloAllocate(drv, dev);
- if (!local) {
- return NULL;
- }
- priv = local->private;
- local->conf_idev = dev;
-
- xf86CollectInputOptions(local, default_options, NULL);
- /* Process the common options. */
- xf86ProcessCommonOptions(local, local->options);
+ priv = pInfo->private;
- str = xf86FindOptionValue(local->options, "Device");
+ str = xf86FindOptionValue(pInfo->options, "Device");
if (!str) {
xf86Msg(X_ERROR, "%s: No Device specified in Elographics module config.\n",
- dev->identifier);
+ pInfo->name);
if (priv) {
if (priv->input_dev) {
free(priv->input_dev);
}
free(priv);
}
- return local;
+ return BadValue;
}
priv->input_dev = strdup(str);
- opt_model = xf86SetStrOption(local->options, "Model", NULL);
+ opt_model = xf86SetStrOption(pInfo->options, "Model", NULL);
model = SupportedModels;
priv->model = MODEL_UNKNOWN;
while(model->type != MODEL_UNKNOWN && opt_model)
@@ -1111,27 +967,27 @@
model++;
}
- local->name = xf86SetStrOption(local->options, "DeviceName", XI_TOUCHSCREEN);
- xf86Msg(X_CONFIG, "Elographics X device name: %s\n", local->name);
- priv->screen_no = xf86SetIntOption(local->options, "ScreenNo", 0);
+ pInfo->name = xf86SetStrOption(pInfo->options, "DeviceName", XI_TOUCHSCREEN);
+ xf86Msg(X_CONFIG, "Elographics X device name: %s\n", pInfo->name);
+ priv->screen_no = xf86SetIntOption(pInfo->options, "ScreenNo", 0);
xf86Msg(X_CONFIG, "Elographics associated screen: %d\n", priv->screen_no);
- priv->untouch_delay = xf86SetIntOption(local->options, "UntouchDelay", ELO_UNTOUCH_DELAY);
+ priv->untouch_delay = xf86SetIntOption(pInfo->options, "UntouchDelay", ELO_UNTOUCH_DELAY);
xf86Msg(X_CONFIG, "Elographics untouch delay: %d ms\n", priv->untouch_delay*10);
- priv->report_delay = xf86SetIntOption(local->options, "ReportDelay", ELO_REPORT_DELAY);
+ priv->report_delay = xf86SetIntOption(pInfo->options, "ReportDelay", ELO_REPORT_DELAY);
xf86Msg(X_CONFIG, "Elographics report delay: %d ms\n", priv->report_delay*10);
- priv->max_x = xf86SetIntOption(local->options, "MaxX", 3000);
+ priv->max_x = xf86SetIntOption(pInfo->options, "MaxX", 3000);
xf86Msg(X_CONFIG, "Elographics maximum x position: %d\n", priv->max_x);
- priv->min_x = xf86SetIntOption(local->options, "MinX", 0);
+ priv->min_x = xf86SetIntOption(pInfo->options, "MinX", 0);
xf86Msg(X_CONFIG, "Elographics minimum x position: %d\n", priv->min_x);
- priv->max_y = xf86SetIntOption(local->options, "MaxY", 3000);
+ priv->max_y = xf86SetIntOption(pInfo->options, "MaxY", 3000);
xf86Msg(X_CONFIG, "Elographics maximum y position: %d\n", priv->max_y);
- priv->min_y = xf86SetIntOption(local->options, "MinY", 0);
+ priv->min_y = xf86SetIntOption(pInfo->options, "MinY", 0);
xf86Msg(X_CONFIG, "Elographics minimum y position: %d\n", priv->min_y);
- priv->swap_axes = xf86SetBoolOption(local->options, "SwapXY", 0);
+ priv->swap_axes = xf86SetBoolOption(pInfo->options, "SwapXY", 0);
if (priv->swap_axes) {
xf86Msg(X_CONFIG, "Elographics device will work with X and Y axes swapped\n");
}
- debug_level = xf86SetIntOption(local->options, "DebugLevel", 0);
+ debug_level = xf86SetIntOption(pInfo->options, "DebugLevel", 0);
if (debug_level) {
#if DEBUG
xf86Msg(X_CONFIG, "Elographics debug level sets to %d\n", debug_level);
@@ -1139,7 +995,7 @@
xf86Msg(X_INFO, "Elographics debug not available\n");
#endif
}
- str = xf86SetStrOption(local->options, "PortraitMode", "Landscape");
+ str = xf86SetStrOption(pInfo->options, "PortraitMode", "Landscape");
if (strcmp(str, "Portrait") == 0) {
portrait = 1;
}
@@ -1156,14 +1012,14 @@
height = priv->max_y - priv->min_y;
if (width == 0) {
xf86Msg(X_ERROR, "Elographics: Cannot configure touchscreen with width 0\n");
- return local;
+ return BadValue;
}
else if (width < 0) {
xf86Msg(X_INFO, "Elographics: reverse x mode (minimum x position >= maximum x position)\n");
}
if (height == 0) {
xf86Msg(X_ERROR, "Elographics: Cannot configure touchscreen with height 0\n");
- return local;
+ return BadValue;
}
else if (height < 0) {
xf86Msg(X_INFO, "Elographics: reverse y mode (minimum y position >= maximum y position)\n");
@@ -1190,9 +1046,7 @@
priv->swap_axes = (priv->swap_axes==0) ? 1 : 0;
}
- /* mark the device configured */
- local->flags |= XI86_CONFIGURED;
- return local;
+ return Success;
}
_X_EXPORT InputDriverRec ELOGRAPHICS = {
@@ -1202,10 +1056,9 @@
xf86EloInit, /* pre-init */
xf86EloUninit, /* un-init */
NULL, /* module */
- 0 /* ref count */
+ default_options
};
-#ifdef XFree86LOADER
static pointer
Plug(pointer module,
pointer options,
@@ -1243,4 +1096,3 @@
*/
_X_EXPORT XF86ModuleData elographicsModuleData = { &version_rec, Plug, Unplug };
-#endif
++++++ xf86-input-fpit-1.3.0.tar.bz2 -> xf86-input-fpit-1.4.0.tar.bz2 ++++++
++++ 67411 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-fpit-1.3.0/COPYING new/xf86-input-fpit-1.4.0/COPYING
--- old/xf86-input-fpit-1.3.0/COPYING 2008-04-16 08:22:29.000000000 +0200
+++ new/xf86-input-fpit-1.4.0/COPYING 2009-11-20 00:48:31.000000000 +0100
@@ -1,12 +1,28 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1995, 1999 by Patrick Lecoanet, France.
+Copyright 2002, Red Hat
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Patrick Lecoanet not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. The Authors make no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+PATRICK LECOANET DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL PATRICK LECOANET BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
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-fpit-1.3.0/ChangeLog new/xf86-input-fpit-1.4.0/ChangeLog
--- old/xf86-input-fpit-1.3.0/ChangeLog 2009-02-18 02:30:46.000000000 +0100
+++ new/xf86-input-fpit-1.4.0/ChangeLog 2011-06-27 04:15:26.000000000 +0200
@@ -1,3 +1,206 @@
+commit c4bab98fe233921ff7d218de1e66f97715640965
+Author: Peter Hutterer
+Date: Mon Jun 27 12:14:47 2011 +1000
+
+ fpit 1.4.0
+
+ Signed-off-by: Peter Hutterer
+
+commit 7371ec56d20f2aa7174271011876c8fd4d9cb592
+Author: Peter Hutterer
+Date: Fri Jun 10 11:47:28 2011 +1000
+
+ Add 50-fpit.conf default configuration file.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Gaetan Nadon
+
+commit 88cd7dd4c420d505e2b881e1c71900b368d9bfae
+Author: Peter Hutterer
+Date: Tue Jun 14 09:38:01 2011 +1000
+
+ Remove usage of sdkdir - not used by this driver
+
+ This driver doesn't install any header files.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Gaetan Nadon
+
+commit 7798bbf89db0d08c79f2c79b5bf252858d20a61c
+Author: Peter Hutterer
+Date: Tue Jun 14 09:18:53 2011 +1000
+
+ Reshuffle configure.ac to be more in-line with other modules
+
+ Also bump required macros to 1.12.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Gaetan Nadon
+
+commit a675198fab13393987dc7383ff679c405d2a10ff
+Author: Peter Hutterer
+Date: Tue Jun 14 09:18:18 2011 +1000
+
+ Include xorg-server.h, not xorgVersion.h
+
+ xorg-server is the generic server header file these days.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Gaetan Nadon
+
+commit 539a4e9e2317d920902840083250c093684ea376
+Author: Peter Hutterer
+Date: Tue Jun 14 09:16:32 2011 +1000
+
+ Bump minimum required server version to 1.10
+
+ And remove manual ABI check, all 1.10 servers ship with ABI 12.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Gaetan Nadon
+
+commit 020c04e295629b4db6afe16b26a028ccbd14e801
+Author: Peter Hutterer
+Date: Thu Dec 2 13:16:38 2010 +1000
+
+ Support input ABI 12
+
+ Untested for lack of device.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit cfbe606a376eacf17bc998140bea75726ea21373
+Author: Peter Hutterer
+Date: Thu Dec 2 12:59:55 2010 +1000
+
+ Use GetMotionHistorySize() instead of driver-internal history
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 3c4795fbe5ef6444a890e2baf8edf0e01530cea2
+Author: Peter Hutterer
+Date: Thu Dec 2 12:58:49 2010 +1000
+
+ Require server 1.9, drop earlier ABI support
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 81ada2b639979aa731854b5441cecb72910643e4
+Author: Peter Hutterer
+Date: Thu Dec 2 12:56:53 2010 +1000
+
+ Drop libc wrappers for free, malloc
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 4f79c6a79aecda664e1397eaba0d32f44eec7508
+Author: Peter Hutterer
+Date: Thu Dec 2 12:55:39 2010 +1000
+
+ Drop close_proc, conversion_proc, reverse_conversion_proc
+
+ Not called by the server.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit a7b06d619652a42321546731994c1a9bf0b04f80
+Author: Peter Hutterer
+Date: Thu Dec 2 12:54:03 2010 +1000
+
+ Replace LocalDevicePtr with InputInfoPtr.
+
+ Both describe the same struct, LocalDevicePtr has been dropped from the
+ server.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit b09b4f288607689e8f1f79c8337b7b1748161a3d
+Author: Peter Hutterer
+Date: Thu Dec 2 12:53:27 2010 +1000
+
+ unifdef XFree86LOADER
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit e9f8bf0fe866db6d5ba072425513186a4bc89eb1
+Author: Peter Hutterer
+Date: Thu Dec 2 12:52:35 2010 +1000
+
+ Remove refcount field, dropped from the server
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Cyril Brulebois
+
+commit 96ef9d422d1ed680b995ec206642eef2bb8f63c0
+Author: Peter Hutterer
+Date: Thu Dec 2 12:48:31 2010 +1000
+
+ Purge CVS tags
+
+ Signed-off-by: Peter Hutterer
+
+commit 646f65fc2a091e6c7bbfb50a7ec7a09a92d1f46e
+Author: Peter Hutterer
+Date: Thu Dec 2 12:48:05 2010 +1000
+
+ Bump to 1.3.99
+
+ Signed-off-by: Peter Hutterer
+
+commit 2d6975f80e72f1c2ca63397d10196d83f65e0f59
+Author: philip
+Date: Wed May 19 12:37:05 2010 +0200
+
+ fpit: minX/ maxX get wrongly initialized
+
+ maxX/ minX get values from maxY/ minY
+ Problem introduced in commit 7d203627e7e3e7a6f8d0e847ed650b0b89760c09
+
+ Reviewed-by: Gaetan Nadon
+ Signed-off-by: philip
+
+commit a7e1d84c0796fbf6b2525416ccce0045a11fc9fb
+Author: Peter Hutterer
+Date: Fri Nov 20 09:48:48 2009 +1000
+
+ Remove unused bits from configure.ac
+
+ Signed-off-by: Peter Hutterer
+
+commit 7dacfde39a027bb868493ba075e2f1d787c9b191
+Author: Peter Hutterer
+Date: Fri Aug 28 08:16:36 2009 +1000
+
+ Fix module unloading.
+
+ After calling xfree(priv), local->private must be set NULL.
+ Otherwise the server tries to free it again during xf86DeleteInput.
+
+ local->name must not be freed, it is set to XI_TOUCHSCREEN during PreInit.
+
+ local must not be freed, we pass it into xf86DeleteInput.
+
+ Signed-off-by: Peter Hutterer
+
+commit 7d203627e7e3e7a6f8d0e847ed650b0b89760c09
+Author: Peter Hutterer
+Date: Fri Jul 17 14:38:31 2009 +1000
+
+ Cope with XINPUT ABI 7.
+
+commit 60fa9ab3ff6b48dfe94a77d63634d9fa82b538b3
+Author: Alan Coopersmith
+Date: Mon May 11 19:37:41 2009 -0700
+
+ Fill in COPYING file, add SubmittingPatches URL to README
+
commit 3cabac9b8d43269dabcd65dbe7477981a3945daa
Author: Peter Hutterer
Date: Wed Feb 18 11:28:19 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-fpit-1.3.0/Makefile.am new/xf86-input-fpit-1.4.0/Makefile.am
--- old/xf86-input-fpit-1.3.0/Makefile.am 2009-02-18 02:25:41.000000000 +0100
+++ new/xf86-input-fpit-1.4.0/Makefile.am 2011-06-14 01:45:00.000000000 +0200
@@ -1,4 +1,3 @@
-# Copyright 2005 Adam Jackson.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -18,8 +17,15 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# During distcheck, system locations (as provided by pkg-config) are
+# not writable; provide instead relative locations.
+DISTCHECK_CONFIGURE_FLAGS = \
+ --with-xorg-conf-dir='$${sysconfdir}/xorg'
+
+
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src man
+SUBDIRS = src man conf
EXTRA_DIST = readme.txt
MAINTAINERCLEANFILES = ChangeLog
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-fpit-1.3.0/README new/xf86-input-fpit-1.4.0/README
--- old/xf86-input-fpit-1.3.0/README 2009-02-18 02:25:41.000000000 +0100
+++ new/xf86-input-fpit-1.4.0/README 2009-11-20 00:48:31.000000000 +0100
@@ -1,20 +1,25 @@
xf86-input-fpit - Fujitsu Stylistic Tablet PC input driver for the Xorg X server
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/driver/xf86-input-fpit
http://cgit.freedesktop.org/xorg/driver/xf86-input-fpit
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage
+
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-fpit-1.3.0/conf/50-fpit.conf new/xf86-input-fpit-1.4.0/conf/50-fpit.conf
--- old/xf86-input-fpit-1.3.0/conf/50-fpit.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-input-fpit-1.4.0/conf/50-fpit.conf 2011-06-14 01:45:00.000000000 +0200
@@ -0,0 +1,28 @@
+Section "InputClass"
+ Identifier "fpit class"
+ MatchProduct "FUJ02B2|FUJ02B3|FUJ02B4|FUJ02B6|FUJ02B7|FUJ02B8|FUJ02B9|FUJ02BC"
+ Driver "fpit"
+ Option "TrackRandR" "on"
+EndSection
+
+Section "InputClass"
+ Identifier "fpit FUJ02B2 and FUJ02B3 default configuration"
+ MatchProduct "FUJ02B2|FUJ02B3"
+ Option "BaudRate" "19200"
+ Option "MaximumXPosition" "6250"
+ Option "MaximumYPosition" "4950"
+ Option "MinimumXPosition" "130"
+ Option "MinimumYPosition" "0"
+ Option "InvertY" "on"
+EndSection
+
+Section "InputClass"
+ Identifier "fpit FUJ02B6, FUJ02B7, FUJ02B8, FUJ02B9, FUJ02BC default configuration"
+ MatchProduct "FUJ02B6|FUJ02B7|FUJ02B8|FUJ02B9|FUJ02BC"
+ Option "BaudRate" "9600"
+ Option "MaximumXPosition" "4070"
+ Option "MaximumYPosition" "4020"
+ Option "MinimumXPosition" "0"
+ Option "MinimumYPosition" "0"
+ Option "Passive" "on"
+EndSection
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-fpit-1.3.0/conf/Makefile.am new/xf86-input-fpit-1.4.0/conf/Makefile.am
--- old/xf86-input-fpit-1.3.0/conf/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-input-fpit-1.4.0/conf/Makefile.am 2011-06-14 01:45:00.000000000 +0200
@@ -0,0 +1,3 @@
+if HAS_XORG_CONF_DIR
+dist_config_DATA = 50-fpit.conf
+endif
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-fpit-1.3.0/config.h.in new/xf86-input-fpit-1.4.0/config.h.in
--- old/xf86-input-fpit-1.3.0/config.h.in 2009-02-18 02:30:46.000000000 +0100
+++ new/xf86-input-fpit-1.4.0/config.h.in 2011-06-27 04:15:26.000000000 +0200
@@ -1,7 +1,5 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-#include "xorg-server.h"
-
/* Define to 1 if you have the header file. */
#undef HAVE_DLFCN_H
@@ -32,6 +30,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
@@ -47,6 +49,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
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-fpit-1.3.0/configure.ac new/xf86-input-fpit-1.4.0/configure.ac
--- old/xf86-input-fpit-1.3.0/configure.ac 2009-02-18 02:28:14.000000000 +0100
+++ new/xf86-input-fpit-1.4.0/configure.ac 2011-06-27 04:14:09.000000000 +0200
@@ -22,46 +22,26 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-fpit],
- 1.3.0,
+ 1.4.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-fpit)
AC_CONFIG_SRCDIR([Makefile.am])
+AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+# Initialize Automake
+AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-AM_CONFIG_HEADER([config.h])
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.12 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
+XORG_DEFAULT_OPTIONS
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
-XORG_CWARNFLAGS
-
-AH_TOP([#include "xorg-server.h"])
-
-#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
-#
-#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
-# [Build XInput support (default: yes)]),
-# [XINPUT=$enableval],[XINPUT=yes])
-#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
-#if test "x$XINPUT" = "xyes" ; then
-# AC_DEFINE(XINPUT,1,[Enable XInput support])
-#fi
-#
-#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
-# [Build XKB support (default: yes)]),
-# [XKB=$enableval],[XKB=yes])
-#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
-#if test "x$XKB" = "xyes" ; then
-# AC_DEFINE(XKB,1,[Enable XKB support])
-#fi
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
@@ -71,25 +51,24 @@
inputdir=${moduledir}/input
AC_SUBST(inputdir)
+# Define a configure option for an alternate X Server configuration directory
+sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server`
+AC_ARG_WITH(xorg-conf-dir,
+ AC_HELP_STRING([--with-xorg-conf-dir=DIR],
+ [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]),
+ [configdir="$withval"],
+ [configdir="$sysconfigdir"])
+AC_SUBST(configdir)
+AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
+
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
-# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_HEADER_STDC
+# Obtain compiler/linker options for the fpit driver dependencies
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10.0] xproto $REQUIRED_MODULES)
DRIVER_NAME=fpit
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
-AC_OUTPUT([Makefile src/Makefile man/Makefile])
+AC_OUTPUT([Makefile src/Makefile man/Makefile conf/Makefile])
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-fpit-1.3.0/missing new/xf86-input-fpit-1.4.0/missing
--- old/xf86-input-fpit-1.3.0/missing 2008-04-16 08:22:35.000000000 +0200
+++ new/xf86-input-fpit-1.4.0/missing 2010-02-26 04:22:10.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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-fpit-1.3.0/src/xf86Fpit.c new/xf86-input-fpit-1.4.0/src/xf86Fpit.c
--- old/xf86-input-fpit-1.3.0/src/xf86Fpit.c 2008-12-01 00:59:15.000000000 +0100
+++ new/xf86-input-fpit-1.4.0/src/xf86Fpit.c 2011-06-14 01:24:05.000000000 +0200
@@ -49,13 +49,12 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/fpit/xf86Fpit.c,v 1.6 2004/04/26 22:48:21 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include
+#include
#include
#include
@@ -70,7 +69,6 @@
# include
-
/*
***************************************************************************
*
@@ -154,10 +152,10 @@
*
***************************************************************************
*/
-static Bool xf86FpitConvert(LocalDevicePtr local, int first, int num, int v0, int v1, int v2, int v3, int v4, int v5, int *x, int *y)
+static Bool xf86FpitConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2, int v3, int v4, int v5, int *x, int *y)
{
- FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
- AxisInfoPtr axes = local->dev->valuator->axes;
+ FpitPrivatePtr priv = (FpitPrivatePtr) pInfo->private;
+ AxisInfoPtr axes = pInfo->dev->valuator->axes;
if (first != 0 || num != 2) {
return FALSE;
}
@@ -188,6 +186,7 @@
* screen to fit one meter.
*/
int quarter_turns;
+ Atom axis_labels[2] = { 0, 0 };
priv->screen_width = screenInfo.screens[priv->screen_no]->width;
priv->screen_height = screenInfo.screens[priv->screen_no]->height;
@@ -212,24 +211,28 @@
}
if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) {
- InitValuatorAxisStruct(dev, 1, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
- 9500 /* max_res */ );
- InitValuatorAxisStruct(dev, 0, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
- 10500 /* max_res */ );
+ InitValuatorAxisStruct(dev, 1, axis_labels[1],
+ priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
+ 9500 /* max_res */, Absolute);
+ InitValuatorAxisStruct(dev, 0, axis_labels[0],
+ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
+ 10500 /* max_res */, Absolute);
} else {
- InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
- 9500 /* max_res */ );
- InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
- 10500 /* max_res */ );
+ InitValuatorAxisStruct(dev, 0, axis_labels[0],
+ priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
+ 9500 /* max_res */, Absolute);
+ InitValuatorAxisStruct(dev, 1, axis_labels[1],
+ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
+ 10500 /* max_res */, Absolute);
}
}
/*
** xf86FpitReadInput
** Reads from the Fpit and posts any new events to the server.
*/
-static void xf86FpitReadInput(LocalDevicePtr local)
+static void xf86FpitReadInput(InputInfoPtr pInfo)
{
- FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
+ FpitPrivatePtr priv = (FpitPrivatePtr) pInfo->private;
int len, loop;
int is_core_pointer = 0;
int x, y, buttons, prox;
@@ -241,12 +244,12 @@
priv->screen_height != screenInfo.screens[priv->screen_no]->height ||
priv->screen_rotation != RRGetRotation(screenInfo.screens[priv->screen_no])
))
- xf86FpitSetUpAxes(local->dev, priv);
+ xf86FpitSetUpAxes(pInfo->dev, priv);
do { /* keep reading blocks until there are no more */
/* Read data into buffer */
- len = xf86ReadSerial(local->fd, priv->fpitData+priv->fpitIndex, BUFFER_SIZE-priv->fpitIndex);
+ len = xf86ReadSerial(pInfo->fd, priv->fpitData+priv->fpitIndex, BUFFER_SIZE-priv->fpitIndex);
if (len <= 0) {
Error("error reading FPIT device");
priv->fpitIndex = 0;
@@ -318,13 +321,10 @@
prox = (priv->fpitData[loop] & PROXIMITY_BIT) ? 0 : 1;
buttons = (priv->fpitData[loop] & BUTTON_BITS);
- device = local->dev;
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- is_core_pointer = xf86IsCorePointer(device);
-#endif
+ device = pInfo->dev;
- xf86FpitConvert(local, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y);
- xf86XInputSetScreen(local, priv->screen_no, conv_x, conv_y);
+ xf86FpitConvert(pInfo, 0, 2, x, y, 0, 0, 0, 0, &conv_x, &conv_y);
+ xf86XInputSetScreen(pInfo, priv->screen_no, conv_x, conv_y);
/* coordinates are ready we can send events */
@@ -380,7 +380,7 @@
I had lifted the pen. So I am checking the device for more data
and then retrieving it. This fixed it for me. I don't know if this is just my system. */
- } while (xf86WaitForInput(local->fd,0)>0); /* go back and check for more data (we don't want to block for I/O!) */
+ } while (xf86WaitForInput(pInfo->fd,0)>0); /* go back and check for more data (we don't want to block for I/O!) */
return;
}
@@ -403,12 +403,13 @@
*/
static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
{
- LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
- FpitPrivatePtr priv = (FpitPrivatePtr) (local->private);
+ InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
+ FpitPrivatePtr priv = (FpitPrivatePtr) (pInfo->private);
unsigned char map[] = {
0, 1, 2, 3 /* DMC: changed this so we can use all three buttons */
};
-
+ Atom btn_labels[3] = { 0 };
+ Atom axis_labels[2] = { 0, 0 };
switch (mode) {
case DEVICE_INIT:
@@ -420,7 +421,7 @@
/*
* Device reports button press for up to 3 buttons.
*/
- if (InitButtonClassDeviceStruct(dev, 3, map) == FALSE) {
+ if (InitButtonClassDeviceStruct(dev, 3, btn_labels, map) == FALSE) {
ErrorF("Unable to allocate Fpit touchscreen ButtonClassDeviceStruct\n");
return !Success;
}
@@ -433,12 +434,9 @@
if(InitPtrFeedbackClassDeviceStruct(dev, xf86FpitPtrCtrl) == FALSE) {
ErrorF("Unable to allocate PtrFeedBackClassDeviceStruct\n");
}
-
- if (InitValuatorClassDeviceStruct(dev, 2,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- xf86GetMotionEvents,
-#endif
- local->history_size, Absolute) == FALSE) {
+
+ if (InitValuatorClassDeviceStruct(dev, 2, axis_labels,
+ GetMotionHistorySize(), Absolute) == FALSE) {
ErrorF("Unable to allocate Fpit touchscreen ValuatorClassDeviceStruct\n");
return !Success;
}
@@ -450,22 +448,22 @@
/*
* Allocate the motion events buffer.
*/
- xf86MotionHistoryAllocate(local);
+ xf86MotionHistoryAllocate(pInfo);
/*
- * This once has caused the server to crash after doing an xalloc & strcpy ??
+ * This once has caused the server to crash after doing a malloc & strcpy ??
*/
return Success;
}
case DEVICE_ON:
- if (local->fd < 0) {
- local->fd = xf86OpenSerial(local->options);
- if (local->fd < 0) {
+ if (pInfo->fd < 0) {
+ pInfo->fd = xf86OpenSerial(pInfo->options);
+ if (pInfo->fd < 0) {
Error("Unable to open Fpit touchscreen device");
return !Success;
}
- xf86AddEnabledDevice(local);
+ xf86AddEnabledDevice(pInfo);
dev->public.on = TRUE;
}
return Success;
@@ -477,11 +475,11 @@
*/
case DEVICE_OFF:
dev->public.on = FALSE;
- if (local->fd >= 0) {
- xf86RemoveEnabledDevice(local);
+ if (pInfo->fd >= 0) {
+ xf86RemoveEnabledDevice(pInfo);
}
- xf86CloseSerial(local->fd);
- local->fd = -1;
+ xf86CloseSerial(pInfo->fd);
+ pInfo->fd = -1;
return Success;
/*
* Final close before server exit. This is used during server shutdown.
@@ -489,11 +487,11 @@
*/
case DEVICE_CLOSE:
dev->public.on = FALSE;
- if (local->fd >= 0) {
- RemoveEnabledDevice(local->fd);
+ if (pInfo->fd >= 0) {
+ RemoveEnabledDevice(pInfo->fd);
}
- xf86CloseSerial(local->fd);
- local->fd = -1;
+ xf86CloseSerial(pInfo->fd);
+ pInfo->fd = -1;
return Success;
default:
ErrorF("unsupported mode=%d\n", mode);
@@ -508,18 +506,12 @@
*
***************************************************************************
*/
-static LocalDevicePtr xf86FpitAllocate(InputDriverPtr drv)
+static int xf86FpitAllocate(InputDriverPtr drv, InputInfoPtr pInfo)
{
- LocalDevicePtr local;
FpitPrivatePtr priv;
- priv = xalloc(sizeof(FpitPrivateRec));
+ priv = malloc(sizeof(FpitPrivateRec));
if (!priv)
- return NULL;
- local = xf86AllocateInput(drv, 0);
- if (!local) {
- xfree(priv);
- return NULL;
- }
+ return BadAlloc;
priv->fpitDev = strdup(FPIT_PORT);
priv->screen_no = 0;
@@ -535,90 +527,80 @@
priv->fpitOldProximity = 0;
priv->fpitIndex = 0;
priv->fpitPassive = 0;
- local->name = XI_TOUCHSCREEN;
- local->flags = 0 /* XI86_NO_OPEN_ON_INIT */ ;
- local->device_control = xf86FpitControl;
- local->read_input = xf86FpitReadInput;
- local->control_proc = NULL;
- local->close_proc = NULL;
- local->switch_mode = NULL;
- local->conversion_proc = xf86FpitConvert;
- local->reverse_conversion_proc = NULL;
- local->fd = -1;
- local->atom = 0;
- local->dev = NULL;
- local->private = priv;
- local->type_name = "Fujitsu Stylistic";
- local->history_size = 0;
- return local;
+ pInfo->name = XI_TOUCHSCREEN;
+ pInfo->flags = 0 /* XI86_NO_OPEN_ON_INIT */ ;
+ pInfo->device_control = xf86FpitControl;
+ pInfo->read_input = xf86FpitReadInput;
+ pInfo->control_proc = NULL;
+ pInfo->switch_mode = NULL;
+ pInfo->fd = -1;
+ pInfo->dev = NULL;
+ pInfo->private = priv;
+ pInfo->type_name = "Fujitsu Stylistic";
+ return Success;
}
-static void xf86FpitUninit(InputDriverPtr drv, LocalDevicePtr local, int flags)
+static void xf86FpitUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
- FpitPrivatePtr priv = (FpitPrivatePtr) local->private;
- xf86FpitControl(local->dev, DEVICE_OFF);
- xfree(priv->fpitDev);
- xfree(priv);
- xfree(local->name);
- xfree(local);
- xf86DeleteInput(local, 0);
+ FpitPrivatePtr priv = (FpitPrivatePtr) pInfo->private;
+ xf86FpitControl(pInfo->dev, DEVICE_OFF);
+ free(priv->fpitDev);
+ free(priv);
+ pInfo->private = NULL;
+ xf86DeleteInput(pInfo, 0);
}
-static const char *default_options[] = {
+static char *default_options[] = {
"BaudRate", "19200", "StopBits", "0", "DataBits", "8", "Parity", "None", "Vmin", "10", "Vtime", "1", "FlowControl", "None", NULL
};
-static InputInfoPtr xf86FpitInit(InputDriverPtr drv, IDevPtr dev, int flags)
+static int xf86FpitInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
- LocalDevicePtr local = NULL;
FpitPrivatePtr priv = NULL;
char *str;
+ int rc;
- local = xf86FpitAllocate(drv);
- if (!local)
- return NULL;
-
- priv = local->private;
- local->conf_idev = dev;
- xf86CollectInputOptions(local, default_options, NULL);
- /* Process the common options. */
- xf86ProcessCommonOptions(local, local->options);
- str = xf86FindOptionValue(local->options, "Device");
+ rc = xf86FpitAllocate(drv, pInfo);
+ if (rc != Success)
+ return rc;
+
+ priv = pInfo->private;
+ str = xf86FindOptionValue(pInfo->options, "Device");
if (!str) {
- xf86Msg(X_ERROR, "%s: No Device specified in FPIT module config.\n", dev->identifier);
+ xf86Msg(X_ERROR, "%s: No Device specified in FPIT module config.\n", pInfo->name);
if (priv) {
if (priv->fpitDev) {
- xfree(priv->fpitDev);
+ free(priv->fpitDev);
}
- xfree(priv);
+ free(priv);
}
- return local;
+ return BadValue;
}
priv->fpitDev = strdup(str);
- local->name = xf86SetStrOption(local->options, "DeviceName", XI_TOUCHSCREEN);
- xf86Msg(X_CONFIG, "FPIT device name: %s\n", local->name);
- priv->screen_no = xf86SetIntOption(local->options, "ScreenNo", 0);
+ pInfo->name = xf86SetStrOption(pInfo->options, "DeviceName", XI_TOUCHSCREEN);
+ xf86Msg(X_CONFIG, "FPIT device name: %s\n", pInfo->name);
+ priv->screen_no = xf86SetIntOption(pInfo->options, "ScreenNo", 0);
xf86Msg(X_CONFIG, "Fpit associated screen: %d\n", priv->screen_no);
- priv->fpitMaxX = xf86SetIntOption(local->options, "MaximumXPosition", FPIT_MAX_X);
+ priv->fpitMaxX = xf86SetIntOption(pInfo->options, "MaximumXPosition", FPIT_MAX_X);
xf86Msg(X_CONFIG, "FPIT maximum x position: %d\n", priv->fpitMaxX);
- priv->fpitMinX = xf86SetIntOption(local->options, "MinimumXPosition", FPIT_MIN_X);
+ priv->fpitMinX = xf86SetIntOption(pInfo->options, "MinimumXPosition", FPIT_MIN_X);
xf86Msg(X_CONFIG, "FPIT minimum x position: %d\n", priv->fpitMinX);
- priv->fpitMaxY = xf86SetIntOption(local->options, "MaximumYPosition", FPIT_MAX_Y);
+ priv->fpitMaxY = xf86SetIntOption(pInfo->options, "MaximumYPosition", FPIT_MAX_Y);
xf86Msg(X_CONFIG, "FPIT maximum y position: %d\n", priv->fpitMaxY);
- priv->fpitMinY = xf86SetIntOption(local->options, "MinimumYPosition", FPIT_MIN_Y);
+ priv->fpitMinY = xf86SetIntOption(pInfo->options, "MinimumYPosition", FPIT_MIN_Y);
xf86Msg(X_CONFIG, "FPIT minimum y position: %d\n", priv->fpitMinY);
priv->fpitBaseOrientation = 0;
- if (xf86SetBoolOption(local->options, "InvertX", 0))
+ if (xf86SetBoolOption(pInfo->options, "InvertX", 0))
priv->fpitBaseOrientation |= FPIT_INVERT_X;
- if (xf86SetBoolOption(local->options, "InvertY", 0))
+ if (xf86SetBoolOption(pInfo->options, "InvertY", 0))
priv->fpitBaseOrientation |= FPIT_INVERT_Y;
- if (xf86SetBoolOption(local->options, "SwapXY", 0))
+ if (xf86SetBoolOption(pInfo->options, "SwapXY", 0))
priv->fpitBaseOrientation |= FPIT_THEN_SWAP_XY;
- priv->fpitPassive = xf86SetBoolOption(local->options, "Passive", 0);
- priv->fpitTrackRandR = xf86SetBoolOption(local->options, "TrackRandR", 0);
+ priv->fpitPassive = xf86SetBoolOption(pInfo->options, "Passive", 0);
+ priv->fpitTrackRandR = xf86SetBoolOption(pInfo->options, "TrackRandR", 0);
/* XXX "Rotate" option provides compatibly stupid behavior. JEB. */
- str = xf86SetStrOption(local->options, "Rotate", 0);
+ str = xf86SetStrOption(pInfo->options, "Rotate", 0);
if (!xf86NameCmp(str, "CW"))
priv->fpitBaseOrientation |= FPIT_INVERT_X | FPIT_INVERT_Y | FPIT_THEN_SWAP_XY;
else if (!xf86NameCmp(str, "CCW"))
@@ -628,9 +610,7 @@
xf86Msg(X_CONFIG, "FPIT swap X and Y axis: %s\n", priv->fpitBaseOrientation & FPIT_THEN_SWAP_XY ? "Yes" : "No");
xf86Msg(X_CONFIG, "FPIT Passive button mode: %s\n", priv->fpitPassive ? "Yes" : "No");
xf86Msg(X_CONFIG, "FPIT RandR tracking: %s\n", priv->fpitTrackRandR ? "Yes" : "No");
- /* mark the device configured */
- local->flags |= XI86_CONFIGURED;
- return local;
+ return Success;
}
@@ -641,10 +621,9 @@
xf86FpitInit, /* pre-init */
xf86FpitUninit, /* un-init */
NULL, /* module */
- 0 /* ref count */
+ default_options
};
-#ifdef XFree86LOADER
static pointer Plug(pointer module, pointer options, int *errmaj, int *errmin)
{
xf86AddInputDriver(&FPIT, module, 0);
@@ -676,4 +655,3 @@
_X_EXPORT XF86ModuleData fpitModuleData = {
&version_rec, Plug, Unplug
};
-#endif
++++++ xf86-input-hyperpen-1.3.0.tar.bz2 -> xf86-input-hyperpen-1.4.1.tar.bz2 ++++++
++++ 66882 lines of diff (skipped)
++++++ xf86-input-joystick-1.5.0.tar.bz2 -> xf86-input-joystick-1.6.0.tar.bz2 ++++++
++++ 29903 lines of diff (skipped)
++++++ xf86-input-keyboard-1.5.0.tar.bz2 -> xf86-input-keyboard-1.6.0.tar.bz2 ++++++
++++ 22881 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-keyboard-1.5.0/ChangeLog new/xf86-input-keyboard-1.6.0/ChangeLog
--- old/xf86-input-keyboard-1.5.0/ChangeLog 2010-10-30 18:15:49.000000000 +0200
+++ new/xf86-input-keyboard-1.6.0/ChangeLog 2011-03-08 00:43:46.000000000 +0100
@@ -1,3 +1,287 @@
+commit 0b9cd5121e1025e95a7e32addb675ab874bc6cb1
+Author: Peter Hutterer
+Date: Tue Mar 8 09:38:29 2011 +1000
+
+ keyboard 1.6.0
+
+ Signed-off-by: Peter Hutterer
+
+commit 24ee4f6738955d507f500a90fda8153f19dd5038
+Author: Peter Hutterer
+Date: Mon Mar 7 12:05:48 2011 +1000
+
+ man: explain what grp_led:scroll does in the example conf section
+
+ Signed-off-by: Peter Hutterer
+ Reviewed by: Magnus Kessler
+
+commit d5634b77b578721e2bb2734f5fd92090e9d4c330
+Author: Peter Hutterer
+Date: Mon Mar 7 11:35:44 2011 +1000
+
+ man: list xorg.conf.d snippets as possible configuration location
+
+ Signed-off-by: Peter Hutterer
+ Reviewed by: Magnus Kessler
+
+commit 89358c49e519c7a1e0f9a9544f9c03b5d9c2115d
+Author: Peter Hutterer
+Date: Mon Mar 7 11:34:21 2011 +1000
+
+ man: don't mention the core keyboard.
+
+ Core devices are an obsolete concept these days.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed by: Magnus Kessler
+
+commit 6496bb21074faff2642e09389b5476225dc4fdb3
+Author: Peter Hutterer
+Date: Mon Feb 21 09:59:14 2011 +1000
+
+ keyboard 1.5.99.901
+
+ Signed-off-by: Peter Hutterer
+
+commit 15f0a4b71b4580c7dd9a0abd7b8fb92756b6733a
+Author: Alexandr Shadchin
+Date: Thu Feb 17 15:40:29 2011 +0500
+
+ Removed unnecessary code, since ABI_XINPUT_VERSION >= 2
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit de7a5c120f646e293cc216007a5df865b41833b8
+Author: Alexandr Shadchin
+Date: Thu Feb 17 15:40:28 2011 +0500
+
+ Require server 1.4 or later
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit a02757d7c3d8018f44c63553578763fcef41bcca
+Author: Alexandr Shadchin
+Date: Wed Feb 16 13:21:03 2011 +0500
+
+ Cleanup set the value of CustomKeycodes
+
+ Also, do not print values of variables CustomKeycodes twice.
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit f45f3dbcf1f2a54d7d6a51d6e9884820cff4be12
+Author: Alexandr Shadchin
+Date: Fri Feb 11 15:33:00 2011 +0500
+
+ Do not print values of Protocol twice
+
+ Protocol printed when found in xf86SetStrOption().
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit 6fca7f2371c113796d4cf27cca5635f3c6fb30af
+Author: Alexandr Shadchin
+Date: Fri Feb 11 15:32:59 2011 +0500
+
+ Remove unused XQUEUE
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit 8a540fa439bd7ea30c49d43ff3339ab599a7ba14
+Author: Alexandr Shadchin
+Date: Fri Feb 11 15:32:57 2011 +0500
+
+ lnx: Fix detect CustomKeycodes for __powerpc__
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit 849f5092efd770cf169ce9950e9dbb0bccbf9017
+Author: Alexandr Shadchin
+Date: Sat Jan 8 17:09:10 2011 +0500
+
+ Removing unused bell_pitch and bell_duration
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit dd9ed7921ccffff9cacb6dc128b3f426f9312535
+Author: Alexandr Shadchin
+Date: Sat Jan 8 20:09:48 2011 +0500
+
+ Removing unused PROT_XQUEUE and PROT_USB
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit 78652023a9f7758635e5507255826d79fbb2b028
+Author: Alexandr Shadchin
+Date: Sat Jan 8 17:09:38 2011 +0500
+
+ bsd: Replace deprecated xfree/xcalloc with free & calloc
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit f7a81ab4225e14a50e26a49a0a17a2cf773a4ab1
+Author: Alexandr Shadchin
+Date: Sat Jan 8 17:08:41 2011 +0500
+
+ Remove random History comment and OS_KBD_VERSION_CURRENT
+
+ In xf86-input-mouse similar cleanup already done, can also make for keyboard?
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Peter Hutterer
+
+commit e2f6e5d976ff8bbe68dc41b51d983cc95c11db84
+Author: Alexandr Shadchin
+Date: Thu Jan 6 14:43:13 2011 +0500
+
+ Do not print values of variables XkbRules etc. twice
+
+ xf86SetStrOption prints in log value of the variables XkbRules etc.,
+ there is no need to take this information twice.
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Alan Coopersmith
+
+commit 7d03efb3a3af77ca6831492a793d18b89cc64083
+Author: Alexandr Shadchin
+Date: Thu Jan 6 13:37:39 2011 +0500
+
+ bsd: Fix print wscons type keyboard for Sun5
+
+ Signed-off-by: Alexandr Shadchin
+ Signed-off-by: Alan Coopersmith