COPYING | 42 - ChangeLog | 324 ++++++++++ Xi/xiproperty.c | 2 composite/compalloc.c | 36 - composite/compext.c | 36 - composite/compinit.c | 36 - composite/compint.h | 36 - composite/compoverlay.c | 36 - composite/compwindow.c | 36 - configure.ac | 25 debian/changelog | 25 debian/control | 5 debian/local/64-xorg-xkb.rules | 3 debian/local/input_id.c | 183 ----- debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff | 2 debian/patches/101_nv-crash-fix.diff | 11 debian/patches/12-Add-libudev-input-hotplug-backend.diff | 122 +-- debian/patches/13-configure-config-udev-defaults-to-off-for-now.diff | 13 debian/patches/series | 1 debian/rules | 9 debian/xserver-xorg-core.postinst.in | 6 dix/Makefile.am | 2 dix/Xserver-dtrace.h.in | 36 - dix/Xserver.d | 40 - dix/dispatch.c | 40 - dix/events.c | 54 - dix/resource.c | 40 - fb/fb.h | 76 +- fb/fbcmap.c | 51 - fb/fbcmap_mi.c | 51 - fb/fbpict.c | 85 +- fb/fbtrap.c | 6 fb/wfbrename.h | 1 hw/kdrive/fake/Makefile.am | 2 hw/xfree86/common/compiler.h | 14 hw/xfree86/common/xf86Config.c | 21 hw/xfree86/common/xf86Globals.c | 2 hw/xfree86/common/xf86Helper.c | 2 hw/xfree86/common/xf86Privstr.h | 2 hw/xfree86/doc/man/Xorg.man.pre | 23 hw/xfree86/doc/man/xorg.conf.man.pre | 85 +- hw/xfree86/int10/Makefile.am | 1 hw/xfree86/modes/xf86RandR12.c | 7 hw/xfree86/os-support/solaris/solaris-amd64.S | 40 - hw/xfree86/os-support/solaris/solaris-ia32.S | 40 - hw/xfree86/os-support/solaris/solaris-sparcv8plus.S | 40 - hw/xfree86/os-support/solaris/sun_VTsw.c | 36 - hw/xfree86/os-support/solaris/sun_agp.c | 36 - hw/xfree86/os-support/solaris/sun_apm.c | 36 - hw/xfree86/os-support/solaris/sun_bell.c | 40 - hw/xfree86/os-support/solaris/sun_vid.c | 36 - hw/xfree86/utils/cvt/Makefile.am | 42 - hw/xfree86/utils/gtf/Makefile.am | 42 - hw/xfree86/x86emu/Makefile.am | 2 hw/xquartz/pbproxy/Makefile.am | 3 include/xorg-config.h.in | 3 mi/micmap.c | 50 - os/access.c | 24 test/xi2/protocol-eventconvert.c | 2 xfixes/cursor.c | 36 - xfixes/xfixes.c | 36 - xfixes/xfixesint.h | 36 - xkb/xkb.c | 5 xkb/xkbLEDs.c | 12 64 files changed, 1151 insertions(+), 1076 deletions(-)
New commits: commit fb0ac653f4921476bf75a08f627b5946bf8051a3 Author: Michael Vogt <[email protected]> Date: Thu Jan 7 22:04:51 2010 +0200 Add 101_nv-crash-fix.diff: Do not crash if gamma_set is NULL. diff --git a/debian/changelog b/debian/changelog index 62f9352..b478456 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ xorg-server (2:1.7.3.902-1ubuntu1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * Merge from Debian unstable. + [ Michael Vogt ] + * Add 101_nv-crash-fix.diff: Do not crash if gamma_set is NULL. + -- Timo Aaltonen <[email protected]> Thu, 07 Jan 2010 21:52:12 +0200 xorg-server (2:1.7.3.902-1) unstable; urgency=low diff --git a/debian/patches/101_nv-crash-fix.diff b/debian/patches/101_nv-crash-fix.diff new file mode 100644 index 0000000..cbfc337 --- /dev/null +++ b/debian/patches/101_nv-crash-fix.diff @@ -0,0 +1,11 @@ +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -354,7 +354,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati + } + + /* Only upload when needed, to avoid unneeded delays. */ +- if (!crtc->active) ++ if (!crtc->active && crtc->funcs->gamma_set) + crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green, + crtc->gamma_blue, crtc->gamma_size); + diff --git a/debian/patches/series b/debian/patches/series index 56da980..14bfd24 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,6 +12,7 @@ 14-config-add-example-udev-rules.diff 15-config-udev-look-for-xkb-rules-model-layout-variant-.diff 100_rethrow_signals.patch +101_nv-crash-fix.diff #104_nvidia_autodetect.patch #105_fglrx_autodetect.patch 121_only_switch_vt_when_active.diff commit 3d40f98aecdef3ef5d000e2d5f64fe9218691107 Author: Timo Aaltonen <[email protected]> Date: Thu Jan 7 21:52:40 2010 +0200 Update the changelog. diff --git a/debian/changelog b/debian/changelog index 9e7c392..62f9352 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.7.3.902-1ubuntu1) UNRELEASED; urgency=low + + * Merge from Debian unstable. + + -- Timo Aaltonen <[email protected]> Thu, 07 Jan 2010 21:52:12 +0200 + xorg-server (2:1.7.3.902-1) unstable; urgency=low [ Timo Aaltonen ] commit 6fad5b26289e6b13aebfd9e684942743d2384439 Author: Julien Cristau <[email protected]> Date: Wed Jan 6 17:45:02 2010 +0000 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index abcf5ce..a2136ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.7.3.902-1) UNRELEASED; urgency=low +xorg-server (2:1.7.3.902-1) unstable; urgency=low [ Timo Aaltonen ] * Run udevadm trigger on postinst, and depend on udev [linux-any]. @@ -9,8 +9,9 @@ xorg-server (2:1.7.3.902-1) UNRELEASED; urgency=low * New upstream release. * Make xserver-common recommend xfonts-base, some clients don't work without those. + * Upload to unstable. - -- Julien Cristau <[email protected]> Wed, 06 Jan 2010 16:57:05 +0000 + -- Julien Cristau <[email protected]> Wed, 06 Jan 2010 17:44:59 +0000 xorg-server (2:1.7.3.901-1) experimental; urgency=low commit 148cf68e059328a66678fd28cc2bfe0d10dc78ff Author: Julien Cristau <[email protected]> Date: Wed Jan 6 17:44:18 2010 +0000 Kill obsolete stuff from 64-xorg-xkb.rules diff --git a/debian/local/64-xorg-xkb.rules b/debian/local/64-xorg-xkb.rules index 311d49b..5a3c5b8 100644 --- a/debian/local/64-xorg-xkb.rules +++ b/debian/local/64-xorg-xkb.rules @@ -2,9 +2,6 @@ ACTION!="add|change", GOTO="xorg_xkb_end" SUBSYSTEM!="input", GOTO="xorg_xkb_end" KERNEL!="event*", GOTO="xorg_xkb_end" -# input_id is only in udev > 147 -ENV{ID_INPUT}=="", IMPORT{program}="/lib/xorg/input_id %p" - # import keyboard layout from /etc/default/keyboard ENV{ID_INPUT_KEY}=="?*", IMPORT{file}="/etc/default/keyboard" commit 21744359bd53998adbfb7e19b310277b3fa74360 Author: Julien Cristau <[email protected]> Date: Wed Jan 6 17:34:44 2010 +0000 Resync patches diff --git a/debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff b/debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff index 0e91795..f975aef 100644 --- a/debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff +++ b/debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff @@ -15,7 +15,7 @@ Index: xorg-server/configure.ac =================================================================== --- xorg-server.orig/configure.ac +++ xorg-server/configure.ac -@@ -1274,6 +1274,12 @@ +@@ -1299,6 +1299,12 @@ [Use libmd SHA1 functions instead of OpenSSL libcrypto])]) fi diff --git a/debian/patches/12-Add-libudev-input-hotplug-backend.diff b/debian/patches/12-Add-libudev-input-hotplug-backend.diff index 8df99fd..8c57195 100644 --- a/debian/patches/12-Add-libudev-input-hotplug-backend.diff +++ b/debian/patches/12-Add-libudev-input-hotplug-backend.diff @@ -31,11 +31,11 @@ Tested-by: Peter Hutterer <[email protected]> 11 files changed, 400 insertions(+), 79 deletions(-) create mode 100644 config/udev.c -diff --git a/config/Makefile.am b/config/Makefile.am -index 7fa2df8..8c57948 100644 ---- a/config/Makefile.am -+++ b/config/Makefile.am -@@ -3,10 +3,18 @@ AM_CFLAGS = @DIX_CFLAGS@ +Index: xorg-server/config/Makefile.am +=================================================================== +--- xorg-server.orig/config/Makefile.am ++++ xorg-server/config/Makefile.am +@@ -3,10 +3,18 @@ noinst_LTLIBRARIES = libconfig.la libconfig_la_SOURCES = config.c config-backends.h @@ -55,7 +55,7 @@ index 7fa2df8..8c57948 100644 if CONFIG_DBUS_API dbusconfigdir = $(sysconfdir)/dbus-1/system.d -@@ -16,7 +24,13 @@ libconfig_la_SOURCES += dbus.c +@@ -16,7 +24,13 @@ endif if CONFIG_HAL @@ -69,10 +69,10 @@ index 7fa2df8..8c57948 100644 +endif # !CONFIG_UDEV + EXTRA_DIST = xorg-server.conf x11-input.fdi -diff --git a/config/config-backends.h b/config/config-backends.h -index 907e86b..0a2a22a 100644 ---- a/config/config-backends.h -+++ b/config/config-backends.h +Index: xorg-server/config/config-backends.h +=================================================================== +--- xorg-server.orig/config/config-backends.h ++++ xorg-server/config/config-backends.h @@ -26,8 +26,18 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> @@ -93,7 +93,7 @@ index 907e86b..0a2a22a 100644 #include <dbus/dbus.h> typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection, -@@ -46,14 +56,15 @@ int config_dbus_core_init(void); +@@ -46,14 +56,15 @@ void config_dbus_core_fini(void); int config_dbus_core_add_hook(struct config_dbus_core_hook *hook); void config_dbus_core_remove_hook(struct config_dbus_core_hook *hook); @@ -113,10 +113,10 @@ index 907e86b..0a2a22a 100644 void config_hal_fini(void); +# endif #endif -diff --git a/config/config.c b/config/config.c -index b013293..7bf5e41 100644 ---- a/config/config.c -+++ b/config/config.c +Index: xorg-server/config/config.c +=================================================================== +--- xorg-server.orig/config/config.c ++++ xorg-server/config/config.c @@ -28,13 +28,17 @@ #endif @@ -136,7 +136,7 @@ index b013293..7bf5e41 100644 if (config_dbus_core_init()) { # ifdef CONFIG_DBUS_API if (!config_dbus_init()) -@@ -54,7 +58,9 @@ config_init(void) +@@ -54,7 +58,9 @@ void config_fini(void) { @@ -147,7 +147,7 @@ index b013293..7bf5e41 100644 # ifdef CONFIG_HAL config_hal_fini(); # endif -@@ -64,3 +70,70 @@ config_fini(void) +@@ -64,3 +70,70 @@ config_dbus_core_fini(); #endif } @@ -218,11 +218,11 @@ index b013293..7bf5e41 100644 + (*options)->value = xstrdup(value); + (*options)->next = NULL; +} -diff --git a/config/hal.c b/config/hal.c -index 28f55a0..22af10f 100644 ---- a/config/hal.c -+++ b/config/hal.c -@@ -58,25 +58,9 @@ struct xkb_options { +Index: xorg-server/config/hal.c +=================================================================== +--- xorg-server.orig/config/hal.c ++++ xorg-server/config/hal.c +@@ -58,25 +58,9 @@ char* options; }; @@ -248,7 +248,7 @@ index 28f55a0..22af10f 100644 char *value; value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */ -@@ -84,36 +68,11 @@ device_removed(LibHalContext *ctx, const char *udi) +@@ -84,36 +68,11 @@ return; sprintf(value, "hal:%s", udi); @@ -286,7 +286,7 @@ index 28f55a0..22af10f 100644 static char * get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name) { -@@ -166,26 +125,6 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop) +@@ -166,26 +125,6 @@ return ret; } @@ -313,11 +313,10 @@ index 28f55a0..22af10f 100644 static void device_added(LibHalContext *hal_ctx, const char *udi) { -diff --git a/config/udev.c b/config/udev.c -new file mode 100644 -index 0000000..62b9052 +Index: xorg-server/config/udev.c +=================================================================== --- /dev/null -+++ b/config/udev.c ++++ xorg-server/config/udev.c @@ -0,0 +1,247 @@ +/* + * Copyright © 2009 Julien Cristau @@ -566,11 +565,11 @@ index 0000000..62b9052 + udev_monitor = NULL; + udev_unref(udev); +} -diff --git a/configure.ac b/configure.ac -index ed710f0..c7fb3d0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -597,6 +597,7 @@ AC_ARG_ENABLE(multibuffer, AS_HELP_STRING([--enable-multibuffer], [Build Mult +Index: xorg-server/configure.ac +=================================================================== +--- xorg-server.orig/configure.ac ++++ xorg-server/configure.ac +@@ -601,6 +601,7 @@ AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no]) AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) @@ -578,7 +577,7 @@ index ed710f0..c7fb3d0 100644 AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no]) AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) -@@ -755,6 +756,26 @@ LIBXI="xi >= 1.2.99.1" +@@ -759,6 +760,26 @@ LIBXTST="xtst >= 1.0.99.2" LIBPCIACCESS="pciaccess >= 0.8.0" LIBGLIB="glib-2.0 >= 2.16" @@ -605,7 +604,7 @@ index ed710f0..c7fb3d0 100644 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config -@@ -788,13 +809,11 @@ if test "x$CONFIG_HAL" = xyes; then +@@ -792,13 +813,11 @@ fi AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API]) @@ -619,11 +618,11 @@ index ed710f0..c7fb3d0 100644 AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug]) fi AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes]) -diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c -index fb8ebd0..8682763 100644 ---- a/hw/kdrive/src/kinput.c -+++ b/hw/kdrive/src/kinput.c -@@ -2280,6 +2280,14 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) +Index: xorg-server/hw/kdrive/src/kinput.c +=================================================================== +--- xorg-server.orig/hw/kdrive/src/kinput.c ++++ xorg-server/hw/kdrive/src/kinput.c +@@ -2280,6 +2280,14 @@ return BadValue; } #endif @@ -638,11 +637,11 @@ index fb8ebd0..8682763 100644 } if (!ki && !pi) { -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 40f65bd..12f9d49 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -1453,12 +1453,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) +Index: xorg-server/hw/xfree86/common/xf86Config.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Config.c ++++ xorg-server/hw/xfree86/common/xf86Config.c +@@ -1444,12 +1444,19 @@ } if (xf86Info.allowEmptyInput && !(foundPointer && foundKeyboard)) { @@ -666,11 +665,11 @@ index 40f65bd..12f9d49 100644 "\tTry disabling AllowEmptyInput.\n"); #endif } -diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c -index d8f7f7f..0b310e8 100644 ---- a/hw/xfree86/common/xf86Globals.c -+++ b/hw/xfree86/common/xf86Globals.c -@@ -132,7 +132,7 @@ xf86InfoRec xf86Info = { +Index: xorg-server/hw/xfree86/common/xf86Globals.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Globals.c ++++ xorg-server/hw/xfree86/common/xf86Globals.c +@@ -132,7 +132,7 @@ .kbdCustomKeycodes = FALSE, .disableRandR = FALSE, .randRFrom = X_DEFAULT, @@ -679,11 +678,11 @@ index d8f7f7f..0b310e8 100644 .allowEmptyInput = TRUE, .autoAddDevices = TRUE, .autoEnableDevices = TRUE -diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c -index fd07c2a..8ad1f95 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -605,9 +605,9 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) +Index: xorg-server/hw/xfree86/common/xf86Xinput.c +=================================================================== +--- xorg-server.orig/hw/xfree86/common/xf86Xinput.c ++++ xorg-server/hw/xfree86/common/xf86Xinput.c +@@ -605,9 +605,9 @@ } } @@ -695,11 +694,11 @@ index fd07c2a..8ad1f95 100644 is_auto = 1; if (!xf86Info.autoAddDevices) { rval = BadMatch; -diff --git a/include/dix-config.h.in b/include/dix-config.h.in -index 798d9e7..423ba3a 100644 ---- a/include/dix-config.h.in -+++ b/include/dix-config.h.in -@@ -384,6 +384,9 @@ +Index: xorg-server/include/dix-config.h.in +=================================================================== +--- xorg-server.orig/include/dix-config.h.in ++++ xorg-server/include/dix-config.h.in +@@ -387,6 +387,9 @@ /* Support D-Bus */ #undef HAVE_DBUS @@ -709,6 +708,3 @@ index 798d9e7..423ba3a 100644 /* Use D-Bus for input hotplug */ #undef CONFIG_NEED_DBUS --- -1.6.5 - diff --git a/debian/patches/13-configure-config-udev-defaults-to-off-for-now.diff b/debian/patches/13-configure-config-udev-defaults-to-off-for-now.diff index daa3138..48e0003 100644 --- a/debian/patches/13-configure-config-udev-defaults-to-off-for-now.diff +++ b/debian/patches/13-configure-config-udev-defaults-to-off-for-now.diff @@ -8,11 +8,11 @@ Signed-off-by: Julien Cristau <[email protected]> configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/configure.ac b/configure.ac -index c7fb3d0..c0e0fe6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -597,7 +597,7 @@ AC_ARG_ENABLE(multibuffer, AS_HELP_STRING([--enable-multibuffer], [Build Mult +Index: xorg-server/configure.ac +=================================================================== +--- xorg-server.orig/configure.ac ++++ xorg-server/configure.ac +@@ -601,7 +601,7 @@ AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no]) AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) @@ -21,6 +21,3 @@ index c7fb3d0..c0e0fe6 100644 AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no]) AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) --- -1.6.5 - commit 5b153070fe0f23011d230bd94335b46b975f2cac Author: Julien Cristau <[email protected]> Date: Wed Jan 6 17:27:12 2010 +0000 Make xserver-common recommend xfonts-base Some clients don't work without those. diff --git a/debian/changelog b/debian/changelog index 540bde4..abcf5ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ xorg-server (2:1.7.3.902-1) UNRELEASED; urgency=low * Add xserver-common dependency on x11-xkb-utils for xkbcomp. * Remove our copy of input_id, add Depends on new enough udev instead. * New upstream release. + * Make xserver-common recommend xfonts-base, some clients don't work without + those. -- Julien Cristau <[email protected]> Wed, 06 Jan 2010 16:57:05 +0000 diff --git a/debian/control b/debian/control index c598630..016c0a2 100644 --- a/debian/control +++ b/debian/control @@ -90,7 +90,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: libgl1-mesa-dri (>= 7.1~rc1) -Suggests: xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable +Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), @@ -313,6 +313,7 @@ Depends: xkb-data, x11-xkb-utils, ${misc:Depends}, +Recommends: xfonts-base Replaces: xserver-xorg-core (<< 2:1.5.2) Description: common files used by various X servers This package provides files necessary for all X.Org based X servers. commit 4c684d01491dfcd3d2ac6daeff357c110fac12ed Author: Julien Cristau <[email protected]> Date: Wed Jan 6 16:58:35 2010 +0000 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 6aa027f..c9efdf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,327 @@ +commit d1320f4f2908fd3a248a79314bd78f76b03c71c5 +Author: Peter Hutterer <[email protected]> +Date: Sat Dec 26 10:13:46 2009 +1000 + + xserver 1.7.3.902 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit c18dd3fd9b2e4bf3862666671042b7c933f64100 +Author: Peter Hutterer <[email protected]> +Date: Mon Dec 7 12:58:57 2009 +1000 + + xkb: don't assign garbage value to led_return. + + As the comment for the function states, led_return is undefined if map is + NULL. We might as well skip writing to it then. + + Found by clang. + + Reported-by: Tomas Carnecky <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Jamey Sharp <[email protected]> + (cherry picked from commit 12fb31815db9de9c01f2d4155a2b74531777c0bf) + +commit 0f71be87b9174c587ccacd6aa61a9a66d3507ef4 +Author: Peter Hutterer <[email protected]> +Date: Mon Dec 14 11:05:20 2009 +1000 + + xfree86: belately init RandR12 if xinerama fails. (#24627) + + On Fri, Dec 11, 2009 at 10:19:01AM -0800, Keith Packard wrote: + > On Wed, 9 Dec 2009 11:55:14 +1000, Peter Hutterer <[email protected]> wrote: + > > On Tue, Dec 08, 2009 at 05:24:06PM -0800, Aaron Plattner wrote: + > > > On Tue, Dec 08, 2009 at 03:52:27PM -0800, Peter Hutterer wrote: + > > > > Xorg +xinerama crashes immediately due to whacky dependency between Xinerama + > > > > and RandR12. The latter doesn't initialize if Xinerama is enabled, but if + > > > > only one screen is found, Xinerama is disabled again and RandR12 tries to + > > > > access data it never initialized. + > + > I'd sure like to have RandR get enabled when xinerama doesn't; is there + > an easy way of making that happen here? Perhaps having the RandR12 code + > disable Xinerama when only one screen is found? Or some other kludge? + + you know the dependency better than I do so any hints are apreciated. + afaict, the screenInfo.numScreens (the check used by Xinerama) isn't + necessarily initialized at this point so we can't use the same check. + The following seems to work though: + + From 670b3ebdb7312a6433a8f093d0820785db2aea20 Mon Sep 17 00:00:00 2001 + From: Peter Hutterer <[email protected]> + Date: Mon, 14 Dec 2009 11:00:58 +1000 + Subject: [PATCH] xfree86: if only one screen was found, disable Xinerama (#24627) + + Xorg +xinerama crashes immediately due to whacky dependency between Xinerama + and RandR12. The latter doesn't initialize if Xinerama is enabled, but if + only one screen is found, Xinerama is disabled again and RandR12 tries to + access data it never initialized. + + Dependency chain is: + - ProcessCommandLine sets noPanoramiXExtension to FALSE + - xf86RandR12Init() is a noop + - PanoramiXExtensionInit sets noPanoramiXExtension to TRUE + - xf86RandR12CreateScreenResources tries to use the devPrivates key it never + initialized. + + This hack checks if there's only one screen at the time RandR12 is + initialized. If so, we expect Xinerama to fail anyhow so we disable it + ourselves and proceed as planned. + + X.Org Bug 24627 <http://bugs.freedesktop.org/show_bug.cgi?id=24627> + + Signed-off-by: Peter Hutterer <[email protected]> + Signed-off-by: Keith Packard <[email protected]> + (cherry picked from commit faca1bc582e374d32ee9d63d10e072fbef4940a3) + +commit b98a07d86dab5b6c5d524d36814fda8e9549120c +Author: Peter Hutterer <[email protected]> +Date: Mon Dec 21 11:08:26 2009 +1000 + + xfree86: remove HistorySize from the xorg.conf man page. + + This option isn't parsed by anything anymore. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Keith Packard <[email protected]> + (cherry picked from commit 190610e0c62170a27ab3e40c6c6210a583ae1ad4) + +commit 7812d760e9b3fe3fc4de710fdddab504c1335fd5 +Author: Peter Hutterer <[email protected]> +Date: Mon Dec 21 10:42:32 2009 +1000 + + xfree86: reword InputDevice man sections, deprecate CorePointer/CoreKeyboard + + Reshuffle and reword - InputDevice sections are only necessary if + hotplugging is disabled. Put more emphasis on hotplugging and less on HAL + since we'll switch backends eventually. + + CorePointer, CoreKeyboard, and AlwaysCore should be listed as deprecated + since they don't do what they used to since 1.4. These days, only + SendCoreEvents matters and it's enabled for any driver calling + xf86ProcessCommonOptions (== every driver). + It only controls the startup behavior too, so document this. + + Signed-off-by: Peter Hutterer <[email protected]> + Acked-by: Keith Packard <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + (cherry picked from commit 094c6b9f97a9f92e5a0ef3cf5be24c09ed4d6063) + +commit 93294355a0429e1f009386632a5fb19d8722c61f +Author: Peter Hutterer <[email protected]> +Date: Mon Dec 14 08:43:19 2009 +1000 + + xfree86: update man page for special keys handling. + + SpecialKeyHandling was removed from the kbd driver with version 1.4.0. Since + this is the only version that will build against server 1.7+ it's not + reasonable to mention it in the man page. Reword, point to XKB instead and + make clear that some key combinations _may_ not be available in any given + config. + + Reported-by: Derek Fawcus + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + (cherry picked from commit 801bc8075aee664bd4c6b6ff842ab737c143a1de) + +commit 9941075acbeb2d069f78072cf710131b8cacc5ab +Author: Peter Hutterer <[email protected]> +Date: Mon Dec 14 08:41:18 2009 +1000 + + xfree86: DontZap has been disabled for a while now, say so in the man page. + + 1.7 always shipped with DontZap disabled, it's just the default keymaps that + may not include the symbol to trigger it. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + (cherry picked from commit 753310837cd3812882d8de67f063bb61813db675) + +commit 7f6fc40bedb31a2c1f6723f0e7b9a7654560d69f +Author: Julien Cristau <[email protected]> +Date: Tue Dec 22 17:14:09 2009 +0100 + + test/xi2: fix maximum max_keycode (bug#25492) + + The number of keycodes needs to be lower than 0xFFFD so that the length + field of xXIKeyInfo doesn't overflow. + + Signed-off-by: Julien Cristau <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + (cherry picked from commit b44c9be244cee286835855483a69c69e80b095c0) + +commit 7cdc00cac817843c913ad442261a43646eb4240e +Author: Jeremy Huddleston <[email protected]> +Date: Fri Dec 11 16:42:43 2009 -0800 + + Xfake: Nuke -Wl,-undefined=InitExtensions from LDFLAGS + + This is not portable, and accodring to Paulo should not be required any more. + + Signed-off-by: Jeremy Huddleston <[email protected]> + (cherry picked from commit d50319550458f8127298cf8672b47f914b74ab1f) + +commit 6cdb0afc9884a13a3fd2da0835fef4724ba94507 +Author: Jeremy Huddleston <[email protected]> +Date: Fri Dec 11 11:53:28 2009 -0800 + + dtrace: Add Xserver-dtrace.h to CLEANFILES + + Signed-off-by: Jeremy Huddleston <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + (cherry picked from commit ed7d2527190ec56aed38db19d9e958abe88441b9) + +commit 01921a2b82da627b223fb2690b4ccd5511437419 +Author: Jeremy Huddleston <[email protected]> +Date: Wed Dec 9 18:27:31 2009 -0800 + + XQuartz: pbproxy: Fix building of standalone xpbproxy executable + + Signed-off-by: Jeremy Huddleston <[email protected]> + (cherry picked from commit 97a6454ea57587db490873fee8ff0f899882972d) + +commit 2b8ba62f006ac56c98b1b91a4215581905223255 +Author: Alan Coopersmith <[email protected]> +Date: Thu Dec 17 18:24:40 2009 -0800 + + Change default xkb model from pc104 to pc105 + + PC105 is a more useful default for non-American keyboard users, + not harmful for American PC101/PC104 keyboard users. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Keith Packard <[email protected]> + (cherry picked from commit 1df4bd6011e110dcf0649b15bfffd4ab9e6961d6) + +commit 0240ad48884476ad5e43a08d35c371f0dd9a0e44 +Author: Alan Coopersmith <[email protected]> +Date: Thu Dec 17 18:24:38 2009 -0800 + + Add platform compatibility defines for Sun Studio compilers + + Signed-off-by: Alan Coopersmith <[email protected]> + Signed-off-by: Keith Packard <[email protected]> + (cherry picked from commit 48749cc21b074ee8e68c3854bd3977ec7c408225) + +commit 17a1587d1606351d3f0b9b148e9c3cbfb6026193 +Author: Alan Coopersmith <[email protected]> +Date: Thu Dec 17 18:24:37 2009 -0800 + + Convert checks for PC98 support from platform #ifdefs to configure flag + + Default remains the same - on for most OS'es on i386 (except Solaris), + off for everyone else. Can be manually toggled via --enable-pc98 or + --disable-pc98. + + Signed-off-by: Alan Coopersmith <[email protected]> + Signed-off-by: Keith Packard <[email protected]> + (cherry picked from commit b63912ed4c69fedd1bea92274d6cae0429a79677) + +commit 2d6a8f668342a5190cdf43b5d385f592d10f5900 +Author: Dave Airlie <[email protected]> +Date: Mon Dec 21 12:26:26 2009 +1000 + + fb: backport fb changes from master for src window operations. + + This rolls up the following commits and also keeps the image_from_pict + API compatiblity. It introduces a new image_from_pict_18 API that is + used by the server leaving the old API alone. + + I've rolled this up as I don't want to introduce ABI breaks in bisection. + + a72c65e9176c51de95db2fdbf4c5d946a4911695 fb: Adjust transform or composite coordinates for pixman operations + bd567061c8b84b268d9bbb01bc4d8981feefb862 Split fbGetDrawable into fbGetDrawablePixmap and fbGetPixmapBitsData + 61335052972a78d67c0ba74f902273b34c63a198 Revert "Fix clipping when windows are used as sources" + 071b3c1810d9f2602173acc8578caac20e0b771e Revert "Use IncludeInferiors when copying windows before compositing." + 8e640d6b131d2865a9725d8997023865b0ef3d69 Revert "Reserve space for two GC values in copy_drawable()." + + Signed-off-by: Dave Airlie <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit a2daadf914fda5177832c2d673b155083ec219ff +Author: Alan Coopersmith <[email protected]> +Date: Mon Dec 14 18:46:00 2009 -0800 + + Add freetype & type1 to the LoadModules ignore list + + Signed-off-by: Alan Coopersmith <[email protected]> + Acked-by: Adam Jackson <[email protected]> + +commit 4548366c222e57515b8add199109dc428157dd66 +Author: Alan Coopersmith <[email protected]> +Date: Tue Dec 15 15:54:22 2009 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <[email protected]> + Acked-by: Peter Hutterer <[email protected]> + +commit 02abf3dab6a4c331e1f64ef9a3c55d6dd64a2787 +Author: Alan Coopersmith <[email protected]> +Date: Mon Nov 23 22:24:44 2009 -0800 + + COPYING: Update license preamble + + Update the comment about "a modification is currently under discussion" + since there hasn't been any such discussion for some time and this is + the consensus agreed upon preferred format. + + Also throw in a pointer to the OSI discussion page about the MIT license. + + Signed-off-by: Alan Coopersmith <[email protected]> + Signed-off-by: Daniel Stone <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + +commit 044b374c06db73ddb26275498ccb0c4fdf93d0f0 +Author: Alan Coopersmith <[email protected]> +Date: Wed Nov 11 14:42:20 2009 -0800 + + Fix builds with --with-int10=stub + + Signed-off-by: Alan Coopersmith <[email protected]> + Acked-by: Adam Jackson <[email protected]> + +commit 1df3321a4002a00f56a05f86503123bcf9aa8db9 +Merge: df84200 601db11 +Author: Peter Hutterer <[email protected]> +Date: Mon Dec 14 13:52:08 2009 +1000 + + Merge branch 'server-1.7-branch' into server-1.7-nominations + +commit df842009a99100d81c645fa2877a3a67a42b2563 +Author: Peter Hutterer <[email protected]> +Date: Thu Dec 3 11:21:31 2009 +1000 + + Xi: reset device properties to NULL after deleting them. (#25374) + + Commit 0e6cee853d8e5bef3274e632ef034d37f14674a9 introduced cleanup code to + remove the accel properties when switching schemes. The same code is + triggered by the default closedown code but only after unconditionally + removing all device properties (as part of the cleanup). The properties, + although deleted never got reset to NULL. + + X.Org Bug 25374 <http://bugs.freedesktop.org/show_bug.cgi?id=25374> + + Signed-off-by: Peter Hutterer <[email protected]> + Tested-by: Andy Furniss <[email protected]> + Reviewed-by: Dave Airlie <[email protected]> + (cherry picked from commit ea14a418214ba4c58910f5650d8b25b3fc3a7099) + +commit d55009f87fca7e2e160901af4755311cc6b0431f +Author: Tomas Carnecky <[email protected]> +Date: Mon Dec 7 05:54:57 2009 +0100 + + Fix possible NULL dereference in XkbFlushLedEvents() + + Through some code paths it is possible that NULL is being passed in the + 'ed' parameter to XkbFlushLedEvents(). Make sure we don't pass it along + to bzero(). + + Signed-off-by: Tomas Carnecky <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + (cherry picked from commit 886140787852c660978a9bb3abc7cc2702cbaed1) + commit 601db11ffc49343807cf562175c2fe51eb6ec056 Author: Peter Hutterer <[email protected]> Date: Fri Dec 11 15:34:05 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 9fd3e9a..540bde4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.7.3.901-2) UNRELEASED; urgency=low +xorg-server (2:1.7.3.902-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * Run udevadm trigger on postinst, and depend on udev [linux-any]. @@ -6,8 +6,9 @@ xorg-server (2:1.7.3.901-2) UNRELEASED; urgency=low [ Julien Cristau ] * Add xserver-common dependency on x11-xkb-utils for xkbcomp. * Remove our copy of input_id, add Depends on new enough udev instead. + * New upstream release. - -- Timo Aaltonen <[email protected]> Mon, 14 Dec 2009 11:21:42 +0200 + -- Julien Cristau <[email protected]> Wed, 06 Jan 2010 16:57:05 +0000 xorg-server (2:1.7.3.901-1) experimental; urgency=low commit 8a110835af10ed24a9e0a4ace207d94f45f44d0a Author: Julien Cristau <[email protected]> Date: Mon Jan 4 16:55:08 2010 +0000 Remove our copy of input_id, add Depends on new enough udev instead. diff --git a/debian/changelog b/debian/changelog index a6f8246..9fd3e9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xorg-server (2:1.7.3.901-2) UNRELEASED; urgency=low [ Julien Cristau ] * Add xserver-common dependency on x11-xkb-utils for xkbcomp. + * Remove our copy of input_id, add Depends on new enough udev instead. -- Timo Aaltonen <[email protected]> Mon, 14 Dec 2009 11:21:42 +0200 diff --git a/debian/control b/debian/control index a0cbaad..c598630 100644 --- a/debian/control +++ b/debian/control @@ -86,9 +86,9 @@ Depends: xserver-common (>= ${source:Version}), xserver-xorg, keyboard-configuration [linux-any kfreebsd-any], + udev (>= 149) [linux-any], ${shlibs:Depends}, ${misc:Depends}, - udev [linux-any], Recommends: libgl1-mesa-dri (>= 7.1~rc1) Suggests: xfonts-base, xfonts-100dpi | xfonts-75dpi, xfonts-scalable Conflicts: diff --git a/debian/local/input_id.c b/debian/local/input_id.c deleted file mode 100644 index 21ee6b3..0000000 --- a/debian/local/input_id.c +++ /dev/null @@ -1,183 +0,0 @@ -/* - * input_id - input device classification - * - * Copyright (C) 2009 Martin Pitt <[email protected]> - * Portions Copyright (C) 2004 David Zeuthen, <[email protected]> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with keymap; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <limits.h> -#include <linux/input.h> - -#include "libudev.h" - -/* we must use this kernel-compatible implementation */ -#define BITS_PER_LONG (sizeof(unsigned long) * 8) -#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) -#define OFF(x) ((x)%BITS_PER_LONG) -#define BIT(x) (1UL<<OFF(x)) -#define LONG(x) ((x)/BITS_PER_LONG) -#define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) - -/* - * Read a capability attribute and return bitmask. - * @param dev udev_device - * @param attr sysfs attribute name (e. g. "capabilities/key") - * @param bitmask: Output array; must have max_size elements - */ -static void get_cap_mask (struct udev_device *dev, const char* attr, - unsigned long *bitmask, size_t max_size) -{ - char text[4096]; - int i; - char* word; - unsigned long val; - - snprintf(text, sizeof(text), "%s", udev_device_get_sysattr_value(dev, attr)); - - memset (bitmask, 0, max_size); - i = 0; - while ((word = strrchr(text, ' ')) != NULL) { - val = strtoul (word+1, NULL, 16); -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
