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

jeremyhu at macports.org jeremyhu at macports.org
Mon Aug 18 13:24:06 PDT 2014


Revision: 124092
          https://trac.macports.org/changeset/124092
Author:   jeremyhu at macports.org
Date:     2014-08-18 13:24:06 -0700 (Mon, 18 Aug 2014)
Log Message:
-----------
xorg-server: Update patches to match XQuartz 2.7.7 / 2.7.8_beta1

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-Use-old-miTrapezoids-and-miTriangles-routines.patch
    trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
    trunk/dports/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch

Added Paths:
-----------
    trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch
    trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch
    trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch
    trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch
    trunk/dports/x11/xorg-server/files/5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch

Removed Paths:
-------------
    trunk/dports/x11/xorg-server/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/Portfile	2014-08-18 20:24:06 UTC (rev 124092)
@@ -6,7 +6,7 @@
 conflicts       xorg-server-devel
 set my_name	xorg-server
 version		1.16.0
-revision        1
+revision        2
 categories	x11 devel
 license		X11
 maintainers	jeremyhu openmaintainer
@@ -88,12 +88,16 @@
 	RAWCPP=${configure.cpp}
 
 patchfiles \
-	0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch \
+	0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch \
+	0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch \
+	0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch \
+	0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch \
 	5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
 	5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
 	5002-Use-old-miTrapezoids-and-miTriangles-routines.patch \
 	5003-fb-Revert-fb-changes-that-broke-XQuartz.patch \
-	5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
+	5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \
+	5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch
 
 patch.pre_args -p1
 

Added: trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/0001-glamor-Fix-temp-picture-coordinates-in-glamor_compos.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -0,0 +1,182 @@
+From 3c0431b8911241552a15a43e4279c50658b50a18 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp at keithp.com>
+Date: Wed, 16 Jul 2014 16:03:23 -0700
+Subject: [PATCH 1/4] glamor: Fix temp picture coordinates in
+ glamor_composite_clipped_region
+
+To understand this patch, let's start at the protocol interface where
+the relationship between the coordinate spaces is documented:
+
+        static Bool
+        _glamor_composite(CARD8 op,
+                          PicturePtr source,
+                          PicturePtr mask,
+                          PicturePtr dest,
+                          INT16 x_source,
+                          INT16 y_source,
+                          INT16 x_mask,
+                          INT16 y_mask,
+                          INT16 x_dest, INT16 y_dest,
+                          CARD16 width, CARD16 height, Bool fallback)
+
+The coordinates are passed to this function directly off the wire and
+are all relative to their respective drawables. For Windows, this means
+that they are relative to the upper left corner of the window, in
+whatever pixmap that window is getting drawn to.
+
+_glamor_composite calls miComputeCompositeRegion to construct a clipped
+region to actually render to. In reality, miComputeCompositeRegion clips
+only to the destination these days; source clip region based clipping
+would have to respect the transform, which isn't really possible. The
+returned region is relative to the screen in which dest lives; offset by
+dest->drawable.x and dest->drawable.y.
+
+What is important to realize here is that, because of clipping, the
+composite region may not have the same position within the destination
+drawable as x_dest, y_dest. The protocol coordinates now exist solely to
+'pin' the three objects together.
+
+        extents->x1,y1		Screen origin of clipped operation
+        width,height            Extents of the clipped operation
+        x_dest,y_dest		Unclipped destination-relative operation coordinate
+        x_source,y_source	Unclipped source-relative operation coordinate
+        x_mask,y_mask		Unclipped mask-relative operation coordinate
+
+One thing we want to know is what the offset is from the original
+operation origin to the clipped origin
+
+        Destination drawable relative coordinates of the clipped operation:
+
+               x_dest_clipped = extents->x1 - dest->drawable.x
+               y_dest_clipped = extents->y1 - dest->drawable.y
+
+        Offset from the original operation origin:
+
+                x_off_clipped = x_dest_clipped - x_dest
+                y_off_clipped = y_dest_clipped - y_dest
+
+        Source drawable relative coordinates of the clipped operation:
+
+                x_source_clipped = x_source + x_off_clipped;
+                y_source_clipped = y_source + y_off_clipped;
+
+        Mask drawable relative coordinates of the clipped operation:
+
+                x_mask_clipped = x_source + x_off_clipped;
+                y_mask_clipped = y_source + y_off_clipped;
+
+This is where the original code fails -- it doesn't subtract the
+destination drawable location when computing the distance that the
+operation has been moved by clipping. Here's what it does when
+constructing a temporary source picture:
+
+        temp_src =
+            glamor_convert_gradient_picture(screen, source,
+                                            extent->x1 + x_source - x_dest,
+                                            extent->y1 + y_source - y_dest,
+                                            width, height);
+        ...
+        x_temp_src = -extent->x1 + x_dest;
+        y_temp_src = -extent->y1 + y_dest;
+
+glamor_convert_gradient_picture needs source drawable relative
+coordinates, but that is not what it's getting; it's getting
+screen-relative coordinates for the destination, adjusted by the
+distance between the provided source and destination operation
+coordinates. We want x_source_clipped and y_source_clipped:
+
+        x_source_clipped = x_source + x_off_clipped
+                         = x_source + x_dest_clipped - x_dest
+                         = x_source + extents->x1 - dest->drawable.x - x_dest
+
+x_temp_src/y_temp_src are supposed to be the coordinates of the original
+operation translated to the temporary picture:
+
+        x_temp_src = x_source - x_source_clipped;
+        y_temp_src = y_source - y_source_clipped;
+
+Note that x_source_clipped/y_source_clipped will never be less than
+x_source/y_source because all we're doing is clipping. This means that
+x_temp_src/y_temp_src will always be non-positive; the original source
+coordinate can never be strictly *inside* the temporary image or we
+could have made the temporary image smaller.
+
+        x_temp_src = x_source - x_source_clipped
+                   = x_source - (x_source + x_off_clipped)
+                   = -x_off_clipped
+                   = x_dest - x_dest_clipped
+                   = x_dest - (extents->x1 - dest->drawable.x)
+
+Again, this is off by the destination origin within the screen
+coordinate space.
+
+The code should look like:
+
+        temp_src =
+            glamor_convert_gradient_picture(screen, source,
+                                            extent->x1 + x_source - x_dest - dest->pDrawable->x,
+                                            extent->y1 + y_source - y_dest - dest->pDrawable->y,
+                                            width, height);
+
+        x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x;
+        y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y;
+
+Signed-off-by: Keith Packard <keithp at keithp.com>
+Reviewed-by: Markus Wick <markus at selfnet.de>
+(cherry picked from commit 55f5bfb578e934319d1308cbb56c900c5ac7cfa7)
+Signed-off-by: Julien Cristau <jcristau at debian.org>
+---
+ glamor/glamor_render.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git xorg-server-1.16.0/glamor/glamor_render.c xorg-server-1.16.0/glamor/glamor_render.c
+index 14ab738..e5d5d2c 100644
+--- xorg-server-1.16.0/glamor/glamor_render.c
++++ xorg-server-1.16.0/glamor/glamor_render.c
+@@ -1450,8 +1450,8 @@ glamor_composite_clipped_region(CARD8 op,
+                     || source_pixmap->drawable.height != height)))) {
+         temp_src =
+             glamor_convert_gradient_picture(screen, source,
+-                                            extent->x1 + x_source - x_dest,
+-                                            extent->y1 + y_source - y_dest,
++                                            extent->x1 + x_source - x_dest - dest->pDrawable->x,
++                                            extent->y1 + y_source - y_dest - dest->pDrawable->y,
+                                             width, height);
+         if (!temp_src) {
+             temp_src = source;
+@@ -1459,8 +1459,8 @@ glamor_composite_clipped_region(CARD8 op,
+         }
+         temp_src_priv =
+             glamor_get_pixmap_private((PixmapPtr) (temp_src->pDrawable));
+-        x_temp_src = -extent->x1 + x_dest;
+-        y_temp_src = -extent->y1 + y_dest;
++        x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x;
++        y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y;
+     }
+ 
+     if (mask
+@@ -1474,8 +1474,8 @@ glamor_composite_clipped_region(CARD8 op,
+          * to do reduce one convertion. */
+         temp_mask =
+             glamor_convert_gradient_picture(screen, mask,
+-                                            extent->x1 + x_mask - x_dest,
+-                                            extent->y1 + y_mask - y_dest,
++                                            extent->x1 + x_mask - x_dest - dest->pDrawable->x,
++                                            extent->y1 + y_mask - y_dest - dest->pDrawable->y,
+                                             width, height);
+         if (!temp_mask) {
+             temp_mask = mask;
+@@ -1483,8 +1483,8 @@ glamor_composite_clipped_region(CARD8 op,
+         }
+         temp_mask_priv =
+             glamor_get_pixmap_private((PixmapPtr) (temp_mask->pDrawable));
+-        x_temp_mask = -extent->x1 + x_dest;
+-        y_temp_mask = -extent->y1 + y_dest;
++        x_temp_mask = -extent->x1 + x_dest + dest->pDrawable->x;
++        y_temp_mask = -extent->y1 + y_dest + dest->pDrawable->y;
+     }
+     /* Do two-pass PictOpOver componentAlpha, until we enable
+      * dual source color blending.
+-- 
+2.0.4
+

Deleted: trunk/dports/x11/xorg-server/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch	2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -1,43 +0,0 @@
-From 07389f7dc7504bcd3892b1031446fd3eb2573c7c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at 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 at apple.com>
-CC: Peter Hutterer <peter.hutterer at 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
-

Added: trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/0002-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -0,0 +1,44 @@
+From a793483e38bfb8af19877f69e873c1776de18d1f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 19 Jul 2014 17:08:09 -0700
+Subject: [PATCH 2/4] mieq: Fix a crash regression in mieqProcessDeviceEvent
+
+(lldb) bt
+* thread #6: tid = 0x92d4eb, 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0,
+screen=0x0000000000000000) + 36 at mieq.c:519, stop reason = EXC_BAD_ACCESS (code=1, address=0x44)
+  * frame #0: 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0, screen=0x0000000000000000) + 36 at
+mieq.c:519
+    frame #1: 0x00000001001df3eb X11.bin`mieqProcessInputEvents + 555 at mieq.c:631
+    frame #2: 0x0000000100017674 X11.bin`ProcessInputEvents + 20 at darwinEvents.c:422
+    frame #3: 0x0000000100175eaa X11.bin`Dispatch + 154 at dispatch.c:357
+    frame #4: 0x0000000100181b4a X11.bin`dix_main(argc=4, argv=0x00007fff5fbff750, envp=0x00007fff5fbff650) + 1594 at main.c:296
+    frame #5: 0x000000010001ba80 X11.bin`server_thread(arg=0x0000000101208220) + 64 at quartzStartup.c:66
+    frame #6: 0x00007fff89bb9899 libsystem_pthread.dylib`_pthread_body + 138
+    frame #7: 0x00007fff89bb972a libsystem_pthread.dylib`_pthread_start + 137
+    frame #8: 0x00007fff89bbdfc9 libsystem_pthread.dylib`thread_start + 13
+
+Regression from: 9fb08310b51b46736f3ca8dbc04efdf502420403
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit 1faa76670572e3478965fd2cd9ab60ab2d865e3a)
+---
+ mi/mieq.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git xorg-server-1.16.0/mi/mieq.c xorg-server-1.16.0/mi/mieq.c
+index 872ff93..8907a6e 100644
+--- xorg-server-1.16.0/mi/mieq.c
++++ xorg-server-1.16.0/mi/mieq.c
+@@ -516,7 +516,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen)
+     verify_internal_event(event);
+ 
+     /* refuse events from disabled devices */
+-    if (!dev->enabled)
++    if (dev && !dev->enabled)
+         return;
+ 
+     /* Custom event handler */
+-- 
+2.0.4
+

Added: trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/0003-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -0,0 +1,39 @@
+From b7a24467f738bfd9437e8de02ed5e44409054185 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 23 Jul 2014 11:53:33 -0700
+Subject: [PATCH 3/4] ListenOnOpenFD: Remove Resets since this is intended to
+ be for hotplugging connections
+
+pharris says that the resets should not be done in the hotplugging case.
+
+This may fix a crash reported against XQuartz:
+http://xquartz.macosforge.org/trac/ticket/869
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Reviewed-by: Peter Harris <pharris at opentext.com>
+(cherry picked from commit dfbc6a1a78ff3192baae6f7f2af98b6e51422f75)
+---
+ os/connection.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git xorg-server-1.16.0/os/connection.c xorg-server-1.16.0/os/connection.c
+index 40d9ff3..f915e12 100644
+--- xorg-server-1.16.0/os/connection.c
++++ xorg-server-1.16.0/os/connection.c
+@@ -1307,13 +1307,6 @@ ListenOnOpenFD(int fd, int noxauth)
+ 
+     /* Increment the count */
+     ListenTransCount++;
+-
+-    /* This *might* not be needed... /shrug */
+-    ResetAuthorization();
+-    ResetHosts(display);
+-#ifdef XDMCP
+-    XdmcpReset();
+-#endif
+ }
+ 
+ /* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */
+-- 
+2.0.4
+

Added: trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/0004-XQuartz-Better-support-turning-off-Displays-have-sep.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -0,0 +1,55 @@
+From af2e9e3bb173885106f041f89b9f39b57fe3550a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Mon, 11 Aug 2014 13:15:24 -0700
+Subject: [PATCH 4/4] XQuartz: Better support turning off "Displays have
+ separate Spaces" on OS X Mavericks
+
+http://xquartz.macosforge.org/trac/ticket/1876
+
+Follow-up to: 1c10b37380d228b35db8a8616a6312ac54f5e59b
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit ab32ee35890be51137b56525826ffe219b63eb88)
+---
+ hw/xquartz/xpr/xprScreen.c | 23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c
+index 7aa1ae1..d0a525f 100644
+--- xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c
++++ xorg-server-1.16.0/hw/xquartz/xpr/xprScreen.c
+@@ -169,14 +169,25 @@ displayScreenBounds(CGDirectDisplayID id)
+               (int)frame.size.width, (int)frame.size.height,
+               (int)frame.origin.x, (int)frame.origin.y);
+ 
+-    /* Remove menubar to help standard X11 window managers.
+-     * On Mavericks and later, the menu bar is on all displays.
+-     */
+-    if (XQuartzIsRootless
++    Boolean spacePerDisplay = false;
+ #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
+-        && (NSAppKitVersionNumber >= 1265 || (frame.origin.x == 0 && frame.origin.y == 0))
++    if (NSAppKitVersionNumber >= 1265)
+ #endif
+-        ) {
++    {
++        Boolean ok;
++        (void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces"));
++        spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"),
++                                                            CFSTR("com.apple.spaces"),
++                                                            &ok);
++        if (!ok)
++            spacePerDisplay = true;
++    }
++
++    /* Remove menubar to help standard X11 window managers.
++     * On Mavericks and later, the menu bar is on all displays when spans-displays is false or unset.
++     */
++    if (XQuartzIsRootless &&
++        (spacePerDisplay || (frame.origin.x == 0 && frame.origin.y == 0))) {
+         frame.origin.y += aquaMenuBarHeight;
+         frame.size.height -= aquaMenuBarHeight;
+     }
+-- 
+2.0.4
+

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	2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -1,7 +1,7 @@
-From f2126ef96002eda432e1974f14a914dc075ef017 Mon Sep 17 00:00:00 2001
+From fcc77206683e2e13d8287598599fa2a2bffe336c 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/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS
+Subject: [PATCH 5000/5005] 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
@@ -13,10 +13,10 @@
  hw/xfree86/Makefile.am | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
+diff --git server-1.16-branch/hw/xfree86/Makefile.am server-1.16-branch/hw/xfree86/Makefile.am
 index c5992c3..71b6769 100644
---- a/hw/xfree86/Makefile.am
-+++ b/hw/xfree86/Makefile.am
+--- server-1.16-branch/hw/xfree86/Makefile.am
++++ server-1.16-branch/hw/xfree86/Makefile.am
 @@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
  bin_PROGRAMS = Xorg
  nodist_Xorg_SOURCES = sdksyms.c
@@ -37,5 +37,5 @@
  SDKSYMS_DEP = sdksyms.dep
  -include $(SDKSYMS_DEP)
 -- 
-2.0.1
+2.0.4
 

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	2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -1,7 +1,7 @@
-From 2f09ff191ef3a03a992d15f6f8176db0892d32f4 Mon Sep 17 00:00:00 2001
+From 1b47538d15f803b3ae45feb0d092b991118940bb 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/5004] Workaround the GC clipping problem in miPaintWindow
+Subject: [PATCH 5001/5005] Workaround the GC clipping problem in miPaintWindow
  and add some debugging output.
 
 Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
@@ -9,10 +9,10 @@
  mi/miexpose.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
  1 file changed, 94 insertions(+), 10 deletions(-)
 
-diff --git a/mi/miexpose.c b/mi/miexpose.c
+diff --git server-1.16-branch/mi/miexpose.c server-1.16-branch/mi/miexpose.c
 index 198c433..ad1621d 100644
---- a/mi/miexpose.c
-+++ b/mi/miexpose.c
+--- server-1.16-branch/mi/miexpose.c
++++ server-1.16-branch/mi/miexpose.c
 @@ -489,7 +489,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
  void RootlessStartDrawing(WindowPtr pWin);
  void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
@@ -161,5 +161,5 @@
      pbox = RegionRects(prgn);
      for (i = numRects; --i >= 0; pbox++, prect++) {
 -- 
-2.0.1
+2.0.4
 

Modified: trunk/dports/x11/xorg-server/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch	2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -1,7 +1,7 @@
-From 8a899939a369a04a31d5c1d118079845890127d4 Mon Sep 17 00:00:00 2001
+From 29c3bb27a56a6120b583a0ff4e36b4ae8b13c002 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 5002/5004] Use old miTrapezoids and miTriangles routines
+Subject: [PATCH 5002/5005] Use old miTrapezoids and miTriangles routines
 
 Reverts commits:
     788ccb9a8bcf6a4fb4054c507111eec3338fb969
@@ -18,10 +18,10 @@
  render/mitri.c  |  61 +++++++++++++++++++++++++++++++
  5 files changed, 201 insertions(+), 4 deletions(-)
 
-diff --git a/fb/fbpict.c b/fb/fbpict.c
+diff --git server-1.16-branch/fb/fbpict.c server-1.16-branch/fb/fbpict.c
 index 21baf89..65eb2a4 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
+--- server-1.16-branch/fb/fbpict.c
++++ server-1.16-branch/fb/fbpict.c
 @@ -507,10 +507,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
      ps->UnrealizeGlyph = fbUnrealizeGlyph;
      ps->CompositeRects = miCompositeRects;
@@ -33,10 +33,10 @@
  
      return TRUE;
  }
-diff --git a/render/mipict.c b/render/mipict.c
+diff --git server-1.16-branch/render/mipict.c server-1.16-branch/render/mipict.c
 index 3959fc4..2bb1a1d 100644
---- a/render/mipict.c
-+++ b/render/mipict.c
+--- server-1.16-branch/render/mipict.c
++++ server-1.16-branch/render/mipict.c
 @@ -595,8 +595,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
      ps->Composite = 0;          /* requires DDX support */
      ps->Glyphs = miGlyphs;
@@ -48,10 +48,10 @@
  
      ps->RasterizeTrapezoid = 0; /* requires DDX support */
      ps->AddTraps = 0;           /* requires DDX support */
-diff --git a/render/mipict.h b/render/mipict.h
+diff --git server-1.16-branch/render/mipict.h server-1.16-branch/render/mipict.h
 index a16dd31..ee90b58 100644
---- a/render/mipict.h
-+++ b/render/mipict.h
+--- server-1.16-branch/render/mipict.h
++++ server-1.16-branch/render/mipict.h
 @@ -122,6 +122,16 @@ miCompositeRects(CARD8 op,
                   xRenderColor * color, int nRect, xRectangle *rects);
  
@@ -97,10 +97,10 @@
   miPointFixedBounds(int npoint, xPointFixed * points, BoxPtr bounds);
  
  extern _X_EXPORT void
-diff --git a/render/mitrap.c b/render/mitrap.c
+diff --git server-1.16-branch/render/mitrap.c server-1.16-branch/render/mitrap.c
 index 17b6dcd..71c1857 100644
---- a/render/mitrap.c
-+++ b/render/mitrap.c
+--- server-1.16-branch/render/mitrap.c
++++ server-1.16-branch/render/mitrap.c
 @@ -34,6 +34,55 @@
  #include "picturestr.h"
  #include "mipict.h"
@@ -223,10 +223,10 @@
 +           miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
 +    }
 +}
-diff --git a/render/mitri.c b/render/mitri.c
+diff --git server-1.16-branch/render/mitri.c server-1.16-branch/render/mitri.c
 index 922f22a..bdca9ca 100644
---- a/render/mitri.c
-+++ b/render/mitri.c
+--- server-1.16-branch/render/mitri.c
++++ server-1.16-branch/render/mitri.c
 @@ -65,3 +65,64 @@ miTriangleBounds(int ntri, xTriangle * tris, BoxPtr bounds)
  {
      miPointFixedBounds(ntri * 3, (xPointFixed *) tris, bounds);
@@ -293,5 +293,5 @@
 +}
 +
 -- 
-2.0.1
+2.0.4
 

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	2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -1,7 +1,7 @@
-From f71e2f31e251f314aff23085f59bbbc79522b8d9 Mon Sep 17 00:00:00 2001
+From 0c3bf02ba1982bcfce8cef13bd0afa11c49fe796 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 5003/5004] fb: Revert fb changes that broke XQuartz
+Subject: [PATCH 5003/5005] fb: Revert fb changes that broke XQuartz
 
 http://bugs.freedesktop.org/show_bug.cgi?id=26124
 
@@ -20,10 +20,10 @@
  fb/fbtrap.c | 43 ++++++++++++++------------------
  3 files changed, 43 insertions(+), 85 deletions(-)
 
-diff --git a/fb/fb.h b/fb/fb.h
+diff --git server-1.16-branch/fb/fb.h server-1.16-branch/fb/fb.h
 index 9057767..f584154 100644
---- a/fb/fb.h
-+++ b/fb/fb.h
+--- server-1.16-branch/fb/fb.h
++++ server-1.16-branch/fb/fb.h
 @@ -1652,8 +1652,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
                    RegionPtr pRegion, FbBits and, FbBits xor);
  
@@ -34,10 +34,10 @@
  
  extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
  
-diff --git a/fb/fbpict.c b/fb/fbpict.c
+diff --git server-1.16-branch/fb/fbpict.c server-1.16-branch/fb/fbpict.c
 index 65eb2a4..e7a3811 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
+--- server-1.16-branch/fb/fbpict.c
++++ server-1.16-branch/fb/fbpict.c
 @@ -46,23 +46,18 @@ fbComposite(CARD8 op,
              INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
  {
@@ -213,10 +213,10 @@
  }
  
  void
-diff --git a/fb/fbtrap.c b/fb/fbtrap.c
+diff --git server-1.16-branch/fb/fbtrap.c server-1.16-branch/fb/fbtrap.c
 index bf82f8f..0145ce9 100644
---- a/fb/fbtrap.c
-+++ b/fb/fbtrap.c
+--- server-1.16-branch/fb/fbtrap.c
++++ server-1.16-branch/fb/fbtrap.c
 @@ -36,13 +36,12 @@ fbAddTraps(PicturePtr pPicture,
             INT16 x_off, INT16 y_off, int ntrap, xTrap * traps)
  {
@@ -312,5 +312,5 @@
  
          DamageRegionProcessPending(pDst->pDrawable);
 -- 
-2.0.1
+2.0.4
 

Modified: trunk/dports/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch	2014-08-18 20:15:06 UTC (rev 124091)
+++ trunk/dports/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -1,7 +1,7 @@
-From bccceaa79183e23d7a3c60f36acd537e2f0d6564 Mon Sep 17 00:00:00 2001
+From 923740dfc55b0b7e3495cbbd0a6a6a8fe86189fd Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 31 May 2014 13:14:20 -0700
-Subject: [PATCH 5004/5004] fb: Revert fb changes that broke XQuartz
+Subject: [PATCH 5004/5005] fb: Revert fb changes that broke XQuartz
 
     http://bugs.freedesktop.org/show_bug.cgi?id=26124
 
@@ -19,10 +19,10 @@
  fb/fbscreen.c |   1 -
  4 files changed, 2 insertions(+), 166 deletions(-)
 
-diff --git a/fb/fb.h b/fb/fb.h
+diff --git server-1.16-branch/fb/fb.h server-1.16-branch/fb/fb.h
 index f584154..25a7eff 100644
---- a/fb/fb.h
-+++ b/fb/fb.h
+--- server-1.16-branch/fb/fb.h
++++ server-1.16-branch/fb/fb.h
 @@ -1310,9 +1310,6 @@ extern _X_EXPORT void
  extern _X_EXPORT Bool
   fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
@@ -33,10 +33,10 @@
  /*
   * fbpixmap.c
   */
-diff --git a/fb/fbpict.c b/fb/fbpict.c
+diff --git server-1.16-branch/fb/fbpict.c server-1.16-branch/fb/fbpict.c
 index e7a3811..276ff06 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
+--- server-1.16-branch/fb/fbpict.c
++++ server-1.16-branch/fb/fbpict.c
 @@ -65,152 +65,6 @@ fbComposite(CARD8 op,
      free_pixman_pict(pDst, dest);
  }
@@ -200,10 +200,10 @@
      ps->CompositeRects = miCompositeRects;
      ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
      ps->AddTraps = fbAddTraps;
-diff --git a/fb/fbpict.h b/fb/fbpict.h
+diff --git server-1.16-branch/fb/fbpict.h server-1.16-branch/fb/fbpict.h
 index 8b0f59f..110f32d 100644
---- a/fb/fbpict.h
-+++ b/fb/fbpict.h
+--- server-1.16-branch/fb/fbpict.h
++++ server-1.16-branch/fb/fbpict.h
 @@ -65,24 +65,11 @@ fbTrapezoids(CARD8 op,
               INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps);
  
@@ -230,10 +230,10 @@
 -	 GlyphPtr *glyphs);
 -
  #endif                          /* _FBPICT_H_ */
-diff --git a/fb/fbscreen.c b/fb/fbscreen.c
+diff --git server-1.16-branch/fb/fbscreen.c server-1.16-branch/fb/fbscreen.c
 index 0d4d87f..e6ff1bd 100644
---- a/fb/fbscreen.c
-+++ b/fb/fbscreen.c
+--- server-1.16-branch/fb/fbscreen.c
++++ server-1.16-branch/fb/fbscreen.c
 @@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen)
      int d;
      DepthPtr depths = pScreen->allowedDepths;
@@ -243,5 +243,5 @@
          free(depths[d].vids);
      free(depths);
 -- 
-2.0.1
+2.0.4
 

Added: trunk/dports/x11/xorg-server/files/5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/5005-XQuartz-Advertise-GLX_ARB_create_context-and-GLX_ARB.patch	2014-08-18 20:24:06 UTC (rev 124092)
@@ -0,0 +1,80 @@
+From 73ed5a39e3a6955834abe13a347dd70c5248a347 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sun, 1 Jun 2014 04:29:19 -0700
+Subject: [PATCH 5005/5005] XQuartz: Advertise GLX_ARB_create_context and
+ GLX_ARB_create_context_profile
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ hw/xquartz/GL/indirect.c | 40 ++++++++++++++++++++++++++++++++++------
+ 1 file changed, 34 insertions(+), 6 deletions(-)
+
+diff --git server-1.16-branch/hw/xquartz/GL/indirect.c server-1.16-branch/hw/xquartz/GL/indirect.c
+index 19b7d86..d8f836d 100644
+--- server-1.16-branch/hw/xquartz/GL/indirect.c
++++ server-1.16-branch/hw/xquartz/GL/indirect.c
+@@ -52,6 +52,7 @@
+ 
+ #include "visualConfigs.h"
+ #include "dri.h"
++#include "extension_string.h"
+ 
+ #include "darwin.h"
+ #define GLAQUA_DEBUG_MSG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", \
+@@ -111,6 +112,10 @@ typedef struct __GLXAquaDrawable __GLXAquaDrawable;
+  */
+ struct __GLXAquaScreen {
+     __GLXscreen base;
++
++    /* Supported GLX extensions */
++    unsigned char glx_enable_bits[__GLX_EXT_BYTES];
++
+     int index;
+     int num_vis;
+ };
+@@ -541,13 +546,36 @@ __glXAquaScreenProbe(ScreenPtr pScreen)
+ 
+     screen->base.GLXmajor = 1;
+     screen->base.GLXminor = 4;
+-    screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "
+-                                        "GLX_SGIS_multisample "
+-                                        "GLX_ARB_multisample "
+-                                        "GLX_EXT_visual_info "
+-                                        "GLX_EXT_import_context ");
+ 
+-    /*We may be able to add more GLXextensions at a later time. */
++    memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES);
++
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");
++
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample");
++
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context");
++    __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context_profile");
++
++    // Generate the GLX extensions string (overrides that set by __glXScreenInit())
++    {
++        unsigned int buffer_size =
++            __glXGetExtensionString(screen->glx_enable_bits, NULL);
++        if (buffer_size > 0) {
++            free(screen->base.GLXextensions);
++
++            screen->base.GLXextensions = xnfalloc(buffer_size);
++            __glXGetExtensionString(screen->glx_enable_bits,
++                                    screen->base.GLXextensions);
++        }
++    }
++
++    // Override the GL extensions string set by __glXScreenInit()
++    //screen->base.GLextensions = strdup(glGetString(GL_EXTENSIONS));
+ 
+     return &screen->base;
+ }
+-- 
+2.0.4
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140818/a211714f/attachment-0001.html>


More information about the macports-changes mailing list