[100772] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Sun Dec 23 17:11:23 PST 2012
Revision: 100772
https://trac.macports.org/changeset/100772
Author: jeremyhu at macports.org
Date: 2012-12-23 17:11:23 -0800 (Sun, 23 Dec 2012)
Log Message:
-----------
xorg-server: Bump to 1.13.1
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
trunk/dports/x11/xorg-server/files/0001-XQuartz-Avoid-a-possible-deadlock-with-DRI-on-OS-X-1.patch
trunk/dports/x11/xorg-server/files/0002-XQuartz-Add-some-verbose-logging-to-debug-xp_lock_wi.patch
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
Added Paths:
-----------
trunk/dports/x11/xorg-server/files/0003-XQuartz-Don-t-add-the-15bit-visual-any-more.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2012-12-23 23:39:43 UTC (rev 100771)
+++ trunk/dports/x11/xorg-server/Portfile 2012-12-24 01:11:23 UTC (rev 100772)
@@ -5,8 +5,7 @@
name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
-version 1.13.0
-revision 1
+version 1.13.1
categories x11 devel
license X11 BSD
maintainers jeremyhu openmaintainer
@@ -21,9 +20,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums sha1 b29aef6ab4924e2b034ccb26b289e929d61a2555 \
- rmd160 d46838bfedbdd845fc3c75f1ac9e5eae5f7405c9 \
- sha256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a
+checksums sha1 634b14f38b0208b2c5714955eb40c59d2a99fd84 \
+ rmd160 29a9481116fbb52e75ea846cdd705c772fa2792d \
+ sha256 c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00
use_bzip2 yes
use_parallel_build yes
@@ -83,8 +82,9 @@
RAWCPP=${configure.cpp}
patchfiles \
- 0001-XQuartz-Avoid-a-possible-deadlock-with-DRI-on-OS-X-1.patch \
- 0002-XQuartz-Add-some-verbose-logging-to-debug-xp_lock_wi.patch \
+ 0001-XQuartz-Avoid-a-possible-deadlock-with-DRI-on-OS-X-1.patch \
+ 0002-XQuartz-Add-some-verbose-logging-to-debug-xp_lock_wi.patch \
+ 0003-XQuartz-Don-t-add-the-15bit-visual-any-more.patch \
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
Modified: trunk/dports/x11/xorg-server/files/0001-XQuartz-Avoid-a-possible-deadlock-with-DRI-on-OS-X-1.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-XQuartz-Avoid-a-possible-deadlock-with-DRI-on-OS-X-1.patch 2012-12-23 23:39:43 UTC (rev 100771)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Avoid-a-possible-deadlock-with-DRI-on-OS-X-1.patch 2012-12-24 01:11:23 UTC (rev 100772)
@@ -1,21 +1,22 @@
-From b6b4287a1db26f75e88f53486c91bfefeb7726fd Mon Sep 17 00:00:00 2001
+From 06e2ecd0df9b81dd518ae6017ec42765520e2e93 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Thu, 20 Sep 2012 21:49:40 -0700
-Subject: [PATCH 1/2] XQuartz: Avoid a possible deadlock with DRI on OS X
+Subject: [PATCH 1/3] XQuartz: Avoid a possible deadlock with DRI on OS X
10.7.5 and OS X 10.8.2
<rdar://problem/12338921>
http://bugs.winehq.org/show_bug.cgi?id=31751
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 25d26875bc9bd6fd23ae1b5280f015abf1b033b7)
---
hw/xquartz/xpr/dri.c | 6 ++++++
1 file changed, 6 insertions(+)
-diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
-index 03af163..4fa4aa8 100644
---- a/hw/xquartz/xpr/dri.c
-+++ b/hw/xquartz/xpr/dri.c
+diff --git xorg-server-1.13.1/hw/xquartz/xpr/dri.c xorg-server-1.13.1/hw/xquartz/xpr/dri.c
+index 03af163..adba69c 100644
+--- xorg-server-1.13.1/hw/xquartz/xpr/dri.c
++++ xorg-server-1.13.1/hw/xquartz/xpr/dri.c
@@ -64,6 +64,7 @@
#include "mi.h"
#include "mipointer.h"
@@ -24,18 +25,18 @@
#include "x-hash.h"
#include "x-hook.h"
#include "driWrap.h"
-@@ -385,6 +386,11 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
+@@ -380,6 +381,11 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
+ DRIDrawablePrivPtr pDRIDrawablePriv;
- if (NULL == pDRIDrawablePriv)
- return FALSE; /*error*/
-+
+ if (pDrawable->type == DRAWABLE_WINDOW) {
+ /* <rdar://problem/12338921>
+ * http://bugs.winehq.org/show_bug.cgi?id=31751
+ */
+ RootlessStopDrawing((WindowPtr)pDrawable, FALSE);
- }
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
- else if (pDrawable->type == DRAWABLE_PIXMAP) {
++
+ pDRIDrawablePriv = CreateSurfaceForWindow(pScreen,
+ (WindowPtr)pDrawable, &wid);
+
--
-1.7.11.5
+1.8.0.2
Modified: trunk/dports/x11/xorg-server/files/0002-XQuartz-Add-some-verbose-logging-to-debug-xp_lock_wi.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-XQuartz-Add-some-verbose-logging-to-debug-xp_lock_wi.patch 2012-12-23 23:39:43 UTC (rev 100771)
+++ trunk/dports/x11/xorg-server/files/0002-XQuartz-Add-some-verbose-logging-to-debug-xp_lock_wi.patch 2012-12-24 01:11:23 UTC (rev 100772)
@@ -1,18 +1,19 @@
-From a55ccb7e8f80992e985694a5ec40b5aa72526d39 Mon Sep 17 00:00:00 2001
+From 34fb39a960898f5a0bcc67f76f385ba8a91ea2ba Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Thu, 20 Sep 2012 21:11:21 -0700
-Subject: [PATCH 2/2] XQuartz: Add some verbose logging to debug
- xp_lock_window being unbalanced
+Subject: [PATCH 2/3] XQuartz: Add some verbose logging to debug xp_lock_window
+ being unbalanced
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit f54987de97720200ee94eba1c7a737d4ad8c55c8)
---
hw/xquartz/xpr/xprFrame.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
-diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
+diff --git xorg-server-1.13.1/hw/xquartz/xpr/xprFrame.c xorg-server-1.13.1/hw/xquartz/xpr/xprFrame.c
index 01f1def..aad375b 100644
---- a/hw/xquartz/xpr/xprFrame.c
-+++ b/hw/xquartz/xpr/xprFrame.c
+--- xorg-server-1.13.1/hw/xquartz/xpr/xprFrame.c
++++ xorg-server-1.13.1/hw/xquartz/xpr/xprFrame.c
@@ -49,6 +49,10 @@
#include <pthread.h>
#endif
@@ -63,5 +64,5 @@
/* This should be a FatalError, but we started tripping over it. Make it a
* FatalError after http://xquartz.macosforge.org/trac/ticket/482 is fixed.
--
-1.7.11.5
+1.8.0.2
Added: trunk/dports/x11/xorg-server/files/0003-XQuartz-Don-t-add-the-15bit-visual-any-more.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0003-XQuartz-Don-t-add-the-15bit-visual-any-more.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0003-XQuartz-Don-t-add-the-15bit-visual-any-more.patch 2012-12-24 01:11:23 UTC (rev 100772)
@@ -0,0 +1,67 @@
+From e348e4afc5323779b686ee8ff2f094359664c42e Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 18 Dec 2012 01:29:12 -0800
+Subject: [PATCH 3/3] XQuartz: Don't add the 15bit visual any more
+
+Mountain Lion only supports 32bit backing stores, so don't use 15bit visuals until libXplugin adapts
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit ba4bb3bc1b87eb57cc34d2ad1f302c9d2a15c847)
+---
+ hw/xquartz/darwin.c | 16 +++++++++-------
+ hw/xquartz/xpr/xprScreen.c | 5 +++++
+ 2 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git xorg-server-1.13.1/hw/xquartz/darwin.c xorg-server-1.13.1/hw/xquartz/darwin.c
+index d26f18a..b3a1fb3 100644
+--- xorg-server-1.13.1/hw/xquartz/darwin.c
++++ xorg-server-1.13.1/hw/xquartz/darwin.c
+@@ -231,13 +231,15 @@ DarwinScreenInit(ScreenPtr pScreen, int argc, char **argv)
+ }
+
+ // TODO: Make PseudoColor visuals not suck in TrueColor mode
+- // if(dfb->depth > 8)
+- // miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
+- if (dfb->depth > 15)
+- miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor,
+- RM_ARGB(0, 5, 5, 5), GM_ARGB(0, 5, 5,
+- 5),
+- BM_ARGB(0, 5, 5, 5));
++ // if(dfb->depth > 8)
++ // miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
++ //
++ // TODO: Re-add support for 15bit
++ // if (dfb->depth > 15)
++ // miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor,
++ // RM_ARGB(0, 5, 5, 5), GM_ARGB(0, 5, 5,
++ // 5),
++ // BM_ARGB(0, 5, 5, 5));
+ if (dfb->depth > 24)
+ miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor,
+ RM_ARGB(0, 8, 8, 8), GM_ARGB(0, 8, 8,
+diff --git xorg-server-1.13.1/hw/xquartz/xpr/xprScreen.c xorg-server-1.13.1/hw/xquartz/xpr/xprScreen.c
+index efe2aa8..e376019 100644
+--- xorg-server-1.13.1/hw/xquartz/xpr/xprScreen.c
++++ xorg-server-1.13.1/hw/xquartz/xpr/xprScreen.c
+@@ -359,6 +359,10 @@ have_depth:
+ dfb->blueMask = 0;
+ break;
+
++#if 0
++ // Removed because Mountain Lion removed support for
++ // 15bit backing stores. We can possibly re-add
++ // this once libXplugin is updated to work around it.
+ case 15:
+ dfb->visuals = TrueColorMask; //LARGE_VISUALS;
+ dfb->preferredCVC = TrueColor;
+@@ -369,6 +373,7 @@ have_depth:
+ dfb->greenMask = GM_ARGB(0, 5, 5, 5);
+ dfb->blueMask = BM_ARGB(0, 5, 5, 5);
+ break;
++#endif
+
+ // case 24:
+ default:
+--
+1.8.0.2
+
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 2012-12-23 23:39:43 UTC (rev 100771)
+++ trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2012-12-24 01:11:23 UTC (rev 100772)
@@ -1,4 +1,4 @@
-From 6dfb7cd702c1130fbe2bc15ef5d00c1983037451 Mon Sep 17 00:00:00 2001
+From 8b2587cf9174dfb76f3e8800831d3894432b26d3 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/5002] sdksyms.sh: Use CPPFLAGS, not CFLAGS
@@ -10,11 +10,11 @@
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
---
- hw/xfree86/Makefile.am | 4 ++--
+ hw/xfree86/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index e50cb88..7ccac80 100644
+index c3899b5..4f48b85 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -38,7 +38,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
@@ -24,9 +24,9 @@
-AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
- -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac
-
-@@ -112,7 +112,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
+ -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
+ -I$(srcdir)/dri -I$(srcdir)/dri2
+@@ -115,7 +115,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
EXTRA_DIST += sdksyms.sh
sdksyms.dep sdksyms.c: sdksyms.sh
@@ -36,5 +36,5 @@
SDKSYMS_DEP = sdksyms.dep
include $(SDKSYMS_DEP)
--
-1.7.10.2
+1.7.11.5
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 2012-12-23 23:39:43 UTC (rev 100771)
+++ trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2012-12-24 01:11:23 UTC (rev 100772)
@@ -1,4 +1,4 @@
-From 6e3829d167383a2fa4b1f14817a91dc3ec12138e Mon Sep 17 00:00:00 2001
+From aa2d6827ddb602a6f6e7ef57876980e7c0ac3183 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/5002] Workaround the GC clipping problem in
@@ -6,14 +6,14 @@
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
- mi/miexpose.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++------
+ mi/miexpose.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 94 insertions(+), 10 deletions(-)
diff --git a/mi/miexpose.c b/mi/miexpose.c
-index dbb29ca..93fd8a1 100644
+index 8b7c93f..3e972f7 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
-@@ -490,7 +490,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
+@@ -489,7 +489,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
void RootlessStartDrawing(WindowPtr pWin);
void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
Bool IsFramedWindow(WindowPtr pWin);
@@ -23,7 +23,7 @@
void
miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
-@@ -519,23 +520,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -518,23 +519,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
Bool solid = TRUE;
DrawablePtr drawable = &pWin->drawable;
@@ -70,7 +70,7 @@
while (pWin->backgroundState == ParentRelative)
pWin = pWin->parent;
-@@ -560,6 +575,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -559,6 +574,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
else {
PixmapPtr pixmap;
@@ -89,7 +89,7 @@
tile_x_off = drawable->x;
tile_y_off = drawable->y;
-@@ -568,6 +595,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -567,6 +594,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
return;
pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
drawable = &pixmap->drawable;
@@ -102,7 +102,7 @@
#ifdef COMPOSITE
draw_x_off = pixmap->screen_x;
draw_y_off = pixmap->screen_y;
-@@ -630,6 +663,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -629,6 +662,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
ChangeGC(NullClient, pGC, gcmask, gcval);
ValidateGC(drawable, pGC);
@@ -161,5 +161,5 @@
pbox = RegionRects(prgn);
for (i = numRects; --i >= 0; pbox++, prect++) {
--
-1.7.10.2
+1.7.11.5
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 2012-12-23 23:39:43 UTC (rev 100771)
+++ trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2012-12-24 01:11:23 UTC (rev 100772)
@@ -1,4 +1,4 @@
-From c36c05c6a2536e442964cfea2adaf8c8e3dc3356 Mon Sep 17 00:00:00 2001
+From 9aa66be9194107b19429c96964a2890fce297363 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/5002] fb: Revert fb changes that broke XQuartz
@@ -15,16 +15,16 @@
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
- fb/fb.h | 3 +--
- fb/fbpict.c | 82 +++++++++++++++++------------------------------------------
- fb/fbtrap.c | 43 +++++++++++++------------------
+ fb/fb.h | 3 +--
+ fb/fbpict.c | 82 ++++++++++++++++++-------------------------------------------
+ fb/fbtrap.c | 43 ++++++++++++++------------------
3 files changed, 43 insertions(+), 85 deletions(-)
diff --git a/fb/fb.h b/fb/fb.h
-index b327ce6..53a6c1a 100644
+index 40a7e38..52d0b0a 100644
--- a/fb/fb.h
+++ b/fb/fb.h
-@@ -1683,8 +1683,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
+@@ -1684,8 +1684,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
RegionPtr pRegion, FbBits and, FbBits xor);
extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
@@ -312,5 +312,5 @@
DamageRegionProcessPending(pDst->pDrawable);
--
-1.7.10.2
+1.7.11.5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121223/5c26bc6e/attachment.html>
More information about the macports-changes
mailing list