[112843] trunk/dports/x11/xorg-server

jeremyhu at macports.org jeremyhu at macports.org
Sat Nov 2 11:06:16 PDT 2013


Revision: 112843
          https://trac.macports.org/changeset/112843
Author:   jeremyhu at macports.org
Date:     2013-11-02 11:06:16 -0700 (Sat, 02 Nov 2013)
Log Message:
-----------
xorg-server: Actually provide patches

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile
    trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
    trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
    trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
    trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch

Added Paths:
-----------
    trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch
    trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch
    trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2013-11-02 17:41:07 UTC (rev 112842)
+++ trunk/dports/x11/xorg-server/Portfile	2013-11-02 18:06:16 UTC (rev 112843)
@@ -86,7 +86,8 @@
 	5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
 	5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
 	5002-fb-Revert-fb-changes-that-broke-XQuartz.patch \
-	5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
+	5003-fb-Revert-fb-changes-that-broke-XQuartz.patch \
+	5004-Use-old-miTrapezoids-and-miTriangles-routines.patch
 
 patch.pre_args -p1
 

Added: trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch	2013-11-02 18:06:16 UTC (rev 112843)
@@ -0,0 +1,29 @@
+From 0a1628bca7b6c85054041312987b73e701aecb80 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 29 Oct 2013 11:06:55 -0700
+Subject: [PATCH 1/2] XQuartz: Bump bundle version to 2.7.5
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ hw/xquartz/bundle/Info.plist.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git xorg-server-1.14.4/hw/xquartz/bundle/Info.plist.cpp xorg-server-1.14.4/hw/xquartz/bundle/Info.plist.cpp
+index b0106c6..905952a 100644
+--- xorg-server-1.14.4/hw/xquartz/bundle/Info.plist.cpp
++++ xorg-server-1.14.4/hw/xquartz/bundle/Info.plist.cpp
+@@ -19,9 +19,9 @@
+ 	<key>CFBundlePackageType</key>
+ 		<string>APPL</string>
+ 	<key>CFBundleShortVersionString</key>
+-		<string>2.7.4</string>
++		<string>2.7.5</string>
+ 	<key>CFBundleVersion</key>
+-		<string>2.7.4</string>
++		<string>2.7.5</string>
+ 	<key>CFBundleSignature</key>
+ 		<string>x11a</string>
+ 	<key>CSResourcesFileMapped</key>
+-- 
+1.8.4.1
+

Added: trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch	2013-11-02 18:06:16 UTC (rev 112843)
@@ -0,0 +1,38 @@
+From 94b7f26aeda31cf55ff9b7c04f390ba6d35977e4 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Thu, 31 Oct 2013 08:57:56 -0700
+Subject: [PATCH 2/2] miext/damage: Partial revert of "Only wrap into the GC
+ ops chain if there's a listener (v3)"
+
+Fixes regression from: 4dc2a76740d921c824a4d8193f39dd373475f02a
+
+http://lists.x.org/archives/xorg-devel/2013-May/036241.html
+https://trac.macports.org/ticket/38993
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Reviewed-by: Adam Jackson <ajax at redhat.com>
+Signed-off-by: Keith Packard <keithp at keithp.com>
+(cherry picked from commit abf5d5ac12437ebe156b4dd500c2acd69eea3654)
+---
+ miext/damage/damage.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git xorg-server-1.14.4/miext/damage/damage.c xorg-server-1.14.4/miext/damage/damage.c
+index a98c20e..3dc3180 100644
+--- xorg-server-1.14.4/miext/damage/damage.c
++++ xorg-server-1.14.4/miext/damage/damage.c
+@@ -439,10 +439,7 @@ damageValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
+     drawableDamage(pDrawable);
+     DAMAGE_GC_FUNC_PROLOGUE(pGC);
+     (*pGC->funcs->ValidateGC) (pGC, changes, pDrawable);
+-    if (pDamage)
+-        pGCPriv->ops = pGC->ops; /* so it's not NULL, so FUNC_EPILOGUE does work */
+-    else
+-        pGCPriv->ops = NULL;
++    pGCPriv->ops = pGC->ops; /* just so it's not NULL */
+     DAMAGE_GC_FUNC_EPILOGUE(pGC);
+ }
+ 
+-- 
+1.8.4.1
+

Modified: trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch	2013-11-02 17:41:07 UTC (rev 112842)
+++ trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch	2013-11-02 18:06:16 UTC (rev 112843)
@@ -1,7 +1,7 @@
-From 2cad1b044ebe3007b9c18fce0525c75aeccde309 Mon Sep 17 00:00:00 2001
+From d36a301fb3d0f2c7a3d81cbda3fd21d8d36038e5 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu at apple.com>
 Date: Fri, 13 Jan 2012 12:00:57 -0800
-Subject: [PATCH 5000/5003] sdksyms.sh: Use CPPFLAGS, not CFLAGS
+Subject: [PATCH 5000/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS
 
 CFLAGS can include flags which are not useful to the preprocessor
 or can even cause it to fail.  This fixes a build issue on darwin
@@ -36,5 +36,5 @@
  SDKSYMS_DEP = sdksyms.dep
  include $(SDKSYMS_DEP)
 -- 
-1.8.0.2
+1.8.4.1
 

Modified: trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch	2013-11-02 17:41:07 UTC (rev 112842)
+++ trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch	2013-11-02 18:06:16 UTC (rev 112843)
@@ -1,7 +1,7 @@
-From b54625d24e217592ef5f00415c58e1622b4c8008 Mon Sep 17 00:00:00 2001
+From 9ca14507a31338fad40d430445a4a4cb8106bc9b Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu at apple.com>
 Date: Fri, 30 Apr 2010 13:08:25 -0700
-Subject: [PATCH 5001/5003] Workaround the GC clipping problem in miPaintWindow
+Subject: [PATCH 5001/5004] Workaround the GC clipping problem in miPaintWindow
  and add some debugging output.
 
 Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
@@ -161,5 +161,5 @@
      pbox = RegionRects(prgn);
      for (i = numRects; --i >= 0; pbox++, prect++) {
 -- 
-1.8.0.2
+1.8.4.1
 

Modified: trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch	2013-11-02 17:41:07 UTC (rev 112842)
+++ trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch	2013-11-02 18:06:16 UTC (rev 112843)
@@ -1,7 +1,7 @@
-From fa26b51f4582e97b68a7ee9382147bc5b3c8cc3a Mon Sep 17 00:00:00 2001
+From 07f9e0beaf66ec9de1455a305c87ab642968f3f1 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu at apple.com>
 Date: Fri, 12 Feb 2010 19:48:52 -0800
-Subject: [PATCH 5002/5003] fb: Revert fb changes that broke XQuartz
+Subject: [PATCH 5002/5004] fb: Revert fb changes that broke XQuartz
 
 http://bugs.freedesktop.org/show_bug.cgi?id=26124
 
@@ -312,5 +312,5 @@
  
          DamageRegionProcessPending(pDst->pDrawable);
 -- 
-1.8.0.2
+1.8.4.1
 

Modified: trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch	2013-11-02 17:41:07 UTC (rev 112842)
+++ trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch	2013-11-02 18:06:16 UTC (rev 112843)
@@ -1,7 +1,7 @@
-From b61545ca749f1b5da43f63dc847719d7ecbb9fd5 Mon Sep 17 00:00:00 2001
+From 4a0444a2773bddc3abbf5305a344001ecfe9378c Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Tue, 18 Dec 2012 01:03:38 -0800
-Subject: [PATCH 5003/5003] fb: Revert fb changes that broke XQuartz
+Subject: [PATCH 5003/5004] fb: Revert fb changes that broke XQuartz
 
     http://bugs.freedesktop.org/show_bug.cgi?id=26124
 
@@ -16,7 +16,7 @@
  4 files changed, 2 insertions(+), 157 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 435a38f..4629fdd 100644
+index 8797df5..99a1e62 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -811,7 +811,7 @@ LIBPCIACCESS="pciaccess >= 0.12.901"
@@ -226,5 +226,5 @@
          free(depths[d].vids);
      free(depths);
 -- 
-1.8.0.2
+1.8.4.1
 

Added: trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch	2013-11-02 18:06:16 UTC (rev 112843)
@@ -0,0 +1,297 @@
+From bd9fce8b74f5358e4d7e5ce9b5cdd8fd195bb3fd Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 2 Nov 2013 11:00:23 -0700
+Subject: [PATCH 5004/5004] Use old miTrapezoids and miTriangles routines
+
+Reverts commits:
+    788ccb9a8bcf6a4fb4054c507111eec3338fb969
+    566f1931ee2916269e164e114bffaf2da1d039d1
+
+http://xquartz.macosforge.org/trac/ticket/525
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ fb/fbpict.c     |   2 -
+ render/mipict.c |   4 +-
+ render/mipict.h |  27 ++++++++++++++
+ render/mitrap.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ render/mitri.c  |  61 +++++++++++++++++++++++++++++++
+ 5 files changed, 201 insertions(+), 4 deletions(-)
+
+diff --git a/fb/fbpict.c b/fb/fbpict.c
+index dc0ca3c..276ff06 100644
+--- a/fb/fbpict.c
++++ b/fb/fbpict.c
+@@ -326,10 +326,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+     ps->Glyphs = miGlyphs;
+     ps->CompositeRects = miCompositeRects;
+     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
+-    ps->Trapezoids = fbTrapezoids;
+     ps->AddTraps = fbAddTraps;
+     ps->AddTriangles = fbAddTriangles;
+-    ps->Triangles = fbTriangles;
+ 
+     return TRUE;
+ }
+diff --git a/render/mipict.c b/render/mipict.c
+index 2e64b20..d21b58a 100644
+--- a/render/mipict.c
++++ b/render/mipict.c
+@@ -595,8 +595,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+     ps->Composite = 0;          /* requires DDX support */
+     ps->Glyphs = miGlyphs;
+     ps->CompositeRects = miCompositeRects;
+-    ps->Trapezoids = 0;
+-    ps->Triangles = 0;
++    ps->Trapezoids = miTrapezoids;
++    ps->Triangles = miTriangles;
+ 
+     ps->RasterizeTrapezoid = 0; /* requires DDX support */
+     ps->AddTraps = 0;           /* requires DDX support */
+diff --git a/render/mipict.h b/render/mipict.h
+index 9436228..7ee2991 100644
+--- a/render/mipict.h
++++ b/render/mipict.h
+@@ -122,6 +122,16 @@ miCompositeRects(CARD8 op,
+                  xRenderColor * color, int nRect, xRectangle *rects);
+ 
+ extern _X_EXPORT void
++miTriangles (CARD8	    op,
++	     PicturePtr	    pSrc,
++	     PicturePtr	    pDst,
++	     PictFormatPtr  maskFormat,
++	     INT16	    xSrc,
++	     INT16	    ySrc,
++	     int	    ntri,
++	     xTriangle	    *tris);
++
++extern _X_EXPORT void
+ 
+ miTriStrip(CARD8 op,
+            PicturePtr pSrc,
+@@ -137,10 +147,27 @@ miTriFan(CARD8 op,
+          PictFormatPtr maskFormat,
+          INT16 xSrc, INT16 ySrc, int npoints, xPointFixed * points);
+ 
++extern _X_EXPORT PicturePtr
++miCreateAlphaPicture (ScreenPtr	    pScreen, 
++		      PicturePtr    pDst,
++		      PictFormatPtr pPictFormat,
++		      CARD16	    width,
++		      CARD16	    height);
++
+ extern _X_EXPORT void
+  miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box);
+ 
+ extern _X_EXPORT void
++miTrapezoids (CARD8        op,
++             PicturePtr    pSrc,
++             PicturePtr    pDst,
++             PictFormatPtr maskFormat,
++             INT16         xSrc,
++             INT16         ySrc,
++             int           ntrap,
++             xTrapezoid    *traps);
++
++extern _X_EXPORT void
+  miPointFixedBounds(int npoint, xPointFixed * points, BoxPtr bounds);
+ 
+ extern _X_EXPORT void
+diff --git a/render/mitrap.c b/render/mitrap.c
+index 17b6dcd..71c1857 100644
+--- a/render/mitrap.c
++++ b/render/mitrap.c
+@@ -34,6 +34,55 @@
+ #include "picturestr.h"
+ #include "mipict.h"
+ 
++PicturePtr
++miCreateAlphaPicture (ScreenPtr	    pScreen, 
++		      PicturePtr    pDst,
++		      PictFormatPtr pPictFormat,
++		      CARD16	    width,
++		      CARD16	    height)
++{
++    PixmapPtr	    pPixmap;
++    PicturePtr	    pPicture;
++    GCPtr	    pGC;
++    int		    error;
++    xRectangle	    rect;
++
++    if (width > 32767 || height > 32767)
++	return 0;
++
++    if (!pPictFormat)
++    {
++	if (pDst->polyEdge == PolyEdgeSharp)
++	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
++	else
++	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
++	if (!pPictFormat)
++	    return 0;
++    }
++
++    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 
++					pPictFormat->depth, 0);
++    if (!pPixmap)
++	return 0;
++    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
++    if (!pGC)
++    {
++	(*pScreen->DestroyPixmap) (pPixmap);
++	return 0;
++    }
++    ValidateGC (&pPixmap->drawable, pGC);
++    rect.x = 0;
++    rect.y = 0;
++    rect.width = width;
++    rect.height = height;
++    (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
++    FreeScratchGC (pGC);
++    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
++			      0, 0, serverClient, &error);
++    (*pScreen->DestroyPixmap) (pPixmap);
++    return pPicture;
++}
++
+ static xFixed
+ miLineFixedX(xLineFixed * l, xFixed y, Bool ceil)
+ {
+@@ -79,3 +128,65 @@ miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box)
+             box->x2 = x2;
+     }
+ }
++
++
++void
++miTrapezoids (CARD8        op,
++             PicturePtr    pSrc,
++             PicturePtr    pDst,
++             PictFormatPtr maskFormat,
++             INT16         xSrc,
++             INT16         ySrc,
++             int           ntrap,
++             xTrapezoid    *traps)
++{
++    ScreenPtr          pScreen = pDst->pDrawable->pScreen;
++    PictureScreenPtr    ps = GetPictureScreen(pScreen);
++
++    /*
++     * Check for solid alpha add
++     */
++    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
++    {
++       for (; ntrap; ntrap--, traps++)
++           (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
++    } 
++    else if (maskFormat)
++    {
++       PicturePtr      pPicture;
++       BoxRec          bounds;
++       INT16           xDst, yDst;
++       INT16           xRel, yRel;
++       
++       xDst = traps[0].left.p1.x >> 16;
++       yDst = traps[0].left.p1.y >> 16;
++
++       miTrapezoidBounds (ntrap, traps, &bounds);
++       if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
++           return;
++       pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
++                                        bounds.x2 - bounds.x1,
++                                        bounds.y2 - bounds.y1);
++       if (!pPicture)
++           return;
++       for (; ntrap; ntrap--, traps++)
++           (*ps->RasterizeTrapezoid) (pPicture, traps, 
++                                      -bounds.x1, -bounds.y1);
++       xRel = bounds.x1 + xSrc - xDst;
++       yRel = bounds.y1 + ySrc - yDst;
++       CompositePicture (op, pSrc, pPicture, pDst,
++                         xRel, yRel, 0, 0, bounds.x1, bounds.y1,
++                         bounds.x2 - bounds.x1,
++                         bounds.y2 - bounds.y1);
++       FreePicture (pPicture, 0);
++    }
++    else
++    {
++       if (pDst->polyEdge == PolyEdgeSharp)
++           maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
++       else
++           maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
++       for (; ntrap; ntrap--, traps++)
++           miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
++    }
++}
+diff --git a/render/mitri.c b/render/mitri.c
+index 922f22a..bdca9ca 100644
+--- a/render/mitri.c
++++ b/render/mitri.c
+@@ -65,3 +65,64 @@ miTriangleBounds(int ntri, xTriangle * tris, BoxPtr bounds)
+ {
+     miPointFixedBounds(ntri * 3, (xPointFixed *) tris, bounds);
+ }
++
++
++void
++miTriangles (CARD8	    op,
++	     PicturePtr	    pSrc,
++	     PicturePtr	    pDst,
++	     PictFormatPtr  maskFormat,
++	     INT16	    xSrc,
++	     INT16	    ySrc,
++	     int	    ntri,
++	     xTriangle	    *tris)
++{
++    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
++    PictureScreenPtr    ps = GetPictureScreen(pScreen);
++    
++    /*
++     * Check for solid alpha add
++     */
++    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
++    {
++	(*ps->AddTriangles) (pDst, 0, 0, ntri, tris);
++    }
++    else if (maskFormat)
++    {
++	BoxRec		bounds;
++	PicturePtr	pPicture;
++	INT16		xDst, yDst;
++	INT16		xRel, yRel;
++	
++	xDst = tris[0].p1.x >> 16;
++	yDst = tris[0].p1.y >> 16;
++
++	miTriangleBounds (ntri, tris, &bounds);
++	if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
++	    return;
++	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
++					 bounds.x2 - bounds.x1,
++					 bounds.y2 - bounds.y1);
++	if (!pPicture)
++	    return;
++	(*ps->AddTriangles) (pPicture, -bounds.x1, -bounds.y1, ntri, tris);
++	
++	xRel = bounds.x1 + xSrc - xDst;
++	yRel = bounds.y1 + ySrc - yDst;
++	CompositePicture (op, pSrc, pPicture, pDst,
++			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
++			  bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
++	FreePicture (pPicture, 0);
++    }
++    else
++    {
++	if (pDst->polyEdge == PolyEdgeSharp)
++	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
++	else
++	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
++	
++	for (; ntri; ntri--, tris++)
++	    miTriangles (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, tris);
++    }
++}
++
+-- 
+1.8.4.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131102/4c782398/attachment-0001.html>


More information about the macports-changes mailing list