<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[124092] trunk/dports/x11/xorg-server</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/124092">124092</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-08-18 13:24:06 -0700 (Mon, 18 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server: Update patches to match XQuartz 2.7.7 / 2.7.8_beta1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverPortfile">trunk/dports/x11/xorg-server/Portfile</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5000sdksymsshUseCPPFLAGSnotCFLAGSpatch">trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5001WorkaroundtheGCclippingprobleminmiPaintWindowpatch">trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5002UseoldmiTrapezoidsandmiTrianglesroutinespatch">trunk/dports/x11/xorg-server/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5003fbRevertfbchangesthatbrokeXQuartzpatch">trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5004fbRevertfbchangesthatbrokeXQuartzpatch">trunk/dports/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverfiles0001glamorFixtemppicturecoordinatesinglamor_compospatch">trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0002mieqFixacrashregressioninmieqProcessDeviceEvenpatch">trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0003ListenOnOpenFDRemoveResetssincethisisintendedpatch">trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0004XQuartzBettersupportturningoffDisplayshaveseppatch">trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5005XQuartzAdvertiseGLX_ARB_create_contextandGLX_ARBpatch">trunk/dports/x11/xorg-server/files/5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverfiles0001mieqFixacrashregressioninmieqProcessDeviceEvenpatch">trunk/dports/x11/xorg-server/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorgserverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/Portfile (124091 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/Portfile 2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/Portfile 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> conflicts xorg-server-devel
</span><span class="cx"> set my_name xorg-server
</span><span class="cx"> version 1.16.0
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -88,12 +88,16 @@
</span><span class="cx"> RAWCPP=${configure.cpp}
</span><span class="cx">
</span><span class="cx"> patchfiles \
</span><del>- 0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch \
</del><ins>+ 0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch \
+ 0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch \
+ 0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch \
+ 0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch \
</ins><span class="cx"> 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span class="cx"> 5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span><span class="cx"> 5002-Use-old-miTrapezoids-and-miTriangles-routines.patch \
</span><span class="cx"> 5003-fb-Revert-fb-changes-that-broke-XQuartz.patch \
</span><del>- 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
</del><ins>+ 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \
+ 5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch
</ins><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0001glamorFixtemppicturecoordinatesinglamor_compospatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch (0 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -0,0 +1,182 @@
</span><ins>+From 3c0431b8911241552a15a43e4279c50658b50a18 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Wed, 16 Jul 2014 16:03:23 -0700
+Subject: [PATCH 1/4] glamor: Fix temp picture coordinates in
+ glamor_composite_clipped_region
+
+To understand this patch, let's start at the protocol interface where
+the relationship between the coordinate spaces is documented:
+
+ static Bool
+ _glamor_composite(CARD8 op,
+ PicturePtr source,
+ PicturePtr mask,
+ PicturePtr dest,
+ INT16 x_source,
+ INT16 y_source,
+ INT16 x_mask,
+ INT16 y_mask,
+ INT16 x_dest, INT16 y_dest,
+ CARD16 width, CARD16 height, Bool fallback)
+
+The coordinates are passed to this function directly off the wire and
+are all relative to their respective drawables. For Windows, this means
+that they are relative to the upper left corner of the window, in
+whatever pixmap that window is getting drawn to.
+
+_glamor_composite calls miComputeCompositeRegion to construct a clipped
+region to actually render to. In reality, miComputeCompositeRegion clips
+only to the destination these days; source clip region based clipping
+would have to respect the transform, which isn't really possible. The
+returned region is relative to the screen in which dest lives; offset by
+dest->drawable.x and dest->drawable.y.
+
+What is important to realize here is that, because of clipping, the
+composite region may not have the same position within the destination
+drawable as x_dest, y_dest. The protocol coordinates now exist solely to
+'pin' the three objects together.
+
+ extents->x1,y1 Screen origin of clipped operation
+ width,height Extents of the clipped operation
+ x_dest,y_dest Unclipped destination-relative operation coordinate
+ x_source,y_source Unclipped source-relative operation coordinate
+ x_mask,y_mask Unclipped mask-relative operation coordinate
+
+One thing we want to know is what the offset is from the original
+operation origin to the clipped origin
+
+ Destination drawable relative coordinates of the clipped operation:
+
+ x_dest_clipped = extents->x1 - dest->drawable.x
+ y_dest_clipped = extents->y1 - dest->drawable.y
+
+ Offset from the original operation origin:
+
+ x_off_clipped = x_dest_clipped - x_dest
+ y_off_clipped = y_dest_clipped - y_dest
+
+ Source drawable relative coordinates of the clipped operation:
+
+ x_source_clipped = x_source + x_off_clipped;
+ y_source_clipped = y_source + y_off_clipped;
+
+ Mask drawable relative coordinates of the clipped operation:
+
+ x_mask_clipped = x_source + x_off_clipped;
+ y_mask_clipped = y_source + y_off_clipped;
+
+This is where the original code fails -- it doesn't subtract the
+destination drawable location when computing the distance that the
+operation has been moved by clipping. Here's what it does when
+constructing a temporary source picture:
+
+ temp_src =
+ glamor_convert_gradient_picture(screen, source,
+ extent->x1 + x_source - x_dest,
+ extent->y1 + y_source - y_dest,
+ width, height);
+ ...
+ x_temp_src = -extent->x1 + x_dest;
+ y_temp_src = -extent->y1 + y_dest;
+
+glamor_convert_gradient_picture needs source drawable relative
+coordinates, but that is not what it's getting; it's getting
+screen-relative coordinates for the destination, adjusted by the
+distance between the provided source and destination operation
+coordinates. We want x_source_clipped and y_source_clipped:
+
+ x_source_clipped = x_source + x_off_clipped
+ = x_source + x_dest_clipped - x_dest
+ = x_source + extents->x1 - dest->drawable.x - x_dest
+
+x_temp_src/y_temp_src are supposed to be the coordinates of the original
+operation translated to the temporary picture:
+
+ x_temp_src = x_source - x_source_clipped;
+ y_temp_src = y_source - y_source_clipped;
+
+Note that x_source_clipped/y_source_clipped will never be less than
+x_source/y_source because all we're doing is clipping. This means that
+x_temp_src/y_temp_src will always be non-positive; the original source
+coordinate can never be strictly *inside* the temporary image or we
+could have made the temporary image smaller.
+
+ x_temp_src = x_source - x_source_clipped
+ = x_source - (x_source + x_off_clipped)
+ = -x_off_clipped
+ = x_dest - x_dest_clipped
+ = x_dest - (extents->x1 - dest->drawable.x)
+
+Again, this is off by the destination origin within the screen
+coordinate space.
+
+The code should look like:
+
+ temp_src =
+ glamor_convert_gradient_picture(screen, source,
+ extent->x1 + x_source - x_dest - dest->pDrawable->x,
+ extent->y1 + y_source - y_dest - dest->pDrawable->y,
+ width, height);
+
+ x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x;
+ y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y;
+
+Signed-off-by: Keith Packard <keithp@keithp.com>
+Reviewed-by: Markus Wick <markus@selfnet.de>
+(cherry picked from commit 55f5bfb578e934319d1308cbb56c900c5ac7cfa7)
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ glamor/glamor_render.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git xorg-server-1.16.0/glamor/glamor_render.c xorg-server-1.16.0/glamor/glamor_render.c
+index 14ab738..e5d5d2c 100644
+--- xorg-server-1.16.0/glamor/glamor_render.c
++++ xorg-server-1.16.0/glamor/glamor_render.c
+@@ -1450,8 +1450,8 @@ glamor_composite_clipped_region(CARD8 op,
+ || source_pixmap->drawable.height != height)))) {
+ temp_src =
+ glamor_convert_gradient_picture(screen, source,
+- extent->x1 + x_source - x_dest,
+- extent->y1 + y_source - y_dest,
++ extent->x1 + x_source - x_dest - dest->pDrawable->x,
++ extent->y1 + y_source - y_dest - dest->pDrawable->y,
+ width, height);
+ if (!temp_src) {
+ temp_src = source;
+@@ -1459,8 +1459,8 @@ glamor_composite_clipped_region(CARD8 op,
+ }
+ temp_src_priv =
+ glamor_get_pixmap_private((PixmapPtr) (temp_src->pDrawable));
+- x_temp_src = -extent->x1 + x_dest;
+- y_temp_src = -extent->y1 + y_dest;
++ x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x;
++ y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y;
+ }
+
+ if (mask
+@@ -1474,8 +1474,8 @@ glamor_composite_clipped_region(CARD8 op,
+ * to do reduce one convertion. */
+ temp_mask =
+ glamor_convert_gradient_picture(screen, mask,
+- extent->x1 + x_mask - x_dest,
+- extent->y1 + y_mask - y_dest,
++ extent->x1 + x_mask - x_dest - dest->pDrawable->x,
++ extent->y1 + y_mask - y_dest - dest->pDrawable->y,
+ width, height);
+ if (!temp_mask) {
+ temp_mask = mask;
+@@ -1483,8 +1483,8 @@ glamor_composite_clipped_region(CARD8 op,
+ }
+ temp_mask_priv =
+ glamor_get_pixmap_private((PixmapPtr) (temp_mask->pDrawable));
+- x_temp_mask = -extent->x1 + x_dest;
+- y_temp_mask = -extent->y1 + y_dest;
++ x_temp_mask = -extent->x1 + x_dest + dest->pDrawable->x;
++ y_temp_mask = -extent->y1 + y_dest + dest->pDrawable->y;
+ }
+ /* Do two-pass PictOpOver componentAlpha, until we enable
+ * dual source color blending.
+--
+2.0.4
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0001mieqFixacrashregressioninmieqProcessDeviceEvenpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch (124091 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch 2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-From 07389f7dc7504bcd3892b1031446fd3eb2573c7c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 19 Jul 2014 17:08:09 -0700
-Subject: [PATCH] mieq: Fix a crash regression in mieqProcessDeviceEvent
-
-(lldb) bt
-* thread #6: tid = 0x92d4eb, 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0,
-screen=0x0000000000000000) + 36 at mieq.c:519, stop reason = EXC_BAD_ACCESS (code=1, address=0x44)
- * frame #0: 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0, screen=0x0000000000000000) + 36 at
-mieq.c:519
- frame #1: 0x00000001001df3eb X11.bin`mieqProcessInputEvents + 555 at mieq.c:631
- frame #2: 0x0000000100017674 X11.bin`ProcessInputEvents + 20 at darwinEvents.c:422
- frame #3: 0x0000000100175eaa X11.bin`Dispatch + 154 at dispatch.c:357
- frame #4: 0x0000000100181b4a X11.bin`dix_main(argc=4, argv=0x00007fff5fbff750, envp=0x00007fff5fbff650) + 1594 at main.c:296
- frame #5: 0x000000010001ba80 X11.bin`server_thread(arg=0x0000000101208220) + 64 at quartzStartup.c:66
- frame #6: 0x00007fff89bb9899 libsystem_pthread.dylib`_pthread_body + 138
- frame #7: 0x00007fff89bb972a libsystem_pthread.dylib`_pthread_start + 137
- frame #8: 0x00007fff89bbdfc9 libsystem_pthread.dylib`thread_start + 13
-
-Regression from: 9fb08310b51b46736f3ca8dbc04efdf502420403
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-CC: Peter Hutterer <peter.hutterer@who-t.net>
----
- mi/mieq.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mi/mieq.c b/mi/mieq.c
-index 872ff93..aced60d 100644
---- a/mi/mieq.c
-+++ b/mi/mieq.c
-@@ -516,7 +516,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen)
- verify_internal_event(event);
-
- /* refuse events from disabled devices */
-- if (!dev->enabled)
-+ if (dev && !dev->enabled)
- return;
-
- /* Custom event handler */
---
-2.0.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0002mieqFixacrashregressioninmieqProcessDeviceEvenpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch (0 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+From a793483e38bfb8af19877f69e873c1776de18d1f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 19 Jul 2014 17:08:09 -0700
+Subject: [PATCH 2/4] mieq: Fix a crash regression in mieqProcessDeviceEvent
+
+(lldb) bt
+* thread #6: tid = 0x92d4eb, 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0,
+screen=0x0000000000000000) + 36 at mieq.c:519, stop reason = EXC_BAD_ACCESS (code=1, address=0x44)
+ * frame #0: 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0, screen=0x0000000000000000) + 36 at
+mieq.c:519
+ frame #1: 0x00000001001df3eb X11.bin`mieqProcessInputEvents + 555 at mieq.c:631
+ frame #2: 0x0000000100017674 X11.bin`ProcessInputEvents + 20 at darwinEvents.c:422
+ frame #3: 0x0000000100175eaa X11.bin`Dispatch + 154 at dispatch.c:357
+ frame #4: 0x0000000100181b4a X11.bin`dix_main(argc=4, argv=0x00007fff5fbff750, envp=0x00007fff5fbff650) + 1594 at main.c:296
+ frame #5: 0x000000010001ba80 X11.bin`server_thread(arg=0x0000000101208220) + 64 at quartzStartup.c:66
+ frame #6: 0x00007fff89bb9899 libsystem_pthread.dylib`_pthread_body + 138
+ frame #7: 0x00007fff89bb972a libsystem_pthread.dylib`_pthread_start + 137
+ frame #8: 0x00007fff89bbdfc9 libsystem_pthread.dylib`thread_start + 13
+
+Regression from: 9fb08310b51b46736f3ca8dbc04efdf502420403
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+(cherry picked from commit 1faa76670572e3478965fd2cd9ab60ab2d865e3a)
+---
+ mi/mieq.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git xorg-server-1.16.0/mi/mieq.c xorg-server-1.16.0/mi/mieq.c
+index 872ff93..8907a6e 100644
+--- xorg-server-1.16.0/mi/mieq.c
++++ xorg-server-1.16.0/mi/mieq.c
+@@ -516,7 +516,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen)
+ verify_internal_event(event);
+
+ /* refuse events from disabled devices */
+- if (!dev->enabled)
++ if (dev && !dev->enabled)
+ return;
+
+ /* Custom event handler */
+--
+2.0.4
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0003ListenOnOpenFDRemoveResetssincethisisintendedpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch (0 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+From b7a24467f738bfd9437e8de02ed5e44409054185 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Wed, 23 Jul 2014 11:53:33 -0700
+Subject: [PATCH 3/4] ListenOnOpenFD: Remove Resets since this is intended to
+ be for hotplugging connections
+
+pharris says that the resets should not be done in the hotplugging case.
+
+This may fix a crash reported against XQuartz:
+http://xquartz.macosforge.org/trac/ticket/869
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Reviewed-by: Peter Harris <pharris@opentext.com>
+(cherry picked from commit dfbc6a1a78ff3192baae6f7f2af98b6e51422f75)
+---
+ os/connection.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git xorg-server-1.16.0/os/connection.c xorg-server-1.16.0/os/connection.c
+index 40d9ff3..f915e12 100644
+--- xorg-server-1.16.0/os/connection.c
++++ xorg-server-1.16.0/os/connection.c
+@@ -1307,13 +1307,6 @@ ListenOnOpenFD(int fd, int noxauth)
+
+ /* Increment the count */
+ ListenTransCount++;
+-
+- /* This *might* not be needed... /shrug */
+- ResetAuthorization();
+- ResetHosts(display);
+-#ifdef XDMCP
+- XdmcpReset();
+-#endif
+ }
+
+ /* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */
+--
+2.0.4
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0004XQuartzBettersupportturningoffDisplayshaveseppatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch (0 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+From af2e9e3bb173885106f041f89b9f39b57fe3550a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon, 11 Aug 2014 13:15:24 -0700
+Subject: [PATCH 4/4] XQuartz: Better support turning off "Displays have
+ separate Spaces" on OS X Mavericks
+
+http://xquartz.macosforge.org/trac/ticket/1876
+
+Follow-up to: 1c10b37380d228b35db8a8616a6312ac54f5e59b
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+(cherry picked from commit ab32ee35890be51137b56525826ffe219b63eb88)
+---
+ hw/xquartz/xpr/xprScreen.c | 23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c
+index 7aa1ae1..d0a525f 100644
+--- xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c
++++ xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c
+@@ -169,14 +169,25 @@ displayScreenBounds(CGDirectDisplayID id)
+ (int)frame.size.width, (int)frame.size.height,
+ (int)frame.origin.x, (int)frame.origin.y);
+
+- /* Remove menubar to help standard X11 window managers.
+- * On Mavericks and later, the menu bar is on all displays.
+- */
+- if (XQuartzIsRootless
++ Boolean spacePerDisplay = false;
+ #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
+- && (NSAppKitVersionNumber >= 1265 || (frame.origin.x == 0 && frame.origin.y == 0))
++ if (NSAppKitVersionNumber >= 1265)
+ #endif
+- ) {
++ {
++ Boolean ok;
++ (void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces"));
++ spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"),
++ CFSTR("com.apple.spaces"),
++ &ok);
++ if (!ok)
++ spacePerDisplay = true;
++ }
++
++ /* Remove menubar to help standard X11 window managers.
++ * On Mavericks and later, the menu bar is on all displays when spans-displays is false or unset.
++ */
++ if (XQuartzIsRootless &&
++ (spacePerDisplay || (frame.origin.x == 0 && frame.origin.y == 0))) {
+ frame.origin.y += aquaMenuBarHeight;
+ frame.size.height -= aquaMenuBarHeight;
+ }
+--
+2.0.4
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5000sdksymsshUseCPPFLAGSnotCFLAGSpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch (124091 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From f2126ef96002eda432e1974f14a914dc075ef017 Mon Sep 17 00:00:00 2001
</del><ins>+From fcc77206683e2e13d8287598599fa2a2bffe336c Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston <jeremyhu@apple.com>
</span><span class="cx"> Date: Fri, 13 Jan 2012 12:00:57 -0800
</span><del>-Subject: [PATCH 5000/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS
</del><ins>+Subject: [PATCH 5000/5005] sdksyms.sh: Use CPPFLAGS, not CFLAGS
</ins><span class="cx">
</span><span class="cx"> CFLAGS can include flags which are not useful to the preprocessor
</span><span class="cx"> or can even cause it to fail. This fixes a build issue on darwin
</span><span class="lines">@@ -13,10 +13,10 @@
</span><span class="cx"> hw/xfree86/Makefile.am | 5 ++---
</span><span class="cx"> 1 file changed, 2 insertions(+), 3 deletions(-)
</span><span class="cx">
</span><del>-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
</del><ins>+diff --git server-1.16-branch/hw/xfree86/Makefile.am server-1.16-branch/hw/xfree86/Makefile.am
</ins><span class="cx"> index c5992c3..71b6769 100644
</span><del>---- a/hw/xfree86/Makefile.am
-+++ b/hw/xfree86/Makefile.am
</del><ins>+--- server-1.16-branch/hw/xfree86/Makefile.am
++++ server-1.16-branch/hw/xfree86/Makefile.am
</ins><span class="cx"> @@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
</span><span class="cx"> bin_PROGRAMS = Xorg
</span><span class="cx"> nodist_Xorg_SOURCES = sdksyms.c
</span><span class="lines">@@ -37,5 +37,5 @@
</span><span class="cx"> SDKSYMS_DEP = sdksyms.dep
</span><span class="cx"> -include $(SDKSYMS_DEP)
</span><span class="cx"> --
</span><del>-2.0.1
</del><ins>+2.0.4
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5001WorkaroundtheGCclippingprobleminmiPaintWindowpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch (124091 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 2f09ff191ef3a03a992d15f6f8176db0892d32f4 Mon Sep 17 00:00:00 2001
</del><ins>+From 1b47538d15f803b3ae45feb0d092b991118940bb Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston <jeremyhu@apple.com>
</span><span class="cx"> Date: Fri, 30 Apr 2010 13:08:25 -0700
</span><del>-Subject: [PATCH 5001/5004] Workaround the GC clipping problem in miPaintWindow
</del><ins>+Subject: [PATCH 5001/5005] Workaround the GC clipping problem in miPaintWindow
</ins><span class="cx"> and add some debugging output.
</span><span class="cx">
</span><span class="cx"> Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
</span><span class="lines">@@ -9,10 +9,10 @@
</span><span class="cx"> mi/miexpose.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
</span><span class="cx"> 1 file changed, 94 insertions(+), 10 deletions(-)
</span><span class="cx">
</span><del>-diff --git a/mi/miexpose.c b/mi/miexpose.c
</del><ins>+diff --git server-1.16-branch/mi/miexpose.c server-1.16-branch/mi/miexpose.c
</ins><span class="cx"> index 198c433..ad1621d 100644
</span><del>---- a/mi/miexpose.c
-+++ b/mi/miexpose.c
</del><ins>+--- server-1.16-branch/mi/miexpose.c
++++ server-1.16-branch/mi/miexpose.c
</ins><span class="cx"> @@ -489,7 +489,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
</span><span class="cx"> void RootlessStartDrawing(WindowPtr pWin);
</span><span class="cx"> void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
</span><span class="lines">@@ -161,5 +161,5 @@
</span><span class="cx"> pbox = RegionRects(prgn);
</span><span class="cx"> for (i = numRects; --i >= 0; pbox++, prect++) {
</span><span class="cx"> --
</span><del>-2.0.1
</del><ins>+2.0.4
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5002UseoldmiTrapezoidsandmiTrianglesroutinespatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch (124091 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch 2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From 8a899939a369a04a31d5c1d118079845890127d4 Mon Sep 17 00:00:00 2001
</del><ins>+From 29c3bb27a56a6120b583a0ff4e36b4ae8b13c002 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 2 Nov 2013 11:00:23 -0700
</span><del>-Subject: [PATCH 5002/5004] Use old miTrapezoids and miTriangles routines
</del><ins>+Subject: [PATCH 5002/5005] Use old miTrapezoids and miTriangles routines
</ins><span class="cx">
</span><span class="cx"> Reverts commits:
</span><span class="cx"> 788ccb9a8bcf6a4fb4054c507111eec3338fb969
</span><span class="lines">@@ -18,10 +18,10 @@
</span><span class="cx"> render/mitri.c | 61 +++++++++++++++++++++++++++++++
</span><span class="cx"> 5 files changed, 201 insertions(+), 4 deletions(-)
</span><span class="cx">
</span><del>-diff --git a/fb/fbpict.c b/fb/fbpict.c
</del><ins>+diff --git server-1.16-branch/fb/fbpict.c server-1.16-branch/fb/fbpict.c
</ins><span class="cx"> index 21baf89..65eb2a4 100644
</span><del>---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
</del><ins>+--- server-1.16-branch/fb/fbpict.c
++++ server-1.16-branch/fb/fbpict.c
</ins><span class="cx"> @@ -507,10 +507,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</span><span class="cx"> ps->UnrealizeGlyph = fbUnrealizeGlyph;
</span><span class="cx"> ps->CompositeRects = miCompositeRects;
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx">
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><del>-diff --git a/render/mipict.c b/render/mipict.c
</del><ins>+diff --git server-1.16-branch/render/mipict.c server-1.16-branch/render/mipict.c
</ins><span class="cx"> index 3959fc4..2bb1a1d 100644
</span><del>---- a/render/mipict.c
-+++ b/render/mipict.c
</del><ins>+--- server-1.16-branch/render/mipict.c
++++ server-1.16-branch/render/mipict.c
</ins><span class="cx"> @@ -595,8 +595,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</span><span class="cx"> ps->Composite = 0; /* requires DDX support */
</span><span class="cx"> ps->Glyphs = miGlyphs;
</span><span class="lines">@@ -48,10 +48,10 @@
</span><span class="cx">
</span><span class="cx"> ps->RasterizeTrapezoid = 0; /* requires DDX support */
</span><span class="cx"> ps->AddTraps = 0; /* requires DDX support */
</span><del>-diff --git a/render/mipict.h b/render/mipict.h
</del><ins>+diff --git server-1.16-branch/render/mipict.h server-1.16-branch/render/mipict.h
</ins><span class="cx"> index a16dd31..ee90b58 100644
</span><del>---- a/render/mipict.h
-+++ b/render/mipict.h
</del><ins>+--- server-1.16-branch/render/mipict.h
++++ server-1.16-branch/render/mipict.h
</ins><span class="cx"> @@ -122,6 +122,16 @@ miCompositeRects(CARD8 op,
</span><span class="cx"> xRenderColor * color, int nRect, xRectangle *rects);
</span><span class="cx">
</span><span class="lines">@@ -97,10 +97,10 @@
</span><span class="cx"> miPointFixedBounds(int npoint, xPointFixed * points, BoxPtr bounds);
</span><span class="cx">
</span><span class="cx"> extern _X_EXPORT void
</span><del>-diff --git a/render/mitrap.c b/render/mitrap.c
</del><ins>+diff --git server-1.16-branch/render/mitrap.c server-1.16-branch/render/mitrap.c
</ins><span class="cx"> index 17b6dcd..71c1857 100644
</span><del>---- a/render/mitrap.c
-+++ b/render/mitrap.c
</del><ins>+--- server-1.16-branch/render/mitrap.c
++++ server-1.16-branch/render/mitrap.c
</ins><span class="cx"> @@ -34,6 +34,55 @@
</span><span class="cx"> #include "picturestr.h"
</span><span class="cx"> #include "mipict.h"
</span><span class="lines">@@ -223,10 +223,10 @@
</span><span class="cx"> + miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
</span><span class="cx"> + }
</span><span class="cx"> +}
</span><del>-diff --git a/render/mitri.c b/render/mitri.c
</del><ins>+diff --git server-1.16-branch/render/mitri.c server-1.16-branch/render/mitri.c
</ins><span class="cx"> index 922f22a..bdca9ca 100644
</span><del>---- a/render/mitri.c
-+++ b/render/mitri.c
</del><ins>+--- server-1.16-branch/render/mitri.c
++++ server-1.16-branch/render/mitri.c
</ins><span class="cx"> @@ -65,3 +65,64 @@ miTriangleBounds(int ntri, xTriangle * tris, BoxPtr bounds)
</span><span class="cx"> {
</span><span class="cx"> miPointFixedBounds(ntri * 3, (xPointFixed *) tris, bounds);
</span><span class="lines">@@ -293,5 +293,5 @@
</span><span class="cx"> +}
</span><span class="cx"> +
</span><span class="cx"> --
</span><del>-2.0.1
</del><ins>+2.0.4
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5003fbRevertfbchangesthatbrokeXQuartzpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch (124091 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From f71e2f31e251f314aff23085f59bbbc79522b8d9 Mon Sep 17 00:00:00 2001
</del><ins>+From 0c3bf02ba1982bcfce8cef13bd0afa11c49fe796 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston <jeremyhu@apple.com>
</span><span class="cx"> Date: Fri, 12 Feb 2010 19:48:52 -0800
</span><del>-Subject: [PATCH 5003/5004] fb: Revert fb changes that broke XQuartz
</del><ins>+Subject: [PATCH 5003/5005] fb: Revert fb changes that broke XQuartz
</ins><span class="cx">
</span><span class="cx"> http://bugs.freedesktop.org/show_bug.cgi?id=26124
</span><span class="cx">
</span><span class="lines">@@ -20,10 +20,10 @@
</span><span class="cx"> fb/fbtrap.c | 43 ++++++++++++++------------------
</span><span class="cx"> 3 files changed, 43 insertions(+), 85 deletions(-)
</span><span class="cx">
</span><del>-diff --git a/fb/fb.h b/fb/fb.h
</del><ins>+diff --git server-1.16-branch/fb/fb.h server-1.16-branch/fb/fb.h
</ins><span class="cx"> index 9057767..f584154 100644
</span><del>---- a/fb/fb.h
-+++ b/fb/fb.h
</del><ins>+--- server-1.16-branch/fb/fb.h
++++ server-1.16-branch/fb/fb.h
</ins><span class="cx"> @@ -1652,8 +1652,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
</span><span class="cx"> RegionPtr pRegion, FbBits and, FbBits xor);
</span><span class="cx">
</span><span class="lines">@@ -34,10 +34,10 @@
</span><span class="cx">
</span><span class="cx"> extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
</span><span class="cx">
</span><del>-diff --git a/fb/fbpict.c b/fb/fbpict.c
</del><ins>+diff --git server-1.16-branch/fb/fbpict.c server-1.16-branch/fb/fbpict.c
</ins><span class="cx"> index 65eb2a4..e7a3811 100644
</span><del>---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
</del><ins>+--- server-1.16-branch/fb/fbpict.c
++++ server-1.16-branch/fb/fbpict.c
</ins><span class="cx"> @@ -46,23 +46,18 @@ fbComposite(CARD8 op,
</span><span class="cx"> INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
</span><span class="cx"> {
</span><span class="lines">@@ -213,10 +213,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><del>-diff --git a/fb/fbtrap.c b/fb/fbtrap.c
</del><ins>+diff --git server-1.16-branch/fb/fbtrap.c server-1.16-branch/fb/fbtrap.c
</ins><span class="cx"> index bf82f8f..0145ce9 100644
</span><del>---- a/fb/fbtrap.c
-+++ b/fb/fbtrap.c
</del><ins>+--- server-1.16-branch/fb/fbtrap.c
++++ server-1.16-branch/fb/fbtrap.c
</ins><span class="cx"> @@ -36,13 +36,12 @@ fbAddTraps(PicturePtr pPicture,
</span><span class="cx"> INT16 x_off, INT16 y_off, int ntrap, xTrap * traps)
</span><span class="cx"> {
</span><span class="lines">@@ -312,5 +312,5 @@
</span><span class="cx">
</span><span class="cx"> DamageRegionProcessPending(pDst->pDrawable);
</span><span class="cx"> --
</span><del>-2.0.1
</del><ins>+2.0.4
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5004fbRevertfbchangesthatbrokeXQuartzpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch (124091 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch 2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>-From bccceaa79183e23d7a3c60f36acd537e2f0d6564 Mon Sep 17 00:00:00 2001
</del><ins>+From 923740dfc55b0b7e3495cbbd0a6a6a8fe86189fd Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 31 May 2014 13:14:20 -0700
</span><del>-Subject: [PATCH 5004/5004] fb: Revert fb changes that broke XQuartz
</del><ins>+Subject: [PATCH 5004/5005] fb: Revert fb changes that broke XQuartz
</ins><span class="cx">
</span><span class="cx"> http://bugs.freedesktop.org/show_bug.cgi?id=26124
</span><span class="cx">
</span><span class="lines">@@ -19,10 +19,10 @@
</span><span class="cx"> fb/fbscreen.c | 1 -
</span><span class="cx"> 4 files changed, 2 insertions(+), 166 deletions(-)
</span><span class="cx">
</span><del>-diff --git a/fb/fb.h b/fb/fb.h
</del><ins>+diff --git server-1.16-branch/fb/fb.h server-1.16-branch/fb/fb.h
</ins><span class="cx"> index f584154..25a7eff 100644
</span><del>---- a/fb/fb.h
-+++ b/fb/fb.h
</del><ins>+--- server-1.16-branch/fb/fb.h
++++ server-1.16-branch/fb/fb.h
</ins><span class="cx"> @@ -1310,9 +1310,6 @@ extern _X_EXPORT void
</span><span class="cx"> extern _X_EXPORT Bool
</span><span class="cx"> fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> /*
</span><span class="cx"> * fbpixmap.c
</span><span class="cx"> */
</span><del>-diff --git a/fb/fbpict.c b/fb/fbpict.c
</del><ins>+diff --git server-1.16-branch/fb/fbpict.c server-1.16-branch/fb/fbpict.c
</ins><span class="cx"> index e7a3811..276ff06 100644
</span><del>---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
</del><ins>+--- server-1.16-branch/fb/fbpict.c
++++ server-1.16-branch/fb/fbpict.c
</ins><span class="cx"> @@ -65,152 +65,6 @@ fbComposite(CARD8 op,
</span><span class="cx"> free_pixman_pict(pDst, dest);
</span><span class="cx"> }
</span><span class="lines">@@ -200,10 +200,10 @@
</span><span class="cx"> ps->CompositeRects = miCompositeRects;
</span><span class="cx"> ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
</span><span class="cx"> ps->AddTraps = fbAddTraps;
</span><del>-diff --git a/fb/fbpict.h b/fb/fbpict.h
</del><ins>+diff --git server-1.16-branch/fb/fbpict.h server-1.16-branch/fb/fbpict.h
</ins><span class="cx"> index 8b0f59f..110f32d 100644
</span><del>---- a/fb/fbpict.h
-+++ b/fb/fbpict.h
</del><ins>+--- server-1.16-branch/fb/fbpict.h
++++ server-1.16-branch/fb/fbpict.h
</ins><span class="cx"> @@ -65,24 +65,11 @@ fbTrapezoids(CARD8 op,
</span><span class="cx"> INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps);
</span><span class="cx">
</span><span class="lines">@@ -230,10 +230,10 @@
</span><span class="cx"> - GlyphPtr *glyphs);
</span><span class="cx"> -
</span><span class="cx"> #endif /* _FBPICT_H_ */
</span><del>-diff --git a/fb/fbscreen.c b/fb/fbscreen.c
</del><ins>+diff --git server-1.16-branch/fb/fbscreen.c server-1.16-branch/fb/fbscreen.c
</ins><span class="cx"> index 0d4d87f..e6ff1bd 100644
</span><del>---- a/fb/fbscreen.c
-+++ b/fb/fbscreen.c
</del><ins>+--- server-1.16-branch/fb/fbscreen.c
++++ server-1.16-branch/fb/fbscreen.c
</ins><span class="cx"> @@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen)
</span><span class="cx"> int d;
</span><span class="cx"> DepthPtr depths = pScreen->allowedDepths;
</span><span class="lines">@@ -243,5 +243,5 @@
</span><span class="cx"> free(depths[d].vids);
</span><span class="cx"> free(depths);
</span><span class="cx"> --
</span><del>-2.0.1
</del><ins>+2.0.4
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5005XQuartzAdvertiseGLX_ARB_create_contextandGLX_ARBpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server/files/5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch (0 => 124092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch 2014-08-18 20:24:06 UTC (rev 124092)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+From 73ed5a39e3a6955834abe13a347dd70c5248a347 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 1 Jun 2014 04:29:19 -0700
+Subject: [PATCH 5005/5005] XQuartz: Advertise GLX_ARB_create_context and
+ GLX_ARB_create_context_profile
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ hw/xquartz/GL/indirect.c | 40 ++++++++++++++++++++++++++++++++++------
+ 1 file changed, 34 insertions(+), 6 deletions(-)
+
+diff --git server-1.16-branch/hw/xquartz/GL/indirect.c server-1.16-branch/hw/xquartz/GL/indirect.c
+index 19b7d86..d8f836d 100644
+--- server-1.16-branch/hw/xquartz/GL/indirect.c
++++ server-1.16-branch/hw/xquartz/GL/indirect.c
+@@ -52,6 +52,7 @@
+
+ #include "visualConfigs.h"
+ #include "dri.h"
++#include "extension_string.h"
+
+ #include "darwin.h"
+ #define GLAQUA_DEBUG_MSG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", \
+@@ -111,6 +112,10 @@ typedef struct __GLXAquaDrawable __GLXAquaDrawable;
+ */
+ struct __GLXAquaScreen {
+ __GLXscreen base;
++
++ /* Supported GLX extensions */
++ unsigned char glx_enable_bits[__GLX_EXT_BYTES];
++
+ int index;
+ int num_vis;
+ };
+@@ -541,13 +546,36 @@ __glXAquaScreenProbe(ScreenPtr pScreen)
+
+ screen->base.GLXmajor = 1;
+ screen->base.GLXminor = 4;
+- screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "
+- "GLX_SGIS_multisample "
+- "GLX_ARB_multisample "
+- "GLX_EXT_visual_info "
+- "GLX_EXT_import_context ");
+
+- /*We may be able to add more GLXextensions at a later time. */
++ memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES);
++
++ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info");
++ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating");
++ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");
++ __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");
++ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");
++
++ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample");
++ __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample");
++
++ __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context");
++ __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context_profile");
++
++ // Generate the GLX extensions string (overrides that set by __glXScreenInit())
++ {
++ unsigned int buffer_size =
++ __glXGetExtensionString(screen->glx_enable_bits, NULL);
++ if (buffer_size > 0) {
++ free(screen->base.GLXextensions);
++
++ screen->base.GLXextensions = xnfalloc(buffer_size);
++ __glXGetExtensionString(screen->glx_enable_bits,
++ screen->base.GLXextensions);
++ }
++ }
++
++ // Override the GL extensions string set by __glXScreenInit()
++ //screen->base.GLextensions = strdup(glGetString(GL_EXTENSIONS));
+
+ return &screen->base;
+ }
+--
+2.0.4
+
</ins></span></pre>
</div>
</div>
</body>
</html>