xorg-server: Changes to 'debian-experimental'
ChangeLog | 626 ++++++++++++++++++++++++++++++++++
Xext/panoramiX.c | 5
Xext/sync.c | 4
Xext/xvmc.c | 8
configure.ac | 4
debian/changelog | 3
debian/patches/03_fix-disable-xv.diff | 15
debian/patches/series | 1
dix/devices.c | 10
glx/glxdri2.c | 23 -
glx/glxext.c | 3
glx/glxserver.h | 2
hw/xfree86/common/xf86.h | 2
hw/xfree86/common/xf86AutoConfig.c | 1
hw/xfree86/common/xf86Extensions.h | 8
hw/xfree86/dri2/dri2.c | 15
hw/xfree86/dri2/dri2.h | 7
hw/xfree86/dri2/dri2ext.c | 9
hw/xfree86/modes/xf86Crtc.c | 6
hw/xfree86/modes/xf86Modes.c | 15
hw/xfree86/modes/xf86RandR12.c | 2
hw/xfree86/sdksyms.sh | 2
hw/xquartz/pseudoramiX.c | 4
hw/xquartz/xpr/dri.h | 3
hw/xwin/InitOutput.c | 23 +
hw/xwin/Makefile.am | 1
hw/xwin/README | 141 -------
hw/xwin/man/XWin.man | 26 -
hw/xwin/win.h | 2
hw/xwin/winblock.c | 2
hw/xwin/winclipboard.h | 7
hw/xwin/winclipboardinit.c | 2
hw/xwin/winclipboardthread.c | 8
hw/xwin/winclipboardunicode.c | 65 ---
hw/xwin/winclipboardwndproc.c | 7
hw/xwin/winclipboardwrappers.c | 10
hw/xwin/winclipboardxevents.c | 14
hw/xwin/wincreatewnd.c | 93 +++--
hw/xwin/windialogs.c | 8
hw/xwin/winerror.c | 4
hw/xwin/winkeyhook.c | 18
hw/xwin/winmonitors.c | 5
hw/xwin/winmonitors.h | 29 +
hw/xwin/winmultiwindowwm.c | 79 ++--
hw/xwin/winprocarg.c | 18
hw/xwin/winscrinit.c | 4
hw/xwin/winwndproc.c | 7
include/extinit.h | 32 -
include/os.h | 10
os/utils.c | 73 +++
randr/rrprovider.c | 47 +-
randr/rrproviderproperty.c | 78 ++--
randr/rrscreen.c | 21 -
test/xtest.c | 3
xkb/ddxList.c | 6
xkb/ddxLoad.c | 75 ----
56 files changed, 1102 insertions(+), 594 deletions(-)
New commits:
commit bc18e7dd5d50066b406a2bca492a3790f81cdcd8
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 12:47:50 2012 +0200
Remove upstreamed build fix
diff --git a/debian/changelog b/debian/changelog
index fda7cad..eec1949 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ xorg-server (2:1.12.99.902-1) UNRELEASED; urgency=low
* New upstream release snapshot (on the way to 1.13).
* Bump minimum required abi, randr, dri2 and gl protos.
- * Add fix for building udeb without xv
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Thu, 12 Jul 2012 13:54:50 +0200
diff --git a/debian/patches/03_fix-disable-xv.diff b/debian/patches/03_fix-disable-xv.diff
deleted file mode 100644
index 6aa4a00..0000000
--- a/debian/patches/03_fix-disable-xv.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
-index c0398da..07372ad 100755
---- a/hw/xfree86/sdksyms.sh
-+++ b/hw/xfree86/sdksyms.sh
-@@ -46,8 +46,10 @@ cat > sdksyms.c << EOF
- #include "misyncstr.h"
-
- /* Xext/Makefile.am -- half is module, half is builtin */
-+#ifdef XV
- #include "xvdix.h"
- #include "xvmcext.h"
-+#endif
- #include "geext.h"
- #include "geint.h"
- #ifdef MITSHM
diff --git a/debian/patches/series b/debian/patches/series
index c38536c..aaaaaed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
## Ubuntu patches start with 100.
001_fedora_extramodes.patch
02_Add-libnettle-as-option-for-sha1.diff
-03_fix-disable-xv.diff
#13_debian_add_xkbpath_env_variable.diff
commit ca7e3cd06e5cc6f8bec9e3d12dedb54c9c3009fc
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 12:45:27 2012 +0200
Bump changelog
diff --git a/ChangeLog b/ChangeLog
index ac7878f..37ece39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,629 @@
+commit 77de2994774e7be24a0bad521180628feb1027c6
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jul 17 15:47:39 2012 -0700
+
+ Bump to version 1.12.99.902
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit beeea70495a8d5c4afc1b1eb2cc06a24ab1a986d
+Merge: 6e438a0 6910280
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jul 17 12:17:39 2012 -0700
+
+ Merge remote-tracking branch 'alanc/master'
+
+commit 6e438a0e183f5a6c22070746c038af53d5b935ca
+Merge: 5884e7d 75966a4
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jul 17 12:12:53 2012 -0700
+
+ Merge remote-tracking branch 'jturney/master'
+
+commit 75966a4186955f3a4625e93796145036c5986d2e
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jul 13 14:36:25 2012 -0700
+
+ xwin: Clean up os wrappers for System, Popen and Pclose on Windows
+
+ Popen and Pclose are never used on Windows, so don't bother to even
+ try to define them.
+
+ System(s) was defined as system(s), but the two users of that
+ function are in xkb, which carefully redefines that as
+ Win32System. Move Win32System and Win32TempDir to os/utils.c, renaming
+ Win32System to be just System, which simplifies the xkb code
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit 6910280297ab610100dd8e7fbe5bb5cc08968f2f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 14 10:54:36 2012 -0700
+
+ Use C99 designated initializers in DRI2GetParam replies
+
+ DRI2GetParam was going through review in parallel with main batch of
+ C99 initialization changes - sync up now that both have landed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit a6c5b8d3ee053cadf685b0e4de96407ad6df4dd4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 14 10:50:41 2012 -0700
+
+ Use C99 designated initializers in RandR 1.4 extension Events
+
+ RandR 1.4 was going through review in parallel with main batch of
+ C99 initialization changes - sync up now that both have landed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit ada04ef0ca8a1213e865ba2c000ccd6ed6d0e371
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 14 10:45:29 2012 -0700
+
+ Use C99 designated initializers in RandR 1.4 extension Replies
+
+ RandR 1.4 was going through review in parallel with main batch of
+ C99 initialization changes - sync up now that both have landed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit fb73f7f40fa46458990038332017d4496caa0691
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 14 10:02:52 2012 -0700
+
+ Fix two more C99 initialization mistakes using members of same struct
+
+ Similar to 34cf559bcf99dad, use temporary variables instead of
+ referencing members of the struct being initialized in the middle
+ of the initialization.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 5884e7dedecdd82ddbb037360cf9c85143e094b5
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Jul 16 17:40:31 2012 -0700
+
+ xf86: Re-export extension disable flags
+
+ These flags were unexported by commit a1d41e311c21eb6627caa0d168e070ceaf90806f,
+ which moved the declarations around and lost the _X_EXPORT attributes in the
+ process. Since drivers need these and it's late in the release cycle, just
+ re-export them for now.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Andy Ritger <aritger@nvidia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 357ec54f46d31ff77c441c15c322152e04f89a11
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Wed Mar 14 13:58:32 2012 +0000
+
+ hw/xwin: Refer to xkeyboard-config man page for XKB configuration option values
+
+ Also polish the keyboard configuration text a bit
+ Include man section number in references to setxkbmap
+ Consistently refer to 'manual page' rather using both that and 'man page'
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 5940580f8c12145c1ef4c3eee898676b48d95879
+Author: Jörg Mensmann <joerg_ml@bitplanet.de>
+Date: Tue Apr 17 10:48:19 2012 +0100
+
+ hw/xwin: Fix command line arguments for multiple monitors.
+
+ Moving Xwin to a certain monitor using "-screen 0 @2" would fail,
+ printing "ddxProcessArgument - screen - Querying monitors failed".
+
+ This happened since commit 3ead1d810b0e157078db39712e02ea6dc85216d8,
+ because EnumDisplayMonitor() returns FALSE if its callback function
+ returns FALSE (which is not clearly documented), and QueryMonitor()
+ would then also return FALSE.
+
+ Moving back to the old behaviour, where the return value of
+ EnumDisplayMonitors() is ignored.
+
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 18801f5e5a98d80f4811ade8c98df65175b1935a
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Fri Feb 10 09:27:16 2012 +0000
+
+ hw/xwin: Remove unused WindowExposuresProcPtr storage in screen private
+
+ We don't wrap the WindowExposures screen function
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 8fd30859c293035fe505da76d8d7e64131bd5bc0
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Fri Feb 10 13:25:32 2012 +0000
+
+ hw/xwin: Remove long obsolete README for hw/xwin
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 3568d4af4ff2490e79286d242916e81afed57b58
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Feb 23 22:32:09 2012 +0000
+
+ hw/xwin: Remove a pointless OS version check in winInstallKeyboardHookLL()
+
+ Checking for OS later than NT4 SP3 (which we didn't do correctly anyhow,
+ just checking for NT) is pointless when other code in hw/xwin assumes at
+ least NT 5.0
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 0ed0d3979050c4ee7bef64441d50c494d58d93b0
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jul 5 22:08:38 2012 +0100
+
+ hw/xwin: Remove winClipboardDetectUnicodeSupport()
+
+ This code for detecting if the Windows clipboard can support unicode
+ is long obsolete.
+
+ All NT versions of Windows support unicode clipboard, so any version
+ of Windows we can run on must support unicode clipboard.
+
+ The -nounicodeclipboard flag to disable use of unicode on the clipboard
+ is retained.
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit c98471fad7d85fc9d9959b1c48edd90415f7bf15
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jul 5 18:00:06 2012 +0100
+
+ hw/xwin: Consolidate duplicated code as getHwnd() function
+
+ Consolidate code to find the native HWND of an X window, stored in the _WINDOWSWM_NATIVE_HWND
+ property, duplicated in UpdateName() and PreserveWin32Stack() as getHwnd()
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit df7636dddb4981e14ee7d128c43bb08bdf6a8727
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jul 5 14:20:52 2012 +0100
+
+ hw/xwin: Correct function name in log message
+
+ Correct function name in log message winInitializeDefaultScreens -> winInitializeScreenDefaults
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 9cdd3ed07425b222e8197b9a2f57ec1525c6fd54
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Fri Mar 16 12:56:45 2012 +0000
+
+ hw/xwin: Tidy up some more pointless output which is always emitted
+
+ It's not very useful to log lines like the below when the About.. dialog is used
+
+ winAboutDlgProc - WM_COMMAND - IDOK or IDCANCEL
+ winAboutDlgProc - WM_CLOSE
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit eb5b4d8d809712053701f057a35bbf5348ac9059
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date: Thu Jul 5 14:03:44 2012 +0100
+
+ hw/xwin: RANDR resize didn't occur when screen window was maximized or restored
+
+ In windowed mode, with option -resize, RANDR resize was missing when the screen
+ window was maximized or restored.
+
+ Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit 7e07d61857c5d2ee6e3c36c81b51bb4fe378b5a0
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jul 5 14:01:03 2012 +0100
+
+ hw/xwin: Bug fixes for screen sizing when the screen window is on a non-primary monitor
+
+ There is a bug that when the -screen option is used to specify a monitor for
+ the screen window to be located on, but no explicit size is specified
+ (and the -multiplemonitors option isn't specified), the screen
+ window size is always constrained to fit the work area of the primary
+ monitor (rather than the work area of the specified monitor)
+
+ This gives incorrect results if you want a screen the same size as your
+ non-primary monitor (e.g. by using -screen 0 @2) and your non-primary
+ monitor is larger than your primary monitor.
+
+ (This can be worked around by specifying -multiplemonitors and an explicit
+ screen size the same size as the monitor (e.g. -multiplemonitors -screen 0
+ 1600x1200@2))
+
+ Fix to use work area for the monitor specified for the screen, rather than the
+ primary monitor work area (unless -multiplemonitors is used, in which case we
+ continue to use the virtual desktop work area instead)
+
+ Also fix the adjustment for an autohide taskbar, so that it is only done if the
+ taskbar is on the same monitor as the screen (or -multiplemonitors is used)
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 090856b55b5895ce07f36ddebe6d8f7cb86c1826
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jul 5 13:19:02 2012 +0100
+
+ hw/xwin: Tidy up some pointless output which is always emitted
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 9fe9c5f868886abf671b3be3964af1965dd92472
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Sun Feb 13 18:52:52 2011 +0000
+
+ hw/xwin: Don't bother reporting XORG_VERSION_CURRENT
+
+ Don't bother reporting XORG_VERSION_CURRENT, when we also
+ report the version number broken down into it's components
+ XORG_VERSION_MAJOR, XORG_VERSION_MINOR, etc. as well.
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit d5977e5bd2c8ee77db08d5f948f266c9661b9fb5
+Author: Dave Airlie <airlied@gmail.com>
+Date: Fri Jul 13 00:28:19 2012 +1000
+
+ xf86: include xf86platformBus.h in xf86AutoConfig.c
+
+ This fixes an implicit declaration,
+ xf86AutoConfig.c:202:5: error: implicit declaration of function 'xf86PlatformMatchDriver' [-Werror=implicit-function-declaration]
+ xf86AutoConfig.c:202:5: warning: nested extern declaration of 'xf86PlatformMatchDriver' [-Wnested-externs]
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit afa3b9ccd27ff9c58f536cb3b727e85feb6a6f6a
+Author: Bartosz Brachaczek <b.brachaczek@gmail.com>
+Date: Fri Jul 6 02:52:40 2012 +0200
+
+ glx: Fix checking GL version
+
+ Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Signed-off-by: Dave Airlie <airlied@gmail.com>
+
+commit 743ccf6fa0a9a4579d6de6d10e2e6040640772d9
+Author: Dave Airlie <airlied@gmail.com>
+Date: Thu Jul 12 19:09:15 2012 +1000
+
+ glx/dri2: don't return NULL in a function with no return.
+
+ Reported by gcc.
+
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit d1a00c26becdc2490ab4660abf108eca09c30d23
+Author: Dave Airlie <airlied@gmail.com>
+Date: Thu Jul 12 19:05:41 2012 +1000
+
+ glx/dri2: use correct define from dri attribs.
+
+ Looks like idr renamed this and pushed the wrong one.
+
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit c62205adcd48d497450655d0136f8ca5bd5cbae7
+Author: Dave Airlie <airlied@gmail.com>
+Date: Thu Jul 12 19:04:13 2012 +1000
+
+ glx/dri2: fix incorrect == vs =
+
+ glxdri2.c:486: warning: statement with no effect
+
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit defca4c192bd7f4af2b273c7cb1fe8665888772a
+Author: Dave Airlie <airlied@gmail.com>
+Date: Thu Jul 12 18:52:34 2012 +1000
+
+ glx/dri2: fix typo in the notification reset for robustness.
+
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit d1cae6bb804f7dfc889fd3c5d5eb116f4baf5149
+Author: Dave Airlie <airlied@gmail.com>
+Date: Thu Jul 12 18:51:52 2012 +1000
+
+ glx: pass screen into the convert function
+
+ when robustness is enabled, this is required.
+
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit ea74e381ae91f45ec195a5505262e2e5a3c0e1c9
+Author: Dave Airlie <airlied@gmail.com>
+Date: Fri Jul 13 00:47:24 2012 +1000
+
+ xtest: add extinit.h for SyncExtensionInit
+
+ This adds the decl for SyncExtenionInit.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Tested-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 746193a7f10f11cccae05c98b933aadf58fc7375
+Merge: a2d0829 2b74949
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 12 15:10:51 2012 -0700
+
+ Merge remote-tracking branch 'jturney/xwin-extmod-removal-fixes'
+
+commit a2d0829531249e24dbca25fc20ed30a2bb2d8ed8
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Thu Jul 12 13:16:37 2012 +0200
+
+ glx: Free DRI2 drawable reference to destroyed GLX drawable.
+
+ Otherwise the reference can lead to use after free in
+ __glXDRIinvalidateBuffers().
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50019
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8a87acc9e57be740e3bd252567622246051a0723
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Thu Jul 12 13:16:36 2012 +0200
+
+ dri2: Add DRI2CreateDrawable2.
+
+ Same as DRI2CreateDrawable, except it can return the DRI2 specific XID of the
+ DRI2 drawable reference to the base drawable.
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 2b74949ad02bd916c3ac502db3f28057f12a8117
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jul 12 00:36:43 2012 +0100
+
+ Restore GLX extension to XWin
+
+ - Add an XwinExtensionInit(), similar in spirit to QuartzExtensionInit()
+ and xf86ExtensionInit()
+ - Load the GLX extension (I'm guessing XQuartz needs this adding somewhere
+ as well)
+ - Also, since we now have a proper place to install the native GL provider
+ where it will take priority over the the swrast provider, do so
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 656e5fea6c9ca15f932889edcc590dd01c881945
+Merge: 8b820f2 1720cd9
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 12 08:26:35 2012 -0700
+
+ Merge remote-tracking branch 'jeremyhu/master'
+
+commit 8b820f221ad54eb96a16c7060048abc8824371b6
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Jul 11 17:31:53 2012 +0100
+
+ sdksyms: Fix build with --disable-xv
+
+ I hate this [redacted] script.
+
+ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+ Tested-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 06ac7937fc37cdf073b77386bed47e14cff23628
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jul 12 12:37:05 2012 +0100
+
+ Restore extern to the declaration of __glXDRISWRastProvider
+
+ b86aa74 dropped the 'extern' from the declaration of __glXDRISWRastProvider
+
+ This turns out to be important to me, as without it, the final link only gets
+ the tentative definition of __glXDRISWRastProvider implied by the declaration,
+ and not the proper one from glxdriswrast.c, presumably because nothing else
+ references anything in the object that file generates.
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit bcbf95b1bafa6ffe724768b9309295e2fdb4b860
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu Jul 12 00:36:10 2012 +0100
+
+ Revert bogus GlxPushProvider() in commit a1d41e3
+
+ a1d41e3 "Move extension initialisation prototypes into extinit.h"
+ also includes a change to GlxExtensionInit to install the swrast GLX
+ provider.
+
+ Since b86aa74 "GLX: Insert swrast provider from GlxExtensionInit"
+ already does this (correctly, by installing the swrast provider
+ at the end of the chain, rather than at the beginning), and since this
+ would seem to have the effect of making the swrast provider the most
+ preferred provider, I'm guessing this wasn't intended.
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 1720cd9badf21e5d6b2c6c929e609ab3b0b92fd2
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Jul 11 23:54:27 2012 -0700
+
+ XQuartz: Re-add prototype for DRIExtensionInit
+
+ Regression from: a1d41e311c21eb6627caa0d168e070ceaf90806f
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ CC: Daniel Stone <daniel@fooishbar.org>
+
+commit 1a64d3cc9c319d5e9ab2365b60469fb5b83407fc
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Jul 11 23:49:59 2012 -0700
+
+ XQuartz: Fix build failure due to incorrect PseudoramiXExtensionInit prototype
+
+ pseudoramiX.c:129:1: error: conflicting types for 'PseudoramiXExtensionInit' [Semantic Issue]
+ PseudoramiXExtensionInit(int argc, char *argv[])
+ ^
+ ../../include/extinit.h:175:13: note: previous declaration is here
+ extern void PseudoramiXExtensionInit(void);
+ ^
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 228f8bfe81890770f1ba109a0acca1c81a2ffee9
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Jul 11 23:49:33 2012 -0700
+
+ XQuartz: Silence an unused-variable warning
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit deb08658e2a6b1647a7213a316c6f3019bcdce48
+Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Wed Jul 11 16:27:46 2012 +0200
+
+ xfree86: Strip dangling pointers from desiredMode
+
+ Based on the original patch by Chris Wilson, which was a better fix than mine.
+
+ We stash a copy of the desiredMode on the crtc so that we can restore it
+ after a vt switch. This copy is a simple memcpy and so also stashes a
+ references to the pointers contained within the desiredMode. Those
+ pointers are freed the next time the outputs are probed and mode list
+ rebuilt, resulting in us chasing those dangling pointers on the next
+ mode switch.
+
+ ==22787== Invalid read of size 1
+ ==22787== at 0x40293C2: __GI_strlen (in
+ /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ ==22787== by 0x668F875: strdup (strdup.c:42)
+ ==22787== by 0x5DBA00: XNFstrdup (utils.c:1124)
+ ==22787== by 0x4D72ED: xf86DuplicateMode (xf86Modes.c:209)
+ ==22787== by 0x4CA848: xf86CrtcSetModeTransform (xf86Crtc.c:276)
+ ==22787== by 0x4D05B4: xf86SetDesiredModes (xf86Crtc.c:2677)
+ ==22787== by 0xA7479D0: sna_create_screen_resources
+ (sna_driver.c:220)
+ ==22787== by 0x4CB914: xf86CrtcCreateScreenResources (xf86Crtc.c:725)
+ ==22787== by 0x425498: main (main.c:216)
+ ==22787== Address 0x72c60e0 is 0 bytes inside a block of size 9 free'd
+ ==22787== at 0x4027AAE: free (in
+ /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ ==22787== by 0x4A547E: xf86DeleteMode (xf86Mode.c:1984)
+ ==22787== by 0x4CD84F: xf86ProbeOutputModes (xf86Crtc.c:1578)
+ ==22787== by 0x4DC405: xf86RandR12GetInfo12 (xf86RandR12.c:1537)
+ ==22787== by 0x518119: RRGetInfo (rrinfo.c:202)
+ ==22787== by 0x51D997: rrGetScreenResources (rrscreen.c:335)
+ ==22787== by 0x51E0D0: ProcRRGetScreenResources (rrscreen.c:475)
+ ==22787== by 0x513852: ProcRRDispatch (randr.c:493)
+ ==22787== by 0x4346DB: Dispatch (dispatch.c:439)
+ ==22787== by 0x4256E4: main (main.c:287)
+
+ Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ Reported-by: Zdenek Kabelac <zdenek.kabelac@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36108
+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 59c2c4f645b4d782599c274f4bc752de9623d308
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 10 09:10:22 2012 +0100
+
+ AllocDevicePair: Ensure XKB privates are initialised
+
+ Since we call directly into XKB and may be doing so before the extension
+ has been initialised, make sure its privates are set up first. XTest
+ had a hack to do this itself, but seems cleaner to just make sure we do
+ it in AllocDevicePair.
+
+ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f937c3d50157a9a42d2f2f10590b6b139ce18a29
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 10 09:10:21 2012 +0100
+
+ Sync: Always initialise system counter list
+
+ Sync is designed to let you add system counters before the extension has
+ been initialised, which means the system counter list may well be full
+ of bees. Make sure it's initialised before we add to it, to avoid the
+ risk of fatal injury.
+
+ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 34cf559bcf99dad550527b5ff53f247f0e8e73ee
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jul 10 15:58:48 2012 -0700
+
+ ProcGetPointerMapping uses rep.nElts before it is initialized
+
+ In:
+
+ commit d792ac125a0462a04a930af543cbc732f8cdab7d
+ Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Date: Mon Jul 9 19:12:43 2012 -0700
+
+ Use C99 designated initializers in dix Replies
+
+ the initializer for the .length element of the xGetPointerMappingReply
+ structure uses the value of rep.nElts, but that won't be set until
+ after this initializer runs, so we get garbage in the length element
+ and clients using it will generally wedge.
+
+ Easy to verify:
+
+ $ xmodmap -pp
+
+ Fixed by creating a local nElts variable and using that.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 44bd27cdd13b6e6c4e6fd3873361e3308ef25ffe
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 01:14:13 2012 -0700
commit 6a5b579ada8623c85e3ece06eac764b465e3f2d2
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 12:45:05 2012 +0200
Xorg 1.13rc2
diff --git a/debian/changelog b/debian/changelog
index 3bb3e3a..fda7cad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.12.99.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.12.99.902-1) UNRELEASED; urgency=low
* New upstream release snapshot (on the way to 1.13).
* Bump minimum required abi, randr, dri2 and gl protos.
commit 77de2994774e7be24a0bad521180628feb1027c6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 15:47:39 2012 -0700
Bump to version 1.12.99.902
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/configure.ac b/configure.ac
index 6456192..bf6868e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.12.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-07-10"
+AC_INIT([xorg-server], 1.12.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-07-17"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 75966a4186955f3a4625e93796145036c5986d2e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 13 14:36:25 2012 -0700
xwin: Clean up os wrappers for System, Popen and Pclose on Windows
Popen and Pclose are never used on Windows, so don't bother to even
try to define them.
System(s) was defined as system(s), but the two users of that
function are in xkb, which carefully redefines that as
Win32System. Move Win32System and Win32TempDir to os/utils.c, renaming
Win32System to be just System, which simplifies the xkb code
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
diff --git a/include/os.h b/include/os.h
index 7701c39..9e323f3 100644
--- a/include/os.h
+++ b/include/os.h
@@ -359,9 +359,13 @@ Fopen(const char *, const char *);
extern _X_EXPORT int
Fclose(pointer);
#else
-#define System(a) system(a)
-#define Popen(a,b) popen(a,b)
-#define Pclose(a) pclose(a)
+
+extern const char *
+Win32TempDir(void);
+
+extern int
+System(const char *cmdline);
+
#define Fopen(a,b) fopen(a,b)
#define Fclose(a) fclose(a)
#endif
diff --git a/os/utils.c b/os/utils.c
index a6f6ef5..d902523 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1561,6 +1561,79 @@ Fclose(pointer iop)
#endif /* !WIN32 */
+#ifdef WIN32
+
+#include <X11/Xwindows.h>
+
+const char *
+Win32TempDir()
+{
+ static char buffer[PATH_MAX];
+
+ if (GetTempPath(sizeof(buffer), buffer)) {
+ int len;
+
+ buffer[sizeof(buffer) - 1] = 0;
+ len = strlen(buffer);
+ if (len > 0)
+ if (buffer[len - 1] == '\\')
+ buffer[len - 1] = 0;
+ return buffer;
+ }
+ if (getenv("TEMP") != NULL)
+ return getenv("TEMP");
+ else if (getenv("TMP") != NULL)
+ return getenv("TEMP");
+ else
+ return "/tmp";
+}
+
+int
+System(const char *cmdline)
+{
+ STARTUPINFO si;
+ PROCESS_INFORMATION pi;
+ DWORD dwExitCode;
+ char *cmd = strdup(cmdline);
+
+ ZeroMemory(&si, sizeof(si));
+ si.cb = sizeof(si);
+ ZeroMemory(&pi, sizeof(pi));
+
+ if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
+ LPVOID buffer;
+
+ if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,
+ GetLastError(),
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR) & buffer, 0, NULL)) {
+ ErrorF("[xkb] Starting '%s' failed!\n", cmdline);
+ }
+ else {
+ ErrorF("[xkb] Starting '%s' failed: %s", cmdline, (char *) buffer);
+ LocalFree(buffer);
+ }
+
+ free(cmd);
+ return -1;
+ }
+ /* Wait until child process exits. */
+ WaitForSingleObject(pi.hProcess, INFINITE);
+
+ GetExitCodeProcess(pi.hProcess, &dwExitCode);
+
+ /* Close process and thread handles. */
+ CloseHandle(pi.hProcess);
+ CloseHandle(pi.hThread);
+ free(cmd);
+
+ return dwExitCode;
+}
+#endif
+
/*
* CheckUserParameters: check for long command line arguments and long
* environment variables. By default, these checks are only done when
diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index 9b69b2b..79f4637 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -44,12 +44,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef WIN32
/* from ddxLoad.c */
-extern const char *Win32TempDir(void);
-extern int Win32System(const char *cmdline);
-
-#undef System
-#define System Win32System
-
#define W32_tmparg " '%s'"
#define W32_tmpfile ,tmpname
#define W32_tmplen strlen(tmpname)+3
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index cb2dfc3..d462957 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -68,81 +68,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define PATHSEPARATOR "/"
#endif
-#ifdef WIN32
-
-#include <X11/Xwindows.h>
-const char *
-Win32TempDir()
-{
- static char buffer[PATH_MAX];
-
- if (GetTempPath(sizeof(buffer), buffer)) {
- int len;
-
- buffer[sizeof(buffer) - 1] = 0;
- len = strlen(buffer);
- if (len > 0)
- if (buffer[len - 1] == '\\')
- buffer[len - 1] = 0;
- return buffer;
- }
- if (getenv("TEMP") != NULL)
- return getenv("TEMP");
- else if (getenv("TMP") != NULL)
- return getenv("TEMP");
- else
- return "/tmp";
-}
-
-int
-Win32System(const char *cmdline)
-{
- STARTUPINFO si;
- PROCESS_INFORMATION pi;
- DWORD dwExitCode;
- char *cmd = strdup(cmdline);
-
- ZeroMemory(&si, sizeof(si));
- si.cb = sizeof(si);
- ZeroMemory(&pi, sizeof(pi));
-
- if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
- LPVOID buffer;
-
- if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL,
- GetLastError(),
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) & buffer, 0, NULL)) {
- ErrorF("[xkb] Starting '%s' failed!\n", cmdline);
- }
- else {
- ErrorF("[xkb] Starting '%s' failed: %s", cmdline, (char *) buffer);
- LocalFree(buffer);
- }
-
- free(cmd);
- return -1;
- }
- /* Wait until child process exits. */
- WaitForSingleObject(pi.hProcess, INFINITE);
-
- GetExitCodeProcess(pi.hProcess, &dwExitCode);
Reply to: