<!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>[120521] 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/120521">120521</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-05-31 02:50:38 -0700 (Sat, 31 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server: Bump to 1.15.1</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="#trunkdportsx11xorgserverfiles5002fbRevertfbchangesthatbrokeXQuartzpatch">trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.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="#trunkdportsx11xorgserverfiles5004UseoldmiTrapezoidsandmiTrianglesroutinespatch">trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.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 (120520 => 120521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/Portfile 2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/Portfile 2014-05-31 09:50:38 UTC (rev 120521)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> name xorg-server
</span><span class="cx"> conflicts xorg-server-devel
</span><span class="cx"> set my_name xorg-server
</span><del>-version 1.14.6
</del><ins>+version 1.15.1
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx"> dist_subdir ${my_name}
</span><span class="cx"> distname ${my_name}-${version}
</span><span class="cx">
</span><del>-checksums sha1 257fe290829a685f5bba5809bb1b422b6dae68a5 \
- rmd160 e8062894d922ff3bad79dd50057c257fae1f18b7 \
- sha256 e8b33f09f6adf706dfd2636990730d7fed6538adf346f78a6c685cf0c3dda730
</del><ins>+checksums sha1 746e533213db8190bf8d71efd54587fd5b5b6511 \
+ rmd160 b805ab772cf1161e07ccbbeee1090629bf4e3bbe \
+ sha256 626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2
</ins><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx"> use_parallel_build yes
</span><span class="lines">@@ -38,6 +38,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,7 @@
</span><span class="cx"> port:xorg-libAppleWM \
</span><span class="cx"> port:xorg-libXfixes
</span><span class="cx">
</span><del>-# https://trac.macports.org/ticket/36055
</del><ins>+# https://trac.macports.org/ticket/36055
</ins><span class="cx"> compiler.blacklist gcc-4.0
</span><span class="cx">
</span><span class="cx"> configure.args --with-apple-applications-dir=${applications_dir} \
</span><span class="lines">@@ -75,7 +76,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="trunkdportsx11xorgserverfiles5000sdksymsshUseCPPFLAGSnotCFLAGSpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch (120520 => 120521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2014-05-31 09:50:38 UTC (rev 120521)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From d36a301fb3d0f2c7a3d81cbda3fd21d8d36038e5 Mon Sep 17 00:00:00 2001
</del><ins>+From b877aca8da4fec52875cbf03646ffad0ffd31ae1 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">@@ -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 15670d0..b35e464 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>+@@ -43,8 +43,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
+
+@@ -118,7 +117,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.4.1
</del><ins>+1.9.1
</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 (120520 => 120521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2014-05-31 09:50:38 UTC (rev 120521)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 9ca14507a31338fad40d430445a4a4cb8106bc9b Mon Sep 17 00:00:00 2001
</del><ins>+From 152a52f607d68c65683eebc61cbb288ec2670b2a 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">@@ -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.4.1
</del><ins>+1.9.1
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5002fbRevertfbchangesthatbrokeXQuartzpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch (120520 => 120521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2014-05-31 09:50:38 UTC (rev 120521)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 07f9e0beaf66ec9de1455a305c87ab642968f3f1 Mon Sep 17 00:00:00 2001
</del><ins>+From eb871812950497a7d11a3cf1ee0e7427813c7ffb 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/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 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.4.1
</del><ins>+1.9.1
</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 (120520 => 120521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2014-05-31 09:50:38 UTC (rev 120521)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 4a0444a2773bddc3abbf5305a344001ecfe9378c Mon Sep 17 00:00:00 2001
</del><ins>+From 1ab1cd8c2732d33624fc7e72d763836dbffc0d3a Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Tue, 18 Dec 2012 01:03:38 -0800
</span><span class="cx"> Subject: [PATCH 5003/5004] fb: Revert fb changes that broke XQuartz
</span><span class="lines">@@ -9,30 +9,16 @@
</span><span class="cx">
</span><span class="cx"> This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
</span><span class="cx"> ---
</span><del>- configure.ac | 2 +-
</del><span class="cx"> fb/fb.h | 3 --
</span><del>- fb/fbpict.c | 153 +---------------------------------------------------------
</del><ins>+ fb/fbpict.c | 149 +---------------------------------------------------------
</ins><span class="cx"> fb/fbscreen.c | 1 -
</span><del>- 4 files changed, 2 insertions(+), 157 deletions(-)
</del><ins>+ 3 files changed, 1 insertion(+), 152 deletions(-)
</ins><span class="cx">
</span><del>-diff --git a/configure.ac b/configure.ac
-index 8797df5..99a1e62 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -811,7 +811,7 @@ LIBPCIACCESS="pciaccess >= 0.12.901"
- LIBUDEV="libudev >= 143"
- LIBSELINUX="libselinux >= 2.0.86"
- LIBDBUS="dbus-1 >= 1.0"
--LIBPIXMAN="pixman-1 >= 0.27.2"
-+LIBPIXMAN="pixman-1 >= 0.21.8"
-
- dnl Pixman is always required, but we separate it out so we can link
- dnl specific modules against it
</del><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">@@ -43,10 +29,10 @@
</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 80c2a91..dc0ca3c 100644
</del><ins>+index 7c2ead5..dc0ca3c 100644
</ins><span class="cx"> --- a/fb/fbpict.c
</span><span class="cx"> +++ b/fb/fbpict.c
</span><del>-@@ -65,156 +65,6 @@ fbComposite(CARD8 op,
</del><ins>+@@ -65,152 +65,6 @@ fbComposite(CARD8 op,
</ins><span class="cx"> free_pixman_pict(pDst, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -165,19 +151,15 @@
</span><span class="cx"> - if (maskFormat) {
</span><span class="cx"> - pixman_format_code_t format;
</span><span class="cx"> - pixman_box32_t extents;
</span><del>-- int x, y;
</del><span class="cx"> -
</span><span class="cx"> - format = maskFormat->format | (maskFormat->depth << 24);
</span><span class="cx"> -
</span><span class="cx"> - pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
</span><span class="cx"> -
</span><del>-- x = extents.x1;
-- y = extents.y1;
--
</del><span class="cx"> - pixman_composite_glyphs(op, srcImage, dstImage, format,
</span><span class="cx"> - xSrc + srcXoff + xDst, ySrc + srcYoff + yDst,
</span><del>-- x, y,
-- x + dstXoff, y + dstYoff,
</del><ins>+- extents.x1, extents.y1,
+- extents.x1 + dstXoff, extents.y1 + dstYoff,
</ins><span class="cx"> - extents.x2 - extents.x1,
</span><span class="cx"> - extents.y2 - extents.y1,
</span><span class="cx"> - glyphCache, n_glyphs, pglyphs);
</span><span class="lines">@@ -203,7 +185,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>-@@ -473,8 +323,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</del><ins>+@@ -469,8 +323,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">@@ -226,5 +208,5 @@
</span><span class="cx"> free(depths[d].vids);
</span><span class="cx"> free(depths);
</span><span class="cx"> --
</span><del>-1.8.4.1
</del><ins>+1.9.1
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5004UseoldmiTrapezoidsandmiTrianglesroutinespatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch (120520 => 120521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch 2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch 2014-05-31 09:50:38 UTC (rev 120521)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From bd9fce8b74f5358e4d7e5ce9b5cdd8fd195bb3fd Mon Sep 17 00:00:00 2001
</del><ins>+From 0b41adb9994696d40ef1ce66b5c70d867581f8a9 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 5004/5004] Use old miTrapezoids and miTriangles routines
</span><span class="lines">@@ -293,5 +293,5 @@
</span><span class="cx"> +}
</span><span class="cx"> +
</span><span class="cx"> --
</span><del>-1.8.4.1
</del><ins>+1.9.1
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>