CVS commit: [netbsd-6] src/external/mit/xorg/server/xorg-server

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Dec 26 07:29:34 UTC 2014

Modified Files:
src/external/mit/xorg/server/xorg-server [netbsd-6]: Makefile

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1222):
external/mit/xorg/server/xorg-server/Makefile   patch

Fix conversion of SDK_REQUIRED_MODULES which was reported by John D. Baker
in PR#49500.


To generate a diff of this commit:
cvs rdiff -u -r1.19.8.1 -r1.19.8.2 \
src/external/mit/xorg/server/xorg-server/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.1 src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.2
--- src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.1	Thu Dec 25 05:05:02 2014
+++ src/external/mit/xorg/server/xorg-server/Makefile	Fri Dec 26 07:29:34 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19.8.1 2014/12/25 05:05:02 msaitoh Exp $
+#	$NetBSD: Makefile,v 1.19.8.2 2014/12/26 07:29:34 msaitoh Exp $
 
 .include bsd.own.mk
 
@@ -35,6 +35,7 @@ PKGCONFIG=	xorg-server
 # Use -fvisibility=hidden for symbol_visibility?
 PKGCONFIG_SED_FLAGS= \
 	-e s,@sysconfigdir@,${X11ETCDIR},; \
+	s,@SDK_REQUIRED_MODULES@,xproto = 7.0.17 randrproto = 1.2.99.3 renderproto = 0.11 xextproto = 7.1.99 inputproto = 1.9.99.902 kbproto = 1.0.3 fontsproto,; \
 	s,@symbol_visibility@,,
 
 .include bsd.x11.mk

CVS commit: [netbsd-6] src/external/mit/xorg/server/xorg-server/Xi

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Dec 21 19:03:40 UTC 2014

Modified Files:
src/external/mit/xorg/server/xorg-server/Xi [netbsd-6]: Makefile

Log Message:
Apply patch (requested by mrg in ticket 1208):
Pass -Wno-error to work around a build failure on vax with gcc 4.1


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/external/mit/xorg/server/xorg-server/Xi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/Xi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.4 src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.4.4.1
--- src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.4	Thu Aug 11 23:15:41 2011
+++ src/external/mit/xorg/server/xorg-server/Xi/Makefile	Sun Dec 21 19:03:40 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2011/08/11 23:15:41 joerg Exp $
+#	$NetBSD: Makefile,v 1.4.4.1 2014/12/21 19:03:40 snj Exp $
 
 .include ../Makefile.serverlib
 .include ../Makefile.servermod
@@ -38,5 +38,8 @@ CPPFLAGS+=  ${X11FLAGS.DIX}
 
 CWARNFLAGS.clang+=	-Wno-tautological-compare
 
+# XXX: uint16 vs INT_MAX
+COPTS.xichangehierarchy.c+=	-Wno-error
+
 .include bsd.x11.mk
 .include bsd.lib.mk