<!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>[114841] 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/114841">114841</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2013-12-17 09:34:13 -0800 (Tue, 17 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server-devel: Bump to current git master</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="#trunkdportsx11xorgserverdevelfiles5002fbRevertfbchangesthatbrokeXQuartzpatch">trunk/dports/x11/xorg-server-devel/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.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>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverdevelfiles0001XQuartzEnsuredixconfighisincludedincapabilitpatch">trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles0002osEnsuredixconfighisincludedinstrndupcpatch">trunk/dports/x11/xorg-server-devel/files/0002-os-Ensure-dix-config.h-is-included-in-strndup.c.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 (114840 => 114841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/Portfile 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2013-12-17 17:34:13 UTC (rev 114841)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> name xorg-server-devel
</span><span class="cx"> conflicts xorg-server
</span><span class="cx"> set my_name xorg-server
</span><del>-version 1.14.99.0
</del><ins>+version 1.14.99.904
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -16,7 +16,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 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f
</del><ins>+git.branch 4d62646142718024b0981eb4f1fd0131e829161f
</ins><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> port:xorg-fontsproto \
</span><span class="cx"> port:xorg-glproto \
</span><span class="cx"> port:xorg-inputproto \
</span><ins>+ port:xorg-presentproto \
</ins><span class="cx"> port:xorg-randrproto \
</span><span class="cx"> port:xorg-recordproto \
</span><span class="cx"> port:xorg-renderproto \
</span><span class="lines">@@ -65,7 +66,9 @@
</span><span class="cx"> --without-fop \
</span><span class="cx"> --without-xmlto \
</span><span class="cx"> --disable-devel-docs \
</span><del>- --with-sha1=CommonCrypto
</del><ins>+ --with-sha1=CommonCrypto \
+ --disable-dri2 \
+ --disable-dri3
</ins><span class="cx">
</span><span class="cx"> # GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
</span><span class="cx"> configure.cppflags-append -I/usr/include -I${filespath}/dri
</span></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles0001XQuartzEnsuredixconfighisincludedincapabilitpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch (114840 => 114841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch 2013-12-17 17:34:13 UTC (rev 114841)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-From f09da85558f816c8d6c72bc2f986aba598ca517a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 9 Feb 2013 20:34:33 -0800
-Subject: [PATCH 1/2] XQuartz: Ensure <dix-config.h> is included in
- capabilities.c
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- hw/xquartz/GL/capabilities.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
-index 4702595..5573629 100644
---- a/hw/xquartz/GL/capabilities.c
-+++ b/hw/xquartz/GL/capabilities.c
-@@ -20,6 +20,10 @@
- * DEALINGS IN THE SOFTWARE.
- */
-
-+#ifdef HAVE_DIX_CONFIG_H
-+#include <dix-config.h>
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
---
-1.8.1.2
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles0002osEnsuredixconfighisincludedinstrndupcpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server-devel/files/0002-os-Ensure-dix-config.h-is-included-in-strndup.c.patch (114840 => 114841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/0002-os-Ensure-dix-config.h-is-included-in-strndup.c.patch 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/0002-os-Ensure-dix-config.h-is-included-in-strndup.c.patch 2013-12-17 17:34:13 UTC (rev 114841)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-From c8b324bf154a32f902abd1090a76502ae1bf2674 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 9 Feb 2013 20:40:10 -0800
-Subject: [PATCH 2/2] os: Ensure <dix-config.h> is included in strndup.c
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- os/strndup.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/os/strndup.c b/os/strndup.c
-index b604b9b..e0eddf1 100644
---- a/os/strndup.c
-+++ b/os/strndup.c
-@@ -27,6 +27,10 @@
- * SUCH DAMAGE.
- */
-
-+#ifdef HAVE_DIX_CONFIG_H
-+#include <dix-config.h>
-+#endif
-+
- #include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
---
-1.8.1.2
-
</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 (114840 => 114841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2013-12-17 17:34:13 UTC (rev 114841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 2cad1b044ebe3007b9c18fce0525c75aeccde309 Mon Sep 17 00:00:00 2001
</del><ins>+From 9de3e51e9a96476d032f208c537f4b4e7f80ccc9 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/5003] sdksyms.sh: Use CPPFLAGS, not CFLAGS
</span><span class="lines">@@ -10,31 +10,32 @@
</span><span class="cx"> Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
</span><span class="cx"> Reviewed-by: Keith Packard <keithp@keithp.com>
</span><span class="cx"> ---
</span><del>- hw/xfree86/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
</del><ins>+ hw/xfree86/Makefile.am | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
</ins><span class="cx">
</span><span class="cx"> diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
</span><del>-index c3899b5..4f48b85 100644
</del><ins>+index eea16a8..982f38d 100644
</ins><span class="cx"> --- a/hw/xfree86/Makefile.am
</span><span class="cx"> +++ b/hw/xfree86/Makefile.am
</span><del>-@@ -38,7 +38,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
</del><ins>+@@ -38,8 +38,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
</ins><span class="cx"> bin_PROGRAMS = Xorg
</span><span class="cx"> nodist_Xorg_SOURCES = sdksyms.c
</span><span class="cx">
</span><span class="cx"> -AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
</span><del>-+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
- INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
</del><ins>+-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
++AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
</ins><span class="cx"> -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
</span><del>- -I$(srcdir)/dri -I$(srcdir)/dri2
-@@ -115,7 +115,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
</del><ins>+ -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
+
+@@ -124,7 +123,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
</ins><span class="cx"> EXTRA_DIST += sdksyms.sh
</span><span class="cx">
</span><span class="cx"> sdksyms.dep sdksyms.c: sdksyms.sh
</span><del>-- $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(INCLUDES)
-+ $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES)
</del><ins>+- $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
++ $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS)
</ins><span class="cx">
</span><span class="cx"> SDKSYMS_DEP = sdksyms.dep
</span><span class="cx"> include $(SDKSYMS_DEP)
</span><span class="cx"> --
</span><del>-1.8.0.2
</del><ins>+1.8.4.1
</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 (114840 => 114841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2013-12-17 17:34:13 UTC (rev 114841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From b54625d24e217592ef5f00415c58e1622b4c8008 Mon Sep 17 00:00:00 2001
</del><ins>+From 601a16126ddd6af0d28b6f8e80bad2249f9a551b 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/5003] Workaround the GC clipping problem in miPaintWindow
</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>-1.8.0.2
</del><ins>+1.8.4.1
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles5002fbRevertfbchangesthatbrokeXQuartzpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server-devel/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch (114840 => 114841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2013-12-17 17:34:13 UTC (rev 114841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From fa26b51f4582e97b68a7ee9382147bc5b3c8cc3a Mon Sep 17 00:00:00 2001
</del><ins>+From 1c5fcdb4daa09fea865b89a4d8de7e3189b12836 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 5002/5003] 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 b869d12..895b148 100644
</del><ins>+index 26957df..1c6963f 100644
</ins><span class="cx"> --- a/fb/fb.h
</span><span class="cx"> +++ b/fb/fb.h
</span><del>-@@ -1686,8 +1686,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
</del><ins>+@@ -1652,8 +1652,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 2804ff4..80c2a91 100644
</del><ins>+index b503858..7c2ead5 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">@@ -67,7 +67,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> free_pixman_pict(pSrc, src);
</span><del>-@@ -293,20 +288,22 @@ create_conical_gradient_image(PictGradient * gradient)
</del><ins>+@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static pixman_image_t *
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> stride * sizeof(FbStride));
</span><span class="cx">
</span><span class="cx"> if (!image)
</span><del>-@@ -333,57 +330,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
</del><ins>+@@ -329,57 +326,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
</ins><span class="cx"> if (pict->clientClipType != CT_NONE)
</span><span class="cx"> pixman_image_set_has_client_clip(image, TRUE);
</span><span class="cx">
</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>-@@ -411,10 +382,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</del><ins>+@@ -407,10 +378,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>-@@ -448,8 +417,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</del><ins>+@@ -444,8 +413,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>-@@ -457,7 +425,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</del><ins>+@@ -453,7 +421,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>-@@ -475,19 +443,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</del><ins>+@@ -471,19 +439,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>-1.8.0.2
</del><ins>+1.8.4.1
</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 (114840 => 114841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2013-12-17 17:34:13 UTC (rev 114841)
</span><span class="lines">@@ -1,20 +1,24 @@
</span><del>-commit 3153e51fac17b5e4976ced2d35b5c4e0fc0faf28
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue Dec 18 01:03:38 2012 -0800
</del><ins>+From 0c840c6310fdba5eda92823ef1c8adb052ccf9f7 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Tue, 18 Dec 2012 01:03:38 -0800
+Subject: [PATCH 5003/5003] fb: Revert fb changes that broke XQuartz
</ins><span class="cx">
</span><del>- fb: Revert fb changes that broke XQuartz
-
- http://bugs.freedesktop.org/show_bug.cgi?id=26124
-
- Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0"
-
- This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
</del><ins>+ http://bugs.freedesktop.org/show_bug.cgi?id=26124
</ins><span class="cx">
</span><ins>+Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0"
+
+This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
+---
+ fb/fb.h | 3 --
+ fb/fbpict.c | 149 +---------------------------------------------------------
+ fb/fbscreen.c | 1 -
+ 3 files changed, 1 insertion(+), 152 deletions(-)
+
</ins><span class="cx"> diff --git a/fb/fb.h b/fb/fb.h
</span><del>-index 895b148..cc5759c 100644
</del><ins>+index 1c6963f..11e6344 100644
</ins><span class="cx"> --- a/fb/fb.h
</span><span class="cx"> +++ b/fb/fb.h
</span><del>-@@ -1344,9 +1344,6 @@ extern _X_EXPORT void
</del><ins>+@@ -1310,9 +1310,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">@@ -203,3 +207,6 @@
</span><span class="cx"> for (d = 0; d < pScreen->numDepths; d++)
</span><span class="cx"> free(depths[d].vids);
</span><span class="cx"> free(depths);
</span><ins>+--
+1.8.4.1
+
</ins></span></pre>
</div>
</div>
</body>
</html>