[97439] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Wed Sep 5 19:31:07 PDT 2012
Revision: 97439
https://trac.macports.org/changeset/97439
Author: jeremyhu at macports.org
Date: 2012-09-05 19:31:03 -0700 (Wed, 05 Sep 2012)
Log Message:
-----------
xorg-server: Bump to 1.13.0
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
Removed Paths:
-------------
trunk/dports/x11/xorg-server/files/4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch
trunk/dports/x11/xorg-server/files/4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch
trunk/dports/x11/xorg-server/files/4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch
trunk/dports/x11/xorg-server/files/4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2012-09-06 01:44:14 UTC (rev 97438)
+++ trunk/dports/x11/xorg-server/Portfile 2012-09-06 02:31:03 UTC (rev 97439)
@@ -5,7 +5,7 @@
name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
-version 1.12.4
+version 1.13.0
categories x11 devel
license X11 BSD
maintainers jeremyhu openmaintainer
@@ -20,9 +20,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums sha1 6d616874f9c7677bda08dc073c03f83e78fbc585 \
- rmd160 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983 \
- sha256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
+checksums sha1 b29aef6ab4924e2b034ccb26b289e929d61a2555 \
+ rmd160 d46838bfedbdd845fc3c75f1ac9e5eae5f7405c9 \
+ sha256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a
use_bzip2 yes
use_parallel_build yes
@@ -82,10 +82,6 @@
RAWCPP=${configure.cpp}
patchfiles \
- 4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch \
- 4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch \
- 4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch \
- 4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.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/4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch 2012-09-06 01:44:14 UTC (rev 97438)
+++ trunk/dports/x11/xorg-server/files/4000-os-Pass-the-FatalError-message-to-OsVendorFatalError.patch 2012-09-06 02:31:03 UTC (rev 97439)
@@ -1,202 +0,0 @@
-From 6eef64baedb616592a8dc5221d753b5388b9b969 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Fri, 17 Feb 2012 12:35:02 -0800
-Subject: [PATCH 4000/4003] os: Pass the FatalError message to
- OsVendorFatalError
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
-(cherry picked from commit a818b305989bbcde4e585112a7ee70cbc0b14a92)
----
- hw/dmx/dmxinit.c | 2 +-
- hw/dmx/dmxlog.c | 3 ---
- hw/kdrive/src/kdrive.c | 2 +-
- hw/vfb/InitOutput.c | 2 +-
- hw/xfree86/common/xf86Init.c | 2 +-
- hw/xnest/Init.c | 2 +-
- hw/xquartz/darwin.c | 2 +-
- hw/xwin/winerror.c | 2 +-
- include/os.h | 2 +-
- os/log.c | 18 +++++++++++-------
- test/ddxstubs.c | 2 +-
- 11 files changed, 20 insertions(+), 19 deletions(-)
-
-diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
-index 09e3d74..5804353 100644
---- a/hw/dmx/dmxinit.c
-+++ b/hw/dmx/dmxinit.c
-@@ -905,7 +905,7 @@ OsVendorInit(void)
- * two routines mentioned here, as well as by others) to use the
- * referenced routine instead of \a vfprintf().) */
- void
--OsVendorFatalError(void)
-+OsVendorFatalError(const char *f, va_list args)
- {
- }
-
-diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c
-index b56bb93..33aee59 100644
---- a/hw/dmx/dmxlog.c
-+++ b/hw/dmx/dmxlog.c
-@@ -110,9 +110,6 @@ VFatalError(const char *format, va_list args)
- {
- VErrorF(format, args);
- ErrorF("\n");
--#ifdef DDXOSFATALERROR
-- OsVendorFatalError();
--#endif
- AbortServer();
- /*NOTREACHED*/}
- #endif
-diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
-index f65ab96..ecdae19 100644
---- a/hw/kdrive/src/kdrive.c
-+++ b/hw/kdrive/src/kdrive.c
-@@ -1104,7 +1104,7 @@ KdInitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
- }
-
- void
--OsVendorFatalError(void)
-+OsVendorFatalError(const char *f, va_list args)
- {
- }
-
-diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
-index 2d679a5..e2cd96c 100644
---- a/hw/vfb/InitOutput.c
-+++ b/hw/vfb/InitOutput.c
-@@ -219,7 +219,7 @@ OsVendorInit(void)
- }
-
- void
--OsVendorFatalError(void)
-+OsVendorFatalError(const char *f, va_list args)
- {
- }
-
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 0974893..2a7d0a3 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -1053,7 +1053,7 @@ AbortDDX(enum ExitCode error)
- }
-
- void
--OsVendorFatalError(void)
-+OsVendorFatalError(const char *f, va_list args)
- {
- #ifdef VENDORSUPPORT
- ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
-diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
-index 0909826..330b8ca 100644
---- a/hw/xnest/Init.c
-+++ b/hw/xnest/Init.c
-@@ -142,7 +142,7 @@ OsVendorInit(void)
- }
-
- void
--OsVendorFatalError(void)
-+OsVendorFatalError(const char *f, va_list args)
- {
- return;
- }
-diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
-index 74e11fe..e2ab057 100644
---- a/hw/xquartz/darwin.c
-+++ b/hw/xquartz/darwin.c
-@@ -670,7 +670,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
- * OsVendorFatalError
- */
- void
--OsVendorFatalError(void)
-+OsVendorFatalError(const char *f, va_list args)
- {
- ErrorF(" OsVendorFatalError\n");
- }
-diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
-index 4049e97..a25307c 100644
---- a/hw/xwin/winerror.c
-+++ b/hw/xwin/winerror.c
-@@ -70,7 +70,7 @@ OsVendorVErrorF(const char *pszFormat, va_list va_args)
- * Attempt to do last-ditch, safe, important cleanup here.
- */
- void
--OsVendorFatalError(void)
-+OsVendorFatalError(const char *f, va_list args)
- {
- /* Don't give duplicate warning if UseMsg was called */
- if (g_fSilentFatalError)
-diff --git a/include/os.h b/include/os.h
-index 4b5b440..970ff02 100644
---- a/include/os.h
-+++ b/include/os.h
-@@ -321,7 +321,7 @@ extern _X_EXPORT void
- OsCleanup(Bool);
-
- extern _X_EXPORT void
--OsVendorFatalError(void);
-+OsVendorFatalError(const char *f, va_list args);
-
- extern _X_EXPORT void
- OsVendorInit(void);
-diff --git a/os/log.c b/os/log.c
-index 0ccd126..d913449 100644
---- a/os/log.c
-+++ b/os/log.c
-@@ -588,6 +588,7 @@ void
- FatalError(const char *f, ...)
- {
- va_list args;
-+ va_list args2;
- static Bool beenhere = FALSE;
-
- if (beenhere)
-@@ -595,22 +596,25 @@ FatalError(const char *f, ...)
- else
- ErrorF("\nFatal server error:\n");
-
-- va_start(args, f);
-+ /* Make a copy for OsVendorFatalError */
-+ va_copy(args2, args);
-+
- #ifdef __APPLE__
- {
-- va_list args2;
-+ va_list apple_args;
-
-- va_copy(args2, args);
-- (void) vsnprintf(__crashreporter_info_buff__,
-- sizeof(__crashreporter_info_buff__), f, args2);
-- va_end(args2);
-+ va_copy(apple_args, args);
-+ (void)vsnprintf(__crashreporter_info_buff__,
-+ sizeof(__crashreporter_info_buff__), f, apple_args);
-+ va_end(apple_args);
- }
- #endif
- VErrorF(f, args);
- va_end(args);
- ErrorF("\n");
- if (!beenhere)
-- OsVendorFatalError();
-+ OsVendorFatalError(f, args2);
-+ va_end(args2);
- if (!beenhere) {
- beenhere = TRUE;
- AbortServer();
-diff --git a/test/ddxstubs.c b/test/ddxstubs.c
-index a214b96..3647dc5 100644
---- a/test/ddxstubs.c
-+++ b/test/ddxstubs.c
-@@ -50,7 +50,7 @@ OsVendorInit(void)
- }
-
- void
--OsVendorFatalError(void)
-+OsVendorFatalError(const char *f, va_list args)
- {
- }
-
---
-1.7.10
-
Deleted: trunk/dports/x11/xorg-server/files/4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch 2012-09-06 01:44:14 UTC (rev 97438)
+++ trunk/dports/x11/xorg-server/files/4001-os-Fix-regression-with-FatalError-not-calling-va_sta.patch 2012-09-06 02:31:03 UTC (rev 97439)
@@ -1,31 +0,0 @@
-From 43e2760f536737cbd50dd3d8eb7faf39633b9e8c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 28 Mar 2012 15:07:51 -0700
-Subject: [PATCH 4001/4003] os: Fix regression with FatalError not calling
- va_start
-
-Regression From: a818b305989bbcde4e585112a7ee70cbc0b14a92
-
-Found-by: Colin Harrison <colin.harrison at virgin.net>
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit 817cec8ffd6cdb1abbcc00decd43569d44801764)
----
- os/log.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/os/log.c b/os/log.c
-index d913449..501fd45 100644
---- a/os/log.c
-+++ b/os/log.c
-@@ -596,6 +596,8 @@ FatalError(const char *f, ...)
- else
- ErrorF("\nFatal server error:\n");
-
-+ va_start(args, f);
-+
- /* Make a copy for OsVendorFatalError */
- va_copy(args2, args);
-
---
-1.7.10
-
Deleted: trunk/dports/x11/xorg-server/files/4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch 2012-09-06 01:44:14 UTC (rev 97438)
+++ trunk/dports/x11/xorg-server/files/4002-os-Annotate-OsVendorFatalError-as-_X_ATTRIBUTE_PRINT.patch 2012-09-06 02:31:03 UTC (rev 97439)
@@ -1,30 +0,0 @@
-From ef28cd2d7da9e1ea8399f1072a9c60a5af6b7fc0 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Thu, 19 Apr 2012 16:39:23 -0700
-Subject: [PATCH 4002/4003] os: Annotate OsVendorFatalError as
- _X_ATTRIBUTE_PRINTF
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-Tested-By: Michal Suchanek <hramrach at gmail.com>
-(cherry picked from commit d97868d934fd1a00f9e9ef23a1154a70c7bc0464)
----
- include/os.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/os.h b/include/os.h
-index 970ff02..8b58d7a 100644
---- a/include/os.h
-+++ b/include/os.h
-@@ -321,7 +321,8 @@ extern _X_EXPORT void
- OsCleanup(Bool);
-
- extern _X_EXPORT void
--OsVendorFatalError(const char *f, va_list args);
-+OsVendorFatalError(const char *f, va_list args)
-+_X_ATTRIBUTE_PRINTF(1, 0);
-
- extern _X_EXPORT void
- OsVendorInit(void);
---
-1.7.10
-
Deleted: trunk/dports/x11/xorg-server/files/4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.patch 2012-09-06 01:44:14 UTC (rev 97438)
+++ trunk/dports/x11/xorg-server/files/4003-XQuartz-Detect-FatalErrors-on-startup-to-prevent-tig.patch 2012-09-06 02:31:03 UTC (rev 97439)
@@ -1,146 +0,0 @@
-From 6826d7bbf0d25194c5a1660403a3aed873fc6d7d Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Fri, 17 Feb 2012 13:15:12 -0800
-Subject: [PATCH 4003/4003] XQuartz: Detect FatalErrors on startup to prevent
- tight crash loops
-
-If a FatalError occurs before the server finishes launching, it will
-not have drained the launchd-owned DISPLAY socket, so launchd will
-just relaunch it. This can cause the server to crash in a tight loop
-which will spam the user with CrashReporter windows that claim focus on
-appearance.
-
-This allows users stuck in this loop to "deal" with the problem without
-popping up a crash report every 10 seconds.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit 3505e1faadddeeec85a0d3f823c877ea33f86e00)
-
-Conflicts:
-
- hw/xquartz/X11Application.h
----
- hw/xquartz/X11Application.h | 3 ++
- hw/xquartz/X11Application.m | 45 ++++++++++++++++++++
- .../Resources/English.lproj/Localizable.strings | Bin 4410 -> 5454 bytes
- hw/xquartz/darwin.c | 4 +-
- 4 files changed, 51 insertions(+), 1 deletion(-)
-
-diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h
-index 740a807..5ea6129 100644
---- a/hw/xquartz/X11Application.h
-+++ b/hw/xquartz/X11Application.h
-@@ -89,6 +89,9 @@ X11ApplicationCanEnterRandR(void);
- void
- X11ApplicationMain(int argc, char **argv, char **envp);
-
-+void
-+X11ApplicationFatalError(const char *f, va_list args) __printflike(1, 0);
-+
- #define PREFS_APPSMENU "apps_menu"
- #define PREFS_FAKEBUTTONS "enable_fake_buttons"
- #define PREFS_KEYEQUIVS "enable_key_equivalents"
-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
-index b686b00..c77b724 100644
---- a/hw/xquartz/X11Application.m
-+++ b/hw/xquartz/X11Application.m
-@@ -72,6 +72,7 @@ static dispatch_queue_t eventTranslationQueue;
-
- extern Bool noTestExtensions;
- extern Bool noRenderExtension;
-+extern BOOL serverRunning;
-
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
- static TISInputSourceRef last_key_layout;
-@@ -1073,6 +1074,50 @@ X11ApplicationCanEnterRandR(void)
- }
- }
-
-+void
-+X11ApplicationFatalError(const char *f, va_list args)
-+{
-+#ifdef HAVE_LIBDISPATCH
-+ NSString *title, *msg;
-+ char *error_msg;
-+
-+ /* This is called by FatalError() in the server thread just before
-+ * we would abort. If the server never got off the ground, We should
-+ * inform the user of the error rather than letting the ever-so-friendly
-+ * CrashReporter do it for us.
-+ *
-+ * This also has the benefit of forcing user interaction rather than
-+ * allowing an infinite throttled-restart if the crash occurs before
-+ * we can drain the launchd socket.
-+ */
-+
-+ if (serverRunning) {
-+ return;
-+ }
-+
-+ title = NSLocalizedString(@"The application X11 could not be opened.",
-+ @"Dialog title when encountering a fatal error");
-+ msg = NSLocalizedString(@"An error occurred while starting the X11 server: \"%s\"\n\nClick Quit to quit X11. Click Report to see more details or send a report to Apple.",
-+ @"Dialog when encountering a fatal error");
-+
-+ vasprintf(&error_msg, f, args);
-+ msg = [NSString stringWithFormat:msg, error_msg];
-+
-+ /* We want the AppKit thread to actually service the alert or we will race [NSApp run] and create an
-+ * 'NSInternalInconsistencyException', reason: 'NSApp with wrong _running count'
-+ */
-+ dispatch_sync(dispatch_get_main_queue(), ^{
-+ if (NSAlertDefaultReturn == NSRunAlertPanel(title, msg, NSLocalizedString(@"Quit", @""),
-+ NSLocalizedString (@"Report...", @""), nil)) {
-+ exit(EXIT_FAILURE);
-+ }
-+ });
-+
-+ /* fall back to caller to do the abort() in the DIX */
-+#endif
-+}
-+
-+
- static void
- check_xinitrc(void)
- {
-diff --git a/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
-index bf2089ca1399c895dc701dfc23fa9bd44a1d8b8f..36ae0ffb3d2ed207a1a73be03bdc898c3306466f 100644
-GIT binary patch
-delta 934
-zcmd5*%}T>S5dKIBl!E9{DdLjS9s*7AsuT%=m!A9s54~s`O);h+iT{T at gYFaf21;+<
-zd;uRx{dSvR)RXoi%j|rcnVp^aX7X&k+Q$2vyfy5n_L6C$*;s5$dgiV%g|cVfOqQz;
-z)e2fdzARkJE2Hgt2r<AI=hP`Y#268sK;V#a%sr(9#L5=aGbXmtK at Ar6;NQ>JHv|r_
-z$|dqp0fxjOom1)~UKPX<bx0Y);Z=byr3lgaWe6D=E3#XuWwYh)GNG at PjakBgY^YjQ
-zssfkr$w{D#NHiNU_nf6ILSLH-1`?iPT<Cp`*ZZuoiA3u at pHs5Qa3el*O8Yh+8{IwD
-zGlz$=VTU0i&9@>kB at ztdaS5F1?+OihRvl6qCOl93qx?dhz3QT><a;ESUm{&q-i(Zn
-s7G@^o&wR}ND?-*$+vkLLIOziAPB<K1)v4kS_-Xqb?Xs;UEHEfO0Pm@$p8x;=
-
-delta 49
-zcmX at 7wM&WV-~Y+hg4!E(Bw1ONRh1<eHhZxKGeMY>y;!R@%Wy2 at U{+9Ln0!E>5&&!Y
-B4M6|^
-
-diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
-index e2ab057..41db72a 100644
---- a/hw/xquartz/darwin.c
-+++ b/hw/xquartz/darwin.c
-@@ -78,6 +78,8 @@
- #include "quartzKeyboard.h"
- #include "quartz.h"
-
-+#include "X11Application.h"
-+
- aslclient aslc;
-
- void
-@@ -672,7 +674,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
- void
- OsVendorFatalError(const char *f, va_list args)
- {
-- ErrorF(" OsVendorFatalError\n");
-+ X11ApplicationFatalError(f, args);
- }
-
- /*
---
-1.7.10
-
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-09-06 01:44:14 UTC (rev 97438)
+++ trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2012-09-06 02:31:03 UTC (rev 97439)
@@ -1,4 +1,4 @@
-From 0045dfa87231a42e65b3619730d363f117c05bbc Mon Sep 17 00:00:00 2001
+From 6dfb7cd702c1130fbe2bc15ef5d00c1983037451 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
@@ -9,13 +9,12 @@
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit 290d366d4c6b6e051f0e337a1a6ee76f42d28003)
---
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 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 \
@@ -27,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/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-09-06 01:44:14 UTC (rev 97438)
+++ trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2012-09-06 02:31:03 UTC (rev 97439)
@@ -1,11 +1,10 @@
-From 7fc9247b415ec000ef3dacede9eadef0d9fa92f4 Mon Sep 17 00:00:00 2001
+From 6e3829d167383a2fa4b1f14817a91dc3ec12138e 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
miPaintWindow and add some debugging output.
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit d7e56959401ce32120af67b01632442c52f2cf85)
---
mi/miexpose.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 94 insertions(+), 10 deletions(-)
@@ -162,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/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-09-06 01:44:14 UTC (rev 97438)
+++ trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2012-09-06 02:31:03 UTC (rev 97439)
@@ -1,4 +1,4 @@
-From a38ffa7e4343a958e04ff7855a0177e3d6eeb206 Mon Sep 17 00:00:00 2001
+From c36c05c6a2536e442964cfea2adaf8c8e3dc3356 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
@@ -14,7 +14,6 @@
This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit e6fa592a74104aa9d0081387823314833526f306)
---
fb/fb.h | 3 +--
fb/fbpict.c | 82 +++++++++++++++++------------------------------------------
@@ -313,5 +312,5 @@
DamageRegionProcessPending(pDst->pDrawable);
--
-1.7.9.5
+1.7.10.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120905/f292e08a/attachment-0001.html>
More information about the macports-changes
mailing list