<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8c1ba70e339a8c088df891849e657efc04c5fd2c">https://github.com/macports/macports-ports/commit/8c1ba70e339a8c088df891849e657efc04c5fd2c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8c1ba70 xorg-server: Update to 1.20.4
</span>8c1ba70 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8c1ba70e339a8c088df891849e657efc04c5fd2c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Mar 17 15:54:19 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> xorg-server: Update to 1.20.4
</span>---
x11/xorg-server/Portfile | 44 +++++---
...-the-issue-where-the-h-key-could-be-come-.patch | 42 --------
...n-Improve-abstraction-for-launchd-secure.patch} | 18 ++--
...anup-CPPFLAGS-that-are-no-longer-necessar.patch | 28 -----
...alize-RandR-even-if-there-are-currently-n.patch | 46 ++++++++
...ize-glx-even-if-there-are-currently-no-sc.patch | 118 +++++++++++++++++++++
...-patch-xorg-server-dont-redefine-GLXscreen.diff | 18 ++++
...atch-randr-randrstr-h-dont-redefine-CARD32.diff | 16 +++
.../files/5008-fix-calloc-free-mis-match-bug.patch | 67 ++++++++++++
9 files changed, 300 insertions(+), 97 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/Portfile b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5a3d2f..0dca9c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.18.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.20.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories x11 devel
license X11
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +23,9 @@ master_sites http://xorg.freedesktop.org/archive/individual/xserver/
</span> dist_subdir ${my_name}
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6f58d84d3bbc59a773e6a2e1eafc208827a5923f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cad624e1d1ada0b46a76a1e5de6b12446f7c6dda \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6123780
</span>
use_bzip2 yes
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,21 +50,14 @@ depends_lib \
</span> port:xorg-libXfont \
port:xorg-libXt \
port:xorg-libAppleWM \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXfixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXfixes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXfont2
</span>
# https://trac.macports.org/ticket/36055
# https://llvm.org/bugs/show_bug.cgi?id=30346
# https://trac.macports.org/ticket/53910
compiler.blacklist gcc-4.0 macports-clang-3.9 macports-clang-devel {clang >= 802 < 900}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove this once a version of base is released that contains macports-clang-4.0 in the default fallback list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append macports-clang-3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback-append macports-clang-4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --with-apple-applications-dir=${applications_dir} \
--with-bundle-id-prefix=org.macports \
--without-dtrace \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,10 +76,9 @@ configure.env-append \
</span> RAWCPP=${configure.cpp}
patchfiles \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-os-connection-Improve-abstraction-for-launchd-secure.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-os-connection-Improve-abstraction-for-launchd-secure.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch \
</span> 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,6 +86,23 @@ patchfiles \
</span> 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \
5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# the following two patches avoid redefinition errors on pre-C11 compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/57333
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# another approach would be to update the port to build with gcc6+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patches to do that are in the above noted ticket/57333.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5006-patch-xorg-server-dont-redefine-GLXscreen.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixes what appears to be a mis-match in the way
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# hw/xquartz/GL/visualConfigs.c allocates __GLXconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# objects with a single calloc call to the way
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# they are released in glxscreens.c with a loop and a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# free call to each struct. The patch below fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this by individually allocating each
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugzilla.freedesktop.org/show_bug.cgi?id=107555
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 5008-fix-calloc-free-mis-match-bug.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patch.pre_args -p1
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch b/x11/xorg-server/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3998375..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b1ee5cc0015e702c8e13c3895f4b2344ab2aeacb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 29 May 2016 14:01:38 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/3] XQuartz: Fix the issue where the h key could be come
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "stuck" after hiding XQuartz with cmd-h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The issue was that we set a flag to ignore the k key's up event when sent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the cmd-h down event, but because the cmd-h keycode hides XQuartz, we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-became !_x_active by the time the event is delivered which caused us to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-go down a differnet codepath rather than getting a chance to ignore it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We then incorrectly ignored the next h up key.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.freedesktop.org/show_bug.cgi?id=92648
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hw/xquartz/X11Application.m | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 9 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d2c5d30..9a22909 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/hw/xquartz/X11Application.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -366,6 +366,15 @@ message_kit_thread(SEL selector, NSObject *arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* No kit window is focused, so send it to X. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for_appkit = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Reset our swallow state if we're seeing the same keyCode again.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This can happen if we become !_x_active when the keyCode we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * intended to swallow is delivered. See:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * https://bugs.freedesktop.org/show_bug.cgi?id=92648
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ([e keyCode] == swallow_keycode) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ do_swallow = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else { /* KeyUp */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch b/x11/xorg-server/files/0001-os-connection-Improve-abstraction-for-launchd-secure.patch
</span>similarity index 80%
rename from x11/xorg-server/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch
rename to x11/xorg-server/files/0001-os-connection-Improve-abstraction-for-launchd-secure.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4ff551a..cd3a253 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/0001-os-connection-Improve-abstraction-for-launchd-secure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 455d862774b791f4ca93f9885e1e899208a5080c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From bf2bb516a584937cd45728fdb6e21bc84dce365a Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 10 Sep 2016 22:32:56 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/3] os/connection: Improve abstraction for launchd secure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] os/connection: Improve abstraction for launchd secure
</span> sockets
This changes away from hard-coding the /tmp/launch-* path to now
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supporting a generic <path to unix socket>[.<screen>] format for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-$DISPLAY.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supporting a generic <absolute path to unix socket>[.<screen>]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+format for $DISPLAY.
</span>
cf-libxcb: d978a4f69b30b630f28d07f1003cf290284d24d8
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+CC: Adam Jackson <ajax@kemper.freedesktop.org>
</span> ---
os/connection.c | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/os/connection.c b/os/connection.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a901ebf..ac7d12b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a901ebf..0d42184 100644
</span> --- a/os/connection.c
+++ b/os/connection.c
@@ -79,6 +79,8 @@ SOFTWARE.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +41,8 @@ index a901ebf..ac7d12b 100644
</span> - if (display_env && (strncmp(display_env, "/tmp/launch", 11) == 0)) {
- /* Make the path the launchd socket if our DISPLAY is set right */
- strcpy(port, display_env);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* First check if display_env matches a <path to unix socket>[.<screen number>] scheme (eg: launchd) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (display_env) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* First check if display_env matches a <absolute path to unix socket>[.<screen number>] scheme (eg: launchd) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (display_env && display_env[0] == '/') {
</span> + struct stat sbuf;
+
+ strlcpy(port, display_env, sizeof(port));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +69,3 @@ index a901ebf..ac7d12b 100644
</span> /* Just some default so things don't break and die. */
snprintf(port, sizeof(port), ":%d", atoi(display));
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch b/x11/xorg-server/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 28bee8a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b863c6cc90f9e0d3db361fbc3210c34ed5298203 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 10 Sep 2016 22:16:11 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/3] XQuartz: Cleanup CPPFLAGS that are no longer necessary on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hw/xquartz/pbproxy/Makefile.am | 5 ++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1b14dff..9429ea2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/hw/xquartz/pbproxy/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/hw/xquartz/pbproxy/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AM_CPPFLAGS=-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_CFLAGS=$(XPBPROXY_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AM_CFLAGS=$(XPBPROXY_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_OBJCFLAGS=$(XPBPROXY_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- noinst_LTLIBRARIES = libxpbproxy.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch b/x11/xorg-server/files/0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..184e311
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7d901d6ecc179020e213664da475ae9e2888ea1d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 11 Sep 2016 02:19:19 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] randr: Initialize RandR even if there are currently no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ screens attached
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Failure to do so causes an overvlow in RRClientCallback().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+=================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==41262==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000103ccfbc8 at pc 0x0001034f32b9 bp 0x7000035a94c0 sp 0x7000035a94b8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+WRITE of size 4 at 0x000103ccfbc8 thread T6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #0 0x1034f32b8 in RRClientCallback randr.c:72
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #1 0x1038c75e3 in _CallCallbacks dixutils.c:737
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #2 0x10388f406 in CallCallbacks callback.h:83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #3 0x1038bc49a in NextAvailableClient dispatch.c:3562
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #4 0x103ad094c in AllocNewConnection connection.c:777
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #5 0x103ad1695 in EstablishNewConnections connection.c:863
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #6 0x1038c6630 in ProcessWorkQueue dixutils.c:523
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #7 0x103ab2dbf in WaitForSomething WaitFor.c:175
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #8 0x103880836 in Dispatch dispatch.c:411
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #9 0x1038c2141 in dix_main main.c:301
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #10 0x1032ac75a in server_thread quartzStartup.c:66
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #11 0x7fffc5f16aaa in _pthread_body (libsystem_pthread.dylib+0x3aaa)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #12 0x7fffc5f169f6 in _pthread_start (libsystem_pthread.dylib+0x39f6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #13 0x7fffc5f161fc in thread_start (libsystem_pthread.dylib+0x31fc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ randr/randr.c | 3 ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/randr/randr.c b/randr/randr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0138dc1..efd3859 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/randr/randr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/randr/randr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,9 +387,6 @@ RRExtensionInit(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ExtensionEntry *extEntry;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (RRNScreens == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!dixRegisterPrivateKey(&RRClientPrivateKeyRec, PRIVATE_CLIENT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sizeof(RRClientRec) +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ screenInfo.numScreens * sizeof(RRTimesRec)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch b/x11/xorg-server/files/0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7e26c4f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,118 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 42a41fabd58ec5c572c7affd095ee15f57883a0d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 11 Sep 2016 02:47:00 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] glx: Initialize glx even if there are currently no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ screens attached
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Failure to do so causes an overvlow in glxClientCallback
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Application Specific Information:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X.Org X Server 1.18.99.1 Build Date: 20160911
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+=================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==52118==ERROR: AddressSanitizer: SEGV on unknown address 0x000102b27b80 (pc 0x000103433245 bp 0x70000de67c20 sp 0x70000de67c00 T6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #0 0x103433244 in __asan::asan_free(void*, __sanitizer::BufferedStackTrace*, __asan::AllocType) (libclang_rt.asan_osx_dynamic.dylib+0x3244)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #1 0x10347aeee in wrap_free (libclang_rt.asan_osx_dynamic.dylib+0x4aeee)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #2 0x102e6a5ed in glxClientCallback glxext.c:301
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #3 0x102b672a3 in _CallCallbacks dixutils.c:737
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #4 0x102b2f0c6 in CallCallbacks callback.h:83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #5 0x102b5c15a in NextAvailableClient dispatch.c:3562
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #6 0x102d7060c in AllocNewConnection connection.c:777
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #7 0x102d71355 in EstablishNewConnections connection.c:863
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #8 0x102b662f0 in ProcessWorkQueue dixutils.c:523
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #9 0x102d52a7f in WaitForSomething WaitFor.c:175
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #10 0x102b204f6 in Dispatch dispatch.c:411
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #11 0x102b61e01 in dix_main main.c:301
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #12 0x10254c42a in server_thread quartzStartup.c:66
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #13 0x7fffc5f16aaa in _pthread_body (libsystem_pthread.dylib+0x3aaa)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #14 0x7fffc5f169f6 in _pthread_start (libsystem_pthread.dylib+0x39f6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #15 0x7fffc5f161fc in thread_start (libsystem_pthread.dylib+0x31fc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glx/glxext.c | 21 ---------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 21 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/glx/glxext.c b/glx/glxext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 99f8661..29f5961 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/glx/glxext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/glx/glxext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ** X resources.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static int glxGeneration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//static int glxGeneration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESTYPE __glXContextRes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESTYPE __glXDrawableRes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -281,23 +281,23 @@ GlxPushProvider(__GLXprovider * provider)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __glXProviderStack = provider;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static Bool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-checkScreenVisuals(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i = 0; i < screenInfo.numScreens; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ScreenPtr screen = screenInfo.screens[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (j = 0; j < screen->numVisuals; j++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((screen->visuals[j].class == TrueColor ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- screen->visuals[j].class == DirectColor) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- screen->visuals[j].nplanes > 12)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//static Bool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//checkScreenVisuals(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// int i, j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// for (i = 0; i < screenInfo.numScreens; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// ScreenPtr screen = screenInfo.screens[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// for (j = 0; j < screen->numVisuals; j++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// if ((screen->visuals[j].class == TrueColor ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// screen->visuals[j].class == DirectColor) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// screen->visuals[j].nplanes > 12)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GetGLXDrawableBytes(void *value, XID id, ResourceSizePtr size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -471,10 +471,10 @@ xorgGlxGetDispatchAddress(CARD8 minorOpcode, CARD32 vendorCode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Bool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xorgGlxServerPreInit(const ExtensionEntry *extEntry)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (glxGeneration != serverGeneration) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //if (glxGeneration != serverGeneration) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Mesa requires at least one True/DirectColor visual */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!checkScreenVisuals())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // if (!checkScreenVisuals())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __glXContextRes = CreateNewResourceType((DeleteType) ContextGone,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GLXContext");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -497,10 +497,12 @@ xorgGlxServerPreInit(const ExtensionEntry *extEntry)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __glXregisterPresentCompleteNotify();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glxGeneration = serverGeneration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // glxGeneration = serverGeneration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //return glxGeneration == serverGeneration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return glxGeneration == serverGeneration;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/5006-patch-xorg-server-dont-redefine-GLXscreen.diff b/x11/xorg-server/files/5006-patch-xorg-server-dont-redefine-GLXscreen.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..19c8878
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/5006-patch-xorg-server-dont-redefine-GLXscreen.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git xorg-server-devel-1.20.3/include/glx_extinit.h.old xorg-server-devel-1.20.3/include/glx_extinit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 07f3cc8..56a66e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xorg-server-devel-1.20.3/include/glx_extinit.h.old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xorg-server-devel-1.20.3/include/glx_extinit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* XXX this comment no longer makes sense i think */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GLXEXT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct __GLXprovider __GLXprovider;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _GLX_screens_h_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* this identical struct is also defined in glx/glxscreens.h and this causes */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* redefinition errors on compilers that don't support C11 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct __GLXscreen __GLXscreen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct __GLXprovider {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __GLXscreen *(*screenProbe) (ScreenPtr pScreen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *name;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff b/x11/xorg-server/files/5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ab396cd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xorg-server-devel-1.20.3/randr/randrstr.h.orig 2019-01-31 11:25:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xorg-server-devel-1.20.3/randr/randrstr.h 2019-01-31 11:31:44.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef XID RROutput;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef XID RRCrtc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef XID RRProvider;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* don't define this here. Causes redefinition errors with pre-C11 compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++due to a conflict in X11/Xmd.h (xorg-xorgproto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++and there is no indication it is used anywhere in the xorg-server source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef XID RRLease;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int RREventBase, RRErrorBase;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/5008-fix-calloc-free-mis-match-bug.patch b/x11/xorg-server/files/5008-fix-calloc-free-mis-match-bug.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9ee9378
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/5008-fix-calloc-free-mis-match-bug.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,67 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 69b18f6a0..79a4cce58 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/hw/xquartz/GL/visualConfigs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/hw/xquartz/GL/visualConfigs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Based originally on code from indirect.c which was based on code from i830_dri.c. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int numConfigs = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __GLXconfig *visualConfigs, *c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __GLXconfig *visualConfigs, *c, *last_c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct glCapabilities caps;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct glCapabilitiesConfig *conf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int stereo, depth, aux, buffers, stencil, accum, color, msample;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,7 +113,7 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(numConfigsPtr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *numConfigsPtr = numConfigs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- visualConfigs = calloc(sizeof(*visualConfigs), numConfigs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ visualConfigs = calloc(sizeof(*visualConfigs),1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NULL == visualConfigs) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ErrorF("xcalloc failure when allocating visualConfigs\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,6 +122,7 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = visualConfigs; /* current buffer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int confCount = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(conf = caps.configurations; conf; conf = conf->next) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(stereo = 0; stereo < (conf->stereo ? 2 : 1); ++stereo) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(aux = 0; aux < (conf->aux_buffers ? 2 : 1); ++aux) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,10 +135,12 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(depth = 0; depth < conf->total_depth_buffer_depths; ++depth) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(msample = 0; msample < (conf->multisample_buffers + 1); ++msample) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++confCount;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Global
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c->visualID = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c->visualType = GLX_TRUE_COLOR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c->next = c + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ c->next = calloc(sizeof(*visualConfigs),1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c->level = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c->indexBits = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,6 +263,7 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* EXT_framebuffer_sRGB */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c->sRGBCapable = GL_FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ last_c = c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = c->next;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -271,10 +275,11 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (c-1)->next = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(last_c->next);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ last_c->next = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (c - visualConfigs != numConfigs) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FatalError("numConfigs calculation error in setVisualConfigs! numConfigs is %d i is %d\n", numConfigs, (int)(c - visualConfigs));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (confCount != numConfigs) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FatalError("numConfigs calculation error in setVisualConfigs! numConfigs is %d count is %d\n", numConfigs, confCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ freeGlCapabilities(&caps);
</span></pre><pre style='margin:0'>
</pre>