<!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>[132694] trunk/dports/x11/xorg-server-devel</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/132694">132694</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-02-07 15:15:22 -0800 (Sat, 07 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server-devel: Update to a slightly newer (but not master) xorg-server</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverdevelPortfile">trunk/dports/x11/xorg-server-devel/Portfile</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles5000sdksymsshUseCPPFLAGSnotCFLAGSpatch">trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles5001WorkaroundtheGCclippingprobleminmiPaintWindowpatch">trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles5002UseoldmiTrapezoidsandmiTrianglesroutinespatch">trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles5003fbRevertfbchangesthatbrokeXQuartzpatch">trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles5004fbRevertfbchangesthatbrokeXQuartzpatch">trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverdevelfiles0001ListenOnOpenFDRemoveResetssincethisisintendedpatch">trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles0001mieqFixacrashregressioninmieqProcessDeviceEvenpatch">trunk/dports/x11/xorg-server-devel/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorgserverdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server-devel/Portfile (132693 => 132694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/Portfile 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2015-02-07 23:15:22 UTC (rev 132694)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> conflicts xorg-server
</span><span class="cx"> set my_name xorg-server
</span><span class="cx"> version 1.16.99.1
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">
</span><span class="cx"> fetch.type git
</span><span class="cx"> git.url git://anongit.freedesktop.org/xorg/xserver
</span><del>-git.branch cff12936275db2f71f6d24f9ea0985a0d14af454
</del><ins>+git.branch e572bcc7f4236b7e0f23ab762f225b3bce37db59
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="lines">@@ -81,8 +81,6 @@
</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 \
- 0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch \
</del><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></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles0001ListenOnOpenFDRemoveResetssincethisisintendedpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch (132693 => 132694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch 2015-02-07 23:15:22 UTC (rev 132694)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-From 2996b9bff99882f2bcd7eaf5540d2e6eb78fa668 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] ListenOnOpenFD: Remove Resets since this is intended to be
- for hotplugging connections
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-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>
-CC: Peter Harris <pharris@opentext.com>
-CC: Kristian Høgsberg <krh@bitplanet.net>
----
- os/connection.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/os/connection.c b/os/connection.c
-index 40d9ff3..f915e12 100644
---- a/os/connection.c
-+++ b/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.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles0001mieqFixacrashregressioninmieqProcessDeviceEvenpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server-devel/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch (132693 => 132694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch 2015-02-07 23:15:22 UTC (rev 132694)
</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="trunkdportsx11xorgserverdevelfiles5000sdksymsshUseCPPFLAGSnotCFLAGSpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch (132693 => 132694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2015-02-07 23:15:22 UTC (rev 132694)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From f2126ef96002eda432e1974f14a914dc075ef017 Mon Sep 17 00:00:00 2001
</del><ins>+From 19ba0d4ad155a66fcdbda925a1509273263db805 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><span class="cx"> Subject: [PATCH 5000/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> 1 file changed, 2 insertions(+), 3 deletions(-)
</span><span class="cx">
</span><span class="cx"> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
</span><del>-index c5992c3..71b6769 100644
</del><ins>+index 30f7c8f..22156d4 100644
</ins><span class="cx"> --- a/hw/xfree86/Makefile.am
</span><span class="cx"> +++ b/hw/xfree86/Makefile.am
</span><span class="cx"> @@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
</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.3.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles5001WorkaroundtheGCclippingprobleminmiPaintWindowpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch (132693 => 132694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2015-02-07 23:15:22 UTC (rev 132694)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 2f09ff191ef3a03a992d15f6f8176db0892d32f4 Mon Sep 17 00:00:00 2001
</del><ins>+From 21b64fe49a2a26d0d57ce135a72a12c9736f5866 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><span class="cx"> Subject: [PATCH 5001/5004] Workaround the GC clipping problem in miPaintWindow
</span><span class="lines">@@ -10,10 +10,10 @@
</span><span class="cx"> 1 file changed, 94 insertions(+), 10 deletions(-)
</span><span class="cx">
</span><span class="cx"> diff --git a/mi/miexpose.c b/mi/miexpose.c
</span><del>-index 198c433..ad1621d 100644
</del><ins>+index de8ee6c..a6678a5 100644
</ins><span class="cx"> --- a/mi/miexpose.c
</span><span class="cx"> +++ b/mi/miexpose.c
</span><del>-@@ -489,7 +489,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
</del><ins>+@@ -408,7 +408,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
</ins><span class="cx"> void RootlessStartDrawing(WindowPtr pWin);
</span><span class="cx"> void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
</span><span class="cx"> Bool IsFramedWindow(WindowPtr pWin);
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> void
</span><span class="cx"> miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
</span><del>-@@ -518,23 +519,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
</del><ins>+@@ -437,23 +438,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
</ins><span class="cx"> Bool solid = TRUE;
</span><span class="cx"> DrawablePtr drawable = &pWin->drawable;
</span><span class="cx">
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> while (pWin->backgroundState == ParentRelative)
</span><span class="cx"> pWin = pWin->parent;
</span><span class="cx">
</span><del>-@@ -559,6 +574,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
</del><ins>+@@ -478,6 +493,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
</ins><span class="cx"> else {
</span><span class="cx"> PixmapPtr pixmap;
</span><span class="cx">
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> tile_x_off = drawable->x;
</span><span class="cx"> tile_y_off = drawable->y;
</span><span class="cx">
</span><del>-@@ -567,6 +594,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
</del><ins>+@@ -486,6 +513,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
</ins><span class="cx"> return;
</span><span class="cx"> pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
</span><span class="cx"> drawable = &pixmap->drawable;
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> #ifdef COMPOSITE
</span><span class="cx"> draw_x_off = pixmap->screen_x;
</span><span class="cx"> draw_y_off = pixmap->screen_y;
</span><del>-@@ -629,6 +662,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
</del><ins>+@@ -548,6 +581,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
</ins><span class="cx"> ChangeGC(NullClient, pGC, gcmask, gcval);
</span><span class="cx"> ValidateGC(drawable, pGC);
</span><span class="cx">
</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.3.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles5002UseoldmiTrapezoidsandmiTrianglesroutinespatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch (132693 => 132694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch 2015-02-07 23:15:22 UTC (rev 132694)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 8a899939a369a04a31d5c1d118079845890127d4 Mon Sep 17 00:00:00 2001
</del><ins>+From 07c2bb05052b9084055ed27e9c3637bfddabea41 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><span class="cx"> Subject: [PATCH 5002/5004] Use old miTrapezoids and miTriangles routines
</span><span class="lines">@@ -19,10 +19,10 @@
</span><span class="cx"> 5 files changed, 201 insertions(+), 4 deletions(-)
</span><span class="cx">
</span><span class="cx"> diff --git a/fb/fbpict.c b/fb/fbpict.c
</span><del>-index 21baf89..65eb2a4 100644
</del><ins>+index 7a9e46a..8e99cbe 100644
</ins><span class="cx"> --- a/fb/fbpict.c
</span><span class="cx"> +++ b/fb/fbpict.c
</span><del>-@@ -507,10 +507,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</del><ins>+@@ -499,10 +499,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</ins><span class="cx"> ps->UnrealizeGlyph = fbUnrealizeGlyph;
</span><span class="cx"> ps->CompositeRects = miCompositeRects;
</span><span class="cx"> ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
</span><span class="lines">@@ -34,10 +34,10 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx"> diff --git a/render/mipict.c b/render/mipict.c
</span><del>-index 3959fc4..2bb1a1d 100644
</del><ins>+index a725104..e14293a 100644
</ins><span class="cx"> --- a/render/mipict.c
</span><span class="cx"> +++ b/render/mipict.c
</span><del>-@@ -595,8 +595,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</del><ins>+@@ -575,8 +575,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</ins><span class="cx"> ps->Composite = 0; /* requires DDX support */
</span><span class="cx"> ps->Glyphs = miGlyphs;
</span><span class="cx"> ps->CompositeRects = miCompositeRects;
</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.3.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles5003fbRevertfbchangesthatbrokeXQuartzpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch (132693 => 132694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-02-07 23:15:22 UTC (rev 132694)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From f71e2f31e251f314aff23085f59bbbc79522b8d9 Mon Sep 17 00:00:00 2001
</del><ins>+From e21b429acf631776d3ebe14c3d5db9fa7f3656d7 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><span class="cx"> Subject: [PATCH 5003/5004] fb: Revert fb changes that broke XQuartz
</span><span class="lines">@@ -21,10 +21,10 @@
</span><span class="cx"> 3 files changed, 43 insertions(+), 85 deletions(-)
</span><span class="cx">
</span><span class="cx"> diff --git a/fb/fb.h b/fb/fb.h
</span><del>-index 9057767..f584154 100644
</del><ins>+index 5099b0f..dd91cae 100644
</ins><span class="cx"> --- a/fb/fb.h
</span><span class="cx"> +++ b/fb/fb.h
</span><del>-@@ -1652,8 +1652,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
</del><ins>+@@ -1383,8 +1383,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
</ins><span class="cx"> RegionPtr pRegion, FbBits and, FbBits xor);
</span><span class="cx">
</span><span class="cx"> extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
</span><span class="cx">
</span><span class="cx"> diff --git a/fb/fbpict.c b/fb/fbpict.c
</span><del>-index 65eb2a4..e7a3811 100644
</del><ins>+index 8e99cbe..2ff9ae2 100644
</ins><span class="cx"> --- a/fb/fbpict.c
</span><span class="cx"> +++ b/fb/fbpict.c
</span><span class="cx"> @@ -46,23 +46,18 @@ fbComposite(CARD8 op,
</span><span class="lines">@@ -97,8 +97,8 @@
</span><span class="cx"> stride * sizeof(FbStride));
</span><span class="cx">
</span><span class="cx"> if (!image)
</span><del>-@@ -329,57 +326,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
- if (pict->clientClipType != CT_NONE)
</del><ins>+@@ -321,57 +318,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+ if (pict->clientClip)
</ins><span class="cx"> pixman_image_set_has_client_clip(image, TRUE);
</span><span class="cx">
</span><span class="cx"> - if (*xoff || *yoff)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (pict->repeatType) {
</span><del>-@@ -407,10 +378,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</del><ins>+@@ -399,10 +370,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</ins><span class="cx"> * as the alpha map for this operation
</span><span class="cx"> */
</span><span class="cx"> if (pict->alphaMap && !is_alpha_map) {
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x,
</span><span class="cx"> pict->alphaOrigin.y);
</span><del>-@@ -444,8 +413,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</del><ins>+@@ -436,8 +405,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static pixman_image_t *
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> {
</span><span class="cx"> pixman_image_t *image = NULL;
</span><span class="cx">
</span><del>-@@ -453,7 +421,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</del><ins>+@@ -445,7 +413,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</ins><span class="cx"> return NULL;
</span><span class="cx">
</span><span class="cx"> if (pict->pDrawable) {
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> }
</span><span class="cx"> else if (pict->pSourcePict) {
</span><span class="cx"> SourcePict *sp = pict->pSourcePict;
</span><del>-@@ -471,19 +439,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</del><ins>+@@ -463,19 +431,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</ins><span class="cx"> else if (sp->type == SourcePictTypeConical)
</span><span class="cx"> image = create_conical_gradient_image(gradient);
</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.3.0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles5004fbRevertfbchangesthatbrokeXQuartzpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch (132693 => 132694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-02-07 23:15:22 UTC (rev 132694)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From bccceaa79183e23d7a3c60f36acd537e2f0d6564 Mon Sep 17 00:00:00 2001
</del><ins>+From 1298d92e044632b04d5693db7ac695ff709d2183 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><span class="cx"> Subject: [PATCH 5004/5004] fb: Revert fb changes that broke XQuartz
</span><span class="lines">@@ -20,10 +20,10 @@
</span><span class="cx"> 4 files changed, 2 insertions(+), 166 deletions(-)
</span><span class="cx">
</span><span class="cx"> diff --git a/fb/fb.h b/fb/fb.h
</span><del>-index f584154..25a7eff 100644
</del><ins>+index dd91cae..0b3bc95 100644
</ins><span class="cx"> --- a/fb/fb.h
</span><span class="cx"> +++ b/fb/fb.h
</span><del>-@@ -1310,9 +1310,6 @@ extern _X_EXPORT void
</del><ins>+@@ -1135,9 +1135,6 @@ extern _X_EXPORT void
</ins><span class="cx"> extern _X_EXPORT Bool
</span><span class="cx"> fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
</span><span class="cx">
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> * fbpixmap.c
</span><span class="cx"> */
</span><span class="cx"> diff --git a/fb/fbpict.c b/fb/fbpict.c
</span><del>-index e7a3811..276ff06 100644
</del><ins>+index 2ff9ae2..9c4cc42 100644
</ins><span class="cx"> --- a/fb/fbpict.c
</span><span class="cx"> +++ b/fb/fbpict.c
</span><span class="cx"> @@ -65,152 +65,6 @@ fbComposite(CARD8 op,
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> static pixman_image_t *
</span><span class="cx"> create_solid_fill_image(PicturePtr pict)
</span><span class="cx"> {
</span><del>-@@ -469,8 +323,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</del><ins>+@@ -461,8 +315,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</ins><span class="cx"> return FALSE;
</span><span class="cx"> ps = GetPictureScreen(pScreen);
</span><span class="cx"> ps->Composite = fbComposite;
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> -
</span><span class="cx"> #endif /* _FBPICT_H_ */
</span><span class="cx"> diff --git a/fb/fbscreen.c b/fb/fbscreen.c
</span><del>-index 0d4d87f..e6ff1bd 100644
</del><ins>+index 71bcc5d..55330fc 100644
</ins><span class="cx"> --- a/fb/fbscreen.c
</span><span class="cx"> +++ b/fb/fbscreen.c
</span><span class="cx"> @@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen)
</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.3.0
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>