[114841] trunk/dports/x11/xorg-server-devel
jeremyhu at macports.org
jeremyhu at macports.org
Tue Dec 17 09:34:13 PST 2013
Revision: 114841
https://trac.macports.org/changeset/114841
Author: jeremyhu at macports.org
Date: 2013-12-17 09:34:13 -0800 (Tue, 17 Dec 2013)
Log Message:
-----------
xorg-server-devel: Bump to current git master
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
trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
Removed 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-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2013-12-17 17:34:13 UTC (rev 114841)
@@ -5,7 +5,7 @@
name xorg-server-devel
conflicts xorg-server
set my_name xorg-server
-version 1.14.99.0
+version 1.14.99.904
categories x11 devel
license X11
maintainers jeremyhu openmaintainer
@@ -16,7 +16,7 @@
fetch.type git
git.url git://anongit.freedesktop.org/xorg/xserver
-git.branch 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f
+git.branch 4d62646142718024b0981eb4f1fd0131e829161f
use_parallel_build yes
@@ -31,6 +31,7 @@
port:xorg-fontsproto \
port:xorg-glproto \
port:xorg-inputproto \
+ port:xorg-presentproto \
port:xorg-randrproto \
port:xorg-recordproto \
port:xorg-renderproto \
@@ -65,7 +66,9 @@
--without-fop \
--without-xmlto \
--disable-devel-docs \
- --with-sha1=CommonCrypto
+ --with-sha1=CommonCrypto \
+ --disable-dri2 \
+ --disable-dri3
# GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
configure.cppflags-append -I/usr/include -I${filespath}/dri
Deleted: 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 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Ensure-dix-config.h-is-included-in-capabilit.patch 2013-12-17 17:34:13 UTC (rev 114841)
@@ -1,29 +0,0 @@
-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
-
Deleted: 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 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/0002-os-Ensure-dix-config.h-is-included-in-strndup.c.patch 2013-12-17 17:34:13 UTC (rev 114841)
@@ -1,28 +0,0 @@
-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
-
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 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2013-12-17 17:34:13 UTC (rev 114841)
@@ -1,4 +1,4 @@
-From 2cad1b044ebe3007b9c18fce0525c75aeccde309 Mon Sep 17 00:00:00 2001
+From 9de3e51e9a96476d032f208c537f4b4e7f80ccc9 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/5003] sdksyms.sh: Use CPPFLAGS, not CFLAGS
@@ -10,31 +10,32 @@
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
---
- hw/xfree86/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ hw/xfree86/Makefile.am | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index c3899b5..4f48b85 100644
+index eea16a8..982f38d 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 \
+@@ -38,8 +38,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
bin_PROGRAMS = Xorg
nodist_Xorg_SOURCES = sdksyms.c
-AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
-+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
- INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
+-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
++AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
- -I$(srcdir)/dri -I$(srcdir)/dri2
-@@ -115,7 +115,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
+ -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
+
+@@ -124,7 +123,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
EXTRA_DIST += sdksyms.sh
sdksyms.dep sdksyms.c: sdksyms.sh
-- $(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)
+- $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
++ $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS)
SDKSYMS_DEP = sdksyms.dep
include $(SDKSYMS_DEP)
--
-1.8.0.2
+1.8.4.1
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 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2013-12-17 17:34:13 UTC (rev 114841)
@@ -1,4 +1,4 @@
-From b54625d24e217592ef5f00415c58e1622b4c8008 Mon Sep 17 00:00:00 2001
+From 601a16126ddd6af0d28b6f8e80bad2249f9a551b 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/5003] Workaround the GC clipping problem in miPaintWindow
@@ -161,5 +161,5 @@
pbox = RegionRects(prgn);
for (i = numRects; --i >= 0; pbox++, prect++) {
--
-1.8.0.2
+1.8.4.1
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 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2013-12-17 17:34:13 UTC (rev 114841)
@@ -1,4 +1,4 @@
-From fa26b51f4582e97b68a7ee9382147bc5b3c8cc3a Mon Sep 17 00:00:00 2001
+From 1c5fcdb4daa09fea865b89a4d8de7e3189b12836 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/5003] fb: Revert fb changes that broke XQuartz
@@ -21,10 +21,10 @@
3 files changed, 43 insertions(+), 85 deletions(-)
diff --git a/fb/fb.h b/fb/fb.h
-index b869d12..895b148 100644
+index 26957df..1c6963f 100644
--- a/fb/fb.h
+++ b/fb/fb.h
-@@ -1686,8 +1686,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
+@@ -1652,8 +1652,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
RegionPtr pRegion, FbBits and, FbBits xor);
extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
@@ -35,7 +35,7 @@
extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 2804ff4..80c2a91 100644
+index b503858..7c2ead5 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -46,23 +46,18 @@ fbComposite(CARD8 op,
@@ -67,7 +67,7 @@
}
free_pixman_pict(pSrc, src);
-@@ -293,20 +288,22 @@ create_conical_gradient_image(PictGradient * gradient)
+@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient)
}
static pixman_image_t *
@@ -97,7 +97,7 @@
stride * sizeof(FbStride));
if (!image)
-@@ -333,57 +330,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+@@ -329,57 +326,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
if (pict->clientClipType != CT_NONE)
pixman_image_set_has_client_clip(image, TRUE);
@@ -159,7 +159,7 @@
}
switch (pict->repeatType) {
-@@ -411,10 +382,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
+@@ -407,10 +378,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
* as the alpha map for this operation
*/
if (pict->alphaMap && !is_alpha_map) {
@@ -171,7 +171,7 @@
pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x,
pict->alphaOrigin.y);
-@@ -448,8 +417,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
+@@ -444,8 +413,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
}
static pixman_image_t *
@@ -181,7 +181,7 @@
{
pixman_image_t *image = NULL;
-@@ -457,7 +425,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
+@@ -453,7 +421,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
return NULL;
if (pict->pDrawable) {
@@ -190,7 +190,7 @@
}
else if (pict->pSourcePict) {
SourcePict *sp = pict->pSourcePict;
-@@ -475,19 +443,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
+@@ -471,19 +439,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
else if (sp->type == SourcePictTypeConical)
image = create_conical_gradient_image(gradient);
}
@@ -312,5 +312,5 @@
DamageRegionProcessPending(pDst->pDrawable);
--
-1.8.0.2
+1.8.4.1
Modified: trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2013-12-17 15:44:46 UTC (rev 114840)
+++ trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2013-12-17 17:34:13 UTC (rev 114841)
@@ -1,20 +1,24 @@
-commit 3153e51fac17b5e4976ced2d35b5c4e0fc0faf28
-Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Tue Dec 18 01:03:38 2012 -0800
+From 0c840c6310fdba5eda92823ef1c8adb052ccf9f7 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 18 Dec 2012 01:03:38 -0800
+Subject: [PATCH 5003/5003] fb: Revert fb changes that broke XQuartz
- fb: Revert fb changes that broke XQuartz
-
- http://bugs.freedesktop.org/show_bug.cgi?id=26124
-
- Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0"
-
- This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
+ http://bugs.freedesktop.org/show_bug.cgi?id=26124
+Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0"
+
+This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
+---
+ fb/fb.h | 3 --
+ fb/fbpict.c | 149 +---------------------------------------------------------
+ fb/fbscreen.c | 1 -
+ 3 files changed, 1 insertion(+), 152 deletions(-)
+
diff --git a/fb/fb.h b/fb/fb.h
-index 895b148..cc5759c 100644
+index 1c6963f..11e6344 100644
--- a/fb/fb.h
+++ b/fb/fb.h
-@@ -1344,9 +1344,6 @@ extern _X_EXPORT void
+@@ -1310,9 +1310,6 @@ extern _X_EXPORT void
extern _X_EXPORT Bool
fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
@@ -203,3 +207,6 @@
for (d = 0; d < pScreen->numDepths; d++)
free(depths[d].vids);
free(depths);
+--
+1.8.4.1
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131217/e99b8b3b/attachment-0001.html>
More information about the macports-changes
mailing list