ChangeLog | 1931 ++ Xext/xtest.c | 9 Xext/xvmc.c | 11 Xi/exevents.c | 28 config/udev.c | 20 configure.ac | 33 debian/changelog | 25 debian/control | 21 debian/patches/02_Add-libnettle-as-option-for-sha1.diff | 22 debian/patches/07-xfree86-fix-build-with-xv-disabled.diff | 16 debian/patches/20-workaround-36986.diff | 13 debian/patches/series | 1 debian/rules | 2 dev/null |binary dix/.gitignore | 1 dix/Makefile.am | 6 dix/dixutils.c | 10 dix/events.c | 113 dix/getevents.c | 68 dix/grabs.c | 112 dix/main.c | 2 dix/window.c | 151 doc/Xserver-spec.xml | 4 doc/dtrace/Makefile.am | 2 docbook.am | 7 exa/exa.c | 4 exa/exa_accel.c | 6 exa/exa_classic.c | 2 exa/exa_driver.c | 2 exa/exa_migration_classic.c | 4 exa/exa_migration_mixed.c | 2 exa/exa_mixed.c | 2 exa/exa_unaccel.c | 4 fb/fb24_32.c | 4 fb/fbarc.c | 9 fb/fbfill.c | 6 fb/fbgc.c | 4 fb/fbpush.c | 2 glx/Makefile.am | 7 glx/glapi.h | 3 glx/glapi_gentable.c | 7589 ++++++++++ glx/glxdri2.c | 9 glx/glxscreens.c | 7 glx/glxscreens.h | 1 hw/dmx/config/xdmxconfig.c | 8 hw/dmx/dmxinit.c | 6 hw/dmx/dmxinput.c | 1 hw/dmx/examples/xbell.c | 3 hw/dmx/glxProxy/glxscreens.h | 1 hw/dmx/input/dmxinputinit.c | 3 hw/dmx/man/Xdmx.man | 30 hw/kdrive/ephyr/ephyr.c | 2 hw/kdrive/ephyr/ephyr.h | 2 hw/kdrive/ephyr/ephyr_draw.c | 2 hw/kdrive/ephyr/ephyrinit.c | 3 hw/kdrive/ephyr/hostx.c | 2 hw/kdrive/ephyr/hostx.h | 2 hw/kdrive/ephyr/man/Xephyr.man | 2 hw/kdrive/ephyr/os.c | 2 hw/kdrive/fake/fakeinit.c | 1 hw/kdrive/fake/kbd.c | 2 hw/kdrive/fbdev/fbdev.c | 2 hw/kdrive/fbdev/fbdev.h | 2 hw/kdrive/fbdev/fbinit.c | 3 hw/kdrive/linux/keyboard.c | 8 hw/kdrive/linux/linux.c | 2 hw/kdrive/linux/mouse.c | 2 hw/kdrive/linux/ps2.c | 2 hw/kdrive/linux/tslib.c | 10 hw/kdrive/src/kcmap.c | 2 hw/kdrive/src/kdrive.c | 6 hw/kdrive/src/kdrive.h | 4 hw/kdrive/src/kinfo.c | 2 hw/kdrive/src/kinput.c | 11 hw/kdrive/src/kshadow.c | 2 hw/vfb/InitInput.c | 1 hw/vfb/InitOutput.c | 6 hw/xfree86/.gitignore | 4 hw/xfree86/Makefile.am | 47 hw/xfree86/common/xf86Config.c | 3 hw/xfree86/common/xf86Configure.c | 2 hw/xfree86/common/xf86Helper.c | 4 hw/xfree86/common/xf86Init.c | 41 hw/xfree86/common/xf86Option.c | 2 hw/xfree86/common/xf86Priv.h | 2 hw/xfree86/common/xf86ShowOpts.c | 2 hw/xfree86/common/xf86Xinput.c | 1 hw/xfree86/dixmods/xkbPrivate.c | 15 hw/xfree86/dri2/dri2.c | 1 hw/xfree86/dri2/dri2.h | 2 hw/xfree86/dri2/dri2ext.c | 7 hw/xfree86/exa/examodule.c | 2 hw/xfree86/loader/.gitignore | 3 hw/xfree86/loader/Makefile.am | 14 hw/xfree86/loader/sdksyms.sh | 425 hw/xfree86/man/Xorg.man | 1 hw/xfree86/modes/xf86Modes.h | 2 hw/xfree86/modes/xf86cvt.c | 4 hw/xfree86/os-support/.gitignore | 2 hw/xfree86/os-support/Makefile.am | 7 hw/xfree86/os-support/shared/posix_tty.c | 2 hw/xfree86/os-support/solaris/sun_agp.c | 4 hw/xfree86/sdksyms.sh | 425 hw/xnest/Init.c | 7 hw/xquartz/GL/indirect.c | 1106 - hw/xquartz/X11Application.h | 3 hw/xquartz/X11Application.m | 76 hw/xquartz/X11Controller.h | 2 hw/xquartz/X11Controller.m | 18 hw/xquartz/bundle/Makefile.am | 9 hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib | 7414 ++++----- hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/English.lproj/locversion.plist | 14 hw/xquartz/bundle/Resources/French.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/French.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib | 633 hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/German.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/German.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib | 586 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib | 7417 ++++----- hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib | 583 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib | 7430 ++++----- hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/ar.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/ar.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib | 375 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/da.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/da.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib | 652 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings |binary hw/xquartz/bundle/Resources/el.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/el.lproj/locversion.plist | 14 hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib | 3521 ++++ hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/fi.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib | 421 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings |binary hw/xquartz/bundle/Resources/he.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/he.lproj/locversion.plist | 14 hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib | 3523 ++++ hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/ko.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib | 7371 ++++----- hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/no.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/no.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib | 325 hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/pl.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib | 7446 ++++----- hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/pt.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib | 7417 ++++----- hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib | 416 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/ru.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib | 7444 ++++----- hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings |binary hw/xquartz/bundle/Resources/sk.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/sk.lproj/locversion.plist | 14 hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib | 3522 ++++ hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/sv.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib | 327 hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib | 7389 +++++---- hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings |binary hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings |binary hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist | 4 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib | 581 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib |binary hw/xquartz/darwin.c | 16 hw/xquartz/darwin.h | 6 hw/xquartz/darwinEvents.c | 4 hw/xquartz/darwinEvents.h | 1 hw/xquartz/darwinXinput.c | 5 hw/xquartz/mach-startup/Makefile.am | 6 hw/xquartz/man/Xquartz.man | 3 hw/xquartz/pbproxy/app-main.m | 11 hw/xquartz/pbproxy/pbproxy.h | 15 hw/xquartz/pbproxy/x-selection.m | 27 hw/xquartz/xpr/dri.c | 61 hw/xquartz/xpr/xpr.h | 5 hw/xquartz/xpr/xprCursor.c | 1 hw/xquartz/xpr/xprEvent.c | 1 hw/xquartz/xpr/xprScreen.c | 1 hw/xwin/InitInput.c | 1 hw/xwin/InitOutput.c | 10 hw/xwin/Makefile.am | 22 hw/xwin/XWin.rc | 2 hw/xwin/glx/Makefile.am | 6 hw/xwin/glx/gen_gl_wrappers.py | 2 hw/xwin/glx/indirect.c | 102 hw/xwin/glx/wgl_ext_api.c | 13 hw/xwin/glx/winpriv.c | 5 hw/xwin/man/XWin.man | 7 hw/xwin/man/XWinrc.man | 2 hw/xwin/windialogs.c | 2 hw/xwin/winerror.c | 2 hw/xwin/winmultiwindowwindow.c | 64 hw/xwin/winmultiwindowwndproc.c | 72 hw/xwin/winwindow.h | 4 hw/xwin/xlaunch/COPYING | 25 hw/xwin/xlaunch/Makefile | 79 hw/xwin/xlaunch/config.cc | 282 hw/xwin/xlaunch/config.h | 60 hw/xwin/xlaunch/main.cc | 700 hw/xwin/xlaunch/resources/dialog.rc | 118 hw/xwin/xlaunch/resources/images.rc | 29 hw/xwin/xlaunch/resources/resources.h | 99 hw/xwin/xlaunch/resources/resources.rc | 30 hw/xwin/xlaunch/resources/strings.rc | 108 hw/xwin/xlaunch/window/dialog.cc | 86 hw/xwin/xlaunch/window/dialog.h | 54 hw/xwin/xlaunch/window/util.cc | 1112 - hw/xwin/xlaunch/window/util.h | 53 hw/xwin/xlaunch/window/window.cc | 284 hw/xwin/xlaunch/window/window.h | 114 hw/xwin/xlaunch/window/wizard.cc | 244 hw/xwin/xlaunch/window/wizard.h | 59 include/dix.h | 5 include/dixgrabs.h | 3 include/input.h | 9 include/os.h | 13 include/window.h | 2 man/Xserver.man | 2 manpages.am | 5 mi/mipointer.c | 2 miext/shadow/shadow.c | 2 miext/shadow/shpacked.c | 2 miext/shadow/shplanar.c | 2 miext/shadow/shplanar8.c | 2 miext/shadow/shrotate.c | 2 miext/shadow/shrotpack.h | 2 miext/shadow/shrotpackYX.h | 2 os/.gitignore | 2 os/Makefile.am | 6 os/log.c | 6 randr/rrcrtc.c | 2 randr/rrproperty.c | 2 test/.gitignore | 17 test/Makefile.am | 13 test/input.c | 3 test/xi2/.gitignore | 10 test/xi2/protocol-common.c | 2 test/xi2/protocol-eventconvert.c | 18 xfixes/cursor.c | 4 xfixes/region.c | 2 xkb/xkb.c | 19 xkb/xkbfmisc.c | 48 xkb/xkmread.c | 31 279 files changed, 53989 insertions(+), 37844 deletions(-)
New commits: commit 25e87a8e237642f0c0e1827434aa102d1186b614 Author: Julien Cristau <[email protected]> Date: Sun Jul 31 22:15:43 2011 +0200 Upload to experimental diff --git a/debian/changelog b/debian/changelog index 00e30a5..17bc6df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low +xorg-server (2:1.10.99.901+git20110731-1) experimental; urgency=low [ Cyril Brulebois ] * New upstream release candidate. @@ -30,7 +30,7 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low * Drop obsolete 20-workaround-36986.diff. * Fix patch stamp dependency. - -- Cyril Brulebois <[email protected]> Tue, 31 May 2011 13:52:04 +0200 + -- Julien Cristau <[email protected]> Sun, 31 Jul 2011 22:15:07 +0200 xorg-server (2:1.10.2-1) unstable; urgency=low commit 1254005030c6de9f1476aced4e4f4d629046574c Author: Julien Cristau <[email protected]> Date: Sun Jul 31 21:19:18 2011 +0200 Refresh patches diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff index 475bf77..bb0c338 100644 --- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff +++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff @@ -8,9 +8,11 @@ Signed-off-by: Cyril Brulebois <[email protected]> [jcristau: forward-ported from 1.7 to 1.8] Signed-off-by: Julien Cristau <[email protected]> --- ---- a/configure.ac -+++ b/configure.ac -@@ -1356,7 +1356,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t +Index: xorg-server/configure.ac +=================================================================== +--- xorg-server.orig/configure.ac ++++ xorg-server/configure.ac +@@ -1315,7 +1315,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t # SHA1 hashing AC_ARG_WITH([sha1], @@ -19,7 +21,7 @@ Signed-off-by: Julien Cristau <[email protected]> [choose SHA1 implementation])]) AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes]) if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then -@@ -1439,6 +1439,16 @@ if test "x$with_sha1" = xlibcrypto; then +@@ -1398,6 +1398,16 @@ if test "x$with_sha1" = xlibcrypto; then SHA1_CFLAGS="$OPENSSL_CFLAGS" fi fi @@ -36,8 +38,10 @@ Signed-off-by: Julien Cristau <[email protected]> AC_MSG_CHECKING([for SHA1 implementation]) if test "x$with_sha1" = x; then AC_MSG_ERROR([No suitable SHA1 implementation found]) ---- a/include/dix-config.h.in -+++ b/include/dix-config.h.in +Index: xorg-server/include/dix-config.h.in +=================================================================== +--- xorg-server.orig/include/dix-config.h.in ++++ xorg-server/include/dix-config.h.in @@ -175,6 +175,9 @@ /* Define to use libsha1 for SHA1 */ #undef HAVE_SHA1_IN_LIBSHA1 @@ -48,8 +52,10 @@ Signed-off-by: Julien Cristau <[email protected]> /* Define to 1 if you have the `shmctl64' function. */ #undef HAVE_SHMCTL64 ---- a/os/xsha1.c -+++ b/os/xsha1.c +Index: xorg-server/os/xsha1.c +=================================================================== +--- xorg-server.orig/os/xsha1.c ++++ xorg-server/os/xsha1.c @@ -127,6 +127,31 @@ int x_sha1_final(void *ctx, unsigned cha return 1; } diff --git a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff index 9aac31f..1bd6b70 100644 --- a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff +++ b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff @@ -8,9 +8,11 @@ Subject: [PATCH] xfree86: fix build with xv disabled hw/xfree86/modes/xf86Crtc.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -3094,6 +3094,7 @@ xf86_crtc_box_area(BoxPtr box) +Index: xorg-server/hw/xfree86/modes/xf86Crtc.c +=================================================================== +--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c ++++ xorg-server/hw/xfree86/modes/xf86Crtc.c +@@ -3089,6 +3089,7 @@ xf86_crtc_box_area(BoxPtr box) return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1); } @@ -18,7 +20,7 @@ Subject: [PATCH] xfree86: fix build with xv disabled /* * Return the crtc covering 'box'. If two crtcs cover a portion of * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc -@@ -3182,6 +3183,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr +@@ -3177,6 +3178,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr return ret; } @@ -26,8 +28,10 @@ Subject: [PATCH] xfree86: fix build with xv disabled xf86_crtc_notify_proc_ptr xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new) ---- a/hw/xfree86/modes/xf86Crtc.h -+++ b/hw/xfree86/modes/xf86Crtc.h +Index: xorg-server/hw/xfree86/modes/xf86Crtc.h +=================================================================== +--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h ++++ xorg-server/hw/xfree86/modes/xf86Crtc.h @@ -934,6 +934,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn); extern _X_EXPORT void xf86_cursors_fini (ScreenPtr screen); commit db14bd281d0a873ee5af613f4b2db2de63872af4 Author: Julien Cristau <[email protected]> Date: Sun Jul 31 21:18:26 2011 +0200 Fix patch stamp dependency. diff --git a/debian/changelog b/debian/changelog index 7724ab2..00e30a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low apt decide to remove them instead of removing all of X. Thanks, David Kalnischkies! * Drop obsolete 20-workaround-36986.diff. + * Fix patch stamp dependency. -- Cyril Brulebois <[email protected]> Tue, 31 May 2011 13:52:04 +0200 diff --git a/debian/rules b/debian/rules index 7d1c012..d000ed4 100755 --- a/debian/rules +++ b/debian/rules @@ -182,6 +182,8 @@ confflags_udeb = \ $(config_backend_udeb) \ $(void) +$(QUILT_STAMPFN): $(STAMP_DIR)/stampdir + $(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir $(QUILT_STAMPFN) dh_testdir autoreconf -vfi commit 1ac0345550ef004c390da7f0831e9b1f2d00c30b Author: Julien Cristau <[email protected]> Date: Sun Jul 31 21:16:32 2011 +0200 Drop obsolete 20-workaround-36986.diff. diff --git a/debian/changelog b/debian/changelog index 8a17e51..7724ab2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,6 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low * Adapt 15-nouveau.diff to cope with the glxdricommon-ification of GLX probing. Nouveau users might still see an error (EE) mentioning the fallback to software rendering. - * Refresh 20-workaround-36986.diff. * Bump pixman build-dep/dep to 0.21.8. * Bump xutils-dev build-dep for new macros. * Drop libglib2.0-dev build-dep, no longer needed for unit tests. @@ -28,6 +27,7 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low + Add Breaks on drivers abandoned between lenny and squeeze. This helps apt decide to remove them instead of removing all of X. Thanks, David Kalnischkies! + * Drop obsolete 20-workaround-36986.diff. -- Cyril Brulebois <[email protected]> Tue, 31 May 2011 13:52:04 +0200 diff --git a/debian/patches/20-workaround-36986.diff b/debian/patches/20-workaround-36986.diff deleted file mode 100644 index d9026cd..0000000 --- a/debian/patches/20-workaround-36986.diff +++ /dev/null @@ -1,13 +0,0 @@ -Workaround fdo#36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986> ---- a/test/input.c -+++ b/test/input.c -@@ -1223,8 +1223,10 @@ static void dix_valuator_alloc(void) - - assert(v); - assert(v->numAxes == num_axes); -+#if 0 - assert(((void*)v->axisVal - (void*)v) % sizeof(double) == 0); - assert(((void*)v->axes - (void*)v) % sizeof(double) == 0); -+#endif - num_axes ++; - } diff --git a/debian/patches/series b/debian/patches/series index a9c30f6..2e0f947 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ 07-xfree86-fix-build-with-xv-disabled.diff #13_debian_add_xkbpath_env_variable.diff 15-nouveau.diff -20-workaround-36986.diff commit 7294c5919b6ca632fbf84680a2f2e23660210c39 Author: Julien Cristau <[email protected]> Date: Sun Jul 31 21:13:04 2011 +0200 Xquartz: include new localization files in the tarball Signed-off-by: Julien Cristau <[email protected]> diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am index 6deecae..6e83a42 100644 --- a/hw/xquartz/bundle/Makefile.am +++ b/hw/xquartz/bundle/Makefile.am @@ -40,6 +40,9 @@ EXTRA_DIST = \ Resources/Dutch.lproj/InfoPlist.strings \ Resources/Dutch.lproj/Localizable.strings \ Resources/Dutch.lproj/main.nib/keyedobjects.nib \ + Resources/el.lproj/InfoPlist.strings \ + Resources/el.lproj/Localizable.strings \ + Resources/el.lproj/main.nib/keyedobjects.nib \ Resources/English.lproj/InfoPlist.strings \ Resources/English.lproj/Localizable.strings \ Resources/English.lproj/main.nib/designable.nib \ @@ -53,6 +56,9 @@ EXTRA_DIST = \ Resources/German.lproj/InfoPlist.strings \ Resources/German.lproj/Localizable.strings \ Resources/German.lproj/main.nib/keyedobjects.nib \ + Resources/he.lproj/InfoPlist.strings \ + Resources/he.lproj/Localizable.strings \ + Resources/he.lproj/main.nib/keyedobjects.nib \ Resources/Italian.lproj/InfoPlist.strings \ Resources/Italian.lproj/Localizable.strings \ Resources/Italian.lproj/main.nib/keyedobjects.nib \ @@ -77,6 +83,9 @@ EXTRA_DIST = \ Resources/ru.lproj/InfoPlist.strings \ Resources/ru.lproj/Localizable.strings \ Resources/ru.lproj/main.nib/keyedobjects.nib \ + Resources/sk.lproj/InfoPlist.strings \ + Resources/sk.lproj/Localizable.strings \ + Resources/sk.lproj/main.nib/keyedobjects.nib \ Resources/Spanish.lproj/InfoPlist.strings \ Resources/Spanish.lproj/Localizable.strings \ Resources/Spanish.lproj/main.nib/keyedobjects.nib \ commit 64589bd2b8002c900f3934b50ac304a69e81f3c5 Author: Julien Cristau <[email protected]> Date: Sat Jul 3 11:58:46 2010 +0100 Add Breaks on drivers abandoned between lenny and squeeze. This helps apt decide to remove them instead of removing all of X. Thanks, David Kalnischkies! (cherry-picked from commit 9c8080d06c457932d3bfec021c69ac000aa60120) diff --git a/debian/changelog b/debian/changelog index 379c9b8..8a17e51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low early, add a Breaks against pre-multiarch libgl1-mesa-dri and libgl1-mesa-dri-experimental. + Bump Standards-Version to 3.9.2 (no changes). + + Add Breaks on drivers abandoned between lenny and squeeze. This helps + apt decide to remove them instead of removing all of X. Thanks, David + Kalnischkies! -- Cyril Brulebois <[email protected]> Tue, 31 May 2011 13:52:04 +0200 diff --git a/debian/control b/debian/control index 657fc26..540f232 100644 --- a/debian/control +++ b/debian/control @@ -110,6 +110,13 @@ Breaks: xserver-xorg-input-tslib (<= 0.0.6-3), xserver-xorg-input-vmmouse (<= 1:12.6.5-4), xserver-xorg-input-wacom (<= 0.10.5+20100415-1), + xserver-xorg-video-cyrix (<= 1:1.1.0-8), + xserver-xorg-video-i810 (<< 2:2.4), + xserver-xorg-video-imstt (<= 1:1.1.0-7), + xserver-xorg-video-nsc (<= 1:2.8.3-4), + xserver-xorg-video-sunbw2 (<= 1:1.1.0-5), + xserver-xorg-video-v4l (<< 1:0.2.0), + xserver-xorg-video-vga (<= 1:4.1.0-8), libgl1-mesa-dri (<< 7.10.2-4), libgl1-mesa-dri-experimental (<< 7.10.2-4), Provides: commit bb0d32bf3a0bde71b686d742f0d7851c9ceec94f Author: Cyril Brulebois <[email protected]> Date: Sat Jul 2 11:58:52 2011 +0200 Bump Standards-Version to 3.9.2 (no changes). diff --git a/debian/changelog b/debian/changelog index 1607cfb..379c9b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low + And since the server's binNMU managed to migrate to testing way too early, add a Breaks against pre-multiarch libgl1-mesa-dri and libgl1-mesa-dri-experimental. + + Bump Standards-Version to 3.9.2 (no changes). -- Cyril Brulebois <[email protected]> Tue, 31 May 2011 13:52:04 +0200 diff --git a/debian/control b/debian/control index b12453d..657fc26 100644 --- a/debian/control +++ b/debian/control @@ -77,7 +77,7 @@ Build-Depends: # unit tests xkb-data, x11-xkb-utils, -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git commit a2f68deaccb0cdc0f9e9ecdd92d465bf1a9f70da Author: Julien Cristau <[email protected]> Date: Sun Jul 31 20:09:33 2011 +0200 Add bug closure diff --git a/debian/changelog b/debian/changelog index c2331cb..1607cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low [ Julien Cristau ] * Update to git HEAD. + + DIX: Set backgroundState correctly for root window (Closes: #632134) * Bump xproto, dri2proto and glproto build-dependencies. * Merge packaging changes from the 1.10.x branch: + Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4, to lower the commit 1c6906bef41e505d76f3ab63742b4f692cda2b5d Author: Cyril Brulebois <[email protected]> Date: Fri Jun 17 18:09:11 2011 +0200 Add Breaks against pre-multiarch libgl1-mesa-dri* packages. diff --git a/debian/changelog b/debian/changelog index 37fb2ac..c2331cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low odds of having a server built against multiarched mesa, installed along a pre-multiarch mesa. The Breaks in mesa packages take care of the other way round already. + + And since the server's binNMU managed to migrate to testing way too + early, add a Breaks against pre-multiarch libgl1-mesa-dri and + libgl1-mesa-dri-experimental. -- Cyril Brulebois <[email protected]> Tue, 31 May 2011 13:52:04 +0200 diff --git a/debian/control b/debian/control index e66ee68..b12453d 100644 --- a/debian/control +++ b/debian/control @@ -110,6 +110,8 @@ Breaks: xserver-xorg-input-tslib (<= 0.0.6-3), xserver-xorg-input-vmmouse (<= 1:12.6.5-4), xserver-xorg-input-wacom (<= 0.10.5+20100415-1), + libgl1-mesa-dri (<< 7.10.2-4), + libgl1-mesa-dri-experimental (<< 7.10.2-4), Provides: ${videoabi}, ${inputabi}, commit a9981311c2a1023fa1a1783dd15013c5ec704569 Author: Cyril Brulebois <[email protected]> Date: Thu Jun 16 03:46:39 2011 +0200 Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4. This lowers the odds of having a server built against multiarched mesa, installed along a pre-multiarch mesa. The Breaks in mesa packages take care of the other way round already. diff --git a/debian/changelog b/debian/changelog index 23ac61c..37fb2ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,11 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low [ Julien Cristau ] * Update to git HEAD. * Bump xproto, dri2proto and glproto build-dependencies. + * Merge packaging changes from the 1.10.x branch: + + Bump libgl1-mesa-dri versioned Recommends to 7.10.2-4, to lower the + odds of having a server built against multiarched mesa, installed + along a pre-multiarch mesa. The Breaks in mesa packages take care of + the other way round already. -- Cyril Brulebois <[email protected]> Tue, 31 May 2011 13:52:04 +0200 diff --git a/debian/control b/debian/control index cbd4d97..e66ee68 100644 --- a/debian/control +++ b/debian/control @@ -89,7 +89,7 @@ Depends: udev (>= 149) [linux-any], ${shlibs:Depends}, ${misc:Depends}, -Recommends: libgl1-mesa-dri (>= 7.1~rc1) +Recommends: libgl1-mesa-dri (>= 7.10.2-4) Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable Breaks: xserver-xorg-video, commit 7890e14d855c247a59047a3197d779be40800a16 Author: Julien Cristau <[email protected]> Date: Sun Jul 31 19:47:49 2011 +0200 Bump xproto, dri2proto and glproto build-dependencies. diff --git a/debian/changelog b/debian/changelog index c63de1f..23ac61c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ xorg-server (2:1.10.99.901+git20110731-1) UNRELEASED; urgency=low [ Julien Cristau ] * Update to git HEAD. + * Bump xproto, dri2proto and glproto build-dependencies. -- Cyril Brulebois <[email protected]> Tue, 31 May 2011 13:52:04 +0200 diff --git a/debian/control b/debian/control index 3ed0e07..cbd4d97 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: xfonts-utils (>= 1:7.5+1), x11proto-bigreqs-dev (>= 1:1.1.0), x11proto-composite-dev (>= 1:0.4), - x11proto-core-dev (>= 7.0.17), + x11proto-core-dev (>= 7.0.22), x11proto-damage-dev (>= 1.1), x11proto-fixes-dev (>= 1:5.0), x11proto-kb-dev (>= 1.0.3), @@ -40,7 +40,7 @@ Build-Depends: xtrans-dev (>= 1.2.2), libxau-dev (>= 1:1.0.5-2), x11proto-input-dev (>= 1.9.99.902), - x11proto-dri2-dev (>= 2.3), + x11proto-dri2-dev (>= 2.6), libxdmcp-dev (>= 1:0.99.1), libxfont-dev (>= 1:1.4.2), libxkbfile-dev (>= 1:0.99.1), @@ -55,7 +55,7 @@ Build-Depends: libaudit-dev [linux-any], x11proto-xf86dri-dev (>= 2.1.0), libdrm-dev (>= 2.4.3) [!hurd-i386], - x11proto-gl-dev (>= 1.4.10), + x11proto-gl-dev (>= 1.4.14), mesa-common-dev (>= 7.8), libgl1-mesa-dev (>= 7.8), libxmuu-dev (>= 1:0.99.1), @@ -148,7 +148,7 @@ Package: xserver-xorg-dev Architecture: any Depends: libpixman-1-dev (>= 0.21.8), - x11proto-core-dev (>= 7.0.17), + x11proto-core-dev (>= 7.0.22), x11proto-input-dev (>= 1.9.99.902), x11proto-xext-dev (>= 7.1.99), x11proto-video-dev, commit ce1c4a81fd186a52d555ad631528382dbcdd822b Author: Julien Cristau <[email protected]> Date: Sun Jul 31 19:45:38 2011 +0200 Changelog bump diff --git a/ChangeLog b/ChangeLog index b7df3cb..b157de8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1934 @@ +commit 08dfff92e8d0c2b1726634392c147f6634d1706d +Author: Aaron Plattner <[email protected]> +Date: Fri Jul 29 16:12:06 2011 -0700 + + randr: Compare all the bytes in RRPostPendingProperties + + RRPostPendingProperties tries to compare the pending and current + property values to decide whether they're actually changing. However, + it does this using a memcmp that passes in pending_value->size as the + number of bytes. This is actually the number of elements, where each + element is (pending_value->format / 8) bytes long. This causes the + pending value to not be propagated if the first pending_value->size + bytes are the same and only the end of it is changing. + + Fix this by computing the total number of bytes to compare in the + memcmp. + + Signed-off-by: Aaron Plattner <[email protected]> + Reviewed-by: Keith Packard <[email protected]> + Signed-off-by: Keith Packard <[email protected]> + +commit b8f61c11c94708d4f17720a55945dee4621315a4 +Merge: 5596f10 f51e42f +Author: Keith Packard <[email protected]> +Date: Fri Jul 29 14:58:58 2011 -0700 + + Merge remote-tracking branch 'whot/for-keith' + +commit f51e42f583073bde0bc8131887cb7220636c8855 +Author: Peter Hutterer <[email protected]> +Date: Wed Jul 20 13:09:05 2011 +1000 + + Terminate the log with one last message. + + Instead of just closing the log when everything is done, put one more + message in stating that we're actually terminating. Users or scripts that + look at the Xorg.log will then know that a) the server has terminated + properly and b) why the server terminated (to some degree, given that most + real-world errors will be caused by AbortServer()). + + Acked-by: Gaetan Nadon <[email protected]> + Reviewed-by: Daniel Stone <[email protected]> + Tested-by: Jeremy Huddleston <[email protected]> + Reviewed-by: Jeremy Huddleston <[email protected]> + Tested-by: Jon TURNEY <[email protected]> + Reviewed-by: Jon TURNEY <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 01de08c7d2c00eef238adba6665896ea3cd7d511 +Author: Julien Cristau <[email protected]> +Date: Tue Jul 26 20:40:38 2011 +0200 + + configure: set default xkb rules to evdev on Linux + + If config/udev was enabled, this would default to base, which means that + after regen the devices would get the wrong rules, and hilarity would + ensue. + + It's probably safe to default to evdev unconditionally on Linux by now. + + Reported-by: Bastian Blank <[email protected]> + Signed-off-by: Julien Cristau <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 3798dd379c1ecf325f9907128fb66d20372f6876 +Author: Peter Hutterer <[email protected]> +Date: Wed Jul 20 09:00:18 2011 +1000 + + Initialize the fd to -1 for xorg.conf input devices. + + For hotplugged devices, xf86AllocateInput does that for us but the xorg.conf + path is different. Since not all drivers reset the fd during PreInit but may + still call close(pInfo->fd) in all cases, this can terminate the logging + early. + + Reproducible: add a wacom driver InputDevice section with no Option Device. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Daniel Stone <[email protected]> + +commit f2a6735cfc07789cca81852b24a85578f200d83d +Author: Peter Hutterer <[email protected]> +Date: Mon Jul 4 12:34:32 2011 +1000 + + xfree86: NULL option values are technically valid, don't strdup them + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Daniel Stone <[email protected]> + +commit f0d7e9db28c374a3db359bcb63a7ce79fd84b541 +Author: Peter Hutterer <[email protected]> +Date: Mon Jul 4 14:14:39 2011 +1000 + + xfree86: duplicate xorg.conf device information before xf86NewInputDevice + + xf86ConfigLayout.inputs contains the information from the xorg.conf + file. Passing this into xf86NewInputDevice means the device will get + cleaned up on exit and the pointers in xf86ConfigLayout.inputs are left + dangling. In the second server generation, this results in a server + crash. + + Also, rename pDev to pInfo. pDev is pretty much reserved for DeviceIntPtr + types. + + Reproducible: AutoAddDevices off and xorg.conf input sections, trigger + server regeneration. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Daniel Stone <[email protected]> + +commit 8ffddbcf72170e246826ee0f39f18989a29fa218 +Author: Peter Hutterer <[email protected]> +Date: Mon Jun 27 16:30:28 2011 +1000 + + xfree86: Remove devices that failed to enable on startup + + Devices that succeeded during PreInit and DEVICE_INIT but failed in + DEVICE_ON would be deleted through xf86DeleteInput but not removed from the + list of input devices (and not turned off). The result was a double free on + server shutdown. + + Fix this by calling RemoveDevice if EnableDevice fails. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Daniel Stone <[email protected]> + +commit 6cea28fe4b7a4a22ad270d8c71403db84a9bfb2c +Author: Lennart Poettering <[email protected]> +Date: Mon Jul 18 21:18:27 2011 +0200 + + config: don't fail if a device vanished by the time we managed to look at it + + The nature of hotplug is that a device we enumerated might already be + gone by the time we look at it, so don't assume otherwise. + + Signed-off-by: Lennart Poettering <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit f13de9ca1b7c4dd0dd5c08037c6bd53f88ac30f5 +Author: Lennart Poettering <[email protected]> +Date: Mon Jul 18 21:17:49 2011 +0200 + + config: limit the kernel subsystems we look for devices in + + Don't enumerate/monitor all devices of the system (since that can be + quite a few), but limit our search to devices from the "input" + subsystem, as well as the "tty" subsystem (to cover Wacom tablets). + + This should make X start up a bit faster and reduce the number of + unnecessary wake-ups of the X server. + + Signed-off-by: Lennart Poettering <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 882e3c2680c339ad7aa0d664e0b0f02b8a05b11d +Author: Lennart Poettering <[email protected]> +Date: Mon Jul 18 21:17:10 2011 +0200 + + config: process udev "changed" and "add" events in the same code paths + + udev gives no guarantee that before each "changed" event for a device + there's an "add" event, or that before each "remove" is an "add", or + that before each "add" there was no "add" already and so on. Users can + trigger these events at any time with "udevadm trigger", and netlink is + a lossy transport, hence the events can come in unexpected ordering. + + With other words: regardless which event is generated, the X server must + not choke on it and make the best of it, hence make sure that if we get + an "add" event for an existing device we don't add the device a second + time. + + Signed-off-by: Lennart Poettering <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 5596f10cce58295d8af73646352b314ecb3ddfca +Author: Jon TURNEY <[email protected]> +Date: Sat Jul 9 13:21:04 2011 +0100 + + Remove hw/xwin/xlaunch + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Colin Harrison <[email protected]> + +commit 73864a87aacbce85b520ccaa6e360b82c0e99716 +Author: Jeremy Huddleston <[email protected]> +Date: Tue Jul 19 20:03:48 2011 -0700 + + XQuartz: Localization updates + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit d2463df84d3a160b2dd1e706b02985e1817784e3 +Author: Jeremy Huddleston <[email protected]> +Date: Tue Jul 19 20:02:33 2011 -0700 + + XQuartz: Add english NIB changes for scroll_in_device_direction + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit e36e7ad6314ca5fcd3292b8022f0a618d567d72b +Author: Jeremy Huddleston <[email protected]> +Date: Tue Jul 19 20:01:11 2011 -0700 + + XQuartz: Add GUI controls to toggle scroll_in_device_direction + + Also cleaned up the wording for fullscreen_menu. + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit ac43984215faf464fd48bd006cac1c6539603cea +Author: Jeremy Huddleston <[email protected]> +Date: Tue Jul 19 20:00:27 2011 -0700 + + XQuartz: Add a scroll_in_device_direction preference + + This preference allows users to override the related option in Mac OS X's + Mouse/Trackpad preferences. This effectively lets the user determine -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
