[102067] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jan 26 16:35:08 PST 2013
Revision: 102067
https://trac.macports.org/changeset/102067
Author: jeremyhu at macports.org
Date: 2013-01-26 16:35:07 -0800 (Sat, 26 Jan 2013)
Log Message:
-----------
xorg-server: Bump to 1.13.2
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
Removed Paths:
-------------
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/0003-XQuartz-Don-t-add-the-15bit-visual-any-more.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2013-01-27 00:14:50 UTC (rev 102066)
+++ trunk/dports/x11/xorg-server/Portfile 2013-01-27 00:35:07 UTC (rev 102067)
@@ -5,7 +5,7 @@
name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
-version 1.13.1
+version 1.13.2
categories x11 devel
license X11
maintainers jeremyhu openmaintainer
@@ -20,9 +20,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums sha1 634b14f38b0208b2c5714955eb40c59d2a99fd84 \
- rmd160 29a9481116fbb52e75ea846cdd705c772fa2792d \
- sha256 c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00
+checksums sha1 b9a5e6b2880fa15df925a7ace15314d8637cc96f \
+ rmd160 5911159e7253da4f21e3a6d00f8b8ca9ace4f8e9 \
+ sha256 3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408
use_bzip2 yes
use_parallel_build yes
@@ -83,9 +83,6 @@
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 \
- 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
Deleted: 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 2013-01-27 00:14:50 UTC (rev 102066)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Avoid-a-possible-deadlock-with-DRI-on-OS-X-1.patch 2013-01-27 00:35:07 UTC (rev 102067)
@@ -1,42 +0,0 @@
-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/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 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"
- #include "rootless.h"
-+#include "rootlessCommon.h"
- #include "x-hash.h"
- #include "x-hook.h"
- #include "driWrap.h"
-@@ -380,6 +381,11 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
- DRIDrawablePrivPtr pDRIDrawablePriv;
-
- if (pDrawable->type == DRAWABLE_WINDOW) {
-+ /* <rdar://problem/12338921>
-+ * http://bugs.winehq.org/show_bug.cgi?id=31751
-+ */
-+ RootlessStopDrawing((WindowPtr)pDrawable, FALSE);
-+
- pDRIDrawablePriv = CreateSurfaceForWindow(pScreen,
- (WindowPtr)pDrawable, &wid);
-
---
-1.8.0.2
-
Deleted: 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 2013-01-27 00:14:50 UTC (rev 102066)
+++ trunk/dports/x11/xorg-server/files/0002-XQuartz-Add-some-verbose-logging-to-debug-xp_lock_wi.patch 2013-01-27 00:35:07 UTC (rev 102067)
@@ -1,68 +0,0 @@
-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/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 xorg-server-1.13.1/hw/xquartz/xpr/xprFrame.c xorg-server-1.13.1/hw/xquartz/xpr/xprFrame.c
-index 01f1def..aad375b 100644
---- 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
-
-+#ifdef DEBUG_XP_LOCK_WINDOW
-+#include <execinfo.h>
-+#endif
-+
- #define DEFINE_ATOM_HELPER(func, atom_name) \
- static Atom func(void) { \
- static int generation; \
-@@ -376,6 +380,18 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
- unsigned int rowbytes[2];
- xp_error err;
-
-+#ifdef DEBUG_XP_LOCK_WINDOW
-+ void* callstack[128];
-+ int i, frames = backtrace(callstack, 128);
-+ char** strs = backtrace_symbols(callstack, frames);
-+
-+ ErrorF("=== LOCK %d ===\n", (int)x_cvt_vptr_to_uint(wid));
-+ for (i = 0; i < frames; ++i) {
-+ ErrorF(" %s\n", strs[i]);
-+ }
-+ free(strs);
-+#endif
-+
- err = xp_lock_window(x_cvt_vptr_to_uint(
- wid), NULL, NULL, data, rowbytes, NULL);
- if (err != Success)
-@@ -395,6 +411,18 @@ xprStopDrawing(RootlessFrameID wid, Bool flush)
- {
- xp_error err;
-
-+#ifdef DEBUG_XP_LOCK_WINDOW
-+ void* callstack[128];
-+ int i, frames = backtrace(callstack, 128);
-+ char** strs = backtrace_symbols(callstack, frames);
-+
-+ ErrorF("=== UNLOCK %d ===\n", (int)x_cvt_vptr_to_uint(wid));
-+ for (i = 0; i < frames; ++i) {
-+ ErrorF(" %s\n", strs[i]);
-+ }
-+ free(strs);
-+#endif
-+
- err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush);
- /* 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.8.0.2
-
Deleted: 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 2013-01-27 00:14:50 UTC (rev 102066)
+++ trunk/dports/x11/xorg-server/files/0003-XQuartz-Don-t-add-the-15bit-visual-any-more.patch 2013-01-27 00:35:07 UTC (rev 102067)
@@ -1,67 +0,0 @@
-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
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130126/3d44c1b0/attachment-0001.html>
More information about the macports-changes
mailing list