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

[jeremyhu at macports.org]

Revision: 92807
          https://trac.macports.org/changeset/92807
Author:   jeremyhu at macports.org
Date:     2012-05-07 00:39:51 -0700 (Mon, 07 May 2012)
Log Message:
-----------
xorg-server: Bump to 1.12.1.901

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile

Removed Paths:
-------------
    trunk/dports/x11/xorg-server/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch
    trunk/dports/x11/xorg-server/files/tiger.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2012-05-07 07:37:25 UTC (rev 92806)
+++ trunk/dports/x11/xorg-server/Portfile	2012-05-07 07:39:51 UTC (rev 92807)
@@ -5,8 +5,7 @@
 name		xorg-server
 conflicts       xorg-server-devel
 set my_name	xorg-server
-version		1.12.1
-revision        1
+version		1.12.1.901
 categories	x11 devel
 license		X11 BSD
 maintainers	jeremyhu openmaintainer
@@ -21,9 +20,9 @@
 dist_subdir     ${my_name}
 distname        ${my_name}-${version}
 
-checksums           sha1    922b963901f4711449b53fb32ce3e14f5b642766 \
-                    rmd160  f52d2ba58999bc8bfbe5f37a29256046014fdbd2 \
-                    sha256  d21dc1dac767975cf9872984c78dd0bff928a74420fbcb415267c6bdbd41b45a
+checksums           sha1    bb9985bae271aa896de7fa12e49a0dbd8e244d2c \
+                    rmd160  84f8c7c1923670aadc0d5c7f634467ee87a67602 \
+                    sha256  e00525cd683da1a7bb9d99c16e2572706863cbb141c428129bf5166a47aefa9b
 
 use_bzip2	yes
 use_parallel_build yes
@@ -82,7 +81,6 @@
 	RAWCPP=${configure.cpp}
 
 patchfiles \
-        0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.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-Fix-a-deadlock-in-pre-dispatch-code.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch	2012-05-07 07:37:25 UTC (rev 92806)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Fix-a-deadlock-in-pre-dispatch-code.patch	2012-05-07 07:39:51 UTC (rev 92807)
@@ -1,29 +0,0 @@
-From cf059966fcba7eb3c2cc5e298887e4802f0a0126 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 18 Apr 2012 01:01:44 -0700
-Subject: [PATCH] XQuartz: Fix a deadlock in pre-dispatch code
-
-The fact that this has been in place so long makes me really wonder if
-anybody cares about this running in Tiger or Leopard.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- hw/xquartz/xpr/xprFrame.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
-index 4c7aac4..01f1def 100644
---- a/hw/xquartz/xpr/xprFrame.c
-+++ b/hw/xquartz/xpr/xprFrame.c
-@@ -212,7 +212,7 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
- #else
-     pthread_rwlock_wrlock(&window_hash_rwlock);
-     x_hash_table_insert(window_hash, pFrame->wid, pFrame);
--    pthread_rwlock_wrlock(&window_hash_rwlock);
-+    pthread_rwlock_unlock(&window_hash_rwlock);
- #endif
- 
-     xprSetNativeProperty(pFrame);
--- 
-1.7.10
-

Deleted: trunk/dports/x11/xorg-server/files/tiger.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/tiger.patch	2012-05-07 07:37:25 UTC (rev 92806)
+++ trunk/dports/x11/xorg-server/files/tiger.patch	2012-05-07 07:39:51 UTC (rev 92807)
@@ -1,60 +0,0 @@
-commit c27279f59296c79910bfe4c87c7144b90f8c866f
-Author: Jeremy Huddleston <jeremyhu at apple.com>
-Date:   Fri Mar 30 14:29:48 2012 -0700
-
-    XQuartz: Tiger build fix
-    
-    Fixes: https://trac.macports.org/ticket/33818
-    
-    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-
-diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
-index 21ad5b5..77962b1 100644
---- a/hw/xquartz/mach-startup/Makefile.am
-+++ b/hw/xquartz/mach-startup/Makefile.am
-@@ -23,7 +23,7 @@ nodist_X11_bin_SOURCES = \
- 	mach_startupServer.c \
- 	mach_startupUser.c
- 
--X11_bin_LDADD = \
-+X11_bin_DEPENDENCIES = \
- 	$(top_builddir)/hw/xquartz/libXquartz.la \
- 	$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
- 	$(top_builddir)/dix/dixfonts.lo \
-@@ -31,8 +31,12 @@ X11_bin_LDADD = \
- 	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
- 	$(XQUARTZ_LIBS) $(XSERVER_LIBS)
- 
-+# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering
-+# to work around build issues on Tiger.
-+X11_bin_LDADD = $(X11_bin_DEPENDENCIES) $(XSERVER_SYS_LIBS)
-+
- X11_bin_LDFLAGS =  \
--	$(XSERVER_SYS_LIBS) -lXplugin \
-+	-lXplugin \
- 	-XCClinker -Objc \
- 	-Wl,-u,_miDCInitialize \
- 	-Wl,-framework,Carbon \
-@@ -41,7 +45,7 @@ X11_bin_LDFLAGS =  \
- 	-Wl,-framework,IOKit
- 
- if GLX
--X11_bin_LDADD += \
-+X11_bin_DEPENDENCIES += \
- 	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
- 	$(top_builddir)/glx/libglx.la
- 
-@@ -55,12 +59,10 @@ X11_bin_LDFLAGS += \
- endif
- 
- if RECORD
--X11_bin_LDADD += \
-+X11_bin_DEPENDENCIES += \
- 	$(top_builddir)/record/librecord.la
- endif
- 
--X11_bin_DEPENDENCIES = $(X11_bin_LDADD)
--
- bin_PROGRAMS = Xquartz
- 
- dist_Xquartz_SOURCES = \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120507/9808eecf/attachment.html>