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

[jeremyhu at macports.org]

Revision: 102880
          https://trac.macports.org/changeset/102880
Author:   jeremyhu at macports.org
Date:     2013-02-09 20:50:35 -0800 (Sat, 09 Feb 2013)
Log Message:
-----------
xorg-server-devel: Bump to current git

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

Added Paths:
-----------
    trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch
    trunk/dports/x11/xorg-server-devel/files/0002-os-Ensure-dix-config.h-is-included-in-strndup.c.patch

Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile	2013-02-10 04:40:09 UTC (rev 102879)
+++ trunk/dports/x11/xorg-server-devel/Portfile	2013-02-10 04:50:35 UTC (rev 102880)
@@ -6,6 +6,7 @@
 conflicts       xorg-server
 set my_name	xorg-server
 version		1.13.99.901
+revision	1
 categories	x11 devel
 license         X11
 maintainers	jeremyhu openmaintainer
@@ -16,7 +17,7 @@
 
 fetch.type      git
 git.url         git://anongit.freedesktop.org/xorg/xserver
-git.branch      bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a
+git.branch      c1602d1c17967bdd4db9db19b3a9c0dfca6a58aa
 
 use_parallel_build yes
 
@@ -75,6 +76,8 @@
 	RAWCPP=${configure.cpp}
 
 patchfiles \
+	0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch \
+	0002-os-Ensure-dix-config.h-is-included-in-strndup.c.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 \

Added: trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch	2013-02-10 04:50:35 UTC (rev 102880)
@@ -0,0 +1,29 @@
+From f09da85558f816c8d6c72bc2f986aba598ca517a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 9 Feb 2013 20:34:33 -0800
+Subject: [PATCH 1/2] XQuartz: Ensure <dix-config.h> is included in
+ capabilities.c
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ hw/xquartz/GL/capabilities.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
+index 4702595..5573629 100644
+--- a/hw/xquartz/GL/capabilities.c
++++ b/hw/xquartz/GL/capabilities.c
+@@ -20,6 +20,10 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+ 
++#ifdef HAVE_DIX_CONFIG_H
++#include <dix-config.h>
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
+-- 
+1.8.1.2
+

Added: trunk/dports/x11/xorg-server-devel/files/0002-os-Ensure-dix-config.h-is-included-in-strndup.c.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0002-os-Ensure-dix-config.h-is-included-in-strndup.c.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0002-os-Ensure-dix-config.h-is-included-in-strndup.c.patch	2013-02-10 04:50:35 UTC (rev 102880)
@@ -0,0 +1,28 @@
+From c8b324bf154a32f902abd1090a76502ae1bf2674 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 9 Feb 2013 20:40:10 -0800
+Subject: [PATCH 2/2] os: Ensure <dix-config.h> is included in strndup.c
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ os/strndup.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/os/strndup.c b/os/strndup.c
+index b604b9b..e0eddf1 100644
+--- a/os/strndup.c
++++ b/os/strndup.c
+@@ -27,6 +27,10 @@
+  * SUCH DAMAGE.
+  */
+ 
++#ifdef HAVE_DIX_CONFIG_H
++#include <dix-config.h>
++#endif
++
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+-- 
+1.8.1.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130209/9f275243/attachment.html>