New branch 'ubuntu' available with the following commits: commit e15efb345f8a5562135a0d58629b560676258141 Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com> Date: Mon Feb 7 10:22:46 2011 +1100
New upstream snapshot for Xserver 1.10 build commit 9035bfeb72f5c653e646cdb192330cd17a6792aa Merge: 0351b39 8c7ad54 Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com> Date: Mon Feb 7 10:20:03 2011 +1100 Merge branch 'upstream-ubuntu' into ubuntu commit 8c7ad54d6d869bb4202aee8408c72ed72bf929a7 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 17:00:28 2010 +1000 Support input ABI 12 This commit adds support for input ABI 12, consisting of a number of changes: - requires an X server with an ABI of 12 - valuators have a per-mode setting - new PreInit prototype. Because of the new PreInit prototype, the hotplug system has been switched around too (should have probably been done in a separate commit before, but...). The old hotplug mechanism added a separate ModuleInfoRec for the keyboard part of the driver. This isn't feasable for InputClass configurations, the driver part may get overwritten. On entering the driver, after checking a few default values, hotplug the keyboard device (wacom-style) and let it initialize. Because NIDR calls DEVICE_INIT and DEVICE_ON the keyboard must initialise the private pointer and pass it back to the original device. Call order is: NewInputDeviceRequest - jstkCorePreInit - jstkKeyboardHotplug - NewInputDeviceRequest - jstkCorePreInit immediately return jstkKeyboardPreInit() - keyboard DEVICE_INIT - keyboard DEVICE_ON return keyboard device - copy keyboard->priv to joystick->priv - finish jstkCorePreInit as normal - joystick DEVICE_INIT - joystick DEVICE_ON Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Trevor Woerner <twoer...@gmail.com> commit f2050e6be5b6b3f8c429060992cc3ead0cfe86c1 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 16:51:15 2010 +1000 Get the option values from pInfo instead of from the IDevRec. Doesn't matter which one we take, but ABI 12 dropped the IDevRec. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Trevor Woerner <twoer...@gmail.com> commit df0567d2fa2d67a00dce78a89803e8925d20e324 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 16:48:50 2010 +1000 Don't call xf86OptionListReport() All options used by the driver will show up in the log anyway. And new xserver versions will call this for debugging purposes for us. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Trevor Woerner <twoer...@gmail.com> commit 135aaf612bcb591ae1692ae47b2d36a814230cbe Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 15:19:08 2010 +1000 Purge use of XI_PRIVATE macro. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Trevor Woerner <twoer...@gmail.com> commit 29a486ba56bc6279297a716b018ba24880680e82 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 15:14:47 2010 +1000 Drop close_proc, conversion_proc, reverse_conversion_proc All three aren't called by the server. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Trevor Woerner <twoer...@gmail.com> commit 0674bdfdb67e9195af7cb5982ae2eda0fa03ce57 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 15:09:32 2010 +1000 Don't handle history_size in the driver. This has been handled in the server for quite a while now, just initialize with the defaults and ignore it otherwise. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Trevor Woerner <twoer...@gmail.com> commit 39205d76cb45242ee9b47594ec5be7edc509edc7 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 15:08:49 2010 +1000 Require server 1.9, drop pre-ABI 11 support. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Trevor Woerner <twoer...@gmail.com> commit 074dc4a2a06aebae144afc21de5c4f8bc365937d Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 15:04:44 2010 +1000 Remove usage of XI86_POINTER_CAPABLE flag. Flag was write-only for a number of server generations already. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Trevor Woerner <twoer...@gmail.com> commit 107e4b14d90d06864247c7878ee0cc5f59e4bc5a Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 14:47:31 2010 +1000 Replace LocalDevicePtr with InputInfoPtr Both typedefs describe the same struct, LocalDevicePtr has been removed with input ABI 12. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Trevor Woerner <twoer...@gmail.com> commit a23a4a77c7157c516a8194e05e9f07b64d8e8089 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Dec 14 15:03:45 2010 +1000 Bump to 1.5.99 commit cd6b81d377a5d541100996fa4e2ac2decffe65f1 Author: Trevor Woerner <twoer...@gmail.com> Date: Sun Oct 17 21:26:16 2010 -0400 Code cleanup, bad structure initialization. The InputDriverRec data structure in xserver/hw/xfree86/common/xf86Xinput.h no longer contains an integer refCount member; as per commit d568221710959cf7d783e6ff0fb80fb43a231124. Signed-off-by: Trevor Woerner <twoer...@gmail.com> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> commit 38363bde5d94c9a8f163fde31ede067f6d0d1669 Author: Trevor Woerner <twoer...@gmail.com> Date: Sun Oct 17 21:25:56 2010 -0400 Deprecated code cleanup. Replace calls to deprecated functions (Xfree(), Xcalloc(), Xmalloc(), etc) with calls to standard dynamic memory functions (free(), calloc(), malloc(), etc) in driver code. Signed-off-by: Trevor Woerner <twoer...@gmail.com> Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> commit d209590c06e7a4df9d921ff53cb9792e9beb1aeb Author: Gaetan Nadon <mems...@videotron.ca> Date: Fri Jun 11 22:00:45 2010 -0400 COPYING: replace stub file with Copyright notices Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit 1d67a2da26fa3ba0b8f5498da89c01aeaa551515 Author: Gaetan Nadon <mems...@videotron.ca> Date: Fri Jun 11 21:50:34 2010 -0400 config: fdi file must be installed in $(datadir)/hal/fdi/policy/20thirdparty Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit 09ca64e76568868e8f9c7bf48e8858669fc5aaa7 Author: Gaetan Nadon <mems...@videotron.ca> Date: Fri Jun 11 21:47:23 2010 -0400 config: EXTRA_DIST is redundant sdkdir provides the install path for sdk_HEADERS primary Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit 55783bf0cd5e0ae29b008dd3fc3a47c66eabffbd Author: Gaetan Nadon <mems...@videotron.ca> Date: Fri Jun 11 17:46:37 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 Use $(AM_V_GEN)$(SED) to support silent rule Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit 342908f4d06c8000789d659b9f8871e56812b78e Author: Gaetan Nadon <mems...@videotron.ca> Date: Fri Jun 11 17:41:59 2010 -0400 config: fix warnings, m4 quoting and layout Fix some m4 quoting Fix some autoconf warnings Regroup statements per section Add comments Remove unused NDEBUG define Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit e98f0d0349222a4d981086f944398d32a548d953 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Apr 18 15:37:29 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. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit c6908579b56b7d8c478ebe8c07e2a68a30c5de44 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Apr 18 15:36:32 2010 -0400 config: remove unrequired AC_HEADER_STDC Autoconf says: "This macro is obsolescent, as current systems have conforming header files. New programs need not use this macro". Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit ab6308ed177fc341ba0cca3e4a9048f858d80007 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Apr 18 15:35:45 2010 -0400 config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS Regroup AC statements at the top. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit 2252c78fb11b09c688b1b2cc82a542fc2470b8e2 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Apr 18 15:26:16 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 Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit 25722aa12bfbb5675a02d7d8520ae83fdc5735c8 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Apr 18 15:24:59 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 <xorg-server.h> in .[hc] files as needed. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit 3de065d6822206695c0aee2fd68cd9db8b2f3063 Author: Gaetan Nadon <mems...@videotron.ca> 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 <mems...@videotron.ca> commit 30d1089cffc9afd9fd468a6c30989e77c7884248 Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri Jan 15 15:08:26 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> commit efe94ccfb4505f18a44b39ada256df8ba16b3ec5 Author: Gaetan Nadon <mems...@videotron.ca> Date: Mon Dec 28 15:05:39 2009 -0500 configure.ac: use backticks rather than $() for cmd subs Use "$PKG_CONFIG" rather than hard coded "pkg-config" Acked-by: Dan Nicholson <dbn.li...@gmail.com> Acked-by: Daniel Stone <dan...@fooishbar.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> commit ad0abb97a19e311988deffd385ca69e96bd106a4 Author: Gaetan Nadon <mems...@videotron.ca> 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 260c441981c1fe1c6e076bde1a6a26328e6b5675 Author: Gaetan Nadon <mems...@videotron.ca> Date: Wed Oct 28 14:41:41 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 877f13a6056cc8b17a73a5d4c839cd8b30065f9b Author: Gaetan Nadon <mems...@videotron.ca> 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 9fc986bd5dc3bd1741b1ad4e4da152edfaf928d9 Author: Gaetan Nadon <mems...@videotron.ca> 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 cd4e5ab0c64f477c343ab161ec309c42b9737450 Author: Gaetan Nadon <mems...@videotron.ca> 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. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pmijc-0002ve...@alioth.debian.org