xorg-server: Changes to 'debian-unstable'
ChangeLog | 473 ++++++++++++++++++++++++++++++++++
Makefile.am | 7
Xext/panoramiX.c | 2
Xext/sync.c | 2
Xext/xf86bigfont.c | 2
configure.ac | 4
debian/changelog | 8
dix/devices.c | 2
dix/events.c | 27 -
dix/touch.c | 4
glx/glxcmds.c | 4
glx/glxdri2.c | 8
hw/xfree86/Makefile.am | 2
hw/xfree86/common/xf86Module.h | 2
hw/xfree86/dixmods/extmod/modinit.h | 2
hw/xfree86/dixmods/extmod/xf86dga2.c | 81 +++--
hw/xfree86/dixmods/extmod/xf86vmode.c | 14 -
hw/xfree86/dri2/dri2.c | 15 -
hw/xfree86/dri2/dri2.h | 7
hw/xfree86/loader/loader.c | 6
hw/xfree86/loader/loader.h | 1
hw/xfree86/loader/loadmod.c | 2
hw/xfree86/parser/Device.c | 2
hw/xfree86/parser/Files.c | 2
hw/xfree86/parser/Flags.c | 2
hw/xfree86/parser/Input.c | 2
hw/xfree86/parser/InputClass.c | 2
hw/xfree86/parser/Layout.c | 2
hw/xfree86/parser/Module.c | 2
hw/xfree86/parser/Monitor.c | 2
hw/xfree86/parser/Pointer.c | 2
hw/xfree86/parser/Screen.c | 2
hw/xfree86/parser/Vendor.c | 2
hw/xfree86/parser/Video.c | 2
hw/xfree86/parser/read.c | 2
hw/xfree86/parser/scan.c | 2
hw/xfree86/parser/write.c | 2
hw/xfree86/ramdac/xf86Cursor.c | 31 --
hw/xquartz/pseudoramiX.c | 21 +
hw/xquartz/pseudoramiX.h | 2
hw/xquartz/xpr/xprEvent.c | 22 +
include/list.h | 2
mi/miexpose.c | 2
os/connection.c | 2
os/io.c | 6
os/utils.c | 4
randr/randr.c | 3
randr/rrcrtc.c | 12
randr/rrinfo.c | 7
randr/rrmode.c | 4
randr/rroutput.c | 12
randr/rrscreen.c | 6
render/render.c | 4
test/xtest.c | 2
xfixes/cursor.c | 7
xfixes/region.c | 3
xkb/xkbAccessX.c | 10
57 files changed, 698 insertions(+), 169 deletions(-)
New commits:
commit dd1c097ae7bf57638fe87404e094db8245458e02
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 3 20:26:44 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index d97f82a..33c75c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,476 @@
+commit ab46bdec65b4b1150ffa0aa4d9f3142e7e89cef9
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Fri Aug 3 10:21:11 2012 -0700
+
+ configure.ac: Version bump to 1.12.3.901 (1.12.4 RC1)
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 631715e12953a392066ca2a0787b37471747f879
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed Aug 1 18:46:08 2012 -0700
+
+ XQuartz: Fix xp_window_bring_all_to_front linking on OS versions with older libXplugin
+
+ Found-by: Tinderbox
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ (cherry picked from commit 884f51e9770c9ccd3b38a14ea393ea2c7a5ef235)
+
+commit e2df31de390f58211029bd975e8af0169d121737
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Mon Jul 23 12:16:36 2012 +0100
+
+ hw/xquartz: Various fixes for pseudoramiX.c
+
+ Various fixes, applied to panoramiX.c in commit 2b266eda, also need applying to pseudoramiX.c:
+ Fix panoramiX request and reply swapping
+ Set window and screen values in panoramix replies
+ Prevent buffer overrun in ProcPanoramiXGetScreenSize
+
+ These fixes seem to be necessary in order to compile pseudoramiX.c with gcc
+
+ pseudoramiX.c: In function 'ProcPseudoramiXGetState':
+ pseudoramiX.c:221:56: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
+ pseudoramiX.c: In function 'ProcPseudoramiXGetScreenCount':
+ pseudoramiX.c:250:62: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
+ pseudoramiX.c: In function 'ProcPseudoramiXGetScreenSize':
+ pseudoramiX.c:283:56: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
+ pseudoramiX.c:284:57: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
+
+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ (cherry picked from commit 067931ccce592e319baffa26d4f7380d8d924537)
+
+commit dfc943609acf73dc3946ba106bcdf6c66997a3b8
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Jul 25 11:40:33 2012 -0700
+
+ XQuartz: Call xp_window_bring_all_to_front if available in libXplugin
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit fd228d318428d0d9dea52ca560a9b66660dd2d02)
+
+commit bfcc45861c7a2396c109fdac9b6db84d6b614db1
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Jul 11 23:49:59 2012 -0700
+
+ XQuartz: Fix incorrect PseudoramiXExtensionInit prototype
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 1a64d3cc9c319d5e9ab2365b60469fb5b83407fc)
+
+commit cb8fbccba79b30d0f8443d181016fa78ccce86e6
+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>
+ (cherry picked from commit 228f8bfe81890770f1ba109a0acca1c81a2ffee9)
+
+commit 1b2ae1fd7a630c9100ed87bc785fa5d9a52661b0
+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>
+ (cherry picked from commit 59c2c4f645b4d782599c274f4bc752de9623d308)
+
+commit fc13888f19cd068ee6485d5d7be54edfa17036a2
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 10 02:02:52 2012 +0100
+
+ Xinerama: Fix ExtensionInit prototype
+
+ Huh, so I guess INITARGS used to be int argc, char *argv then. Either
+ way, it's now void, so fix that ...
+
+ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit bddb8c6cbe52ba9923b1d36d01f5ac9391b0ec0e)
+
+commit ce106ae299a5444ee7cca1b6f4b7bc3bdfe15888
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 10 02:02:49 2012 +0100
+
+ Xorg: Link XKB DDX library after core server libs
+
+ libxorgxkb.a contains a number of libraries which are used by XKB action
+ code to call back into the DDX, e.g. for VT switching, termination, grab
+ breaking, et al. Make sure libxkb.a comes first in the link order, so
+ it can mark XkbDDX* as used in order for the linker to not discard them.
+
+ 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>
+ (cherry picked from commit 67953d6975ef2ee573b95e7641aaf3d72e9f8379)
+
+commit 7b7db8ced263093bdcc1e57dfe7574e07cd5b63a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 10 02:02:46 2012 +0100
+
+ Don't make failure to -nolisten fatal
+
+ If failing to disable a protocol specified by -nolisten failed, we'd
+ throw a FatalError and bomb startup entirely. From poking at xtrans, it
+ looks like the only way we can get a failure here is because we've
+ specified a protocol name which doesn't exist, which probably doesn't
+ constitute a security risk.
+
+ And it makes it possible to start gdm even though you've built with
+ --disable-tcp-transport.
+
+ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 656af2c7e73d948338683675e14cd827b46a97c4)
+
+commit af7ff8f1ccec722bc8690c6f512a986b0f3c7a9c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jul 9 19:12:44 2012 -0700
+
+ Initialize padding bits to 0 in ErrorConnMax()
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Daniel Stone <daniel@fooishbar.org>
+ (cherry picked from commit 7a29f6878284e2d65e69fcd157aa9ec01d21b3c0)
+
+commit f29c0ddd5afc4549e20d72a1d9e4c17276bb4bb1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jul 9 19:12:44 2012 -0700
+
+ Set padding bytes to 0 in WriteToClient
+
+ Clear them out when needed instead of leaving whatever values were
+ present in previously sent messages.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Daniel Stone <daniel@fooishbar.org>
+ (cherry picked from commit bed610fcae41ddfe21fa9acde599b17d1d15f5d1)
+
+commit eeefadf95ed764755bfb04b107f636c6ae60bdde
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jul 9 19:12:42 2012 -0700
+
+ Use calloc to zero fill buffers being allocated for replies & events
+
+ Ensures padding bytes are zero-filled
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Daniel Stone <daniel@fooishbar.org>
+ (cherry picked from commit cdf5bcd420e5bcf4a4a24a275d3133a4e16ce41e)
+
+commit 8cefa9bf0766f10a1fc09a8d414e6ddfaa4addd9
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jul 9 19:12:42 2012 -0700
+
+ xf86dga2.c & xf86vmode.c: Move REQUEST_SIZE_MATCH checks before using stuff
+
+ Seems silly waiting to check if the client failed to send us enough bytes
+ until after we've already tried using them.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Daniel Stone <daniel@fooishbar.org>
+ (cherry picked from commit ef0f701c9245b0373eb0c7a84dd804af4738bb29)
+
+commit 18863154bdb0f4ff79b2c79eae73ddd7a6ddc764
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jul 9 19:12:42 2012 -0700
+
+ ProcRRGetScreenInfo: swap configTimestamp as well
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Daniel Stone <daniel@fooishbar.org>
+ (cherry picked from commit 15bc13c8d088e05f14c7262348e0066929c29251)
+
+commit abffc882af655d2c8434e6eb7374dda472d6a8b0
+Author: Jaroslav Šmíd <jardasmid@gmail.com>
+Date: Mon Jul 9 19:12:42 2012 -0700
+
+ Bug 51375: Xorg doesn't set status for RRGetOutputInfo
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=51375
+ https://bugs.freedesktop.org/attachment.cgi?id=63397
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Daniel Stone <daniel@fooishbar.org>
+ (cherry picked from commit 3a013b8816bc0bb765c99e8a2bf2ea536dc62c3b)
+
+commit 5c6c4fc0820b4f7845ec43a1b784fa566713e566
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jul 9 16:29:04 2012 -0700
+
+ Add 'install-headers' target in the top-level Makefile
+
+ This target recursively locates directories with sdk headers and
+ installs them all. Useful when you want to build a complete new X
+ server and drivers without having to install the X server before the
+ drivers are actually working.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit d1c639c006526b8cab14dac582508f3f54848967)
+
+commit 4060ebfea066693f9d9dd5fab63278ebd4951533
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jun 19 16:01:08 2012 +0100
+
+ xf86: cursor code got mangled by indenting
+
+ This fixes some really ugly code that got mangled by the indenting.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ (cherry picked from commit 2c52d776a42a28bb3e1463edf0cfe0672d0c08a9)
+
+commit 31ca2e2d5d2f26826fe15d4537a57e1cbf863140
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 5 16:17:56 2012 +1000
+
+ list.h: don't crash when removing an element from a NULL list
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 167993254a5cbe11a1f44fad1e8ae042089c1619)
+
+commit 7197c1c571dab1ecef2dc57b8e3bd2689b589f6d
+Author: Michal Srb <msrb@suse.com>
+Date: Thu Jun 28 17:17:12 2012 +0200
+
+ Look for ModuleData only in appropriate library
+
+ LoaderSymbol calls dlsym with RTLD_DEFAULT pseudo handle making it search in
+ every loaded library. In addition glibc adds NODELETE flag to the library
+ containing the symbol.
+
+ It's used in doLoadModule to locate <modulename>ModuleData symbol, the
+ module's library gets the flag and is kept in memory even after it is
+ unloaded.
+
+ This patch adds LoaderSymbolFromModule function that looks for symbol only in
+ library specified by handle. That way the NODELETE flag isn't added.
+
+ This glibc behavior doesn't seem to be documented, but even if other
+ implementations differ, there is no reason to search ModuleData symbol outside
+ the module's library.
+
+ Signed-off-by: Michal Srb <msrb@suse.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+ v2: Switch LoaderSymbolFromModule arguments order.
+ Correct description.
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 258abbf823f753757e4dddc13ef495f4024680db)
+
+commit b0e3696e01ec69e17b74164f4b366baef316f86c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Jun 25 14:22:31 2012 +1000
+
+ dix: fix dereference before null check
+
+ Found by Coverity.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ (cherry picked from commit 55ff20eb37f00a3ad07b5acff19d4497ab513a97)
+
+commit b99a4ac32cc613337af79eb130247364f478dd21
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jun 20 14:25:54 2012 +1000
+
+ xkb: use local variable instead of casting arg
+
+ No functional changes.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 252a69b592001b34714d0fe7508e1898883f9d01)
+
+commit 465a7a253ae36a35d2d85a990c6c50c2a26a861e
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Jun 29 13:33:58 2012 -0700
+
+ randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch
+
+ ProcRRGetScreenSizeRange uses REQUEST(xRRGetScreenSizeRangeReq) followed by
+ REQUEST_SIZE_MATCH(xRRGetScreenInfoReq). This happens to work out because both
+ requests have the same size, so this is not a functional change, just a cosmetic
+ one.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 212b9803238d2de2e77cbe5de62d3f616ae50daf)
+
+commit 6f4b6bca4c8f823adf83519b40f02b39a0c271ed
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 21 18:45:18 2012 -0700
+
+ randr: Catch two more potential unset rrScrPriv uses
+
+ Ricardo Salveti <ricardo.salveti@linaro.org> found one place where the
+ randr code could use the randr screen private data without checking
+ for null first. This happens when the X server is running with
+ multiple screens, some of which are randr enabled and some of which
+ are not. Applications making protocol requests to the non-randr
+ screens can cause segfaults where the server touches the unset private
+ structure.
+
+ I audited the code and found two more possible problem spots; the
+ trick to auditing for this issue was to look for functions not taking
+ a RandR data structure and where there was no null screen private
+ check above them in the call graph.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 855003c333a0ead1db912695bc9705ef2b3144b4)
+
+commit 47c61c56472f885e355f4b5e932f5282c1a7b1f5
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 21 18:42:46 2012 -0700
+
+ randr: Clean up compiler warnings about unused and shadowing variables
+
+ set but not used variables
+ shadowing a previous local
+
+ A hidden problem was that the VERIFY_RR_* macros define local 'rc'
+ variables, any other local definitions for those would be shadowed and
+ generate warnings from gcc. I've renamed the other locals 'ret'
+ instead of 'rc'.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 4ba340cfaa8d430c808566495f8deda0ff1b4424)
+
+commit ba0fe0092c25556e682d7b51fa94cafb75c00f3e
+Author: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
+Date: Thu Jun 21 00:55:53 2012 -0300
+
+ randr: first check pScrPriv before using the pointer at RRFirstOutput
+
+ Fix a seg fault in case pScrPriv is NULL at ProcRRGetScreenInfo,
+ which later calls RRFirstOutput.
+
+ Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 32603f57ca03b6390b109960f8bb5ea53ac95ecb)
+
+commit b348cfd4b85e10e1ff36344473758325201c3816
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 13 21:20:51 2012 -0700
+
+ Remove obsolete tab stop comments from hw/xfree86/parser/*.c
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit ff541e0a1f84bd98966148793f35afeaf71c271b)
+
+commit 94c7d0f8b979ccadd8e5c95f030b8b2cd7ef6f98
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 12 22:38:46 2012 -0700
+
+ Fix some overly indented/poorly line wrapped comments in dix/events.c
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 687536b1044a3297f6b9a45f6a2d2987daa7be59)
+
+commit 49bb2694f10149fbd27c04375939dcfe7cde1e4e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 12 22:29:51 2012 -0700
+
+ OtherClientGone: Remove unreachable return statement
+
+ Now that FatalError is marked as _X_NORETURN, the compilers know we
+ can't get here, and the return statement added to make them happy in
+ the past now makes them unhappy.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 93a378aad4a4a03f37ddafccfedeb9d6e2be2a6a)
+
+commit e08f1c261c75d50a3581e8791700436cba6e4b21
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Jul 30 19:24:38 2012 +0200
+
+ Bump video ABI version to 12.1
+
+ Track the addition of DRI2CreateDrawable2.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 953c8df9fb7515f70ee6dac7e210e909d26e1490
+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>
+ (cherry picked from commit a2d0829531249e24dbca25fc20ed30a2bb2d8ed8)
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 60da5029634ca6258e4e2924ed204096437a0503
+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>
+ (cherry picked from commit 8a87acc9e57be740e3bd252567622246051a0723)
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit cdeb178cd020bbbd0ebbdb512de1d1d16474858a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 10 02:03:17 2012 +0100
+
+ DRI2: Remove prototype for DRI2DestroyDrawable
+
+ DRI2DestroyDrawable() was still being _X_EXPORTed, but hasn't existed
+ since 1da1f33f last year.
+
+ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit b8a3267c36e2e335b888bd4f2ef2f2c477cdfdce)
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
commit 60e0d205666c1fc0c818b9430c1e20428c9d3808
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 9 10:44:01 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index 501d650..b0a94a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.12.3.901-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate
+ + glx: Free DRI2 drawable reference to destroyed GLX drawable
+ (closes: #681265, #674668)
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 03 Aug 2012 20:17:43 +0200
+
xorg-server (2:1.12.3-1) unstable; urgency=low
* New upstream release.
commit ab46bdec65b4b1150ffa0aa4d9f3142e7e89cef9
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri Aug 3 10:21:11 2012 -0700
configure.ac: Version bump to 1.12.3.901 (1.12.4 RC1)
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index c8dee90..aece819 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.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-07-09"
+AC_INIT([xorg-server], 1.12.3.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2012-08-03"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 631715e12953a392066ca2a0787b37471747f879
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Aug 1 18:46:08 2012 -0700
XQuartz: Fix xp_window_bring_all_to_front linking on OS versions with older libXplugin
Found-by: Tinderbox
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 884f51e9770c9ccd3b38a14ea393ea2c7a5ef235)
diff --git a/hw/xquartz/xpr/xprEvent.c b/hw/xquartz/xpr/xprEvent.c
index 73bcc93..398177c 100644
--- a/hw/xquartz/xpr/xprEvent.c
+++ b/hw/xquartz/xpr/xprEvent.c
@@ -59,13 +59,6 @@
#include "rootlessWindow.h"
#include "xprEvent.h"
-/* This is important enough to declare here if building against an old
- * libXplugin, so we pick it up whenever libXplugin starts to support it.
- */
-#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION < 6
-extern xp_error xp_window_bring_all_to_front(void) __attribute__((weak_import));
-#endif
-
Bool
QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev)
{
@@ -86,21 +79,18 @@ QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev)
/* There's no need to do xp_window_bring_all_to_front on Leopard,
* and we don't care about the result, so just do it async.
*/
-#if defined(HAVE_LIBDISPATCH)
-#if (defined(XPLUGIN_VERSION_MIN_REQUIRED) && XPLUGIN_VERSION_MIN_REQUIRED >= 6) || \
- (!defined(XPLUGIN_VERSION_MIN_REQUIRED) && defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 6)
- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
- xp_window_bring_all_to_front();
- });
-#else
- if (&xp_window_bring_all_to_front) {
- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
- xp_window_bring_all_to_front();
- });
- } else {
- RootlessOrderAllWindows(e->data[0]);
- }
-#endif
+#if defined(HAVE_LIBDISPATCH) && defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 6
+# if defined(XPLUGIN_VERSION_MIN_REQUIRED) && XPLUGIN_VERSION_MIN_REQUIRED < 6
+ if (&xp_window_bring_all_to_front) {
+# endif
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+ xp_window_bring_all_to_front();
+ });
+# if defined(XPLUGIN_VERSION_MIN_REQUIRED) && XPLUGIN_VERSION_MIN_REQUIRED < 6
+ } else {
+ RootlessOrderAllWindows(e->data[0]);
+ }
+# endif
#else
RootlessOrderAllWindows(e->data[0]);
#endif
commit e2df31de390f58211029bd975e8af0169d121737
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jul 23 12:16:36 2012 +0100
hw/xquartz: Various fixes for pseudoramiX.c
Various fixes, applied to panoramiX.c in commit 2b266eda, also need applying to pseudoramiX.c:
Fix panoramiX request and reply swapping
Set window and screen values in panoramix replies
Prevent buffer overrun in ProcPanoramiXGetScreenSize
These fixes seem to be necessary in order to compile pseudoramiX.c with gcc
pseudoramiX.c: In function 'ProcPseudoramiXGetState':
pseudoramiX.c:221:56: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
pseudoramiX.c: In function 'ProcPseudoramiXGetScreenCount':
pseudoramiX.c:250:62: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
pseudoramiX.c: In function 'ProcPseudoramiXGetScreenSize':
pseudoramiX.c:283:56: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
pseudoramiX.c:284:57: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 067931ccce592e319baffa26d4f7380d8d924537)
diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index 24349e3..0f591d5 100644
--- a/hw/xquartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
@@ -211,10 +211,11 @@ ProcPseudoramiXGetState(ClientPtr client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.state = !noPseudoramiXExtension;
+ rep.window = stuff->window;
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
- swaps(&rep.state);
+ swapl(&rep.window);
}
WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
return Success;
@@ -240,10 +241,11 @@ ProcPseudoramiXGetScreenCount(ClientPtr client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.ScreenCount = pseudoramiXNumScreens;
+ rep.window = stuff->window;
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
- swaps(&rep.ScreenCount);
+ swapl(&rep.window);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
return Success;
@@ -260,6 +262,9 @@ ProcPseudoramiXGetScreenSize(ClientPtr client)
TRACE();
+ if (stuff->screen >= pseudoramiXNumScreens)
+ return BadMatch;
+
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
if (rc != Success)
@@ -273,11 +278,15 @@ ProcPseudoramiXGetScreenSize(ClientPtr client)
// was screenInfo.screens[stuff->screen]->width;
rep.height = pseudoramiXScreens[stuff->screen].h;
// was screenInfo.screens[stuff->screen]->height;
+ rep.window = stuff->window;
+ rep.screen = stuff->screen;
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
- swaps(&rep.width);
- swaps(&rep.height);
+ swapl(&rep.width);
+ swapl(&rep.height);
+ swapl(&rep.window);
+ swapl(&rep.screen);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
return Success;
commit dfc943609acf73dc3946ba106bcdf6c66997a3b8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jul 25 11:40:33 2012 -0700
XQuartz: Call xp_window_bring_all_to_front if available in libXplugin
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit fd228d318428d0d9dea52ca560a9b66660dd2d02)
diff --git a/hw/xquartz/xpr/xprEvent.c b/hw/xquartz/xpr/xprEvent.c
index 106a919..73bcc93 100644
--- a/hw/xquartz/xpr/xprEvent.c
+++ b/hw/xquartz/xpr/xprEvent.c
@@ -52,9 +52,20 @@
#include <sys/uio.h>
#include <unistd.h>
+#ifdef HAVE_LIBDISPATCH
+#include <dispatch/dispatch.h>
+#endif
+
#include "rootlessWindow.h"
#include "xprEvent.h"
+/* This is important enough to declare here if building against an old
+ * libXplugin, so we pick it up whenever libXplugin starts to support it.
+ */
+#if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION < 6
+extern xp_error xp_window_bring_all_to_front(void) __attribute__((weak_import));
+#endif
+
Bool
QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev)
{
@@ -72,7 +83,28 @@ QuartzModeEventHandler(int screenNum, XQuartzEvent *e, DeviceIntPtr dev)
case kXquartzBringAllToFront:
DEBUG_LOG("kXquartzBringAllToFront\n");
+ /* There's no need to do xp_window_bring_all_to_front on Leopard,
+ * and we don't care about the result, so just do it async.
+ */
+#if defined(HAVE_LIBDISPATCH)
+#if (defined(XPLUGIN_VERSION_MIN_REQUIRED) && XPLUGIN_VERSION_MIN_REQUIRED >= 6) || \
+ (!defined(XPLUGIN_VERSION_MIN_REQUIRED) && defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 6)
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+ xp_window_bring_all_to_front();
+ });
+#else
+ if (&xp_window_bring_all_to_front) {
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+ xp_window_bring_all_to_front();
+ });
+ } else {
+ RootlessOrderAllWindows(e->data[0]);
+ }
+#endif
+#else
RootlessOrderAllWindows(e->data[0]);
+#endif
+
return TRUE;
default:
commit bfcc45861c7a2396c109fdac9b6db84d6b614db1
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jul 11 23:49:59 2012 -0700
XQuartz: Fix incorrect PseudoramiXExtensionInit prototype
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 1a64d3cc9c319d5e9ab2365b60469fb5b83407fc)
diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index 01113ce..24349e3 100644
--- a/hw/xquartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
@@ -125,7 +125,7 @@ PseudoramiXAddScreen(int x, int y, int w, int h)
// Initialize PseudoramiX.
// Copied from PanoramiXExtensionInit
void
-PseudoramiXExtensionInit(int argc, char *argv[])
+PseudoramiXExtensionInit(void)
{
Bool success = FALSE;
ExtensionEntry *extEntry;
diff --git a/hw/xquartz/pseudoramiX.h b/hw/xquartz/pseudoramiX.h
index f41b5cb..7e08749 100644
--- a/hw/xquartz/pseudoramiX.h
+++ b/hw/xquartz/pseudoramiX.h
@@ -6,6 +6,6 @@ extern int noPseudoramiXExtension;
void
PseudoramiXAddScreen(int x, int y, int w, int h);
-void PseudoramiXExtensionInit(int argc, char *argv[]);
+void PseudoramiXExtensionInit(void);
void
PseudoramiXResetScreens(void);
commit cb8fbccba79b30d0f8443d181016fa78ccce86e6
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>
(cherry picked from commit 228f8bfe81890770f1ba109a0acca1c81a2ffee9)
diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index 8bb7f2d..01113ce 100644
--- a/hw/xquartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
@@ -256,7 +256,7 @@ ProcPseudoramiXGetScreenSize(ClientPtr client)
REQUEST(xPanoramiXGetScreenSizeReq);
WindowPtr pWin;
xPanoramiXGetScreenSizeReply rep;
- register int n, rc;
+ register int rc;
TRACE();
commit 1b2ae1fd7a630c9100ed87bc785fa5d9a52661b0
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>
(cherry picked from commit 59c2c4f645b4d782599c274f4bc752de9623d308)
diff --git a/dix/devices.c b/dix/devices.c
index 0125504..fbc9fec 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2630,6 +2630,8 @@ AllocDevicePair(ClientPtr client, const char *name,
*ptr = *keybd = NULL;
+ XkbInitPrivates();
+
pointer = AddInputDevice(client, ptr_proc, TRUE);
if (!pointer)
diff --git a/test/xtest.c b/test/xtest.c
index aeca669..0b8d866 100644
--- a/test/xtest.c
+++ b/test/xtest.c
@@ -63,8 +63,6 @@ xtest_init_devices(void)
dixResetPrivates();
InitAtoms();
- XkbInitPrivates();
-
/* this also inits the xtest devices */
InitCoreDevices();
commit fc13888f19cd068ee6485d5d7be54edfa17036a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:52 2012 +0100
Xinerama: Fix ExtensionInit prototype
Huh, so I guess INITARGS used to be int argc, char *argv then. Either
way, it's now void, so fix that ...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit bddb8c6cbe52ba9923b1d36d01f5ac9391b0ec0e)
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 98d327f..3e5cd62 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -434,7 +434,7 @@ XineramaReinitData(void)
*/
void
-PanoramiXExtensionInit(int argc, char *argv[])
+PanoramiXExtensionInit(void)
{
int i;
Bool success = FALSE;
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 9753fe0..e7c7448 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -85,7 +85,7 @@ extern void SecurityExtensionInit(INITARGS);
#endif
#if 1
-extern void PanoramiXExtensionInit(int argc, char *argv[]);
+extern void PanoramiXExtensionInit(INITARGS);
#endif
#if 1
commit ce106ae299a5444ee7cca1b6f4b7bc3bdfe15888
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:49 2012 +0100
Xorg: Link XKB DDX library after core server libs
libxorgxkb.a contains a number of libraries which are used by XKB action
code to call back into the DDX, e.g. for VT switching, termination, grab
breaking, et al. Make sure libxkb.a comes first in the link order, so
it can mark XkbDDX* as used in order for the linker to not discard them.
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>
(cherry picked from commit 67953d6975ef2ee573b95e7641aaf3d72e9f8379)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 72be889..391b26e 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -54,8 +54,8 @@ LOCAL_LIBS = \
ramdac/libramdac.la \
ddc/libddc.la \
i2c/libi2c.la \
- dixmods/libxorgxkb.la \
$(XORG_LIBS) \
+ dixmods/libxorgxkb.la \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/os/libos.la
Xorg_LDADD = \
commit 7b7db8ced263093bdcc1e57dfe7574e07cd5b63a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:46 2012 +0100
Don't make failure to -nolisten fatal
If failing to disable a protocol specified by -nolisten failed, we'd
throw a FatalError and bomb startup entirely. From poking at xtrans, it
looks like the only way we can get a failure here is because we've
specified a protocol name which doesn't exist, which probably doesn't
constitute a security risk.
And it makes it possible to start gdm even though you've built with
--disable-tcp-transport.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 656af2c7e73d948338683675e14cd827b46a97c4)
diff --git a/os/utils.c b/os/utils.c
index 30592d2..e33e4d2 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -746,8 +746,8 @@ ProcessCommandLine(int argc, char *argv[])
Reply to: