[93881] trunk/dports/x11/xorg-server-devel

2 Jun 2012

Revision: 93881
          https://trac.macports.org/changeset/93881
Author:   jeremyhu@macports.org
Date:     2012-06-02 01:44:36 -0700 (Sat, 02 Jun 2012)
Log Message:
-----------
xorg-server-devel: Update to current git

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

Removed Paths:
-------------
    trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch
    trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Tiger-build-fix.patch
    trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch

Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================

--- trunk/dports/x11/xorg-server-devel/Portfile	2012-06-02 08:33:24 UTC (rev 93880)
+++ trunk/dports/x11/xorg-server-devel/Portfile	2012-06-02 08:44:36 UTC (rev 93881)
@@ -6,7 +6,7 @@
 conflicts       xorg-server
 set my_name	xorg-server
 version		1.12.99.0
-revision        2
+revision        3
 categories	x11 devel
 maintainers	jeremyhu openmaintainer
 description	The X.org / Xquartz X server.
@@ -16,7 +16,7 @@
 
 fetch.type      git
 git.url         git://anongit.freedesktop.org/xorg/xserver
-git.branch      97041364a6acb2b66b5cfd06757c90a006ad50e9
+git.branch      78f0d9cdc441a575e15e5f7200ce74750d2f7ad2
 
 use_parallel_build yes
 
@@ -73,9 +73,6 @@
 	RAWCPP=${configure.cpp}
 
 patchfiles \
-        0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch \
-        0002-XQuartz-Tiger-build-fix.patch \
-        0003-XQuartz-Provide-fls-implementation-for-Tiger.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-devel/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch	2012-06-02 08:33:24 UTC (rev 93880)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Workaround-an-SDK-bug-on-Leopard-x86_64.patch	2012-06-02 08:44:36 UTC (rev 93881)
@@ -1,30 +0,0 @@
-From 5657c075c3662fc6965250ccee50e305598f0e2c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Mon, 7 May 2012 16:16:20 -0700
-Subject: [PATCH 1/3] XQuartz: Workaround an SDK bug on Leopard/x86_64
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
- hw/xquartz/quartz.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
-index ebaa567..62a2852 100644
---- a/hw/xquartz/quartz.c
-+++ b/hw/xquartz/quartz.c
-@@ -69,6 +69,12 @@
- #include <rootlessCommon.h>
- #include <Xplugin.h>
- 
-+/* Work around a bug on Leopard's headers */
-+#if defined (__LP64__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 && MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-+extern OSErr UpdateSystemActivity(UInt8 activity);
-+#define OverallAct 0
-+#endif
-+
- DevPrivateKeyRec quartzScreenKeyRec;
- int aquaMenuBarHeight = 0;
- QuartzModeProcsPtr quartzProcs = NULL;
--- 
-1.7.10.1
-

Deleted: trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Tiger-build-fix.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Tiger-build-fix.patch	2012-06-02 08:33:24 UTC (rev 93880)
+++ trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Tiger-build-fix.patch	2012-06-02 08:44:36 UTC (rev 93881)
@@ -1,42 +0,0 @@
-From 8c5fb186a7fd6b4d185b22af468790e9906449da Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Mon, 7 May 2012 16:31:38 -0700
-Subject: [PATCH 2/3] XQuartz: Tiger build fix
-
-http://trac.macports.org/ticket/34364
-
-Regression-from: 662d41acdde1dcb9774fbe4054e251c708acaffe
-
-Reported-by: Peter Dyballa <Peter_Dyballa@Freenet.DE>
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
- hw/xquartz/X11Application.m |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
-index 0c3283e..9f4c9b7 100644
---- a/hw/xquartz/X11Application.m
-+++ b/hw/xquartz/X11Application.m
-@@ -1641,6 +1641,11 @@ handle_mouse:
- 
-     case NSScrollWheel:
-     {
-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-+        float deltaX = [e deltaX];
-+        float deltaY = [e deltaY];
-+        BOOL isContinuous = NO;
-+#else
-         CGFloat deltaX = [e deltaX];
-         CGFloat deltaY = [e deltaY];
-         CGEventRef cge = [e CGEvent];
-@@ -1662,6 +1667,7 @@ handle_mouse:
-             deltaY *= lineHeight / 5.0;
-         }
- #endif
-+#endif
-         
- #if !defined(XPLUGIN_VERSION) || XPLUGIN_VERSION == 0
-         /* If we're in the background, we need to send a MotionNotify event
--- 
-1.7.10.1
-

Deleted: trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch	2012-06-02 08:33:24 UTC (rev 93880)
+++ trunk/dports/x11/xorg-server-devel/files/0003-XQuartz-Provide-fls-implementation-for-Tiger.patch	2012-06-02 08:44:36 UTC (rev 93881)
@@ -1,39 +0,0 @@
-From 1de82bbe86bfdc1717dc4e04ab5125af1f24d51a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Mon, 7 May 2012 17:07:27 -0700
-Subject: [PATCH 3/3] XQuartz: Provide fls implementation for Tiger
-
-Regression-from: 30623d6ff7bca223f9e1a825e86bd317eef8bf16
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
- hw/xquartz/console_redirect.c |   14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/hw/xquartz/console_redirect.c b/hw/xquartz/console_redirect.c
-index 1e0e56b..91d693b 100644
---- a/hw/xquartz/console_redirect.c
-+++ b/hw/xquartz/console_redirect.c
-@@ -310,6 +310,20 @@ xq_asl_init(void)
-     atexit(redirect_atexit);
- }
- 
-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-+#define fls(v) xq_fls(v)
-+
-+static inline int fls(int value) {
-+    unsigned int b, v;
-+
-+    v = *((unsigned int *)&value);
-+
-+    for(b=0 ; v ; v >>= 1 , b++);
-+
-+    return b;
-+}
-+#endif
-+
- int
- xq_asl_log_fd(aslclient asl, aslmsg msg, int level, int fd)
- {
--- 
-1.7.10.1
-

Modified: trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch	2012-06-02 08:33:24 UTC (rev 93880)
+++ trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch	2012-06-02 08:44:36 UTC (rev 93881)
@@ -1,4 +1,4 @@
-From cbacf89b6b1a72384f431fa4a759ac995158953d Mon Sep 17 00:00:00 2001
+From 6dfb7cd702c1130fbe2bc15ef5d00c1983037451 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu@apple.com>
 Date: Fri, 13 Jan 2012 12:00:57 -0800
 Subject: [PATCH 5000/5002] sdksyms.sh: Use CPPFLAGS, not CFLAGS
@@ -14,7 +14,7 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index 72be889..c0b81c3 100644
+index e50cb88..7ccac80 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 \
@@ -26,15 +26,15 @@
  INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
  	-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac
  
-@@ -109,7 +109,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
+@@ -112,7 +112,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
  EXTRA_DIST += sdksyms.sh
  
  sdksyms.dep sdksyms.c: sdksyms.sh
--	CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(INCLUDES)
-+	CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES)
+-	$(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)
  
  SDKSYMS_DEP = sdksyms.dep
  include $(SDKSYMS_DEP)
 -- 
-1.7.9.5
+1.7.10.2
 

Modified: trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch	2012-06-02 08:33:24 UTC (rev 93880)
+++ trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch	2012-06-02 08:44:36 UTC (rev 93881)
@@ -1,4 +1,4 @@
-From bf524082a923c9d7591deeb7b4b3f7e6e987f94d Mon Sep 17 00:00:00 2001
+From 6e3829d167383a2fa4b1f14817a91dc3ec12138e Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu@apple.com>
 Date: Fri, 30 Apr 2010 13:08:25 -0700
 Subject: [PATCH 5001/5002] Workaround the GC clipping problem in
@@ -161,5 +161,5 @@
      pbox = RegionRects(prgn);
      for (i = numRects; --i >= 0; pbox++, prect++) {
 -- 
-1.7.9.5
+1.7.10.2
 

Modified: trunk/dports/x11/xorg-server-devel/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch	2012-06-02 08:33:24 UTC (rev 93880)
+++ trunk/dports/x11/xorg-server-devel/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch	2012-06-02 08:44:36 UTC (rev 93881)
@@ -1,4 +1,4 @@
-From d78dc154176056b8ba23d2f7fd9205ef08fa6a6f Mon Sep 17 00:00:00 2001
+From c36c05c6a2536e442964cfea2adaf8c8e3dc3356 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu@apple.com>
 Date: Fri, 12 Feb 2010 19:48:52 -0800
 Subject: [PATCH 5002/5002] fb: Revert fb changes that broke XQuartz
@@ -312,5 +312,5 @@
  
          DamageRegionProcessPending(pDst->pDrawable);
 -- 
-1.7.9.5
+1.7.10.2

    

jeremyhu＠macports.org

tags

participants (1)