ChangeLog | 1144 Makefile.am | 12 Xext/shm.c | 214 Xext/shmint.h | 24 Xext/sync.c | 51 Xext/syncsrv.h | 13 Xext/xvdisp.c | 13 Xi/exevents.c | 2 configure.ac | 233 debian/changelog | 6 debian/control | 18 debian/patches/series | 1 debian/patches/xfree86-Bump-to-video-ABI-15-and-input-ABI-20.patch | 30 debian/serverminver | 2 dix/region.c | 15 dri3/Makefile.am | 13 dri3/dri3.c | 87 dri3/dri3.h | 65 dri3/dri3_event.c | 163 dri3/dri3_priv.h | 80 dri3/dri3_request.c | 394 dri3/dri3_screen.c | 80 dri3/dri3int.h | 26 glx/Makefile.am | 18 glx/createcontext.c | 4 glx/dispatch.h |19816 ---------- glx/extension_string.c | 5 glx/extension_string.h | 1 glx/glapi.c | 504 glx/glapi.h | 135 glx/glapi_gentable.c |10058 ----- glx/glapitable.h | 1016 glx/glprocs.h | 3534 - glx/glthread.h | 234 glx/glxcmds.c | 36 glx/glxcmdsswap.c | 4 glx/glxcontext.h | 10 glx/glxdri.c | 1172 glx/glxdri2.c | 15 glx/glxdricommon.c | 67 glx/glxdriswrast.c | 4 glx/glxext.c | 46 glx/glxext.h | 16 glx/glxserver.h | 5 glx/glxstubs.c | 50 glx/indirect_dispatch.c | 3236 - glx/indirect_dispatch.h | 602 glx/indirect_dispatch_swap.c | 4016 -- glx/indirect_program.c | 49 glx/indirect_reqsize.c | 77 glx/indirect_reqsize.h | 47 glx/indirect_size.h | 12 glx/indirect_size_get.c | 204 glx/indirect_size_get.h | 16 glx/indirect_table.c | 468 glx/indirect_texture_compression.c | 27 glx/indirect_util.c | 7 glx/render2.c | 69 glx/render2swap.c | 69 glx/renderpix.c | 26 glx/renderpixswap.c | 26 glx/single2.c | 18 glx/single2swap.c | 16 glx/singlepix.c | 87 glx/singlepixswap.c | 88 glx/singlesize.c | 10 glx/swap_interval.c | 4 glx/xfont.c | 30 hw/dmx/dmx_glxvisuals.c | 7 hw/dmx/dmxextension.c | 3 hw/dmx/dmxinit.c | 2 hw/dmx/glxProxy/glxcmds.c | 42 hw/dmx/input/dmxevents.c | 3 hw/kdrive/ephyr/ephyr.c | 2 hw/kdrive/ephyr/hostx.c | 22 hw/kdrive/src/kinput.c | 11 hw/xfree86/Makefile.am | 9 hw/xfree86/common/compiler.h | 2 hw/xfree86/common/xf86Bus.c | 5 hw/xfree86/common/xf86Configure.c | 2 hw/xfree86/common/xf86DPMS.c | 9 hw/xfree86/common/xf86Events.c | 31 hw/xfree86/common/xf86Module.h | 6 hw/xfree86/common/xf86RandR.c | 16 hw/xfree86/common/xf86platformBus.c | 5 hw/xfree86/dixmods/glxmodule.c | 3 hw/xfree86/modes/xf86Crtc.c | 20 hw/xfree86/os-support/linux/lnx_video.c | 3 hw/xfree86/sdksyms.sh | 4 hw/xfree86/x86emu/decode.c | 10 hw/xfree86/x86emu/x86emu/regs.h | 9 hw/xfree86/x86emu/x86emu/x86emui.h | 12 hw/xquartz/X11Controller.m | 2 hw/xquartz/bundle/Info.plist.cpp | 8 hw/xwin/glx/indirect.c | 4 include/Makefile.am | 1 include/busfault.h | 48 include/dix-config.h.in | 23 include/dixstruct.h | 12 include/extinit.h | 10 include/misc.h | 29 include/os.h | 7 include/protocol-versions.h | 4 include/regionstr.h | 2 include/servermd.h | 14 include/xorg-config.h.in | 3 include/xorg-server.h.in | 12 mi/miinitext.c | 6 miext/damage/damage.c | 5 miext/sync/Makefile.am | 8 miext/sync/misync.c | 31 miext/sync/misync.h | 21 miext/sync/misyncshm.c | 176 miext/sync/misyncshm.h | 28 miext/sync/misyncstr.h | 15 os/Makefile.am | 5 os/WaitFor.c | 5 os/backtrace.c | 5 os/busfault.c | 150 os/connection.c | 2 os/io.c | 33 os/osinit.c | 5 os/utils.c | 27 os/xstrans.c | 2 present/Makefile.am | 17 present/present.c | 781 present/present.h | 118 present/present_event.c | 239 present/present_fake.c | 140 present/present_fence.c | 112 present/present_notify.c | 114 present/present_priv.h | 288 present/present_request.c | 330 present/present_screen.c | 231 present/presentext.h | 29 randr/randr.c | 96 randr/randrstr.h | 8 randr/rrcrtc.c | 4 randr/rroutput.c | 5 randr/rrprovider.c | 25 record/record.c | 4 test/Makefile.am | 11 142 files changed, 9423 insertions(+), 42710 deletions(-)
New commits: commit 5156b5b907f58fddf937c4df1fb115873beb92fd Author: Julien Cristau <jcris...@debian.org> Date: Sun Nov 24 15:49:20 2013 +0100 Bump serverminver diff --git a/debian/serverminver b/debian/serverminver index 16b926f..c01f07e 100644 --- a/debian/serverminver +++ b/debian/serverminver @@ -1,3 +1,3 @@ -2:1.14.99.3 +2:1.14.99.902 ABI_VIDEODRV_VERSION:15.0 ABI_XINPUT_VERSION:20.0 commit 3ecc672703be8ad025b9a59a6af32197ff7db7ba Author: Julien Cristau <jcris...@debian.org> Date: Sun Nov 24 15:48:08 2013 +0100 Drop xfree86-Bump-to-video-ABI-15-and-input-ABI-20.patch ABI got bumped upstream. diff --git a/debian/patches/series b/debian/patches/series index 03161b9..3527236 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ ## Patches with a number < 100 are applied in debian. ## Ubuntu patches start with 100. 001_fedora_extramodes.patch -xfree86-Bump-to-video-ABI-15-and-input-ABI-20.patch 03_static-nettle.diff 05_Revert-Unload-submodules.diff 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff diff --git a/debian/patches/xfree86-Bump-to-video-ABI-15-and-input-ABI-20.patch b/debian/patches/xfree86-Bump-to-video-ABI-15-and-input-ABI-20.patch deleted file mode 100644 index c723890..0000000 --- a/debian/patches/xfree86-Bump-to-video-ABI-15-and-input-ABI-20.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f1f3842d8bc13c41e9fb099f238329e4b05e61fe Mon Sep 17 00:00:00 2001 -From: Adam Jackson <a...@redhat.com> -Date: Wed, 11 Sep 2013 18:19:15 -0400 -Subject: [PATCH] xfree86: Bump to video ABI 15 and input ABI 20 - -Damage and mipointer stuff got rearranged in the last few dozen commits. - -Signed-off-by: Adam Jackson <a...@redhat.com> ---- - hw/xfree86/common/xf86Module.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h -index e0cec05..51645ea 100644 ---- a/hw/xfree86/common/xf86Module.h -+++ b/hw/xfree86/common/xf86Module.h -@@ -80,8 +80,8 @@ typedef enum { - * mask is 0xFFFF0000. - */ - #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) --#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(14, 1) --#define ABI_XINPUT_VERSION SET_ABI_VERSION(19, 2) -+#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(15, 0) -+#define ABI_XINPUT_VERSION SET_ABI_VERSION(20, 0) - #define ABI_EXTENSION_VERSION SET_ABI_VERSION(7, 0) - #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) - --- -1.8.4.rc3 - commit 6ee2da70dc16443f1ee9a17c29d5acabe009feee Author: Julien Cristau <jcris...@debian.org> Date: Sun Nov 24 15:45:43 2013 +0100 Update (build)dependencies diff --git a/debian/control b/debian/control index e661228..f1fa5cf 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,6 @@ Source: xorg-server Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -# all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg -# server, and common dependencies for the DIX. -# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server. -# everything on is for the DMX, Xnest and Xephyr servers. Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.16.1), @@ -32,11 +28,13 @@ Build-Depends: x11proto-scrnsaver-dev, x11proto-video-dev, x11proto-xcmisc-dev (>= 1.2.0), - x11proto-xext-dev (>= 7.1.99), + x11proto-xext-dev (>= 7.2.99.901), x11proto-xf86bigfont-dev (>= 1.2.0), x11proto-xf86dga-dev (>= 2.0.99.1), x11proto-xf86vidmode-dev (>= 2.2.99.1), - xtrans-dev (>= 1.2.2), + x11proto-present-dev, + x11proto-dri3-dev, + xtrans-dev (>= 1.3.2), libxau-dev (>= 1:1.0.5-2), x11proto-input-dev (>= 2.3), x11proto-dri2-dev (>= 2.8), @@ -55,8 +53,7 @@ Build-Depends: x11proto-xf86dri-dev (>= 2.1.0), libdrm-dev (>= 2.4.3) [!hurd-i386], x11proto-gl-dev (>= 1.4.16), - mesa-common-dev (>= 7.8), - libgl1-mesa-dev (>= 7.8), + libgl1-mesa-dev (>= 9.2), libxmuu-dev (>= 1:0.99.1), libxext-dev (>= 1:0.99.1), libx11-dev (>= 2:1.6), @@ -73,6 +70,7 @@ Build-Depends: libxfixes-dev (>= 1:3.0.0), libxv-dev, libxinerama-dev, + libxshmfence-dev, # XCB bits for Xephyr libxcb1-dev, libxcb-shape0-dev, @@ -173,7 +171,7 @@ Depends: libpixman-1-dev (>= 0.27.2), x11proto-core-dev (>= 7.0.22), x11proto-input-dev (>= 2.3), - x11proto-xext-dev (>= 7.1.99), + x11proto-xext-dev (>= 7.2.99.901), x11proto-video-dev, x11proto-randr-dev (>= 1.4.0), x11proto-render-dev (>= 2:0.11), @@ -186,6 +184,8 @@ Depends: x11proto-resource-dev (>= 1.2.0), x11proto-scrnsaver-dev, x11proto-xf86bigfont-dev (>= 1.2.0), + x11proto-dri3-dev, + x11proto-present-dev, libxkbfile-dev, libpciaccess-dev, mesa-common-dev, commit 0f36bbfec73ed5af4f88cdbf29fb8e7830dcf3b5 Author: Julien Cristau <jcris...@debian.org> Date: Sun Nov 24 15:45:36 2013 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index f048a64..9752e3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1140 @@ +commit 2aa67ccef6ad8f51deb94b66defc668ddb7d226c +Author: Keith Packard <kei...@keithp.com> +Date: Thu Nov 14 10:26:20 2013 +0900 + + Update to version 1.14.99.902 + + 1.15 RC2 + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 9309d2a009a6a3b6090fc377fc7a3eded1a34dc0 +Author: Keith Packard <kei...@keithp.com> +Date: Wed Nov 13 07:01:45 2013 +0900 + + xext: Fix shmint.h to not use headers outside of sdk_HEADERS + + shmint.h is part of sdk_HEADERS, and so can't use anything not + included in sdk_HEADERS. + + busfault.h includes dix-config.h which is not. Leave the use of + struct busfault in shmint.h and move the include of busfault.h to + shm.c. + + protocol-versions.h is not part of sdk_HEADERS, so instead of using + that, just use XTRANS_SEND_FDS to choose whether to expose the fd + passing requests directly. + + Reported-by: Julien Cristau <jcris...@debian.org> + Signed-off-by: Keith Packard <kei...@keithp.com> + Tested-by: Knut Petersen <knut_peter...@t-online.de> + Reviewed-by: Julien Cristau <jcris...@debian.org> + + v2: also avoid using protocol-versions.h + +commit 4a251f5883b042cd902c192060a0be2b11148f2b +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Fri Nov 8 14:55:33 2013 -0800 + + xfree86: Fix build without libpciaccess + + Regression fix from commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639 + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + Reviewed-by: Connor Behan <connor.be...@gmail.com> + +commit 5b02d5b7aaabf1ba8dcbdfe4525b7995b4e79f92 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Nov 7 21:08:56 2013 -0800 + + Enable XTRANS_SEND_FDS on Solaris too. + + Requires passing through the __EXTENSIONS__ and _XOPEN_SOURCE defines + in order to expose the msg_control members in struct msghdr. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit c4c154d18ef42dc550f2675a9ee88e07b1ca6bed +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Nov 7 21:05:33 2013 -0800 + + Avoid conflicts with Solaris <sys/regset.h> defines that clash with our names + + When building on Solaris with _XOPEN_SOURCE set to a recent XPG release, + <stdlib.h> and other core headers start including <sys/regset.h>, which + has a bunch of unfortunately named macros such as "CS", "ES", etc. for + x86 & x64 registers which clash with existing variable & struct member + names in Xorg - so #undef these so they don't interfere with our use. + + (Yes, have filed a bug against the system headers for exposing these, + but this solves the problem for building on existing releases.) + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit d7f9be0f8541368bf1a095ad1fbe7f38be6d3d15 +Author: Keith Packard <kei...@keithp.com> +Date: Mon Nov 11 15:48:41 2013 -0800 + + Proper spelling of MAP_ANONYMOUS is MAP_ANON. + + The former doesn't exist on BSD and the latter is available everywhere + AFAIK (checked Solaris and Linux). + + You also might want to wrap that line ;). + + Reported-by: Mark Kettenis <mark.kette...@xs4all.nl> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit fc84166e65c35ad75f566b135dcfc305ad5a2fde +Author: Keith Packard <kei...@keithp.com> +Date: Thu Nov 7 15:18:28 2013 -0800 + + Get rid of the rest of the FD passing code when XTRANS_SEND_FDS isn't set + + req_fds and SetReqFds in include/dixstruct.h + + ReadFdFromClient, WriteFdToClient and the FD flushing in os/io.c + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit a239e6faf3fce848ac0d10c48f8e817db68a493c +Merge: 43e5a43 f70a8bf +Author: Keith Packard <kei...@keithp.com> +Date: Mon Nov 11 15:26:12 2013 -0800 + + Merge remote-tracking branch 'jeremyhu/master' + +commit 43e5a43fa8994e50cf01dd954118f4ef2c4e7933 +Author: Adam Jackson <a...@redhat.com> +Date: Thu Nov 7 12:01:41 2013 -0500 + + present: Don't try to initialize when building without present support + + There's a --disable-present, so it'd be nice if it worked. + + Signed-off-by: Adam Jackson <a...@redhat.com> + Reviewed-by: Jasper St. Pierre <jstpie...@mecheye.net> + Reviewed-by: Mark Kettenis <kette...@openbsd.org> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 0822a23e048b12c98c654e8b6af711c5f2c97141 +Author: Keith Packard <kei...@keithp.com> +Date: Thu Nov 7 03:19:42 2013 -0800 + + present: Change debug output a bit to help diagnose missing vblank signals + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 20bb49ae9ba11d3dccfba191483cd682d9c9d96c +Author: Keith Packard <kei...@keithp.com> +Date: Wed Nov 6 23:56:26 2013 -0800 + + Present: Check for window/fence destroyed when idling pixmaps + + A client destroying objects in the middle of an unflip can end up + having the screen flip window or fence set to NULL in the unflip + notify path. Check for these and don't try to use those objects. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 41da295eb50fa08eaacd0ecde99f43a716fcb41a +Author: Keith Packard <kei...@keithp.com> +Date: Sun Nov 3 13:12:40 2013 -0800 + + Trap SIGBUS to handle truncated shared memory segments + + If a client passes a section of memory via file descriptor and then + subsequently truncates that file, the underlying pages will be freed + and the addresses invalidated. Subsequent accesses to the page will + fail with a SIGBUS error. + + Trap that SIGBUS, figure out which segment was causing the error and + then allocate new pages to fill in for that region. Mark the offending + shared segment as invalid and free the resource ID so that the client + will be able to tell when subsequently attempting to use the segment. + + Signed-off-by: Keith Packard <kei...@keithp.com> + + v2: Use MAP_FIXED to simplify the recovery logic (Mark Kettenis) + v3: Also catch errors in ShmCreateSegment + + Conflicts: + include/dix-config.h.in + include/xorg-config.h.in + +commit 719e880d7698d92f9b854b217ef9680aaa446f2e +Author: Keith Packard <kei...@keithp.com> +Date: Wed Nov 6 23:22:51 2013 -0800 + + Require libXtrans version 1.3.2 + + This has the FD passing support included + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit bee2ec54049377e0033d49abff20d7bd069c62aa +Author: Keith Packard <kei...@keithp.com> +Date: Sun Nov 3 10:08:15 2013 -0800 + + Xext: Enable MIT-SHM FD-passing request definitions only when possible + + Check to see if xtrans FD passing is available and use that to + advertise the appropriate version of the SHM extension + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit ea8acfe3e2f74a46c3f1e91809b4b99af18502b7 +Author: Keith Packard <kei...@keithp.com> +Date: Wed Nov 6 23:06:28 2013 -0800 + + Require xextproto version 7.2.99.901 + + This includes the MIT-SHM FD passing requests + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 914672fefacc15386041e7c2bc3beed4faf45e9d +Author: Keith Packard <kei...@keithp.com> +Date: Thu Nov 7 14:20:26 2013 -0800 + + Remove dix-config.h config variables from xorg-config.h + + xorg-config.h includes dix-config, so there's no need to duplicate. + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 7aad79c5a582ece301d950bd65f0bcb4b9956e86 +Author: Keith Packard <kei...@keithp.com> +Date: Wed Nov 6 23:05:46 2013 -0800 + + Make XTrans FD passing support optional. Define only on Linux + + Until other operating systems have a libXtrans port for FD passing, + disable this on non-Linux systems. + + Note that this define affects how libXtrans gets built into the X + server, which is why it need only define the symbol + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit f70a8bf3714d89bccaad36841ef9149e91ad3bba +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Sun Nov 10 11:40:27 2013 -0800 + + XQuartz: Don't sleep forever on exit if usleep() returns an error + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + +commit ebcc1c214c466582d7b92826b4860256fd9c582a +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Sun Nov 10 11:26:49 2013 -0800 + + XQuartz: Update Info.plist copyright years + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + +commit 81c123ea2dd833864f7ba217791e59acca0f7c97 +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Mon Nov 4 12:13:45 2013 -0800 + + configure.ac: Move GLX section after DRI + + The GLX section of configura.ac checks the state of DRI2, so it + needs to be after DRI2=auto is resolved. + + Also reset libgl requirement to 7.1.0 in non-dri2 case. + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be +Author: Andreas Schwab <sch...@suse.de> +Date: Thu Aug 15 12:03:42 2013 +0200 + + ARM64: Add support for aarch64 + + Signed-off-by: Andreas Schwab <sch...@suse.de> + Reviewed-by: Mark Kettenis <kette...@openbsd.org> + Reviewed-by: Adam Jackson <a...@redhat.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 8fcf82cbf015609e00b3feb9bc567133c7aee5cf +Author: Keith Packard <kei...@keithp.com> +Date: Tue Nov 5 18:39:11 2013 -0800 + + Use $GL_LIBS instead of -lGL for linking + + -lGL presumes that the GL library is in the system path, while + $GL_LIBS is auto-detected. + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit f348935e7d2c84a438aba08eee2f2c4e0dc77d20 +Author: Keith Packard <kei...@keithp.com> +Date: Tue Nov 5 18:37:12 2013 -0800 + + Link with xshmfence, reference miSyncShmScreenInit in sdksyms + + This gets the server to link with xshmfence again, and also ensures + that the miSyncShm code is linked into the server with the reference + from sdksyms. + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 5f1e832694e57986c0185048a941b3af51b2f85f +Author: Julien Cristau <jcris...@debian.org> +Date: Tue Nov 5 07:08:21 2013 -0800 + + os: Actually use the computed clockid in GetTimeInMicros + + The selection of which clock to use for this function was not actually + getting used when fetching the final clock value. + + Reported-by: Julien Cristau <jcris...@debian.org> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 903a058370645ea075ea98d380fd565efb6160c9 +Author: Keith Packard <kei...@keithp.com> +Date: Mon Nov 4 19:01:26 2013 -0800 + + hw/xfree86: Link libdri3 only when DRI3 is defined + + Don't attempt to link non-existant libraries... + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit aaf0e29619196a283fee7ead2020a91032d84f48 +Author: Keith Packard <kei...@keithp.com> +Date: Sun Nov 3 09:56:02 2013 -0800 + + Disable DRI3 and sync fence FD functions if xshmfence isn't available + + Make sure the server can build when the xshmfence library isn't present + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 33c85beed521c9db140cadd8c5aa9992398ee1fe +Author: Keith Packard <kei...@keithp.com> +Date: Fri Nov 1 01:01:58 2013 -0700 + + Set version to 1.14.99.901 (1.15 RC1) + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 9db1d66f6d2c6857de220d8f1c08965962fe1416 +Author: Keith Packard <kei...@keithp.com> +Date: Fri Nov 1 01:43:59 2013 -0700 + + Add dri3 and present directorys to distribution + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 977e2644b1d9e13b44debcb9a372bbc832ee32a3 +Merge: 66c5ee0 f36f5a6 +Author: Keith Packard <kei...@keithp.com> +Date: Fri Nov 1 00:34:18 2013 -0700 + + Merge remote-tracking branch 'whot/for-keith' + +commit 66c5ee0ff4690e630a69656331fd9d545c99c26c +Author: Egbert Eich <e...@freedesktop.org> +Date: Wed Aug 14 18:18:56 2013 +0200 + + config/APM: Add option to disable building of APM support on Linux + + APM support in the Xserver was used to restore the console mode + prior to a power management event. This was to ensure the mode + upon suspend/resume was one that the system firmware or kernel + could deal with. + APM support is now largely obsolete, KMS drivers don't require a + mode restoration anyhow. Therefore it should be possible to disable + this feature. + + (small modification by keithp - move test for XF86PM flag after check + for APM, then move XF86PM flag to xorg-config.h.in) + + Signed-off-by: Egbert Eich <e...@freedesktop.org> + Tested-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit f36f5a65f639b6524191d888d5bf89e73027156c +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Oct 30 15:40:58 2013 +1000 + + sync: fix corner-case in triggering idle alarms + + ProcessInputEvent() resets the device idle times. If idle time was higher than + the lower bracket, this should trigger an event in the idle time wakeup + handler. + + If processing is slow, the idle time may advance past the lower bracket + between the reset and the time the BlockHandler is called. In that case, we'd + never schedule a wakeup to handle the event, causing us to randomly miss + events. + + Ran tests with a neg transition trigger on 5ms with 200 repeats of the test + and it succeeded. Anything below that gets a bit tricky to make sure the + server sees the same idle time as the client usleeps for. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Keith Packard <kei...@keithp.com> + +commit f994d99539192a10a8c83047e11991f52e0ca677 +Author: Egbert Eich <e...@freedesktop.org> +Date: Wed Aug 14 18:18:39 2013 +0200 + + config/ACPI: Add option to disable building of ACPI support on Linux + + ACPI support in the Xserver was used to restore the console mode + prior to a power management event. This was to ensure the mode + upon suspend/resume was one that the system firmware or kernel + could deal with. + The feature depended on acpid to be running. Most of this functionality + is now take over by systemd, KMS drivers don't require a mode restoration + anyhow. Therefore it should be possible to disable this feature under + some circumstances. + + Tested-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 2aa5092b88174cb9988076ae96298217c97ad75f +Author: Egbert Eich <e...@freedesktop.org> +Date: Mon Aug 12 18:21:33 2013 +0200 + + DDX/Randr: Avoid server crash when xrandr SetConfig is called while switched away + + A call to Xrandr SetScreenConfig (for randr 1.1) causes the Xserver to + crash when xf86SetViewport() which does not check if the hardware is + accessible. + Wrap accesses to xf86SetViewport() with if (vtSema) { ... } to avoid that. + + Signed-off-by: Egbert Eich <e...@freedesktop.org> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 508e05777aba823c93a2417cc26d18c9f061ca26 +Author: Egbert Eich <e...@freedesktop.org> +Date: Mon Aug 12 18:20:36 2013 +0200 + + DDX/Events: Distinguish between Input- and GeneralHandlers in xf86VTSwitch() + + When enabling/disabling input handlers in xf86VTSwitch() we treat Input- + and GeneralHandlers equally. The result is that after a VT switch the + masks for EnabledDevices and AllSockets are equal and the distiction + between both types is lost. + + Signed-off-by: Egbert Eich <e...@freedesktop.org> + Reviewed-by: Daniel Stone <dan...@fooishbar.org> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 0cb33ce34081d7d123ec565582d7d19bdb3964ad +Author: Egbert Eich <e...@freedesktop.org> +Date: Sat Oct 5 08:02:28 2013 +0200 + + DDX/modes: Add a sanity check when using screen sizes from EDID + + EDID sometimes lies about screen sizes. Since the screen size is used + by clients to determine the DPI a wrong ration will lead to terrible + looking fonts. + Add a sanity check for the h/v ratio cutting off at 2.4. This would + still accept the cinemascope aspect ratio as valid. + Also add message suggesting to add a quirk table entry. + + Signed-off-by: Egbert Eich <e...@freedesktop.org> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 41d4beb2616ceb3f1a1b8694733e85bae70de59a +Author: Egbert Eich <e...@freedesktop.org> +Date: Wed Aug 14 11:50:26 2013 +0200 + + DDX/DPMS: Call dixSaveScreens() also when screen is turned on + + DMPS calls dixSaveScreens() when turned off but not when turned + on. In most cases this is irrelevant as DPMS is done when a + key is hit in which case dixSaveScreens() will be called to + unblank anyhow. This isn't the case if we use xset (or the + DPMS extension directly) to unblank. + Check screenIsSaved to make sure the state needs to be changed + before calling dixSaveScreens(). + + Signed-off-by: Egbert Eich <e...@freedesktop.org> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 623c4147650d0404cfbea0f9b7df66dc7d928e00 +Author: Søren Sandmann Pedersen <s...@redhat.com> +Date: Mon Oct 21 17:11:56 2013 -0400 + + ephyr: Ensure stride of private framebuffer is multiple of 4 + + The fb layer of X can't deal with strides that are not a multiple of + 4, so when Xephyr allocates its own framebuffer it should make sure to + align it. + + This fixes crashes and rendering corruption when Xephyr runs in a + depth that is different from the host X server and its screen size is + not a multiple of 4 / depth. (This is particularly easy to trigger if + you use the -resizeable option). + + Reviewed-by: Eric Anholt <e...@anholt.net> + Signed-off-by: Soren Sandmann <s...@redhat.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 97cf53cc2ad7ecfdd495133bad31d0ec7d939326 +Author: Søren Sandmann Pedersen <s...@redhat.com> +Date: Mon Oct 21 16:58:54 2013 -0400 + + ephyr: hostx_screen_init(): Fix bits_per_pixel and bytes_per_line + + When the depth of the Xephyr server matches that of the host X server, + Xephyr simply uses the buffer associated with the XImage as its + framebuffer. In this case, it is correct to get the bits_per_pixel and + bytes_per_line values returned from hostx_screen_init() from the XImage. + + However, when the depth doesn't match the host, Xephyr uses a private + framebuffer that is periodically copied to the XImage. In this case, + the returned values of bits_per_pixel and bytes_per_line should be + those of the private framebuffer, not those of the XImage. + + Reviewed-by: Eric Anholt <e...@anholt.net> + Signed-off-by: Soren Sandmann <s...@redhat.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 55246b67b755d4c1039d54971fe3f77ea60d604e +Author: Søren Sandmann Pedersen <s...@redhat.com> +Date: Tue Oct 8 17:45:40 2013 -0400 + + xf86AddBusDeviceToConfigure(): Store device in DevToConfig[i].pVideo + + After fc3ab84d the pVideo field in DevToConfig[i] is no longer + initialized, so it's always NULL. This causes the duplicate finding + algorithm in the beginning of the function to not work anymore as it + is based on this field. + + The symptom of this bug is that X -configure reports + + Number of created screens does not match number of detected devices. + Configuration failed. + Server terminated with error (2). Closing log file. + + rather than producing a working config file. + + This patch fixes that bug by initializing the field before calling + xf86PciConfigureNewDev(). + + Cc: tvigna...@gmail.com + Signed-off-by: Soren Sandmann <s...@redhat.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 95bf478b78e466002c382bcde7d4d62591e9215d +Merge: abf5d5a bb745f2 +Author: Keith Packard <kei...@keithp.com> +Date: Thu Oct 31 18:18:19 2013 -0700 + + Merge remote-tracking branch 'jeremyhu/master' + +commit abf5d5ac12437ebe156b4dd500c2acd69eea3654 +Author: Jeremy Huddleston Sequoia <jerem...@apple.com> +Date: Thu Oct 31 08:57:56 2013 -0700 + + miext/damage: Partial revert of "Only wrap into the GC ops chain if there's a listener (v3)" + + Fixes regression from: 4dc2a76740d921c824a4d8193f39dd373475f02a + + http://lists.x.org/archives/xorg-devel/2013-May/036241.html + https://trac.macports.org/ticket/38993 + + Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit e4636072949a76477fe7c9d54662a0b3536b1372 +Merge: 17ed7ac 5c5c1b7 +Author: Keith Packard <kei...@keithp.com> +Date: Thu Oct 31 17:05:48 2013 -0700 + + Merge remote-tracking branch 'keithp/dri3' + +commit 17ed7ac1fe7426d66f688087c09da5ff1dbb41d3 +Author: Adam Jackson <a...@redhat.com> +Date: Thu Oct 31 18:39:22 2013 -0400 + + glx: Lie about GLX_Y_INVERTED_EXT + + Well, that was lame. The problem with reporting y inversion honestly is + that libGL asks the driver _its_ opinion of Y inversion, which it just + fabricates from whole cloth. So then when libGL goes to compare the + driver's idea of fbconfigs with that of the server - a fairly dumb idea + to begin with - nothing matches, and direct rendering fails, and + sadness. + + So until the DRI drivers are fixed we should just continue to lie about + Y inversion. GLX_DONT_CARE is what libGL would make up for that + attribute if we hadn't sent it, so just send that instead. + + Signed-off-by: Adam Jackson <a...@redhat.com> + Tested-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 5c5c1b77982a9af7279a90bc3c2be48adaa9c778 +Author: Keith Packard <kei...@keithp.com> +Date: Thu Jul 11 16:11:57 2013 -0700 + + present: Add Present extension + + Provides both a software implementation using timers and driver hooks + to base everything on vblank intervals. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 563138298868f62501875d3016f03469dcffaad0 +Author: Keith Packard <kei...@keithp.com> +Date: Tue Apr 9 19:59:39 2013 -0700 + + dri3: Add DRI3 extension + + Adds DRM compatible fences using futexes. + Uses FD passing to get pixmaps from DRM applications. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit fdec793cdc2ef9a6ea66b311cb1068a7bd4a3be3 +Author: Keith Packard <kei...@keithp.com> +Date: Thu Jan 17 13:46:55 2013 -0800 + + Add support for MIT-SHM AttachFd request + + This passes a file descriptor from the client to the server, which is + then mmap'd + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 9fd35daa3160fd36f00ed354bfcbefefa1353cce +Author: Keith Packard <kei...@keithp.com> +Date: Thu Jan 17 13:43:02 2013 -0800 + + Add interfaces to get FDs from clients over the socket + + This adds two interfaces: + + void SetReqFds(ClientPtr client, int req_fds) + + Marks the number of file descriptors expected for this + request. Call this before any request processing so that + any un-retrieved file descriptors will be closed + automatically. + + int ReadFdFromClient(ClientPtr client) + + Reads the next queued file descriptor from the connection. If + this request is not expecting any more file descriptors, or + if there are no more file descriptors available from the + connection, then this will return -1. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 264fc3abe5f18341d0cf9ddb6766e10e4154e447 +Author: Keith Packard <kei...@keithp.com> +Date: Thu Oct 31 13:01:46 2013 -0700 + + misync: Don't smash custom screen sync functions + + There was a check to avoid smashing custom functions, but the sense + was backwards causing it to always smash them, and also not set them otherwise. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 2d96948ab5c952b68875ac63844cf7d778d4bf63 +Author: Keith Packard <kei...@keithp.com> +Date: Thu Jul 11 16:10:34 2013 -0700 + + os: Add GetTimeInMicros + + 64-bit higher resolution current time value. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 0c33f47281c36726848daf513fb0483cdea57bff +Author: Keith Packard <kei...@keithp.com> +Date: Thu Jul 11 16:09:34 2013 -0700 + + Add swapll to byte swap 64-bit datatypes + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 26f013ba45b08a02bb028a461af68288a86fadb1 +Author: Keith Packard <kei...@keithp.com> +Date: Thu Jul 11 16:08:41 2013 -0700 + + Add a RegionDuplicate function + + This allocates a new region structure and copies a source region into + it in a single API rather than forcing the caller to do both steps themselves. + + Signed-off-by: Keith Packard <kei...@keithp.com> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit d25c217964eb1fe54c3a54bca4cac7f47b4b9fdf +Author: Keith Packard <kei...@keithp.com> +Date: Mon Jan 14 14:24:36 2013 -0800 + + Clean up a couple of warnings in os/ -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vkb0o-00067u...@moszumanska.debian.org