Update new xorg server to 1.14.4.

This will break some drivers, fixes for affected drivers are forthcomming.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1214 058c260c-8361-11dd-a0ac-aa2bafec7d09

8 files changed, 40 insertions, 178 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 9605431..698ef95 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,5 +1,5 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11-servers/xorg-server/Makefile 328762 2013-09-29 23:46:47Z zeising $
+# $FreeBSD: head/x11-servers/xorg-server/Makefile 321157 2013-06-17 21:51:48Z jkim $
 
 PORTNAME?=	xorg-server
 PORTVERSION=	${XORG_VERSION}
@@ -34,12 +34,10 @@ OPTIONS_EXCLUDE_sparc64=	HAL
 .include <bsd.port.options.mk>
 
 .if defined(WITH_NEW_XORG)
-XORG_VERSION=	1.12.4
-XORG_REVISION=	4
+XORG_VERSION=	1.14.4
+XORG_REVISION=	0
 PLIST_SUB+=	OLD="@comment " NEW=""
-EXTRA_PATCHES+=	${FILESDIR}/extra-clang \
-		${FILESDIR}/extra-configure \
-		${FILESDIR}/extra-new-dix_dixfonts.c
+EXTRA_PATCHES+=	${FILESDIR}/extra-hw_xfree86_loader_loadmod.c
 .else
 XORG_VERSION=	1.7.7
 XORG_REVISION=	11
@@ -50,7 +48,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-xace.c \
 		${FILESDIR}/extra-os-utils.c \
 		${FILESDIR}/extra-dix_events.c \
 		${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c \
-		${FILESDIR}/extra-old-dix_dixfonts.c
+		${FILESDIR}/extra-dix_dixfonts.c
 .endif
 
 USE_BZIP2=	yes
@@ -107,8 +105,7 @@ CONFIGURE_ARGS+=	--enable-aiglx=no
 .endif
 
 .if ${PORT_OPTIONS:MSUID}
-CONFIGURE_ARGS+=--enable-install-setuid=no
-#CONFIGURE_ARGS+=--enable-install-setuid=yes
+CONFIGURE_ARGS+=--enable-install-setuid=yes
 PLIST_SUB+=	SUID=""
 .else
 CONFIGURE_ARGS+=--enable-install-setuid=no
@@ -197,7 +194,9 @@ post-install:
 	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
 		${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/*.so
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}//lib/xorg/modules/extensions/*.so
+.if !defined(WITH_NEW_XORG)
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/*.so
+.endif
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/multimedia/*.so
 
 .if defined(WITH_NEW_XORG)
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 7f1ac51..2854591 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,4 +1,4 @@
 SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
 SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
-SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
-SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761
+SHA256 (xorg/xserver/xorg-server-1.14.4.tar.bz2) = 608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3
+SIZE (xorg/xserver/xorg-server-1.14.4.tar.bz2) = 5507288
diff --git a/x11-servers/xorg-server/files/extra-clang b/x11-servers/xorg-server/files/extra-clang
deleted file mode 100644
index 7f22a52..0000000
--- a/x11-servers/xorg-server/files/extra-clang
+++ /dev/null
@@ -1,98 +0,0 @@
---- dix/events.c.orig	2012-07-09 02:32:59.000000000 +0200
-+++ dix/events.c	2012-07-22 14:34:46.000000000 +0200
-@@ -5189,7 +5189,8 @@
- InitEvents(void)
- {
-     int i;
--    QdEventPtr qe, tmp;
-+    QdEventPtr qe = NULL;
-+    QdEventPtr tmp;
- 
-     inputInfo.numDevices = 0;
-     inputInfo.devices = (DeviceIntPtr) NULL;
---- hw/xfree86/common/xf86Xinput.c.orig	2012-06-26 08:24:18.000000000 +0200
-+++ hw/xfree86/common/xf86Xinput.c	2012-07-22 14:34:46.000000000 +0200
-@@ -524,7 +524,7 @@
- MatchAttrToken(const char *attr, struct xorg_list *patterns,
-                int (*compare) (const char *attr, const char *pattern))
- {
--    const xf86MatchGroup *group;
-+    const xf86MatchGroup *group = NULL;
- 
-     /* If there are no patterns, accept the match */
-     if (xorg_list_is_empty(patterns))
---- hw/xfree86/dri2/dri2.c.orig	2012-07-09 02:32:59.000000000 +0200
-+++ hw/xfree86/dri2/dri2.c	2012-07-22 14:38:42.000000000 +0200
-@@ -239,7 +239,7 @@
- static DRI2DrawableRefPtr
- DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
- {
--    DRI2DrawableRefPtr ref;
-+    DRI2DrawableRefPtr ref = NULL;
- 
-     xorg_list_for_each_entry(ref, &pPriv->reference_list, link) {
-         if (ref->id == id)
-@@ -306,7 +306,8 @@
- {
-     DRI2DrawablePtr pPriv = p;
-     DRI2ScreenPtr ds = pPriv->dri2_screen;
--    DRI2DrawableRefPtr ref, next;
-+    DRI2DrawableRefPtr ref = NULL;
-+    DRI2DrawableRefPtr next;
-     WindowPtr pWin;
-     PixmapPtr pPixmap;
-     DrawablePtr pDraw;
-@@ -587,7 +588,7 @@
- DRI2InvalidateDrawable(DrawablePtr pDraw)
- {
-     DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
--    DRI2DrawableRefPtr ref;
-+    DRI2DrawableRefPtr ref = NULL;
- 
-     if (!pPriv || !pPriv->needInvalidate)
-         return;
---- test/list.c.orig	2012-06-26 06:12:51.000000000 +0200
-+++ test/list.c	2012-07-22 14:34:46.000000000 +0200
-@@ -187,7 +187,7 @@
- {
-     struct parent parent = { 0 };
-     struct child child[3];
--    struct child *c;
-+    struct child *c = NULL;
-     int i = 0;
- 
-     xorg_list_init(&parent.children);
---- xfixes/cursor.c.orig	2012-07-06 07:17:19.000000000 +0200
-+++ xfixes/cursor.c	2012-07-22 14:34:46.000000000 +0200
-@@ -1143,7 +1143,7 @@
- barrier_find_nearest(CursorScreenPtr cs, int dir,
-                      int x1, int y1, int x2, int y2)
- {
--    struct PointerBarrierClient *c;
-+    struct PointerBarrierClient *c = NULL;
-     struct PointerBarrier *nearest = NULL;
-     double min_distance = INT_MAX;      /* can't get higher than that in X anyway */
- 
---- hw/xfree86/parser/InputClass.c.orig	2013-07-04 11:45:42.139818164 +0200
-+++ hw/xfree86/parser/InputClass.c	2013-07-04 11:46:29.034806839 +0200
-@@ -362,7 +362,8 @@
-     XF86ConfInputClassPtr prev;
- 
-     while (ptr) {
--        xf86MatchGroup *group, *next;
-+        xf86MatchGroup *group = NULL;
-+        xf86MatchGroup *next;
-         char **list;
- 
-         TestFree(ptr->identifier);
---- hw/xfree86/loader/loadmod.c.orig	2013-07-04 11:48:11.160800614 +0200
-+++ hw/xfree86/loader/loadmod.c	2013-07-04 11:48:32.000800157 +0200
-@@ -472,7 +472,7 @@
-     char **elem;
-     const char **subdirs;
-     const char **s;
--    PatternPtr patterns;
-+    PatternPtr patterns = NULL;
-     PatternPtr p;
-     DIR *d;
-     struct dirent *dp;
diff --git a/x11-servers/xorg-server/files/extra-configure b/x11-servers/xorg-server/files/extra-configure
deleted file mode 100644
index cede35b..0000000
--- a/x11-servers/xorg-server/files/extra-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2013-09-07 22:11:27.210621324 +0200
-+++ configure	2013-09-07 22:11:52.912624338 +0200
-@@ -22839,7 +22839,7 @@
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_tls=$kw
-+  ac_cv_tls=$kw; break ;
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         done
diff --git a/x11-servers/xorg-server/files/extra-old-dix_dixfonts.c b/x11-servers/xorg-server/files/extra-dix_dixfonts.c
index 163a4ef..163a4ef 100644
--- a/x11-servers/xorg-server/files/extra-old-dix_dixfonts.c
+++ b/x11-servers/xorg-server/files/extra-dix_dixfonts.c
diff --git a/x11-servers/xorg-server/files/extra-hw_xfree86_loader_loadmod.c b/x11-servers/xorg-server/files/extra-hw_xfree86_loader_loadmod.c
new file mode 100644
index 0000000..1d769f2
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-hw_xfree86_loader_loadmod.c
@@ -0,0 +1,11 @@
+--- hw/xfree86/loader/loadmod.c.orig	2013-06-21 15:54:25.000000000 +0200
++++ hw/xfree86/loader/loadmod.c	2013-06-21 15:55:09.000000000 +0200
+@@ -490,7 +490,7 @@
+     char **elem;
+     const char **subdirs;
+     const char **s;
+-    PatternPtr patterns;
++    PatternPtr patterns = NULL;
+     PatternPtr p;
+     DIR *d;
+     struct dirent *dp;
diff --git a/x11-servers/xorg-server/files/extra-new-dix_dixfonts.c b/x11-servers/xorg-server/files/extra-new-dix_dixfonts.c
deleted file mode 100644
index d1f5674..0000000
--- a/x11-servers/xorg-server/files/extra-new-dix_dixfonts.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- dix/dixfonts.c.orig	2012-05-17 19:09:01.000000000 +0200
-+++ dix/dixfonts.c	2013-10-09 10:49:38.158284440 +0200
-@@ -1414,6 +1414,7 @@
-             GC *pGC;
-             unsigned char *data;
-             ITclosurePtr new_closure;
-+            ITclosurePtr old_closure;
- 
-             /* We're putting the client to sleep.  We need to
-                save some state.  Similar problem to that handled
-@@ -1425,12 +1426,14 @@
-                 err = BadAlloc;
-                 goto bail;
-             }
-+            old_closure = c;
-             *new_closure = *c;
-             c = new_closure;
- 
-             data = malloc(c->nChars * itemSize);
-             if (!data) {
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
-@@ -1441,6 +1444,7 @@
-             if (!pGC) {
-                 free(c->data);
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
-@@ -1453,6 +1457,7 @@
-                 FreeScratchGC(pGC);
-                 free(c->data);
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 0cb6565..704d374 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -61,6 +61,7 @@ include/xorg/geext.h
 include/xorg/geint.h
 include/xorg/globals.h
 include/xorg/glyphstr.h
+%%NEW%%include/xorg/glx_extinit.h
 include/xorg/hotplug.h
 include/xorg/i2c_def.h
 include/xorg/input.h
@@ -68,7 +69,7 @@ include/xorg/inputstr.h
 %%NEW%%include/xorg/list.h
 include/xorg/mi.h
 %%OLD%%include/xorg/mibank.h
-include/xorg/mibstore.h
+%%OLD%%include/xorg/mibstore.h
 include/xorg/micmap.h
 include/xorg/micoord.h
 include/xorg/mifillarc.h
@@ -133,9 +134,9 @@ include/xorg/vidmodeproc.h
 include/xorg/wfbrename.h
 include/xorg/window.h
 include/xorg/windowstr.h
-include/xorg/xaa.h
+%%OLD%%include/xorg/xaa.h
 %%OLD%%include/xorg/xaaWrapper.h
-include/xorg/xaalocal.h
+%%OLD%%include/xorg/xaalocal.h
 include/xorg/xaarop.h
 include/xorg/xace.h
 include/xorg/xacestr.h
@@ -165,6 +166,7 @@ include/xorg/xf86cmap.h
 include/xorg/xf86fbman.h
 include/xorg/xf86i2c.h
 include/xorg/xf86int10.h
+%%NEW%%include/xorg/xf86platformBus.h
 include/xorg/xf86sbusBus.h
 include/xorg/xf86str.h
 include/xorg/xf86xv.h
@@ -181,16 +183,16 @@ include/xorg/xorgVersion.h
 include/xorg/xserver-properties.h
 include/xorg/xvdix.h
 include/xorg/xvmcext.h
-lib/xorg/modules/extensions/libdbe.la
-lib/xorg/modules/extensions/libdbe.so
-lib/xorg/modules/extensions/libdri.la
-lib/xorg/modules/extensions/libdri.so
-lib/xorg/modules/extensions/libdri2.la
-lib/xorg/modules/extensions/libdri2.so
-lib/xorg/modules/extensions/libextmod.la
-lib/xorg/modules/extensions/libextmod.so
-lib/xorg/modules/extensions/librecord.la
-lib/xorg/modules/extensions/librecord.so
+%%OLD%%lib/xorg/modules/extensions/libdbe.la
+%%OLD%%lib/xorg/modules/extensions/libdbe.so
+%%OLD%%lib/xorg/modules/extensions/libdri.la
+%%OLD%%lib/xorg/modules/extensions/libdri.so
+%%OLD%%lib/xorg/modules/extensions/libdri2.la
+%%OLD%%lib/xorg/modules/extensions/libdri2.so
+%%OLD%%lib/xorg/modules/extensions/libextmod.la
+%%OLD%%lib/xorg/modules/extensions/libextmod.so
+%%OLD%%lib/xorg/modules/extensions/librecord.la
+%%OLD%%lib/xorg/modules/extensions/librecord.so
 lib/xorg/modules/extensions/.xorg/libglx.so
 lib/xorg/modules/libexa.la
 lib/xorg/modules/libexa.so
@@ -210,8 +212,8 @@ lib/xorg/modules/libvgahw.la
 lib/xorg/modules/libvgahw.so
 lib/xorg/modules/libwfb.la
 lib/xorg/modules/libwfb.so
-lib/xorg/modules/libxaa.la
-lib/xorg/modules/libxaa.so
+%%OLD%%lib/xorg/modules/libxaa.la
+%%OLD%%lib/xorg/modules/libxaa.so
 %%OLD%%lib/xorg/modules/libxf8_16bpp.la
 %%OLD%%lib/xorg/modules/libxf8_16bpp.so
 %%OLD%%lib/xorg/modules/linux/libfbdevhw.la
@@ -251,4 +253,4 @@ share/aclocal/xorg-server.m4
 @dirrm lib/xorg/modules
 @dirrm lib/xorg
 %%NEW%%@dirrmtry share/X11/xorg.conf.d
-@dirrmtry share/X11
+%%NEW%%@dirrmtry share/X11