<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/62b3a45f30d243b2cb2c34721eb3b6ec209c8f74">https://github.com/macports/macports-ports/commit/62b3a45f30d243b2cb2c34721eb3b6ec209c8f74</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 62b3a45 xorg-server-devel: Update to 1.20.x branch
</span>62b3a45 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62b3a45f30d243b2cb2c34721eb3b6ec209c8f74
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Aug 31 21:59:43 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> xorg-server-devel: Update to 1.20.x branch
</span>---
x11/xorg-server-devel/Portfile | 74 ++++++++++----------
...ize-glx-even-if-there-are-currently-no-sc.patch | 79 +++++++++++++++++-----
.../5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch | 2 +-
...evert-dix-Restore-PaintWindow-screen-hook.patch | 2 +-
...the-GC-clipping-problem-in-miPaintWindow-.patch | 2 +-
...old-miTrapezoids-and-miTriangles-routines.patch | 2 +-
...4-fb-Revert-fb-changes-that-broke-XQuartz.patch | 2 +-
...5-fb-Revert-fb-changes-that-broke-XQuartz.patch | 2 +-
.../files/fix-calloc-free-mis-match-bug.patch | 67 ++++++++++++++++++
9 files changed, 171 insertions(+), 61 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/Portfile b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7814d2..05179b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,24 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name xorg-server-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name xorg-server-devel
</span> conflicts xorg-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name xorg-server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.19.99.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11 devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name xorg-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.20.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories x11 devel
</span> license X11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description The X.org / Xquartz X server.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.x.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description The X.org / Xquartz X server.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.x.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin macosx
</span> long_description The X.org X server allows you to run X11 applications on your computer.
fetch.type git
git.url git://anongit.freedesktop.org/xorg/xserver
<span style='display:block; white-space:pre;background:#ffe0e0;'>-git.branch d16133e3e293fe16b291114d344fbd5a61d5ed65
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#git.branch xorg-server-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git.branch 1508ea68065b7976dbf56039f9b20dcaf0394431
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#git.branch xorg-server-${version}
</span>
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,24 +26,7 @@ use_parallel_build yes
</span> depends_build \
port:pkgconfig \
port:mesa \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-applewmproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-bigreqsproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-damageproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-fixesproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-fontsproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-glproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-inputproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-presentproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-randrproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-recordproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-renderproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-resourceproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-scrnsaverproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-videoproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xcmiscproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xextproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xineramaproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xorgproto \
</span> port:xorg-xtrans
# This xinit dependency needs to be port: not bin: because we specifically run ${prefix}/bin/startx from bundle-main.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,19 +71,34 @@ configure.args --with-apple-applications-dir=${applications_dir} \
</span> # GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
configure.cppflags-append -I/usr/include -I${filespath}/dri -F${configure.sdkroot}/System/Library/Frameworks/ApplicationServices.framework/Frameworks
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Debugging ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.cppflags-append -g -fsanitize=address -fno-omit-frame-pointer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.cflags-append -g -fsanitize=address -fno-omit-frame-pointer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.cppflags-replace -Os -O1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.cflags-replace -Os -O1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env-append \
RAWCPP=${configure.cpp}
patchfiles \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-os-connection-Improve-abstraction-for-launchd-secure.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5003-Use-old-miTrapezoids-and-miTriangles-routines.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5005-fb-Revert-fb-changes-that-broke-XQuartz.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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5003-Use-old-miTrapezoids-and-miTriangles-routines.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
</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 fix-calloc-free-mis-match-bug.patch
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch b/x11/xorg-server-devel/files/0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c29d5c..7e26c4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/files/0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/files/0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,10 +33,19 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> 1 file changed, 21 deletions(-)
diff --git a/glx/glxext.c b/glx/glxext.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d595a05..d216c9d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 99f8661..29f5961 100644
</span> --- a/glx/glxext.c
+++ b/glx/glxext.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -319,23 +319,6 @@ GlxPushProvider(__GLXprovider * provider)
</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> __glXProviderStack = provider;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,26 +57,62 @@ index d595a05..d216c9d 100644
</span> - for (i = 0; i < screenInfo.numScreens; i++) {
- ScreenPtr screen = screenInfo.screens[i];
- for (j = 0; j < screen->numVisuals; j++) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (screen->visuals[j].class == TrueColor ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- screen->visuals[j].class == DirectColor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return True;
</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:#ffe0e0;'>-- return False;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span> -}
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</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> static void
GetGLXDrawableBytes(void *value, XID id, ResourceSizePtr size)
<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:#ffe0e0;'>-@@ -371,10 +354,6 @@ GlxExtensionInit(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *stack = &__glXDRISWRastProvider;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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:#ffe0e0;'>-- /* Mesa requires at least one True/DirectColor visual */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!checkScreenVisuals())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __glXContextRes = CreateNewResourceType((DeleteType) ContextGone,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GLXContext");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __glXDrawableRes = CreateNewResourceType((DeleteType) DrawableGone,
</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-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch b/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a1364bd..1d8bf8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8d0796bfa8ab8599994b5d029182428d62398712 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From da0dc81ea081657dba3ba492359593ba40d7245a Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri, 13 Jan 2012 12:00:57 -0800
Subject: [PATCH 5000/5005] sdksyms.sh: Use CPPFLAGS, not CFLAGS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch b/x11/xorg-server-devel/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 90d5550..f944366 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5103ec7f937fc64a355da212c013619437dcf545 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1d3dba846a7e51608b71797e7510d114555bfcd3 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 26 Dec 2015 10:56:52 -0800
Subject: [PATCH 5001/5005] Revert "dix: Restore PaintWindow screen hook"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch b/x11/xorg-server-devel/files/5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b3c285f..7c1ae87 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/files/5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/files/5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 04d7c9360a106564666337e961da78c3f52bf72d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d6058fa4f68b68dff95c5ce826f9b9b498df3951 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri, 30 Apr 2010 13:08:25 -0700
Subject: [PATCH 5002/5005] Workaround the GC clipping problem in miPaintWindow
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch b/x11/xorg-server-devel/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 32ebad4..8423ce12 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 963cad095b31c534f827019cb0b83a96b37cbef2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2850855f560451bb64dd5af3f005c6988961336e Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 2 Nov 2013 11:00:23 -0700
Subject: [PATCH 5003/5005] Use old miTrapezoids and miTriangles routines
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch b/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d1d8134..8ed90d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ede0b86e109653af9119013ff56e452346fef826 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 055a7bb8f22eb94a35cae6224d109daa435d288d Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri, 12 Feb 2010 19:48:52 -0800
Subject: [PATCH 5004/5005] fb: Revert fb changes that broke XQuartz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch b/x11/xorg-server-devel/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f6ae765..1b88f8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 33dd8bad4b6a018d1bbe66b6e6de972c58cfc9f1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3475655620bc51071f0ba9cbc30b39587d9b0b44 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 31 May 2014 13:14:20 -0700
Subject: [PATCH 5005/5005] fb: Revert fb changes that broke XQuartz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/fix-calloc-free-mis-match-bug.patch b/x11/xorg-server-devel/files/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-devel/files/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>