CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 20:57:20 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lcode.c llex.c lstrlib.c
Log Message:
fix kernel Lua code style issues
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/lua/dist/src/lcode.c
cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/src/llex.c
cvs rdiff -u -r1.14 -r1.15 src/external/mit/lua/dist/src/lstrlib.c
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/lua/dist/src/lcode.c
diff -u src/external/mit/lua/dist/src/lcode.c:1.7 src/external/mit/lua/dist/src/lcode.c:1.8
--- src/external/mit/lua/dist/src/lcode.c:1.7 Thu Sep 8 02:57:32 2016
+++ src/external/mit/lua/dist/src/lcode.c Thu Sep 8 20:57:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lcode.c,v 1.7 2016/09/08 02:57:32 salazar Exp $ */
+/* $NetBSD: lcode.c,v 1.8 2016/09/08 20:57:20 salazar Exp $ */
/*
** Id: lcode.c,v 2.109 2016/05/13 19:09:21 roberto Exp
@@ -775,7 +775,7 @@ int luaK_exp2RK (FuncState *fs, expdesc
case VKINT: e->u.info = luaK_intK(fs, e->u.ival); goto vk;
#ifndef _KERNEL
case VKFLT: e->u.info = luaK_numberK(fs, e->u.nval); goto vk;
-#endif
+#endif /* _KERNEL */
case VK:
vk:
e->k = VK;
Index: src/external/mit/lua/dist/src/llex.c
diff -u src/external/mit/lua/dist/src/llex.c:1.8 src/external/mit/lua/dist/src/llex.c:1.9
--- src/external/mit/lua/dist/src/llex.c:1.8 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/llex.c Thu Sep 8 20:57:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: llex.c,v 1.8 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: llex.c,v 1.9 2016/09/08 20:57:20 salazar Exp $ */
/*
** Id: llex.c,v 2.96 2016/05/02 14:02:12 roberto Exp
@@ -213,6 +213,7 @@ static int check_next2 (LexState *ls, co
else return 0;
}
+
#ifndef _KERNEL
/* LUA_NUMBER */
/*
Index: src/external/mit/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.14 src/external/mit/lua/dist/src/lstrlib.c:1.15
--- src/external/mit/lua/dist/src/lstrlib.c:1.14 Thu Sep 8 02:51:53 2016
+++ src/external/mit/lua/dist/src/lstrlib.c Thu Sep 8 20:57:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lstrlib.c,v 1.14 2016/09/08 02:51:53 salazar Exp $ */
+/* $NetBSD: lstrlib.c,v 1.15 2016/09/08 20:57:20 salazar Exp $ */
/*
** Id: lstrlib.c,v 1.251 2016/05/20 14:13:21 roberto Exp
@@ -942,7 +942,7 @@ static void checkdp (char *buff, int nb)
if (ppoint) *ppoint = '.'; /* change it to a dot */
}
}
-#endif
+#endif /* _KERNEL */
static void addliteral (lua_State *L, luaL_Buffer *b, int arg) {
@@ -961,7 +961,7 @@ static void addliteral (lua_State *L, lu
lua_Number n = lua_tonumber(L, arg); /* write as hexa ('%a') */
nb = lua_number2strx(L, buff, MAX_ITEM, "%" LUA_NUMBER_FRMLEN "a", n);
checkdp(buff, nb); /* ensure it uses a dot */
-#endif
+#endif /* _KERNEL */
}
else { /* integers */
lua_Integer n = lua_tointeger(L, arg);
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 02:57:32 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lcode.c
Log Message:
fix bug 3 (for Lua.5.3.3) reported on www.lua.org/bugs.html
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lcode.c
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/lua/dist/src/lcode.c
diff -u src/external/mit/lua/dist/src/lcode.c:1.6 src/external/mit/lua/dist/src/lcode.c:1.7
--- src/external/mit/lua/dist/src/lcode.c:1.6 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/lcode.c Thu Sep 8 02:57:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lcode.c,v 1.6 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: lcode.c,v 1.7 2016/09/08 02:57:32 salazar Exp $ */
/*
** Id: lcode.c,v 2.109 2016/05/13 19:09:21 roberto Exp
@@ -1046,8 +1046,8 @@ static void codeunexpval (FuncState *fs,
*/
static void codebinexpval (FuncState *fs, OpCode op,
expdesc *e1, expdesc *e2, int line) {
- int rk1 = luaK_exp2RK(fs, e1); /* both operands are "RK" */
- int rk2 = luaK_exp2RK(fs, e2);
+ int rk2 = luaK_exp2RK(fs, e2); /* both operands are "RK" */
+ int rk1 = luaK_exp2RK(fs, e1);
freeexps(fs, e1, e2);
e1->u.info = luaK_codeABC(fs, op, 0, rk1, rk2); /* generate opcode */
e1->k = VRELOCABLE; /* all those operations are relocatable */
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 02:55:50 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: loslib.c
Log Message:
fix bug 2 (for Lua.5.3.3) reported on www.lua.org/bugs.html
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/loslib.c
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/lua/dist/src/loslib.c
diff -u src/external/mit/lua/dist/src/loslib.c:1.6 src/external/mit/lua/dist/src/loslib.c:1.7
--- src/external/mit/lua/dist/src/loslib.c:1.6 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/loslib.c Thu Sep 8 02:55:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: loslib.c,v 1.6 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: loslib.c,v 1.7 2016/09/08 02:55:50 salazar Exp $ */
/*
** Id: loslib.c,v 1.64 2016/04/18 13:06:55 roberto Exp
@@ -262,8 +262,9 @@ static int getfield (lua_State *L, const
static const char *checkoption (lua_State *L, const char *conv, char *buff) {
const char *option;
int oplen = 1;
- for (option = LUA_STRFTIMEOPTIONS; *option != '\0'; option += oplen) {
-if (*option == '|') /* next block? */
+ int convlen = (int)strlen(conv);
+ for (option = LUA_STRFTIMEOPTIONS; *option != '\0' && oplen <= convlen; option += oplen) {
+ if (*option == '|') /* next block? */
oplen++; /* next length */
else if (memcmp(conv, option, oplen) == 0) { /* match? */
memcpy(buff, conv, oplen); /* copy valid option to buffer */
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 02:53:39 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lparser.c
Log Message:
fix bug 1 reported on www.lua.org/bugs.html
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/lparser.c
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/lua/dist/src/lparser.c
diff -u src/external/mit/lua/dist/src/lparser.c:1.6 src/external/mit/lua/dist/src/lparser.c:1.7
--- src/external/mit/lua/dist/src/lparser.c:1.6 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/lparser.c Thu Sep 8 02:53:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lparser.c,v 1.6 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: lparser.c,v 1.7 2016/09/08 02:53:39 salazar Exp $ */
/*
** Id: lparser.c,v 2.153 2016/05/13 19:10:16 roberto Exp
@@ -327,6 +327,8 @@ static void adjust_assign (LexState *ls,
luaK_nil(fs, reg, extra);
}
}
+ if (nexps > nvars)
+ls->fs->freereg -= nexps - nvars; /* remove extra values */
}
@@ -1174,11 +1176,8 @@ static void assignment (LexState *ls, st
int nexps;
checknext(ls, '=');
nexps = explist(ls, &e);
-if (nexps != nvars) {
+if (nexps != nvars)
adjust_assign(ls, nvars, nexps, &e);
- if (nexps > nvars)
-ls->fs->freereg -= nexps - nvars; /* remove extra values */
-}
else {
luaK_setoneret(ls->fs, &e); /* close last expression */
luaK_storevar(ls->fs, &lh->v, &e);
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: salazar
Date: Thu Sep 8 02:51:53 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lstrlib.c
Log Message:
fix misplaced kernel Lua ifndef
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/lua/dist/src/lstrlib.c
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/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.13 src/external/mit/lua/dist/src/lstrlib.c:1.14
--- src/external/mit/lua/dist/src/lstrlib.c:1.13 Thu Sep 8 02:21:31 2016
+++ src/external/mit/lua/dist/src/lstrlib.c Thu Sep 8 02:51:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lstrlib.c,v 1.13 2016/09/08 02:21:31 salazar Exp $ */
+/* $NetBSD: lstrlib.c,v 1.14 2016/09/08 02:51:53 salazar Exp $ */
/*
** Id: lstrlib.c,v 1.251 2016/05/20 14:13:21 roberto Exp
@@ -956,22 +956,20 @@ static void addliteral (lua_State *L, lu
case LUA_TNUMBER: {
char *buff = luaL_prepbuffsize(b, MAX_ITEM);
int nb;
-#ifndef _KERNEL
if (!lua_isinteger(L, arg)) { /* float? */
+#ifndef _KERNEL
lua_Number n = lua_tonumber(L, arg); /* write as hexa ('%a') */
nb = lua_number2strx(L, buff, MAX_ITEM, "%" LUA_NUMBER_FRMLEN "a", n);
checkdp(buff, nb); /* ensure it uses a dot */
+#endif
}
else { /* integers */
-#else
- {
lua_Integer n = lua_tointeger(L, arg);
const char *format = (n == LUA_MININTEGER) /* corner case? */
? "0x%" LUA_INTEGER_FRMLEN "x" /* use hexa */
: LUA_INTEGER_FMT; /* else use default format */
nb = l_sprintf(buff, MAX_ITEM, format, n);
}
-#endif
luaL_addsize(b, nb);
break;
}
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: martin
Date: Mon Sep 5 06:30:40 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
HAVE_GCC may not be set at all
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/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/drivers/xf86-video-suncg6/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.7 Sat Aug 20 20:22:54 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Mon Sep 5 06:30:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/20 20:22:54 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/09/05 06:30:40 martin Exp $
DRIVER= xf86-video-suncg6
DRIVER_NAME= suncg6_drv
@@ -12,6 +12,6 @@ MAN= suncg6.4
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.cg6_accel.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.10 Mon Aug 22 08:39:20 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Mon Sep 5 06:30:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/22 08:39:20 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/09/05 06:30:40 martin Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
@@ -24,7 +24,7 @@ MAN= sunffb.4
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.ffb_dac.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.ffb_dga.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common
Module Name:src
Committed By: jakllsch
Date: Fri Sep 2 11:38:01 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Log Message:
More clang -Wno-error=
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/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/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.26 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.27
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.26 Tue Aug 30 04:04:07 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Fri Sep 2 11:38:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/08/30 04:04:07 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2016/09/02 11:38:01 jakllsch Exp $
.include
@@ -129,5 +129,7 @@ COPTS.xf86sbusBus.c= -Wno-error=incompa
COPTS.xf86Configure.c= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
+COPTS.xf86pciBus.c= ${${ACTIVE_CC} == "clang":? -Wno-error=tautological-constant-out-of-range-compare :}
+
.include
.include
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: jakllsch
Date: Fri Sep 2 04:49:48 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tseng: Makefile
Log Message:
More clang -Werror avoidance
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-tseng/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/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.16
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.15 Sat Aug 20 06:49:21 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile Fri Sep 2 04:49:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/08/20 06:49:21 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/02 04:49:48 jakllsch Exp $
DRIVER= xf86-video-s3
DRIVER_NAME= s3_drv
@@ -23,6 +23,7 @@ CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE
# XXX xf86PciInfo.h
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
+COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
CWARNFLAGS.clang+= -Wno-parentheses
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.10 Sun Aug 21 18:23:58 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Fri Sep 2 04:49:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/21 18:23:58 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2016/09/02 04:49:48 jakllsch Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -17,6 +17,7 @@ CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROT
.if ${HAVE_GCC:U0} > 48
COPTS.smi_video.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
+COPTS.smi_video.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
XORG_PKG_VER_PROG= ${DRIVER}
.include "../../../xorg-pkg-ver.mk"
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.14 Sun Aug 21 18:23:58 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Fri Sep 2 04:49:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/08/21 18:23:58 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2016/09/02 04:49:48 jakllsch Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -28,3 +28,6 @@ COPTS.sis_driver.c+= ${${ACTIVE_CC} == "
COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.initextx.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
+COPTS.sis_driver.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+COPTS.sis_utility.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+COPTS.initextx.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
Index: src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.7 Sat Aug 20 06:49:21 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile Fri Sep 2 04:49:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/20 06:49:21 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/09/02 04:49:48 jakllsch Exp $
DRIVER= xf86-video-tseng
DRIVER_NAME= tseng_drv
@@ -10,6 +10,7 @@ MAN= tseng.4
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
+COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
CWARNFLAGS.clang+= -Wno-pointer-sign
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nouveau
Module Name:src
Committed By: jakllsch
Date: Fri Sep 2 04:27:13 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
Log Message:
More clang -Werror avoidance
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/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/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.4 Sun Aug 21 18:23:58 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Fri Sep 2 04:27:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/08/21 18:23:58 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2016/09/02 04:27:13 jakllsch Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -51,6 +51,7 @@ CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DAT
.if ${HAVE_GCC:U0} > 48
COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
+COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
CPPFLAGS+= -DHAVE_XORG_LIST
CVS commit: src/external/mit/xorg/server/xorg-server/glamor
Module Name:src
Committed By: jakllsch
Date: Fri Sep 2 03:58:59 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/glamor: Makefile
Log Message:
Add -Wno-error=enum-conversion when building glamor with clang.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/glamor/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/glamor/Makefile
diff -u src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.2 src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.2 Thu Aug 18 18:42:09 2016
+++ src/external/mit/xorg/server/xorg-server/glamor/Makefile Fri Sep 2 03:58:59 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/18 18:42:09 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2016/09/02 03:58:59 jakllsch Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -52,5 +52,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
+COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :}
+
.include
.include
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: jakllsch
Date: Fri Sep 2 03:49:56 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-i128: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i740: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
Log Message:
sprinkle appropriate -Wno-error for clang
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-nv/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/drivers/xf86-video-i128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.5 Sat Aug 20 06:49:21 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile Fri Sep 2 03:49:55 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/20 06:49:21 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/09/02 03:49:55 jakllsch Exp $
DRIVER= xf86-video-i128
DRIVER_NAME= i128_drv
@@ -8,5 +8,6 @@ SRCS+= i128IBMDAC.c i128init.c
MAN= i128.4
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
+COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.7 Sat Aug 20 06:49:21 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Fri Sep 2 03:49:55 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/20 06:49:21 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/09/02 03:49:55 jakllsch Exp $
DRIVER= xf86-video-i740
DRIVER_NAME= i740_drv
@@ -8,5 +8,6 @@ SRCS+= i740_i2c.c i740_io.c i740_video.
MAN= i740.4
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
+COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.10 Sat Aug 20 06:49:21 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Fri Sep 2 03:49:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/20 06:49:21 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/09/02 03:49:56 jakllsch Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -27,6 +27,7 @@ CPPFLAGS+= -DAVOID_VGAHW
# XXX
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
+COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/lib/libxshmfence
Module Name:src
Committed By: christos
Date: Wed Aug 31 14:29:13 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libxshmfence: Makefile
Log Message:
no stack protector for evbarm
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libxshmfence/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/lib/libxshmfence/Makefile
diff -u src/external/mit/xorg/lib/libxshmfence/Makefile:1.3 src/external/mit/xorg/lib/libxshmfence/Makefile:1.4
--- src/external/mit/xorg/lib/libxshmfence/Makefile:1.3 Thu Aug 18 14:11:03 2016
+++ src/external/mit/xorg/lib/libxshmfence/Makefile Wed Aug 31 10:29:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/18 18:11:03 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/31 14:29:13 christos Exp $
.include
@@ -23,5 +23,7 @@ NOMAN= # defined
PKGDIST= ${LIB}
+COPTS.xshmfence_semaphore.c += -Wno-stack-protector
+
.include
.include
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: mrg
Date: Tue Aug 30 08:19:43 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
look for present and damage includes.
define HAVE_STRCASECMP and HAVE_DIX_CONFIG_H.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/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/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.2 Fri Nov 6 21:32:22 2015
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Tue Aug 30 08:19:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/11/06 21:32:22 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/30 08:19:43 mrg Exp $
.include
@@ -36,11 +36,16 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${X11SRCDIR.xorg-server}/fb \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/render \
+ -I${X11SRCDIR.xorg-server}/present \
+ -I${X11SRCDIR.xorg-server}/miext/damage \
-I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
-UXF86DRI -UXF86BIGFONT
+CPPFLAGS+= -DHAVE_DIX_CONFIG_H
+CPPFLAGS+= -DHAVE_STRCASECMP
+
CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\"
.include "../../../Makefile.Xserver"
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src Committed By: mrg Date: Tue Aug 30 08:18:23 UTC 2016 Removed Files: src/external/mit/xorg/server/xorg-server/afb: Makefile Makefile.afb src/external/mit/xorg/server/xorg-server/cfb: Makefile Makefile.cfb src/external/mit/xorg/server/xorg-server/cfb32: Makefile src/external/mit/xorg/server/xorg-server/mfb: Makefile Makefile.mfb Log Message: remove obsolete module build subdirs To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/server/xorg-server/afb/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/xorg-server/afb/Makefile.afb cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/server/xorg-server/cfb/Makefile cvs rdiff -u -r1.4 -r0 \ src/external/mit/xorg/server/xorg-server/cfb/Makefile.cfb cvs rdiff -u -r1.2 -r0 \ src/external/mit/xorg/server/xorg-server/cfb32/Makefile cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/server/xorg-server/mfb/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/xorg-server/mfb/Makefile.mfb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common
Module Name:src
Committed By: mrg
Date: Tue Aug 30 04:04:07 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Log Message:
apply some more -Wno-error=discarded-qualifiers
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/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/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.25 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.26
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.25 Fri Aug 19 19:10:54 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Tue Aug 30 04:04:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/08/19 19:10:54 mrg Exp $
+# $NetBSD: Makefile,v 1.26 2016/08/30 04:04:07 mrg Exp $
.include
@@ -125,6 +125,9 @@ CPPFLAGS.xf86AutoConfig.c= -DPROJECTROOT
-DIDRIVERS='"${IDRIVERS}"'
COPTS.xf86sbusBus.c= -Wno-error=incompatible-pointer-types
+.if ${HAVE_GCC:U0} > 48
+COPTS.xf86Configure.c= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
.include
.include
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-chips
Module Name:src
Committed By: macallan
Date: Sat Aug 27 03:58:13 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-chips: Makefile
Log Message:
pass -DAVOID_VGAHW on shark
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-chips/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/drivers/xf86-video-chips/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.6 Sun May 15 22:55:01 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile Sat Aug 27 03:58:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/05/15 22:55:01 christos Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/27 03:58:13 macallan Exp $
DRIVER= xf86-video-chips
DRIVER_NAME= chips_drv
@@ -9,7 +9,7 @@ SRCS+= ct_accelmm.c ct_accelhi.c
MAN= chips.4
.if ${MACHINE} == "shark"
-CPPFLAGS+= -DHAVE_ISA
+CPPFLAGS+= -DHAVE_ISA -DAVOID_VGAHW
.endif
CPPFLAGS.ct_driver.c= -DVERSION=${PACKAGE_MAJOR} -I${X11SRCDIR.xorg-server}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-sunffb
Module Name:src
Committed By: mrg
Date: Mon Aug 22 08:39:20 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
ffb_dga.c has const issues as well
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/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/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.9 Sat Aug 20 20:22:54 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Mon Aug 22 08:39:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:54 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/22 08:39:20 mrg Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
@@ -26,4 +26,5 @@ MAN= sunffb.4
# XXX
.if ${HAVE_GCC} > 48
COPTS.ffb_dac.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.ffb_dga.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Sun Aug 21 20:51:04 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile
Log Message:
build 'hw' (the actual servers) after everything else. should fix
a build issue reported by Dave Tyson.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 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.26 src/external/mit/xorg/server/xorg-server/Makefile:1.27
--- src/external/mit/xorg/server/xorg-server/Makefile:1.26 Fri Aug 19 03:59:30 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile Sun Aug 21 20:51:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/08/19 03:59:30 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/21 20:51:04 mrg Exp $
.include
@@ -10,7 +10,6 @@ SUBDIR+= dix fb mi Xext miext os randr r
SUBDIR+= present pseudoramiX
SUBDIR+= Xi xkb xkbstubs dbe record xfixes
SUBDIR+= damageext composite config .WAIT
-SUBDIR+= hw
# XXX
.if ${HAVE_DRI3:Uno} != "no"
@@ -21,6 +20,9 @@ SUBDIR+= dri3
SUBDIR+= glamor
.endif
+# And finally, build the servers.
+SUBDIR+= .WAIT hw
+
.PATH: ${X11SRCDIR.xorg-server}
PKGCONFIG= xorg-server
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: joerg
Date: Sun Aug 21 18:23:58 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
Log Message:
HAVE_GCC may be undefined.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-sis/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/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.3 Sat Aug 20 20:22:53 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Sun Aug 21 18:23:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/20 20:22:53 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/21 18:23:58 joerg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -48,7 +48,7 @@ CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DAT
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.9 Sat Aug 20 20:22:53 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Sun Aug 21 18:23:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/21 18:23:58 joerg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -14,7 +14,7 @@ CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROT
.include "../Makefile.xf86-driver"
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.smi_video.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.13 Sat Aug 20 20:22:54 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Sun Aug 21 18:23:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/20 20:22:54 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/21 18:23:58 joerg Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -23,7 +23,7 @@ CWARNFLAGS.clang+= -Wno-parentheses
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.initextx.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
CVS commit: src/external/mit/xorg/lib/libdrm_nouveau
Module Name:src
Committed By: joerg
Date: Sun Aug 21 18:23:33 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libdrm_nouveau: Makefile
Log Message:
Ignore abuse of VLAs.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libdrm_nouveau/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/lib/libdrm_nouveau/Makefile
diff -u src/external/mit/xorg/lib/libdrm_nouveau/Makefile:1.1 src/external/mit/xorg/lib/libdrm_nouveau/Makefile:1.2
--- src/external/mit/xorg/lib/libdrm_nouveau/Makefile:1.1 Tue Oct 13 04:33:21 2015
+++ src/external/mit/xorg/lib/libdrm_nouveau/Makefile Sun Aug 21 18:23:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/10/13 04:33:21 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/21 18:23:33 joerg Exp $
.include
@@ -11,6 +11,8 @@ SRCS= nouveau.c \
bufctx.c \
abi16.c
+COPTS.nouveau.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=gnu-variable-sized-type-not-at-end :}
+
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src
Committed By: joerg
Date: Sun Aug 21 12:39:18 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
Log Message:
HAVE_GCC may be undefined.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.9 Sat Aug 20 20:22:53 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Sun Aug 21 12:39:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/21 12:39:17 joerg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -42,7 +42,7 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
# XXX
COPTS.via_dri.c+= -Wno-error
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.via_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.via_lvds.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Sat Aug 20 20:22:54 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
apply -Wno-error=discarded-qualifiers only with GCC > 4.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/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/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2 Mon Aug 15 17:01:25 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Sat Aug 20 20:22:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/15 17:01:25 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/20 20:22:53 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -45,11 +45,13 @@ CPPFLAGS+= -DNV_MINOR_VERSION=${PACKAGE_
CPPFLAGS+= -DNV_PATCHLEVEL=${PACKAGE_PATCH}
CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DATE}
-# XXX
-COPTS.nouveau_xv.c+= -Wno-error=discarded-qualifiers
-
.include "../Makefile.xf86-driver"
+# XXX
+.if ${HAVE_GCC} > 48
+COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
+
.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
CPPFLAGS+= -DHAVE_XORG_LIST
CPPFLAGS+= -DHAVE_XAA_H
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8 Fri Aug 19 23:51:44 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Sat Aug 20 20:22:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/19 23:51:44 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -41,10 +41,10 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
.include "../Makefile.xf86-driver"
# XXX
-.if defined(HAVE_GCC)
COPTS.via_dri.c+= -Wno-error
-COPTS.via_driver.c+= -Wno-error=discarded-qualifiers
-COPTS.via_lvds.c+= -Wno-error=discarded-qualifiers
+.if ${HAVE_GCC} > 48
+COPTS.via_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.via_lvds.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
CWARNFLAGS.clang+= -Wno-tautological-compare
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8 Tue Aug 16 07:10:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Sat Aug 20 20:22:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -12,9 +12,11 @@ MAN= siliconmotion.4
CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROTO_71
-COPTS.smi_video.c+= -Wno-error=discarded-qualifiers
-
.include "../Makefile.xf86-driver"
+.if ${HAVE_GCC} > 48
+COPTS.smi_video.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
+
XORG_PKG_VER_PROG= ${DRIVER}
.include "../../../xorg-pkg-ver.mk"
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12 Tue Aug 16 08:37:47 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Sat Aug 20 20:22:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Make
CVS commit: src/external/mit/xorg/lib/libdrm
Module Name:src
Committed By: joerg
Date: Sat Aug 20 20:19:08 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile
Log Message:
Don't bail out on #warning for clang either.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/libdrm/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/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.13 src/external/mit/xorg/lib/libdrm/Makefile:1.14
--- src/external/mit/xorg/lib/libdrm/Makefile:1.13 Sat Aug 20 06:49:21 2016
+++ src/external/mit/xorg/lib/libdrm/Makefile Sat Aug 20 20:19:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/20 06:49:21 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/20 20:19:08 joerg Exp $
.include
@@ -18,6 +18,7 @@ PKGCONFIG= libdrm
PKGDIST= ${LIB}
COPTS.xf86drm.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
+COPTS.xf86drm.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Sat Aug 20 06:49:21 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i128: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i740: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tseng: Makefile
Log Message:
redo previous in a way that always works
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-tseng/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/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.12 src/external/mit/xorg/lib/libdrm/Makefile:1.13
--- src/external/mit/xorg/lib/libdrm/Makefile:1.12 Sat Aug 20 05:44:00 2016
+++ src/external/mit/xorg/lib/libdrm/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/20 05:44:00 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/20 06:49:21 mrg Exp $
.include
@@ -17,9 +17,7 @@ SUBDIR= drm kms
PKGCONFIG= libdrm
PKGDIST= ${LIB}
-.if ${ACTIVE_CC} == "gcc"
-COPTS.xf86drm.c+= -Wno-error=cpp # #warnings needing porting
-.endif
+COPTS.xf86drm.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare
Index: src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.4 Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/08/20 05:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/20 06:49:21 mrg Exp $
DRIVER= xf86-video-i128
DRIVER_NAME= i128_drv
@@ -7,8 +7,6 @@ SRCS= i128accel.c i128dga.c i128exa.c i
SRCS+= i128IBMDAC.c i128init.c
MAN= i128.4
-.if ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=cpp
-.endif
+COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.6 Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/20 05:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/20 06:49:21 mrg Exp $
DRIVER= xf86-video-i740
DRIVER_NAME= i740_drv
@@ -7,8 +7,6 @@ SRCS= i740_accel.c i740_cursor.c i740_d
SRCS+= i740_i2c.c i740_io.c i740_video.c
MAN= i740.4
-.if ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=cpp
-.endif
+COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.9 Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/20 05:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/20 06:49:21 mrg Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -26,9 +26,7 @@ CPPFLAGS+= -DAVOID_VGAHW
.endif
# XXX
-.if ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=cpp
-.endif
+COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.14 Sat Aug 20 05:44:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile Sat Aug 20 06:49:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/08/20 05:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/20 06:49:21 mrg Exp $
DRIVER= xf86
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Sat Aug 20 05:44:01 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i128: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i740: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tseng: Makefile
Log Message:
apply -Wno-error=cpp only for GCC builds.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-tseng/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/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.11 src/external/mit/xorg/lib/libdrm/Makefile:1.12
--- src/external/mit/xorg/lib/libdrm/Makefile:1.11 Wed Aug 17 03:10:23 2016
+++ src/external/mit/xorg/lib/libdrm/Makefile Sat Aug 20 05:44:00 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/08/17 03:10:23 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/20 05:44:00 mrg Exp $
.include
@@ -17,7 +17,9 @@ SUBDIR= drm kms
PKGCONFIG= libdrm
PKGDIST= ${LIB}
+.if ${ACTIVE_CC} == "gcc"
COPTS.xf86drm.c+= -Wno-error=cpp # #warnings needing porting
+.endif
CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare
Index: src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.3 Sat Aug 20 05:02:58 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile Sat Aug 20 05:44:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/20 05:02:58 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/20 05:44:01 mrg Exp $
DRIVER= xf86-video-i128
DRIVER_NAME= i128_drv
@@ -7,6 +7,8 @@ SRCS= i128accel.c i128dga.c i128exa.c i
SRCS+= i128IBMDAC.c i128init.c
MAN= i128.4
+.if ${ACTIVE_CC} == "gcc"
COPTS+= -Wno-error=cpp
+.endif
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.5 Sat Aug 20 05:02:58 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Sat Aug 20 05:44:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/20 05:02:58 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/20 05:44:01 mrg Exp $
DRIVER= xf86-video-i740
DRIVER_NAME= i740_drv
@@ -7,6 +7,8 @@ SRCS= i740_accel.c i740_cursor.c i740_d
SRCS+= i740_i2c.c i740_io.c i740_video.c
MAN= i740.4
+.if ${ACTIVE_CC} == "gcc"
COPTS+= -Wno-error=cpp
+.endif
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.8 Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Sat Aug 20 05:44:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/16 06:24:02 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/20 05:44:01 mrg Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -26,7 +26,9 @@ CPPFLAGS+= -DAVOID_VGAHW
.endif
# XXX
+.if ${ACTIVE_CC} == "gcc"
COPTS+= -Wno-error=cpp
+.endif
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.13 Sat Aug 20 00:48:23 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile Sat Aug 20 05:44:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/20 00:48:23 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/20 05:44:01 mrg Exp $
DRIVER= xf86-video-s3
DRIVER_NAME= s3_drv
@@ -22,7 +22,9 @@ CPPFLAGS.s3_video.c+= -DS3_NEWMMIO=1 \
CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\"
# XXX xf86PciInfo.h
+.if ${ACTIVE_CC} == "gcc"
COPTS+= -Wno-error=cpp
+.endif
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Sat Aug 20 03:44:19 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
Log Message:
use and force evaluation of ${.PARSEDIR}. fixes build for some drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
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/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.21 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.22
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.21 Sat Aug 20 00:22:02 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Sat Aug 20 03:44:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.21 2016/08/20 00:22:02 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.22 2016/08/20 03:44:19 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -51,8 +51,9 @@ CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG
.PATH: ${X11SRCDIR.${DRIVER}}/src
.PATH: ${X11SRCDIR.${DRIVER}}/man
+DRIVER_TOPDIR:=${.PARSEDIR}
.if !exists(${X11SRCDIR.${DRIVER}}/../include)
-CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../fake-include
+CPPFLAGS+= -DHAVE_CONFIG_H -I${DRIVER_TOPDIR}/fake-include
.endif
.include
CVS commit: src/external/mit/xorg/server/xorg-server.old/mi
Module Name:src
Committed By: mrg
Date: Sat Aug 20 01:04:48 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/mi: Makefile
Log Message:
delete dead code
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/mi/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.old/mi/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/mi/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/mi/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/mi/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/mi/Makefile Sat Aug 20 01:04:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/20 01:04:48 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -32,15 +32,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/..
CPPFLAGS.miscrinit.c= ${X11FLAGS.EXTENSION}
-.if 0
-.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "mac68k"
-SRCS+= miinitext.c
-CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION}
-CPPFLAGS.miinitext.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA
-CPPFLAGS.miscrinit.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA
-.endif
-.endif
-
COPTS.micmap.c+= -Wno-error
COPTS.miexpose.c+= -Wno-error
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Sat Aug 20 01:03:34 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/Xext: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/mi: Makefile
Log Message:
delete dead code. fix DIX flags for xorg-server 1.18 build after the
no longer installed dix-config.h
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/mi/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/Xext/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.6 src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.6 Sun Aug 14 03:43:03 2016
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile Sat Aug 20 01:03:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/14 03:43:03 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/20 01:03:34 mrg Exp $
LIBISPRIVATE= yes
LIB= Xext
@@ -28,24 +28,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/xf
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/miext/sync
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/composite
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/damageext
-CPPFLAGS+= -DHAVE_DIX_CONFIG_H
-
-.if 0
-COPTS.panoramiX.c+= -Wno-error
-COPTS.panoramiXprocs.c+= -Wno-error
-COPTS.saver.c+= -Wno-error
-COPTS.security.c+= -Wno-error
-COPTS.shape.c+= -Wno-error
-COPTS.shm.c+= -Wno-error
-COPTS.sync.c+= -Wno-error
-COPTS.xf86bigfont.c+= -Wno-error
-COPTS.xres.c= -Wno-error
-COPTS.xvdisp.c+= -Wno-error
-COPTS.xvmain.c+= -Wno-error
-COPTS.xvmc.c+= -Wno-error
-COPTS.bigreq.c+= -Wno-error # XXX bigreqstr.h
-COPTS.xcmisc.c+= -Wno-error # XXX xcmiscstr.h
-.endif
+#CPPFLAGS+= -DHAVE_DIX_CONFIG_H
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
.PATH: ${X11SRCDIR.xorg-server}/Xext
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.12 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.12 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Sat Aug 20 01:03:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/20 01:03:34 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -19,8 +19,9 @@ CPPFLAGS+= \
CPPFLAGS+= \
${X11FLAGS.EXTENSION} \
- -DHAVE_DIX_CONFIG_H \
-DXFree86LOADER
+CPPFLAGS+= \
+ -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
SUBDIR = \
fb \
Index: src/external/mit/xorg/server/xorg-server/mi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/mi/Makefile:1.12 src/external/mit/xorg/server/xorg-server/mi/Makefile:1.13
--- src/external/mit/xorg/server/xorg-server/mi/Makefile:1.12 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/mi/Makefile Sat Aug 20 01:03:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/20 01:03:34 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -35,15 +35,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/..
CPPFLAGS.miscrinit.c= ${X11FLAGS.EXTENSION}
-.if 0
-.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "mac68k"
-SRCS+= miinitext.c
-CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION}
-CPPFLAGS.miinitext.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA
-CPPFLAGS.miscrinit.c+= -UXF86MISC -UXINPUT -UXF86VIDMODE -UXFreeXDGA
-.endif
-.endif
-
COPTS.micmap.c+= -Wno-error
COPTS.miexpose.c+= -Wno-error
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-s3
Module Name:src
Committed By: mrg
Date: Sat Aug 20 00:48:23 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
Log Message:
apply -Wno-error=cpp due to this driver using xf86PciInfo.h.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-s3/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/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.12 Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile Sat Aug 20 00:48:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/16 06:24:02 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/20 00:48:23 mrg Exp $
DRIVER= xf86-video-s3
DRIVER_NAME= s3_drv
@@ -21,6 +21,9 @@ CPPFLAGS.s3_video.c+= -DS3_NEWMMIO=1 \
CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\"
+# XXX xf86PciInfo.h
+COPTS+= -Wno-error=cpp
+
CWARNFLAGS.clang+= -Wno-parentheses
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Sat Aug 20 00:22:03 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
Added Files:
src/external/mit/xorg/server/drivers/fake-include: config.h
Log Message:
instead of including xorg-server.h manually all over the places we
don't have a generated config.h, provide a fake one that does.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/fake-include/config.h
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/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.20 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.21
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.20 Tue Aug 16 06:24:03 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Sat Aug 20 00:22:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.20 2016/08/16 06:24:03 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.21 2016/08/20 00:22:02 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -51,4 +51,8 @@ CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG
.PATH: ${X11SRCDIR.${DRIVER}}/src
.PATH: ${X11SRCDIR.${DRIVER}}/man
+.if !exists(${X11SRCDIR.${DRIVER}}/../include)
+CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../fake-include
+.endif
+
.include
Added files:
Index: src/external/mit/xorg/server/drivers/fake-include/config.h
diff -u /dev/null src/external/mit/xorg/server/drivers/fake-include/config.h:1.1
--- /dev/null Sat Aug 20 00:22:03 2016
+++ src/external/mit/xorg/server/drivers/fake-include/config.h Sat Aug 20 00:22:02 2016
@@ -0,0 +1,7 @@
+/* $NetBSD: config.h,v 1.1 2016/08/20 00:22:02 mrg Exp $ */
+
+/*
+ * Fake header for drivers missing generated config.h and need it for
+ * the xorg-server.h include.
+ */
+#include "xorg-server.h"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src Committed By: mrg Date: Fri Aug 19 23:51:45 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile Log Message: update for openchrome 0.4.0: remove via_vbe.c To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/drivers/xf86-video-openchrome/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/drivers/xf86-video-openchrome/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8 --- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.7 Tue Aug 16 07:10:01 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Fri Aug 19 23:51:44 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/08/16 07:10:01 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2016/08/19 23:51:44 mrg Exp $ DRIVER= xf86-video-openchrome DRIVER_NAME= openchrome_drv @@ -20,7 +20,6 @@ SRCS= \ via_outputs.c \ via_xv_overlay.c \ via_ums.c \ - via_vbe.c \ via_vgahw.c \ via_xv.c \ via_vt162x.c
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: mrg
Date: Fri Aug 19 22:33:34 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/Xext: Makefile.Xext
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods:
Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod:
Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader:
Makefile
src/external/mit/xorg/server/xorg-server.old/include: Makefile
src/external/mit/xorg/server/xorg-server/include: Makefile
Log Message:
don't install dix-config.h. it shouldn't be.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/include/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/include/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.old/Xext/Makefile.Xext
diff -u src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext:1.2
--- src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext:1.1.1.1 Fri Jun 10 03:42:13 2016
+++ src/external/mit/xorg/server/xorg-server.old/Xext/Makefile.Xext Fri Aug 19 22:33:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xext,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+# $NetBSD: Makefile.Xext,v 1.2 2016/08/19 22:33:34 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/Xext
@@ -12,7 +12,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/xf
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/miext/sync
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/composite
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/damageext
-CPPFLAGS+= -DHAVE_DIX_CONFIG_H
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
COPTS.panoramiX.c+= -Wno-error
COPTS.panoramiXprocs.c+= -Wno-error
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/Makefile Fri Aug 19 22:33:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/19 22:33:34 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -20,6 +20,8 @@ CPPFLAGS+= \
${X11FLAGS.EXTENSION} \
-DHAVE_DIX_CONFIG_H \
-DXFree86LOADER
+CPPFLAGS+= \
+ -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
SUBDIR = \
dbe \
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/extmod/Makefile Fri Aug 19 22:33:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/19 22:33:34 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -26,8 +26,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
-CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} \
- -DHAVE_XORG_CONFIG_H
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
+CPPFLAGS+= ${X11INCS.DIX} -DHAVE_XORG_CONFIG_H
# XXX
CPPFLAGS.xf86RandR12.c= -Wno-error
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/loader/Makefile Fri Aug 19 22:33:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/19 22:33:34 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.server
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: mrg
Date: Fri Aug 19 19:10:54 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Log Message:
update build for sparc64 xorg-server 1.18.
clean up the xfree86/common makefile for obsolete warnings. (XXX: there are
a lot of old disabled warnings we can obsolete in the xsrc tree.)
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.78 src/external/mit/xorg/server/drivers/Makefile:1.79
--- src/external/mit/xorg/server/drivers/Makefile:1.78 Fri Aug 19 03:59:30 2016
+++ src/external/mit/xorg/server/drivers/Makefile Fri Aug 19 19:10:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2016/08/19 03:59:30 mrg Exp $
+# $NetBSD: Makefile,v 1.79 2016/08/19 19:10:54 mrg Exp $
# xf86-input drivers
@@ -278,17 +278,20 @@ SUBDIR+= \
.if ${MACHINE} == "sparc" || \
${MACHINE} == "sparc64"
SUBDIR+= \
- xf86-video-ag10e \
xf86-video-ati \
- xf86-video-glint \
xf86-video-mach64 \
- xf86-video-mga \
xf86-video-r128 \
xf86-video-radeon \
xf86-video-suncg6 \
- xf86-video-sunffb \
- xf86-video-sunleo \
xf86-video-wsfb
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
+ xf86-video-ag10e \
+ xf86-video-glint \
+ xf86-video-mga \
+ xf86-video-sunffb \
+ xf86-video-sunleo
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.if ${MACHINE} == "sparc"
SUBDIR+= \
xf86-video-pnozz \
Index: src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.5 Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Fri Aug 19 19:10:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/16 06:24:02 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/19 19:10:54 mrg Exp $
DRIVER= xf86-video-suncg6
DRIVER_NAME= suncg6_drv
@@ -9,4 +9,7 @@ CPPFLAGS+= ${X11FLAGS.DRI}
MAN= suncg6.4
+# XXX
+COPTS.cg6_accel.c+= -Wno-error=discarded-qualifiers
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.7 Tue Aug 16 06:24:03 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Fri Aug 19 19:10:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/16 06:24:03 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/19 19:10:54 mrg Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
@@ -21,4 +21,7 @@ CPPFLAGS+= ${X11FLAGS.DRI} -DUSE_VIS
MAN= sunffb.4
+# XXX
+COPTS.ffb_dac.c+= -Wno-error=discarded-qualifiers
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.24 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.25
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.24 Thu Aug 18 18:40:23 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Fri Aug 19 19:10:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/08/18 18:40:23 mrg Exp $
+# $NetBSD: Makefile,v 1.25 2016/08/19 19:10:54 mrg Exp $
.include
@@ -124,15 +124,7 @@ CPPFLAGS.xf86AutoConfig.c= -DPROJECTROOT
-DDRIVERS='"${DRIVERS}"' \
-DIDRIVERS='"${IDRIVERS}"'
-COPTS.xf86AutoConfig.c= -Wno-error
-COPTS.xf86Config.c= -Wno-error
-COPTS.xf86Configure.c= -Wno-error
-COPTS.xf86Cursor.c= -Wno-error
-COPTS.xf86RandR.c= -Wno-error
-COPTS.xf86Helper.c= -Wno-error
-COPTS.xf86cmap.c= -Wno-error
-COPTS.xf86Cursor.c= -Wno-error # XXX xf86dgastr.h
-COPTS.xf86DGA.c= -Wno-error # XXX xf86dgastr.h
+COPTS.xf86sbusBus.c= -Wno-error=incompatible-pointer-types
.include
.include
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms
Module Name:src
Committed By: christos
Date: Fri Aug 19 16:33:23 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
fix reversed test
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.5 Thu Aug 18 23:59:30 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Fri Aug 19 12:33:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/19 03:59:30 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/19 16:33:23 christos Exp $
.include
@@ -29,12 +29,12 @@ SRCS.KMS= radeon_dri2.c radeon_dri3.c ra
drmmode_display.c
.if ${HAVE_XORG_GLAMOR} != "no"
-SRCS.GLAMOR=
-.else
SRCS.GLAMOR= radeon_glamor.c radeon_glamor_wrappers.c
CPPFLAGS+= \
-DHAVE_GLAMOR_H \
-DUSE_GLAMOR
+.else
+SRCS.GLAMOR=
.endif
SRCS= radeon_accel.c radeon_video.c \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common
Module Name:src Committed By: mrg Date: Thu Aug 18 18:40:23 UTC 2016 Modified Files: src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile Log Message: apply some more -Wno-error for the const char *name vs mode issue To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/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/hw/xfree86/common/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.23 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.24 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.23 Sun Aug 14 03:43:04 2016 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Thu Aug 18 18:40:23 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2016/08/14 03:43:04 mrg Exp $ +# $NetBSD: Makefile,v 1.24 2016/08/18 18:40:23 mrg Exp $ .include @@ -126,6 +126,7 @@ CPPFLAGS.xf86AutoConfig.c= -DPROJECTROOT COPTS.xf86AutoConfig.c= -Wno-error COPTS.xf86Config.c= -Wno-error +COPTS.xf86Configure.c= -Wno-error COPTS.xf86Cursor.c= -Wno-error COPTS.xf86RandR.c= -Wno-error COPTS.xf86Helper.c= -Wno-error
CVS commit: src/external/mit/xorg/lib/libxshmfence
Module Name:src
Committed By: mrg
Date: Thu Aug 18 18:11:04 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libxshmfence: Makefile
Log Message:
this depends upon librt
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libxshmfence/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/lib/libxshmfence/Makefile
diff -u src/external/mit/xorg/lib/libxshmfence/Makefile:1.2 src/external/mit/xorg/lib/libxshmfence/Makefile:1.3
--- src/external/mit/xorg/lib/libxshmfence/Makefile:1.2 Sun Aug 14 03:43:03 2016
+++ src/external/mit/xorg/lib/libxshmfence/Makefile Thu Aug 18 18:11:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/14 03:43:03 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/18 18:11:03 mrg Exp $
.include
@@ -16,6 +16,9 @@ CPPFLAGS+= -DHAVE_SEMAPHORE
# XXX
CPPFLAGS+= -DLIBXSHM_PAGESIZE=4096
+LDADD+= -lrt
+DPADD+= ${LIBRT}
+
NOMAN= # defined
PKGDIST= ${LIB}
CVS commit: src/external/mit/xorg/lib/libdrm_amdgpu
Module Name:src
Committed By: christos
Date: Thu Aug 18 13:46:58 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libdrm_amdgpu: Makefile
Log Message:
elide stack protector warning.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libdrm_amdgpu/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/lib/libdrm_amdgpu/Makefile
diff -u src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.1 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.2
--- src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.1 Tue Aug 16 23:10:23 2016
+++ src/external/mit/xorg/lib/libdrm_amdgpu/Makefile Thu Aug 18 09:46:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/17 03:10:23 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/18 13:46:58 christos Exp $
.include
@@ -24,6 +24,8 @@ LIBDPLIBS= drm ${.CURDIR}/../libdrm
PKGCONFIG= libdrm_amdgpu
PKGDIST= drm
+COPTS.amdgpu_cs.c+= -Wno-stack-protector
+
.include "../libdrm/Makefile.defines"
.include
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-igs
Module Name:src
Committed By: mrg
Date: Thu Aug 18 09:34:02 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-igs: Makefile
Log Message:
don't need HAVE_CONFIG_H any more
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-igs/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/drivers/xf86-video-igs/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile:1.1 Tue Nov 10 21:44:11 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile Thu Aug 18 09:34:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/11/10 21:44:11 macallan Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/18 09:34:02 mrg Exp $
DRIVER= xf86-video-igs
DRIVER_NAME= igs_drv
@@ -6,6 +6,4 @@ DRIVER_NAME= igs_drv
SRCS= igs_driver.c igs_cursor.c igs_accel.c
MAN= igs.4
-CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
-
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-amdgpu
Module Name:src
Committed By: mrg
Date: Thu Aug 18 07:49:09 UTC 2016
Added Files:
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile
Log Message:
build glue for xf86-video-amdgpu
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.1
--- /dev/null Thu Aug 18 07:49:09 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile Thu Aug 18 07:49:09 2016
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2016/08/18 07:49:09 mrg Exp $
+
+.include
+
+DRIVER= xf86-video-amdgpu
+DRIVER_NAME= amdgpu_drv
+
+LIBDPLIBS+= drm_amdgpu ${.CURDIR}/../../../lib/libdrm_amdgpu
+
+SRCS.KMS= amdgpu_bo_helper.c amdgpu_dri2.c amdgpu_dri3.c \
+ amdgpu_drm_queue.c amdgpu_kms.c amdgpu_present.c \
+ amdgpu_sync.c drmmode_display.c
+SRCS.GLAMOR= amdgpu_glamor.c amdgpu_glamor_wrappers.c amdgpu_pixmap.c
+
+SRCS= amdgpu_video.c amdgpu_misc.c amdgpu_probe.c \
+ $(SRCS.KMS) $(SRCS.GLAMOR)
+
+MAN= amdgpu.4
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/dri \
+ -I${DESTDIR}${X11INCDIR}/libdrm \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.${DRIVER}}/../include
+
+# XXX
+COPTS+= -Wno-error
+
+.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/xorg-server/glamor
Module Name:src
Committed By: mrg
Date: Thu Aug 18 07:48:14 UTC 2016
Added Files:
src/external/mit/xorg/server/xorg-server/glamor: Makefile
Log Message:
build glue for glamor extension
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/glamor/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/server/xorg-server/glamor/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.1
--- /dev/null Thu Aug 18 07:48:14 2016
+++ src/external/mit/xorg/server/xorg-server/glamor/Makefile Thu Aug 18 07:48:14 2016
@@ -0,0 +1,59 @@
+# $NetBSD: Makefile,v 1.1 2016/08/18 07:48:14 mrg Exp $
+
+.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
+
+LIB= glamor
+
+.PATH: ${X11SRCDIR.xorg-server}/${LIB}
+SRCS= \
+ glamor.c \
+ glamor_copy.c \
+ glamor_core.c \
+ glamor_dash.c \
+ glamor_font.c \
+ glamor_glx.c \
+ glamor_composite_glyphs.c \
+ glamor_image.c \
+ glamor_lines.c \
+ glamor_segs.c \
+ glamor_render.c \
+ glamor_gradient.c \
+ glamor_prepare.c \
+ glamor_program.c \
+ glamor_rects.c \
+ glamor_spans.c \
+ glamor_text.c \
+ glamor_transfer.c \
+ glamor_transform.c \
+ glamor_trapezoid.c \
+ glamor_triangles.c \
+ glamor_addtraps.c \
+ glamor_glyphblt.c \
+ glamor_points.c \
+ glamor_pixmap.c \
+ glamor_largepixmap.c \
+ glamor_picture.c \
+ glamor_vbo.c \
+ glamor_window.c \
+ glamor_fbo.c \
+ glamor_compositerects.c \
+ glamor_utils.c \
+ glamor_sync.c
+SRCS+= \
+ glamor_xv.c
+SRCS+= \
+ glamor_egl_stubs.c
+SRCS.EGL= \
+ glamor_egl.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/../include
+CPPFLAGS+= ${X11FLAGS.DIX}
+
+INCSDIR= ${X11INCDIR}/xorg
+INCS= glamor.h
+
+.include
+.include
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src
Committed By: mrg
Date: Thu Aug 18 07:44:32 UTC 2016
Added Files:
src/external/mit/xorg/lib/libepoxy: Makefile shlib_version
Log Message:
build glue for libepoxy
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libepoxy/Makefile \
src/external/mit/xorg/lib/libepoxy/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/lib/libepoxy/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libepoxy/Makefile:1.1
--- /dev/null Thu Aug 18 07:44:32 2016
+++ src/external/mit/xorg/lib/libepoxy/Makefile Thu Aug 18 07:44:32 2016
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2016/08/18 07:44:32 mrg Exp $
+
+.include
+
+LIB= epoxy
+.PATH: ${X11SRCDIR.${LIB}}/src
+.PATH: ${X11SRCDIR.${LIB}}/include/epoxy
+.PATH: ${X11SRCDIR.${LIB}}/../src
+
+SRCS= \
+ dispatch_common.c \
+ dispatch_glx.c \
+ gl_generated_dispatch.c \
+ glx_generated_dispatch.c
+SRCS.EGL= \
+ dispatch_egl.c \
+ egl_generated_dispatch.c
+
+INCSDIR=${X11INCDIR}/epoxy
+INCS= \
+ gl.h gl_generated.h \
+ glx.h glx_generated.h \
+ egl.h egl_generated.h
+
+CPPFLAGS+= -I${X11SRCDIR.${LIB}}/src
+CPPFLAGS+= ${X11FLAGS.CONNECTION}
+
+PKGCONFIG= epoxy
+
+.include
+.include
Index: src/external/mit/xorg/lib/libepoxy/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libepoxy/shlib_version:1.1
--- /dev/null Thu Aug 18 07:44:32 2016
+++ src/external/mit/xorg/lib/libepoxy/shlib_version Thu Aug 18 07:44:32 2016
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2016/08/18 07:44:32 mrg Exp $
+#
+major=0
+minor=0
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms
Module Name:src
Committed By: mrg
Date: Wed Aug 17 00:10:19 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
clean up some obsolete and duplicated code. port to xf86-video-ati 7.7.0.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.3 Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Wed Aug 17 00:10:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/16 06:24:02 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/17 00:10:19 mrg Exp $
.include
@@ -11,34 +11,30 @@ SRCS.ATOMBIOS= \
Decoder.c \
hwserv_drv.c
-.if ${X11DRI} != "no"
-SRCS.DRI= radeon_dri.c
-CPPFLAGS+= ${X11FLAGS.DRI}
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
.endif
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DUSE_XAA
.else
-CPPFLAGS+= -DHAS_DIRTYTRACKING2 -DHAVE_XORG_LIST
-.endif
-
-.if ${X11DRI} != "no"
-# XXX
-. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
-CPPFLAGS+= -DXF86DRM_MODE
-LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
-. endif
+CPPFLAGS+= -DHAS_DIRTYTRACKING2 \
+ -DHAVE_XORG_LIST \
+ -DHAVE_XF86_CURSOR_RESET_CURSOR \
+ -DHAVE_DRI3_H \
+ -DHAVE_MISYNCSHM_H \
+ -DHAVE_PRESENT_H
.endif
SRCS.EXA= radeon_exa.c r600_exa.c r6xx_accel.c \
r600_textured_videofuncs.c r600_shader.c radeon_exa_shared.c \
evergreen_exa.c evergreen_accel.c evergreen_shader.c \
evergreen_textured_videofuncs.c cayman_accel.c cayman_shader.c
-SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c \
- radeon_bo_helper.c
+SRCS.KMS= radeon_dri2.c radeon_dri3.c radeon_drm_queue.c radeon_kms.c \
+ radeon_present.c radeon_sync.c radeon_vbo.c radeon_bo_helper.c \
+ drmmode_display.c
# XXX not yet
-SRCS.GLAMOR= radeon_glamor.c
+SRCS.GLAMOR= radeon_glamor.c radeon_glamor_wrappers.c
SRCS= radeon_accel.c radeon_video.c \
radeon_misc.c radeon_probe.c \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Tue Aug 16 21:05:14 UTC 2016
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
only build the radeon and nouveau drivers on i386/amd64/evbarm,
where they're useful. this saves almost 2MB in text/data on shark.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/gallium/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/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.14 src/external/mit/xorg/lib/gallium/Makefile:1.15
--- src/external/mit/xorg/lib/gallium/Makefile:1.14 Sun Feb 28 22:55:21 2016
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Aug 16 21:05:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/02/28 22:55:21 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/16 21:05:14 mrg Exp $
# Link the gallium mega driver.
@@ -13,20 +13,8 @@ LIB= gallium_dri
DRIDIR= ${X11USRLIBDIR}/modules/dri
DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
-DRIVERS= kms_swrast swrast
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-DRIVERS+= r600
-.endif
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
-DRIVERS+= nouveau
-.endif
-
CXXFLAGS+= -std=c++11
-CPPFLAGS+= \
- -I${DESTDIR}${X11INCDIR}/libdrm
-
-# cargo culted.
-#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
GALLIUM_SUBDIRS= \
auxiliary \
@@ -48,21 +36,44 @@ GALLIUM_SUBDIRS= \
drivers/noop \
drivers/trace \
drivers/rbug \
+ drivers/softpipe \
+ winsys/sw/null \
+ winsys/sw/dri \
+ winsys/sw/kms-dri \
+ state_trackers/dri
+
+GALLIUM_SUBDIRS_ATI= \
drivers/radeon \
drivers/r600 \
drivers/r600/sb \
+ winsys/radeon/drm
+
+GALLIUM_SUBDIRS_NOUVEAU= \
drivers/nouveau \
drivers/nouveau/nv30 \
drivers/nouveau/nv50 \
drivers/nouveau/codegen \
drivers/nouveau/nvc0 \
- drivers/softpipe \
- winsys/radeon/drm \
- winsys/nouveau/drm \
- winsys/sw/null \
- winsys/sw/dri \
- winsys/sw/kms-dri \
- state_trackers/dri
+ winsys/nouveau/drm
+
+BUILD_RADEON=0
+BUILD_NOUVEAU=0
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_RADEON=1
+.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
+BUILD_NOUVEAU=1
+.endif
+
+DRIVERS= kms_swrast swrast
+.if ${BUILD_RADEON} == 1
+DRIVERS+= r600
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_ATI}
+.endif
+.if ${BUILD_NOUVEAU} == 1
+DRIVERS+= nouveau
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_NOUVEAU}
+.endif
GALLIUM_SOURCES.auxiliary/cso_cache= \
cso_cache.c \
@@ -537,12 +548,17 @@ SRCS+= ${GALLIUM_SOURCES.${_d}}
.include "../libloader.mk"
+
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+.if ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
+.if ${BUILD_RADEON} == 1
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
+.endif # ${BUILD_RADEON} == 1
+.if ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= drm_nouveau ${.CURDIR}/../libdrm_nouveau
-.endif
+.endif # ${BUILD_NOUVEAU} == 1
+.endif # ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
@@ -580,14 +596,22 @@ CPPFLAGS.target.c += \
-DGALLIUM_NOOP \
-DGALLIUM_RBUG \
-DGALLIUM_TRACE \
- -DGALLIUM_R200 \
- -DGALLIUM_R600 \
- -DGALLIUM_NOUVEAU \
-DGALLIUM_SOFTPIPE \
-I${X11SRCDIR.MesaLib}/src/gallium/state_trackers/dri \
-I${X11SRCDIR.MesaLib}/src/loader \
-I${X11SRCDIR.MesaLib}/src/gallium/winsys
+.if ${BUILD_RADEON} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_R200 \
+ -DGALLIUM_R600
+.endif # ${BUILD_RADEON} == 1
+
+.if ${BUILD_NOUVEAU} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_NOUVEAU
+.endif # ${BUILD_NOUVEAU} == 1
+
CWARNFLAGS.clang+= -Wno-error=constant-conversion \
-Wno-error=tautological-constant-out-of-range-compare \
-Wno-error=pointer-sign \
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Aug 16 19:45:33 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
disable chips and igs drivers on shark and xorg-server 1.18 for now.
fortunately, wsfb works.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/external/mit/xorg/server/drivers/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.76 src/external/mit/xorg/server/drivers/Makefile:1.77
--- src/external/mit/xorg/server/drivers/Makefile:1.76 Tue Aug 16 07:20:25 2016
+++ src/external/mit/xorg/server/drivers/Makefile Tue Aug 16 19:45:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2016/08/16 07:20:25 mrg Exp $
+# $NetBSD: Makefile,v 1.77 2016/08/16 19:45:33 mrg Exp $
# xf86-input drivers
@@ -262,9 +262,13 @@ SUBDIR+= \
.if ${MACHINE} == "shark"
SUBDIR+= \
- xf86-video-chips \
-xf86-video-igs \
xf86-video-wsfb
+# needs porting for xorg-server 1.18
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
+ xf86-video-chips \
+xf86-video-igs
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "shark"
.if ${MACHINE} == "sparc" || \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: mrg
Date: Tue Aug 16 19:09:48 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
remove obsolete code, and adjust for new amd64 iopl usage.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/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/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.44 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.45
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.44 Sun Aug 14 03:43:05 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Tue Aug 16 19:09:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2016/08/14 03:43:05 mrg Exp $
+# $NetBSD: Makefile,v 1.45 2016/08/16 19:09:48 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -25,8 +25,11 @@ SRCS.bsd+= i386_video.c lnx_agp.c
.for _FN in ${SRCS.bsd}
.if ${MACHINE_ARCH} == "i386"
CPPFLAGS.${_FN}+= -DPCCONS_SUPPORT -DHAS_APERTURE_DRV
+CPPFLAGS.${_FN}+= -DUSE_I386_IOPL
+.else
+CPPFLAGS.${_FN}+= -DUSE_AMD64_IOPL
.endif
-CPPFLAGS.${_FN}+= -DUSE_I386_IOPL -DPCVT_SUPPORT -DWSCONS_SUPPORT \
+CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCONS_SUPPORT \
-DUSESTDRES -DHAVE_SYSV_IPC \
-DHAS_MTRR_BUILTIN
.endfor
@@ -125,14 +128,6 @@ SRCS.bus+= Pci.c
#CPPFLAGS.netbsdPci.c+= -DPCI_VIA_TTYE0
.endif
-# XXX .S not built from automake either
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
-#CPPFLAGS.BUSmemcpy.S= -DUSE_GAS
-#CPPFLAGS.IODelay.S= -DUSE_GAS
-#CPPFLAGS.SlowBcopy.S= -DUSE_GAS
-.endif
-
.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "sparc" || ${MACHINE} == "netwinder" || \
@@ -148,11 +143,6 @@ SRCS.bus+= nobus.c
.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc
SRCS.misc+= SlowBcopy.c
-# XXX namespace collision so avoid it, only has to be done for non-i386.
-#BUILDSYMLINKS= BUSmemcpy.c CBUSmemcpy.c \
-# IODelay.c CIODelay.c \
-# SlowBcopy.c CSlowBcopy.c
-
SRCS= ${SRCS.bsd} ${SRCS.bus} ${SRCS.misc}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb
Module Name:src
Committed By: mrg
Date: Tue Aug 16 18:20:38 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb: Makefile
Log Message:
find and include xorg-config.h.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/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/hw/xfree86/shadowfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.4 Fri Jun 12 01:59:06 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile Tue Aug 16 18:20:38 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/16 18:20:38 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -19,7 +19,9 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/render \
- -I${DESTDIR}${X11INCDIR}/X11/extensions
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -DHAVE_XORG_CONFIG_H \
+ -I${X11SRCDIR.xorg-server}/../include
.include
LIBDIR= ${XMODULEDIR}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-sis
Module Name:src
Committed By: mrg
Date: Tue Aug 16 08:37:47 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
Log Message:
revert part of previous
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-sis/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/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.11 Tue Aug 16 07:10:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Tue Aug 16 08:37:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/08/16 07:10:01 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/16 08:37:47 mrg Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -11,7 +11,6 @@ SRCS+= sis_vga.c sis_video.c
MAN= sis.4
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
-CPPFLAGS+= -DSIS_USE_EXA
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Tue Aug 16 07:56:48 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils: Makefile
Makefile.utils
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci:
Makefile
Log Message:
remove obsolete things.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
cvs rdiff -u -r1.6 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile
cvs rdiff -u -r1.6 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile
cvs rdiff -u -r1.7 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/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.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.17 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.18
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.17 Sun Aug 14 03:43:03 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Tue Aug 16 07:56:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.17 2016/08/14 03:43:03 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.18 2016/08/16 07:56:47 mrg Exp $
.for _SL in \
mi \
@@ -30,15 +30,10 @@
hw/xfree86/common \
hw/xfree86/ddc \
hw/xfree86/dixmods \
- hw/xfree86/dixmods/dbe \
hw/xfree86/dixmods/fb \
- hw/xfree86/dixmods/freetype \
- hw/xfree86/dixmods/record \
hw/xfree86/dixmods/shadow \
- hw/xfree86/dixmods/type1 \
hw/xfree86/dixmods/wfb \
hw/xfree86/dixmods/xorgxkb \
- hw/xfree86/dixmods/xtrap \
hw/xfree86/doc \
hw/xfree86/dri \
hw/xfree86/dri2 \
@@ -48,16 +43,12 @@
hw/xfree86/int10 \
hw/xfree86/loader \
hw/xfree86/xorgos \
- hw/xfree86/rac \
hw/xfree86/ramdac \
- hw/xfree86/scanpci \
hw/xfree86/shadowfb \
hw/xfree86/utils \
hw/xfree86/vbe \
hw/xfree86/vgahw \
hw/xfree86/x86emu \
- hw/xfree86/xf8_16bpp \
- hw/xfree86/xf8_32bpp \
hw/xfree86/xf86config \
hw/xfree86/xf86modes
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.15 Mon Feb 21 04:42:17 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Tue Aug 16 07:56:47 2016
@@ -1,18 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2011/02/21 04:42:17 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2016/08/16 07:56:47 mrg Exp $
SUBDIR= cvt gtf
-#SUBDIR= cvt gtf xorgconfig
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-#SUBDIR+=ioport pcitweak scanpci
-.endif
-
-.if ${MACHINE} == "cats" || ${MACHINE} == "macppc" || \
-${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
-${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
-${MACHINE} == "prep" || ${MACHINE} == "bebox" || \
-${MACHINE} == "ofppc"
-#SUBDIR+=pcitweak scanpci
-.endif
+#SUBDIR+= xorgconfig
.include
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.6 Fri Jun 10 03:37:34 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils Tue Aug 16 07:56:47 2016
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile.utils,v 1.6 2016/06/10 03:37:34 mrg Exp $
+# $NetBSD: Makefile.utils,v 1.7 2016/08/16 07:56:47 mrg Exp $
.include
DUMMYOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/dummy && ${PRINTOBJDIR}
-SCANPCIOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/scanpci && ${PRINTOBJDIR}
XORGOSOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/xorgos && ${PRINTOBJDIR}
LIBDUMMY= ${DUMMYOBJDIR}/libdummy.a
LIBXORGOS= ${XORGOSOBJDIR}/libxorgos.a
-LIBSCANPCI= ${SCANPCIOBJDIR}/libscanpci.a
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Aug 16 07:20:25 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
don't build a bunch of drivers for xorg-server 1.18 and x86:
xf86-video-apm
xf86-video-ark
xf86-video-ast
xf86-video-chips
xf86-video-cirrus
xf86-video-cirrus_alpine
xf86-video-cirrus_laguna
xf86-video-glint
xf86-video-i128
xf86-video-i740
xf86-video-intel-old
xf86-video-mach64
xf86-video-mga
xf86-video-neomagic
xf86-video-s3
xf86-video-s3virge
xf86-video-tdfx
xf86-video-tseng
xf86-video-xgi
some of them could be ported. future work!
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/external/mit/xorg/server/drivers/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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.75 src/external/mit/xorg/server/drivers/Makefile:1.76
--- src/external/mit/xorg/server/drivers/Makefile:1.75 Fri Nov 6 21:32:22 2015
+++ src/external/mit/xorg/server/drivers/Makefile Tue Aug 16 07:20:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2015/11/06 21:32:22 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.76 2016/08/16 07:20:25 mrg Exp $
# xf86-input drivers
@@ -26,47 +26,51 @@ SUBDIR+= \
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
+ xf86-video-ati \
+ xf86-video-intel \
+ xf86-video-nv \
+ xf86-video-nouveau \
+ xf86-video-openchrome \
+ xf86-video-r128 \
+ xf86-video-radeon \
+ xf86-video-radeon-kms \
+ xf86-video-savage \
+ xf86-video-siliconmotion \
+ xf86-video-sis \
+ xf86-video-tga \
+ xf86-video-trident \
+ xf86-video-vmware \
+ xf86-video-vesa \
+ xf86-video-wsfb
+
+# needs porting for xorg-server 1.6
+# xf86-video-imstt
+# xf86-video-rendition
+
+# needs porting for xorg-server 1.18
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
xf86-video-apm \
xf86-video-ark \
xf86-video-ast \
- xf86-video-ati \
xf86-video-chips \
xf86-video-cirrus \
xf86-video-cirrus_alpine \
xf86-video-cirrus_laguna \
xf86-video-glint \
xf86-video-i128 \
- xf86-video-i740
-
-# needs porting for xorg-server 1.6
-# xf86-video-imstt \
-
-SUBDIR+= \
- xf86-video-intel \
+ xf86-video-i740 \
xf86-video-intel-old \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-neomagic \
- xf86-video-nv \
- xf86-video-nouveau \
- xf86-video-openchrome \
- xf86-video-r128 \
- xf86-video-radeon \
- xf86-video-radeon-kms \
xf86-video-s3 \
xf86-video-s3virge \
- xf86-video-savage \
- xf86-video-siliconmotion \
- xf86-video-sis \
xf86-video-tdfx \
- xf86-video-tga \
- xf86-video-trident \
xf86-video-tseng \
- xf86-video-vmware \
- xf86-video-vesa \
- xf86-video-wsfb \
xf86-video-xgi
-# xf86-video-rendition
+
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.if ${MACHINE_ARCH} == "i386"
SUBDIR+= \
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Aug 16 07:10:01 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vesa: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
Log Message:
apply -Wno-error more liberally for xorg-server 1.18 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/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/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.6 Sun Aug 24 06:13:36 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Tue Aug 16 07:10:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/08/24 06:13:36 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/16 07:10:01 mrg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -44,6 +44,8 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
# XXX
.if defined(HAVE_GCC)
COPTS.via_dri.c+= -Wno-error
+COPTS.via_driver.c+= -Wno-error=discarded-qualifiers
+COPTS.via_lvds.c+= -Wno-error=discarded-qualifiers
.endif
CWARNFLAGS.clang+= -Wno-tautological-compare
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.7 Mon Jul 20 02:07:36 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Tue Aug 16 07:10:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/20 02:07:36 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -10,7 +10,9 @@ SRCS+= smilynx_output.c smilynx_hw.c sm
SRCS+= smi501_crtc.c smi501_output.c
MAN= siliconmotion.4
-CPPFLAGS+= -DHAVE_XAA_H -DHAVE_XMODES -DHAVE_XEXTPROTO_71
+CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROTO_71
+
+COPTS.smi_video.c+= -Wno-error=discarded-qualifiers
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.10 Thu Aug 11 23:15:40 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Tue Aug 16 07:10:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/16 07:10:01 mrg Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -11,13 +11,16 @@ SRCS+= sis_vga.c sis_video.c
MAN= sis.4
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
+CPPFLAGS+= -DSIS_USE_EXA
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
# XXX
-COPTS.sis_driver.c= -Wno-error
+COPTS.sis_driver.c+= -Wno-error=discarded-qualifiers
+COPTS.sis_utility.c+= -Wno-error=discarded-qualifiers
+COPTS.initextx.c+= -Wno-error=discarded-qualifiers
X11MANCPP= yes
Index: src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.7 Mon Jun 3 10:03:14 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile Tue Aug 16 07:10:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/06/03 10:03:14 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
DRIVER= xf86-video-tga
DRIVER_NAME= tga_drv
@@ -7,8 +7,13 @@ SRCS= BT463ramdac.c BTramdac.c IBM561ra
SRCS+= tga_accel.c t
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: mrg Date: Tue Aug 16 07:09:28 UTC 2016 Removed Files: src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel/ivch: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel/sil164: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410: Makefile Log Message: remove stuff only present in the old intel driver To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon
Module Name:src
Committed By: mrg
Date: Tue Aug 16 07:08:17 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
Log Message:
define USE_XAA here for xorg-server 1.10.
for xorg-server 1.18 builds, copy some files from xorg-server 1.10.
this may not work with xorg-server 1.18, i'll test later.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.19 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.20
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.19 Thu May 28 14:36:45 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Tue Aug 16 07:08:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/05/28 14:36:45 rjs Exp $
+# $NetBSD: Makefile,v 1.20 2016/08/16 07:08:17 mrg Exp $
.include
@@ -20,6 +20,11 @@ SRCS.DRI= radeon_dri.c
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
+# XXX
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+= -DUSE_XAA
+.endif
+
.if ${X11DRI} != "no"
# XXX
. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -54,7 +59,14 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/libdrm \
- -I${X11SRCDIR.${DRIVER}}/../include
+ -I${X11SRCDIR.${DRIVER}}/../include \
+ -I${X11SRCDIR.${DRIVER}}/../xorg-server-copy
+.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
+CPPFLAGS+= -DHAVE_XORG_LIST
+# XXX These have been copied from xorg-server 1.10.6.
+SRCS+= fi1236.c msp3430.c tda9885.c uda1380.c
+.PATH: ${X11SRCDIR.${DRIVER}}/../xorg-server-copy
+.endif
# XXX
COPTS+= -Wno-error
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-geode
Module Name:src Committed By: mrg Date: Tue Aug 16 06:54:12 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile Log Message: apply -Wno-error more liberally, needed for xorg-server 1.18 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/drivers/xf86-video-geode/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/drivers/xf86-video-geode/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.5 --- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.4 Mon Mar 7 14:35:21 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile Tue Aug 16 06:54:12 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/03/07 14:35:21 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2016/08/16 06:54:12 mrg Exp $ DRIVER= xf86-video-geode DRIVER_NAME= geode_drv @@ -43,6 +43,13 @@ CPPFLAGS+= -Doff64_t=off_t -Dlseek64=lse COPTS.gx_randr.c+= -Wno-error # XXX COPTS.lx_memory.c+= -Wno-error # XXX COPTS.panel.c+= -Wno-error # XXX -- huh? don't get this one +COPTS.geode_driver.c+= -Wno-error # XXX +COPTS.gx_accel.c+= -Wno-error # XXX +COPTS.gx_cursor.c+= -Wno-error # XXX +COPTS.gx_video.c+= -Wno-error # XXX +COPTS.lx_video.c+= -Wno-error # XXX +COPTS.lx_driver.c+= -Wno-error # XXX +COPTS.lx_panel.c+= -Wno-error # XXX CWARNFLAGS.clang+= -Wno-empty-body
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-mouse
Module Name:src
Committed By: mrg
Date: Tue Aug 16 06:53:01 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-mouse: Makefile
Log Message:
drivers should not define HAVE_XORG_CONFIG_H
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-input-mouse/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/drivers/xf86-input-mouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.7 Wed Jul 22 09:49:51 2015
+++ src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile Tue Aug 16 06:53:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/22 09:49:51 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/16 06:53:01 mrg Exp $
WARNS?= 2
@@ -8,7 +8,7 @@ DRIVER_NAME= mouse_drv
SRCS= mouse.c pnp.c bsd_mouse.c
MAN= mousedrv.4
-CPPFLAGS+= -DHAVE_XORG_CONFIG_H -DHAVE_ASPRINTF
+CPPFLAGS+= -DHAVE_ASPRINTF
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/include
INCSDIR= ${X11INCDIR}/xorg
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Aug 16 06:24:03 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-ark: Makefile
src/external/mit/xorg/server/drivers/xf86-video-ast: Makefile
src/external/mit/xorg/server/drivers/xf86-video-ati: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i740: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-mach64: Makefile
src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-neomagic: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
src/external/mit/xorg/server/drivers/xf86-video-savage: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg14: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunleo: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suntcx: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile
src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile
Log Message:
define HAVE_XAA_H in Makefile.xf86-driver for xorg-server 1.10 only,
move it out of many driver makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-trident/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/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.19 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.20
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.19 Tue Nov 23 08:22:29 2010
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Tue Aug 16 06:24:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.19 2010/11/23 08:22:29 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.20 2016/08/16 06:24:03 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -37,9 +37,12 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \
-DXSERVER_LIBPCIACCESS \
- -DXFree86LOADER \
-DHAVE_XEXTPROTO_71
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+= -DHAVE_XAA_H -DXFree86LOADER
+.endif
+
CPPFLAGS+= -DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
CPPFLAGS+= -DPACKAGE_VERSION_MINOR=${PACKAGE_MINOR}
CPPFLAGS+= -DPACKAGE_VERSION_PATCHLEVEL=${PACKAGE_PATCH}
Index: src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile
diff -u src/extern
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-apm
Module Name:src Committed By: mrg Date: Tue Aug 16 06:19:47 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-apm: Makefile Log Message: define XV_NEW_REPUT. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/drivers/xf86-video-apm/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/drivers/xf86-video-apm/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile:1.3 --- src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile:1.2 Sun Aug 3 07:32:03 2008 +++ src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile Tue Aug 16 06:19:47 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/08/03 07:32:03 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2016/08/16 06:19:47 mrg Exp $ DRIVER= xf86-video-apm DRIVER_NAME= apm_drv @@ -6,4 +6,6 @@ DRIVER_NAME= apm_drv SRCS= apm_accel.c apm_cursor.c apm_dga.c apm_driver.c apm_i2c.c MAN= apm.4 +CPPFLAGS+= -DXV_NEW_REPUT + .include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/xorg-server/include
Module Name:src
Committed By: mrg
Date: Mon Aug 15 22:01:44 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/include: Makefile
Log Message:
add new mi headers in xorg-server 1.18.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/include/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/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.15 src/external/mit/xorg/server/xorg-server/include/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.15 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Mon Aug 15 22:01:44 2016
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2016/08/15 22:01:44 mrg Exp $
.include
XORGSRC= ${X11SRCDIR.xorg-server}
XORGINC_SUBDIR= Xext composite dbe dri3 exa fb include mi \
- miext/damage miext/shadow present randr render xkb record
+ miext/damage miext/shadow miext/sync \
+ present randr render xkb record
XF86_SUBDIR= common ddc dri fbdevhw i2c int10 modes \
os-support os-support/bus parser rac ramdac shadowfb \
vbe vgahw xf1bpp xf4bpp xf8_16bpp xf8_32bpp dri2
@@ -37,6 +38,7 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
mi.h micmap.h micoord.h \
migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
mistruct.h mizerarc.h opaque.h \
+ misync.h misyncstr.h misyncshm.h misyncfd.h \
nonsdk_extinit.h optionstr.h \
os.h picture.h picturestr.h pixmap.h pixmapstr.h \
present.h presentext.h \
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Mon Aug 15 22:01:16 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/Xi: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile
Log Message:
add missing include paths.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/Xi/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/randr/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.6 src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.6 Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/Xi/Makefile Mon Aug 15 22:01:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/14 00:03:58 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/15 22:01:16 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -37,6 +37,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/xfixes \
-I${X11SRCDIR.xorg-server}/Xi \
+ -I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
Index: src/external/mit/xorg/server/xorg-server/randr/Makefile
diff -u src/external/mit/xorg/server/xorg-server/randr/Makefile:1.7 src/external/mit/xorg/server/xorg-server/randr/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/randr/Makefile:1.7 Fri Aug 12 01:15:52 2016
+++ src/external/mit/xorg/server/xorg-server/randr/Makefile Mon Aug 15 22:01:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/12 01:15:52 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/15 22:01:16 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -26,6 +26,7 @@ SRCS= \
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/Xext \
+ -I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Mon Aug 15 21:58:40 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Log Message:
don't define HAVE_XORG_CONFIG_H or _HAVE_DIX_CONFIG_H here.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
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.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.10 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.11
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.10 Sun Aug 14 03:43:03 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Mon Aug 15 21:58:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.10 2016/08/14 03:43:03 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.11 2016/08/15 21:58:40 mrg Exp $
.include # for NETBSDSRCDIR and mk.conf processing
@@ -21,9 +21,6 @@ X_BYTE_ORDER=0
CPPFLAGS+= ${X11FLAGS.SERVER}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include \
- -DHAVE_XORG_CONFIG_H -D_HAVE_DIX_CONFIG_H
-
.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
CPPFLAGS+= -D__GLX_ALIGN64
.endif
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nouveau
Module Name:src
Committed By: mrg
Date: Mon Aug 15 17:01:25 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
Log Message:
updates for xf86-video-nouveau 1.0.12.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/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/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.1 Tue Oct 13 04:33:22 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Mon Aug 15 17:01:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/10/13 04:33:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/15 17:01:25 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -10,7 +10,6 @@ SRCS= nouveau_copy.c \
nouveau_exa.c \
nouveau_xv.c \
nouveau_dri2.c \
- nouveau_glamor.c \
nouveau_present.c \
nouveau_sync.c \
nouveau_wfb.c \
@@ -39,7 +38,6 @@ LIBDPLIBS+= drm_nouveau ${.CURDIR}/../..
MAN= nouveau.4
-CPPFLAGS+= -DHAVE_XAA_H
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
@@ -47,7 +45,15 @@ CPPFLAGS+= -DNV_MINOR_VERSION=${PACKAGE_
CPPFLAGS+= -DNV_PATCHLEVEL=${PACKAGE_PATCH}
CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DATE}
+# XXX
+COPTS.nouveau_xv.c+= -Wno-error=discarded-qualifiers
+
.include "../Makefile.xf86-driver"
+.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
+CPPFLAGS+= -DHAVE_XORG_LIST
+CPPFLAGS+= -DHAVE_XAA_H
+.endif
+
# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
DRIVER_DATE!=awk '/^Date:/{print "\"" $0 "\"";exit}' ${X11SRCDIR.${DRIVER}}/ChangeLog
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Sun Aug 14 03:43:05 UTC 2016 Modified Files: src/external/mit/xorg/lib/libxshmfence: Makefile src/external/mit/xorg/server/xorg-server: Makefile.Xserver Makefile.serverlib src/external/mit/xorg/server/xorg-server/Xext: Makefile src/external/mit/xorg/server/xorg-server/composite: Makefile src/external/mit/xorg/server/xorg-server/dbe: Makefile src/external/mit/xorg/server/xorg-server/dix: Makefile src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/doc: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile src/external/mit/xorg/server/xorg-server/os: Makefile src/external/mit/xorg/server/xorg-server/xfixes: Makefile Removed Files: src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xext Makefile.Xextbuiltin Makefile.Xextmodule src/external/mit/xorg/server/xorg-server/Xext/Xextbuiltin: Makefile src/external/mit/xorg/server/xorg-server/Xext/Xextmodule: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/rac: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp: Makefile Log Message: various updates: - port pkgsrc libxshmfence patches - Xextbuiltin/module is no longer a thing, make it normal - always need xorg-config.h/xorg-server.h for server components now - add present, damage, render, Xi, dri, pixman, extension where needed - fix various CPPFLAGS issues - deal with moved sdksyms.sh To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxshmfence/Makefile cvs rdiff -u -r1.16 -r1.17 \ src/external/mit/xorg/server/xorg-server/Makefile.Xserver cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/xorg-server/Makefile.serverlib cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/Xext/Makefile cvs rdiff -u -r1.12 -r0 \ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext cvs rdiff -u -r1.7 -r0 \ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin cvs rdiff -u -r1.9 -r0 \ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule cvs rdiff -u -r1.4 -r0 \ src/external/mit/xorg/server/xorg-server/Xext/Xextbuiltin/Makefile cvs rdiff -u -r1.7 -r0 \ src/external/mit/xorg/server/xorg-server/Xext/Xextmodule/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/composite/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server/dbe/Makefile cvs rdiff -u -r1.14 -r1.15 \ src/external/mit/xorg/server/xorg-server/dix/Makefile cvs rdiff -u -r1.14 -r1.15 \ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile cvs rdiff -u -r1.22 -r1.23 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile cvs rdiff -u -r1.5 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/rac/Makefile cvs rdiff -u -r1.4 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci/Makefile cvs rdiff -u -r1.8 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile cvs rdiff -u -r1.4 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile cvs rdi
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src Committed By: mrg Date: Sun Aug 14 00:03:59 UTC 2016 Modified Files: src/external/mit/xorg/server/xorg-server: Makefile src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xextbuiltin src/external/mit/xorg/server/xorg-server/Xi: Makefile src/external/mit/xorg/server/xorg-server/dix: Makefile src/external/mit/xorg/server/xorg-server/doc: Makefile src/external/mit/xorg/server/xorg-server/dri3: Makefile src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile src/external/mit/xorg/server/xorg-server/include: Makefile src/external/mit/xorg/server/xorg-server/mi: Makefile src/external/mit/xorg/server/xorg-server/os: Makefile src/external/mit/xorg/server/xorg-server/present: Makefile src/external/mit/xorg/server/xorg-server/pseudoramiX: Makefile src/external/mit/xorg/server/xorg-server/xfixes: Makefile src/external/mit/xorg/server/xorg-server/xkb: Makefile src/external/mit/xorg/server/xorg-server/xkbstubs: Makefile Log Message: various build updates for xorg-server 1.18. with this and some other uncommited work, Xvfb and Xnest both link. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/server/xorg-server/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/server/xorg-server/Xi/Makefile cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/server/xorg-server/dix/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/doc/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server/dri3/Makefile cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile cvs rdiff -u -r1.17 -r1.18 \ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile cvs rdiff -u -r1.14 -r1.15 \ src/external/mit/xorg/server/xorg-server/include/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/mi/Makefile cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/server/xorg-server/os/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server/present/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server/pseudoramiX/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server/xfixes/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/xorg-server/xkb/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/xkbstubs/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.23 src/external/mit/xorg/server/xorg-server/Makefile:1.24 --- src/external/mit/xorg/server/xorg-server/Makefile:1.23 Fri Aug 12 01:15:49 2016 +++ src/external/mit/xorg/server/xorg-server/Makefile Sun Aug 14 00:03:57 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2016/08/12 01:15:49 mrg Exp $ +# $NetBSD: Makefile,v 1.24 2016/08/14 00:03:57 mrg Exp $ .include @@ -13,7 +13,7 @@ SUBDIR.xfont= SUBDIR= doc include .WAIT SUBDIR+= glx SUBDIR+= dix fb mi Xext miext os randr render -SUBDIR+= present dri3 pseudoramiX +SUBDIR+= present pseudoramiX SUBDIR+= Xi xkb xkbstubs dbe record xfixes SUBDIR+= damageext composite config .WAIT SUBDIR+= hw Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.6 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.7 --- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin:1.6 Fri Jun 12 01:59:04 2009 +++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin Sun Aug 14 00:03:57 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.Xextbuiltin,v 1.6 2009/06/12 01:59:04 mrg Exp $ +# $NetBSD: Makefile.Xextbuiltin,v 1.7 2016/08/14 00:03:57 mrg Exp $ SRCS.Xextbuiltin= bigreq.c geext.c shape.c sleepuntil.c \ sync.c xcmisc.c xtest.c @@ -7,3 +7,4 @@ SRCS.Xextbuiltin+= panoramiX.c panoramiX SRCS.Xextbuiltin+= xace.c SRCS.Xextbuiltin+= security.c SRCS.Xextbuiltin+= xf86bigfont.c +SRCS.Xextbuiltin+= hashtable.c Index: src/external/mit/xorg/server/xorg-server/Xi/Makefile diff -u src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.5 src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.6 --- src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.5 Thu Aug 11 08:32:42 2016 +++ src/external/mit/xorg/server/xorg-server/Xi/Makefile Sun Aug 14 00:03:58 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/08/11 08:32:42 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2016/08/14 00:03:58 mrg Exp $ .include "../Makefile.serverlib" .include "../Makefi
CVS commit: src/external/mit/xorg/lib/libxshmfence
Module Name:src
Committed By: mrg
Date: Sun Aug 14 00:02:19 UTC 2016
Added Files:
src/external/mit/xorg/lib/libxshmfence: Makefile shlib_version
Log Message:
build glue for libxshmfence. not yet plugged into the build.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libxshmfence/Makefile \
src/external/mit/xorg/lib/libxshmfence/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/lib/libxshmfence/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libxshmfence/Makefile:1.1
--- /dev/null Sun Aug 14 00:02:20 2016
+++ src/external/mit/xorg/lib/libxshmfence/Makefile Sun Aug 14 00:02:19 2016
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2016/08/14 00:02:19 mrg Exp $
+
+.include
+
+LIB= xshmfence
+
+XSHMFENCEDIR= ${X11SRCDIR.${LIB}}
+.PATH: ${XSHMFENCEDIR}/src
+SRCS= xshmfence_pthread.c xshmfence_alloc.c
+
+INCS= xshmfence.h
+INCSDIR=${X11INCDIR}/X11
+
+#CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= -DHAVE_PTHREAD
+CPPFLAGS+= -DSHMDIR=\"/var/shm\"
+# XXX
+CPPFLAGS+= -D_PTHREAD_PSHARED
+
+NOMAN= # defined
+
+#LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic
+
+PKGDIST= ${LIB}
+
+.include
+.include
Index: src/external/mit/xorg/lib/libxshmfence/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libxshmfence/shlib_version:1.1
--- /dev/null Sun Aug 14 00:02:20 2016
+++ src/external/mit/xorg/lib/libxshmfence/shlib_version Sun Aug 14 00:02:19 2016
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2016/08/14 00:02:19 mrg Exp $
+#
+major=1
+minor=0
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg
Module Name:src
Committed By: mrg
Date: Fri Aug 12 20:45:05 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
Log Message:
fix a edit-o in the previous, pointed out by richard@. thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/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/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.10 Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Fri Aug 12 20:45:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/12 01:15:49 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/12 20:45:05 mrg Exp $
.include
@@ -46,7 +46,7 @@ LDADD+= ${LDADD.mi}
LDADD+= ${LDADD.xfixes}
LDADD+= ${LDADD.Xext/Xextbuiltin}
LDADD+= ${LDADD.render}
-eDADD+= ${LDADD.randr}
+LDADD+= ${LDADD.randr}
LDADD+= ${LDADD.damageext}
LDADD+= ${LDADD.miext/damage}
LDADD+= ${LDADD.miext/shadow}
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src Committed By: mrg Date: Fri Aug 12 01:15:52 UTC 2016 Modified Files: src/external/mit/xorg/server/xorg-server: Makefile Makefile.Xserver src/external/mit/xorg/server/xorg-server/fb: Makefile.fb src/external/mit/xorg/server/xorg-server/glx: Makefile.glx src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/i2c: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile src/external/mit/xorg/server/xorg-server/include: Makefile src/external/mit/xorg/server/xorg-server/mi: Makefile src/external/mit/xorg/server/xorg-server/os: Makefile src/external/mit/xorg/server/xorg-server/randr: Makefile Added Files: src/external/mit/xorg/server/xorg-server/dri3: Makefile src/external/mit/xorg/server/xorg-server/present: Makefile src/external/mit/xorg/server/xorg-server/pseudoramiX: Makefile Removed Files: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/afb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/mfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/type1: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xtrap: Makefile Log Message: round do of reach over updates for xorg-server 1.18. again, untested, but this should be much closer to complete for the necessary changes. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/mit/xorg/server/xorg-server/Makefile cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/server/xorg-server/Makefile.Xserver cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/server/xorg-server/dri3/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile cvs rdiff -u -r1.10 -r1.11 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore/Makefile cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/afb/Makefile cvs rdiff -u -r1.2 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb/Makefile cvs rdiff -u -r1.2 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile cvs rdiff -u -r1.6 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile cvs rdiff -u -r1.11 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/mfb/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile cvs rdiff -u -r1.2 -r0 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/type1/Makefile
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src Committed By: mrg Date: Thu Aug 11 08:32:45 UTC 2016 Modified Files: src/external/mit/xorg/server/xorg-server: Makefile.Xserver src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xext src/external/mit/xorg/server/xorg-server/Xi: Makefile src/external/mit/xorg/server/xorg-server/config: Makefile src/external/mit/xorg/server/xorg-server/dix: Makefile src/external/mit/xorg/server/xorg-server/exa: Makefile.exa src/external/mit/xorg/server/xorg-server/fb: Makefile.fb src/external/mit/xorg/server/xorg-server/glx: Makefile.glx src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xaa: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile src/external/mit/xorg/server/xorg-server/include: Makefile src/external/mit/xorg/server/xorg-server/mi: Makefile src/external/mit/xorg/server/xorg-server/miext: Makefile src/external/mit/xorg/server/xorg-server/miext/damage: Makefile.damage src/external/mit/xorg/server/xorg-server/miext/rootless: Makefile.rootless src/external/mit/xorg/server/xorg-server/miext/shadow: Makefile.shadow src/external/mit/xorg/server/xorg-server/miext/sync: Makefile.sync src/external/mit/xorg/server/xorg-server/randr: Makefile src/external/mit/xorg/server/xorg-server/xkb: Makefile src/external/mit/xorg/server/xorg-server/xkbstubs: Makefile Removed Files: src/external/mit/xorg/server/xorg-server/miext/cw: Makefile Makefile.cw Log Message: first merge of xorg-server 1.18.4 reach over. not tested, and missing at these new subdirs, some which may not be needed: dri2 glamor hw/xfree86/drivers/modesetting hw/xfree86/parser present pseudoramiX To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/external/mit/xorg/server/xorg-server/Makefile.Xserver cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/server/xorg-server/Xi/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server/config/Makefile cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/server/xorg-server/dix/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/exa/Makefile.exa cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb cvs rdiff -u -r1.10 -r1.11 \ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx cvs rdiff -u -r1.33 -r1.34 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile cvs rdiff -u -r1.21 -r1.22 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xor
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-tdfx
Module Name:src
Committed By: macallan
Date: Fri Jul 1 23:29:17 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile
Log Message:
set USE_PCIVGAIO=0 on non-x86
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-tdfx/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/drivers/xf86-video-tdfx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.12 Thu Mar 20 05:32:31 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Fri Jul 1 23:29:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/03/20 05:32:31 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/07/01 23:29:17 macallan Exp $
DRIVER= xf86-video-tdfx
DRIVER_NAME= tdfx_drv
@@ -11,6 +11,8 @@ MAN= tdfx.4
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DUSE_INT10
+.else
+CPPFLAGS+= -DUSE_PCIVGAIO=0
.endif
CPPFLAGS+= -DHAVE_XAA_H
CPPFLAGS+= -DTDFXDRI
CVS commit: src/external/mit/xorg/server/xorg-server/hw
Module Name:src
Committed By: christos
Date: Wed Jun 29 19:36:56 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
Log Message:
Fix MKCRYPTO=no build.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xnest/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/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.11 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.11 Tue Aug 2 05:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/29 19:36:56 christos Exp $
.include
@@ -81,8 +81,7 @@ LDADD+= ${LDADD.dix} \
-lpixman-1 \
-lXdmcp \
-lz \
- -lm \
- -lcrypto
+ -lm
DPADD+= ${DPADD.dix} \
${DPADD.fb} \
@@ -111,8 +110,12 @@ DPADD+= ${DPADD.dix} \
${LIBPIXMAN1} \
${LIBXDMCP} \
${LIBZ} \
- ${LIBM} \
- ${LIBCRYPTO}
+ ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.7 Thu Jul 23 04:03:25 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/23 08:03:25 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/29 19:36:56 christos Exp $
.include
@@ -62,7 +62,6 @@ LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
LDADD+= -lpciaccess -ldrm
-LDADD+= -lcrypto
LDADD+= -Wl,--no-whole-archive
.if ${MACHINE_ARCH} == "i386"
@@ -119,8 +118,12 @@ DPADD+= ${DPADD.dix} \
${DPADD.hw/xfree86/i2c} \
${LIBCWRAPPER} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
- ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
- ${LIBCRYPTO}
+ ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.14 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.14 Tue Aug 2 05:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/29 19:36:56 christos Exp $
.include
@@ -71,7 +71,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.glx} \
-lXfont -lXext -lfontenc \
-lpixman-1 -lX11 -lXau \
- -lXdmcp -lfreetype -lm -lcrypto
+ -lXdmcp -lfreetype -lm
DPADD+= ${LDADD.dix} \
${DPADD.fb} \
@@ -95,7 +95,12 @@ DPADD+= ${LDADD.dix} \
${DPADD.glx} \
${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
- ${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
+ ${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw
Module Name:src
Committed By: christos
Date: Wed Jun 29 19:36:35 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xnest: Makefile
Log Message:
Fix MKCRYPTO=no build
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xnest/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.old/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.1.1.1 Thu Jun 9 23:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile Wed Jun 29 15:36:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
.include
@@ -81,8 +81,7 @@ LDADD+= ${LDADD.dix} \
-lpixman-1 \
-lXdmcp \
-lz \
- -lm \
- -lcrypto
+ -lm
DPADD+= ${DPADD.dix} \
${DPADD.fb} \
@@ -111,8 +110,12 @@ DPADD+= ${DPADD.dix} \
${LIBPIXMAN1} \
${LIBXDMCP} \
${LIBZ} \
- ${LIBM} \
- ${LIBCRYPTO}
+ ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile:1.1.1.1 Thu Jun 9 23:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile Wed Jun 29 15:36:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
.include
@@ -62,7 +62,6 @@ LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
LDADD+= -lpciaccess -ldrm
-LDADD+= -lcrypto
LDADD+= -Wl,--no-whole-archive
.if ${MACHINE_ARCH} == "i386"
@@ -119,8 +118,12 @@ DPADD+= ${DPADD.dix} \
${DPADD.hw/xfree86/i2c} \
${LIBCWRAPPER} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
- ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
- ${LIBCRYPTO}
+ ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X
Index: src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.1.1.1 Thu Jun 9 23:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile Wed Jun 29 15:36:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
.include
@@ -71,7 +71,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.glx} \
-lXfont -lXext -lfontenc \
-lpixman-1 -lX11 -lXau \
- -lXdmcp -lfreetype -lm -lcrypto
+ -lXdmcp -lfreetype -lm
DPADD+= ${LDADD.dix} \
${DPADD.fb} \
@@ -95,7 +95,12 @@ DPADD+= ${LDADD.dix} \
${DPADD.glx} \
${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
- ${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
+ ${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: mrg
Date: Fri Jun 10 03:37:34 UTC 2016
Modified Files:
src/external/mit/xorg/server: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils:
Makefile.utils
Log Message:
minor clean ups and use ${XORG_SERVER_SUBDIR} where necessary
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/server/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
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/Makefile
diff -u src/external/mit/xorg/server/Makefile:1.8 src/external/mit/xorg/server/Makefile:1.9
--- src/external/mit/xorg/server/Makefile:1.8 Wed Jun 12 21:35:29 2013
+++ src/external/mit/xorg/server/Makefile Fri Jun 10 03:37:34 2016
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2013/06/12 21:35:29 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/10 03:37:34 mrg Exp $
# Makefile for modular-xorg-server and drivers
.include
-.include "xorg-server/Makefile.common"
-
-SUBDIR= xorg-server
+SUBDIR= ${XORG_SERVER_SUBDIR}
# We only make drivers if we make the actual Xorg server,
# as opposed to Xvfb and Xnest.
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.13 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.14
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.13 Wed Oct 3 21:50:14 2012
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Fri Jun 10 03:37:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.13 2012/10/03 21:50:14 gsutre Exp $
+# $NetBSD: Makefile.Xserver,v 1.14 2016/06/10 03:37:34 mrg Exp $
.for _SL in \
mi \
@@ -63,7 +63,7 @@
hw/xfree86/xf86modes
.if !defined(LIBDIR.${_SL})
-LIBDIR.${_SL}!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/${_SL} && ${PRINTOBJDIR}
+LIBDIR.${_SL}!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/${_SL} && ${PRINTOBJDIR}
.MAKEOVERRIDES+=LIBDIR.${_SL}
.endif
LDADD.${_SL}= ${LIBDIR.${_SL}}/lib${_SL:T}.a
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.10 Tue Nov 23 08:22:32 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile Fri Jun 10 03:37:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/11/23 08:22:32 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/10 03:37:34 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -34,7 +34,7 @@ CPPFLAGS.xf86RandR12.c= -Wno-error
CPPFLAGS.xf86dga2.c= -Wno-error
CPPFLAGS.xf86vmode.c= -Wno-error # XXX xf86vmstr.h
-XEXTMODULEOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/Xext/Xextmodule && ${PRINTOBJDIR}
+XEXTMODULEOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/Xext/Xextmodule && ${PRINTOBJDIR}
LIBXEXTMODULE= ${XEXTMODULEOBJDIR}/libXextmodule.a
LDADD= -L${XEXTMODULEOBJDIR} -lXextmodule
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils:1.5 Fri Aug 15 15:55:06 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils Fri Jun 10 03:37:34 2016
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile.utils,v 1.5 2008/08/15 15:55:06 rtr Exp $
+# $NetBSD: Makefile.utils,v 1.6 2016/06/10 03:37:34 mrg Exp $
.include
-#SCANPCIINCDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/bin/xf86cfg && ${PRINTOBJDIR}
-#XF86OBJDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xf86config && ${PRINTOBJDIR}
-#XLOADEROBJDIR!= cd ${NETBSDSRCDIR}/x11/Xserver/hw/xfree86/xloader && ${PRINTOBJDIR}
-DUMMYOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/hw/xfree86/dummy && ${PRINTOBJDIR}
-SCANPCIOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/hw/xfree86/scanpci && ${PRINTOBJDIR}
-XORGOSOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos && ${PRINTOBJDIR}
+DUMMYOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/h
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: christos
Date: Wed Jun 8 02:27:31 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
more -Wno-stack-protector
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.21 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.22
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.21 Wed May 13 22:43:33 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue Jun 7 22:27:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/05/14 02:43:33 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2016/06/08 02:27:31 christos Exp $
.include
@@ -197,6 +197,13 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib
CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-compare \
-Wno-empty-body -Wno-error
-COPTS.sna_display.c= -Wno-stack-protector
+COPTS.sna_display.c+= -Wno-stack-protector
+COPTS.sna_threads.c+= -Wno-stack-protector
+COPTS.sna_trapezoids.c+= -Wno-stack-protector
+COPTS.sna_trapezoids_boxes.c+= -Wno-stack-protector
+COPTS.sna_trapezoids_imprecise.c+= -Wno-stack-protector
+COPTS.sna_trapezoids_mono.c+= -Wno-stack-protector
+COPTS.sna_trapezoids_precise.c+= -Wno-stack-protector
+COPTS.i965_video.c+= -Wno-stack-protector
.include
CVS commit: src/external/mit/xorg/bin/xrandr
Module Name:src
Committed By: christos
Date: Tue Jun 7 23:33:45 UTC 2016
Modified Files:
src/external/mit/xorg/bin/xrandr: Makefile
Log Message:
elide stack protector warning
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xrandr/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/bin/xrandr/Makefile
diff -u src/external/mit/xorg/bin/xrandr/Makefile:1.6 src/external/mit/xorg/bin/xrandr/Makefile:1.7
--- src/external/mit/xorg/bin/xrandr/Makefile:1.6 Fri May 31 05:14:18 2013
+++ src/external/mit/xorg/bin/xrandr/Makefile Tue Jun 7 19:33:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/05/31 09:14:18 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/07 23:33:45 christos Exp $
.include
@@ -12,6 +12,7 @@ CPPFLAGS+= -DVERSION=\"1.4.0\"
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
CWARNFLAGS.clang+= -Wno-parentheses
+COPTS.xrandr.c += -Wno-stack-protector
.include
.include
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: christos
Date: Tue Jun 7 23:21:58 UTC 2016
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
sprinke -Wno-stack-protector
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/dri/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/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.27 src/external/mit/xorg/lib/dri/Makefile:1.28
--- src/external/mit/xorg/lib/dri/Makefile:1.27 Tue Nov 3 05:26:06 2015
+++ src/external/mit/xorg/lib/dri/Makefile Tue Jun 7 19:21:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/11/03 10:26:06 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.28 2016/06/07 23:21:58 christos Exp $
# Link the mesa_dri_drivers mega driver.
@@ -401,6 +401,18 @@ LIBDIR= ${X11USRLIBDIR}/modules/dri
CWARNFLAGS.clang+= -Wno-error=initializer-overrides -Wno-error=switch \
-Wno-error=tautological-constant-out-of-range-compare
+COPTS.brw_state_batch.c += -Wno-stack-protector
+COPTS.brw_eu_compact.c += -Wno-stack-protector
+COPTS.brw_fs.cpp += -Wno-stack-protector
+COPTS.brw_fs_copy_propagation.cpp += -Wno-stack-protector
+COPTS.brw_fs_reg_allocate.cpp += -Wno-stack-protector
+COPTS.brw_program.c += -Wno-stack-protector
+COPTS.brw_schedule_instructions.cpp += -Wno-stack-protector
+COPTS.brw_vec4.cpp += -Wno-stack-protector
+COPTS.brw_vec4_copy_propagation.cpp += -Wno-stack-protector
+COPTS.brw_vec4_reg_allocate.cpp += -Wno-stack-protector
+COPTS.brw_vec4_visitor.cpp += -Wno-stack-protector
+
.include
.else
.include
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: mrg
Date: Thu Jun 2 22:41:27 UTC 2016
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.ximcp Makefile.xlcDef
Makefile.xlcUTF8Load Makefile.xlibi18n Makefile.xomGeneric
src/external/mit/xorg/lib/libX11/static: Makefile
src/external/mit/xorg/lib/libX11/ximcp: Makefile
src/external/mit/xorg/lib/libX11/xlcDef: Makefile
src/external/mit/xorg/lib/libX11/xlcUTF8Load: Makefile
src/external/mit/xorg/lib/libX11/xlibi18n: Makefile
src/external/mit/xorg/lib/libX11/xomGeneric: Makefile
Log Message:
fix PR 48928: build the static libX11 properly. pull in the
ximcp, xlcDef, xlcUTF8Load, xlibi18n, and xomGeneric modules
directly.
also, don't include bsd.lib.mk in the fragment parts for these
modules, but in the module build itself. otherwise, bsd.lib.mk
is included before SRCS is complete and the build strangely
seems to miss parts listed.
tested using the example in the PR.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libX11/Makefile.ximcp
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/Makefile.xlcDef \
src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load \
src/external/mit/xorg/lib/libX11/Makefile.xlibi18n \
src/external/mit/xorg/lib/libX11/Makefile.xomGeneric
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libX11/static/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libX11/ximcp/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xlcDef/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/libX11/xlcUTF8Load/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xlibi18n/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/xomGeneric/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/lib/libX11/Makefile.ximcp
diff -u src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.2 src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.3
--- src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.2 Mon Oct 6 16:24:33 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.ximcp Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.2 2008/10/06 16:24:33 tron Exp $
+# $NetBSD: Makefile.ximcp,v 1.3 2016/06/02 22:41:26 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
@@ -43,5 +43,3 @@ CPPFLAGS.imDefLkup.c= -Wno-error
CPPFLAGS.imRm.c= -Wno-error
CPPFLAGS.imTrans.c= -Wno-error
CPPFLAGS.imLcLkup.c= -Wno-stack-protector
-
-.include
Index: src/external/mit/xorg/lib/libX11/Makefile.xlcDef
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xlcDef:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlcDef Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcDef,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcDef,v 1.2 2016/06/02 22:41:26 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/def
SRCS.xlcDef= lcDefConv.c
@@ -9,5 +9,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
-DHASXDMAUTH
-
-.include
Index: src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlcUTF8Load Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlcUTF8Load,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlcUTF8Load,v 1.2 2016/06/02 22:41:26 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/Utf8
@@ -11,5 +11,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
-DHASXDMAUTH
-
-.include
Index: src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.1 src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xlibi18n Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.2 2016/06/02 22:41:26 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/gen
SRCS.xlibi18n= lcGenConv.c
@@ -10,5 +10,3 @@ CPPFLAGS+= \
CPPFLAGS+= \
${XLOCALE.DEFINES} \
-DHASXDMAUTH
-
-.include
Index: src/external/mit/xorg/lib/libX11/Makefile.xomGeneric
diff -u src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.1 src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.2
--- src/external/mit/xorg/lib/libX11/Makefile.xomGeneric:1.1 Sun Sep 7 13:15:11 2008
+++ src/external/mit/xorg/lib/libX11/Makefile.xomGeneric Thu Jun 2 22:41:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xomGeneric,v 1.1 2008/09/07 13:15:11 rtr Exp $
+# $NetBSD: Mak
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: pgoyette
Date: Tue May 31 02:35:49 UTC 2016
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
Install man-link from fonts-conf.5 --> fonts.conf.5 to deal with an
erroneous cross-ref in xclock's man-page. suggested by wiz@.
Fixes PR xsrc/49777
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/fontconfig/src/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/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.17 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.18
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.17 Wed Jul 16 14:05:04 2014
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Tue May 31 02:35:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/07/16 14:05:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.18 2016/05/31 02:35:49 pgoyette Exp $
.include
@@ -90,6 +90,8 @@ MAN= FcAtomicCreate.3 FcAtomicDeleteNew.
MAN+= fonts-conf.5
+MLINKS= fonts-conf.5 fonts.conf.5
+
LIBDPLIBS=\
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
freetype ${.CURDIR}/../../freetype
CVS commit: src/external/mit/xorg/lib/freetype
Module Name:src
Committed By: christos
Date: Mon May 16 22:19:10 UTC 2016
Modified Files:
src/external/mit/xorg/lib/freetype: Makefile shlib_version
src/external/mit/xorg/lib/freetype/freetype: Makefile
src/external/mit/xorg/lib/freetype/freetype/cache: Makefile
src/external/mit/xorg/lib/freetype/freetype/config: Makefile
Log Message:
Adjust to 2.6.3.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/freetype/shlib_version
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/lib/freetype/freetype/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/freetype/freetype/cache/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/freetype/freetype/config/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/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.16 src/external/mit/xorg/lib/freetype/Makefile:1.17
--- src/external/mit/xorg/lib/freetype/Makefile:1.16 Mon Jul 20 00:10:40 2015
+++ src/external/mit/xorg/lib/freetype/Makefile Mon May 16 18:19:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/07/20 04:10:40 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2016/05/16 22:19:10 christos Exp $
.include
@@ -8,6 +8,12 @@ FREETYPE= ${X11SRCDIR.${LIB}}
SUBDIR= freetype
+.PATH: ${X11SRCDIR.freetype}/include/
+
+INCSDIR=${X11INCDIR}/freetype2
+
+INCS= ft2build.h
+
.PATH: ${FREETYPE}/src/base
SRCS= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c ftfstype.c \
ftglyph.c ftinit.c ftlcdfil.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
@@ -83,7 +89,7 @@ CPPFLAGS+= -DFT_CONFIG_OPTION_SYSTEM_ZLI
-DFT2_BUILD_LIBRARY \
-DFT_CONFIG_MODULES_H=""
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
- -I${DESTDIR}${X11INCDIR}/freetype2/config \
+ -I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \
-I${X11SRCDIR.${LIB}}/include
.if !defined(MKSUBPIXEL) || ${MKSUBPIXEL} != "no"
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.9 src/external/mit/xorg/lib/freetype/shlib_version:1.10
--- src/external/mit/xorg/lib/freetype/shlib_version:1.9 Mon Jul 20 00:10:40 2015
+++ src/external/mit/xorg/lib/freetype/shlib_version Mon May 16 18:19:10 2016
@@ -1,6 +1,6 @@
-# $NetBSD: shlib_version,v 1.9 2015/07/20 04:10:40 mrg Exp $
+# $NetBSD: shlib_version,v 1.10 2016/05/16 22:19:10 christos Exp $
#
# try to keep this in sync with builds/unix/configure.ac:version_info=
major=18
minor=0
-teeny=12
+teeny=13
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.21 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.22
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.21 Mon Mar 21 01:23:39 2016
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Mon May 16 18:19:10 2016
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2016/03/21 05:23:39 dholland Exp $
+# $NetBSD: Makefile,v 1.22 2016/05/16 22:19:10 christos Exp $
.include
SUBDIR= config
-.PATH: ${X11SRCDIR.freetype}/include
+.PATH: ${X11SRCDIR.freetype}/include/freetype
-INCSDIR=${X11INCDIR}/freetype2
+INCSDIR=${X11INCDIR}/freetype2/freetype
INCS= freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \
ftchapters.h ftcid.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h \
@@ -15,7 +15,7 @@ INCS= freetype.h ftadvanc.h ftbbox.h ftb
ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
ftsystem.h fttrigon.h ftttdrv.h fttypes.h ftwinfnt.h \
t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
- ftautoh.h ftcffdrv.h ft2build.h
+ ftautoh.h ftcffdrv.h
SCRIPTS= freetype-config
Index: src/external/mit/xorg/lib/freetype/freetype/cache/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/cache/Makefile:1.2 src/external/mit/xorg/lib/freetype/freetype/cache/Makefile:1.3
--- src/external/mit/xorg/lib/freetype/freetype/cache/Makefile:1.2 Thu Mar 20 04:57:48 2014
+++ src/external/mit/xorg/lib/freetype/freetype/cache/Makefile Mon May 16 18:19:10 2016
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/20 08:57:48 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2016/05/16 22:19:10 christos Exp $
.include
-.PATH: ${X11SRCDIR.freetype}/include/cache
+.PATH: ${X11SRCDIR.freetype}/include/freetype/cache
-INCSDIR=${X11INCDIR}/freetype2/cache
+INCSDIR=${X11INCDIR}/freetype2/freetype/cache
INCS= ftcimage.h ftcmanag.h \
ftcsbits.h ftcmru.h
Index: src/external/mit/xorg/lib/freetype/freetype/config/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.2 src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.3
--- src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.2 Thu Mar 20 04:57:48 2014
+++ src/external/mit/xorg/lib/freetype/free
CVS commit: src/external/mit/xorg/bin
Module Name:src Committed By: nakayama Date: Sun Apr 17 02:16:26 UTC 2016 Modified Files: src/external/mit/xorg/bin/fc-pattern: Makefile src/external/mit/xorg/bin/fc-query: Makefile Log Message: Fix NetBSD RCS keyword. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/fc-pattern/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-query/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/bin/fc-pattern/Makefile diff -u src/external/mit/xorg/bin/fc-pattern/Makefile:1.1 src/external/mit/xorg/bin/fc-pattern/Makefile:1.2 --- src/external/mit/xorg/bin/fc-pattern/Makefile:1.1 Mon Jun 3 06:56:49 2013 +++ src/external/mit/xorg/bin/fc-pattern/Makefile Sun Apr 17 02:16:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD +# $NetBSD: Makefile,v 1.2 2016/04/17 02:16:26 nakayama Exp $ .include Index: src/external/mit/xorg/bin/fc-query/Makefile diff -u src/external/mit/xorg/bin/fc-query/Makefile:1.2 src/external/mit/xorg/bin/fc-query/Makefile:1.3 --- src/external/mit/xorg/bin/fc-query/Makefile:1.2 Mon Jun 3 20:23:39 2013 +++ src/external/mit/xorg/bin/fc-query/Makefile Sun Apr 17 02:16:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD +# $NetBSD: Makefile,v 1.3 2016/04/17 02:16:26 nakayama Exp $ .include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: nakayama
Date: Sat Apr 16 20:52:07 UTC 2016
Modified Files:
src/external/mit/xorg/bin/smproxy: Makefile
src/external/mit/xorg/bin/xkill: Makefile
src/external/mit/xorg/bin/xlsclients: Makefile
src/external/mit/xorg/bin/xrdb: Makefile
src/external/mit/xorg/bin/xset: Makefile
src/external/mit/xorg/bin/xsetroot: Makefile
src/external/mit/xorg/bin/xstdcmap: Makefile
Log Message:
Use xorg-pkg-ver.mk to retrieve PACKAGE_STRING.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/smproxy/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xkill/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xlsclients/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xrdb/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xset/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xsetroot/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xstdcmap/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/bin/smproxy/Makefile
diff -u src/external/mit/xorg/bin/smproxy/Makefile:1.5 src/external/mit/xorg/bin/smproxy/Makefile:1.6
--- src/external/mit/xorg/bin/smproxy/Makefile:1.5 Sat Apr 16 16:57:06 2016
+++ src/external/mit/xorg/bin/smproxy/Makefile Sat Apr 16 20:52:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/04/16 16:57:06 nakayama Exp $
+# $NetBSD: Makefile,v 1.6 2016/04/16 20:52:07 nakayama Exp $
.include
@@ -6,12 +6,13 @@ PROG= smproxy
SRCS= smproxy.c save.c
CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
-CPPFLAGS+= -DPACKAGE_STRING="\"smproxy 1.0.6\""
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xkill/Makefile
diff -u src/external/mit/xorg/bin/xkill/Makefile:1.3 src/external/mit/xorg/bin/xkill/Makefile:1.4
--- src/external/mit/xorg/bin/xkill/Makefile:1.3 Sat Jul 12 20:31:04 2014
+++ src/external/mit/xorg/bin/xkill/Makefile Sat Apr 16 20:52:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/07/12 20:31:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.4 2016/04/16 20:52:07 nakayama Exp $
.include
@@ -7,9 +7,9 @@ PROG= xkill
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-CPPFLAGS+= -DPACKAGE_STRING="\"xkill 1.0.4\""
-
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.7 src/external/mit/xorg/bin/xlsclients/Makefile:1.8
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.7 Sat Jul 12 20:31:04 2014
+++ src/external/mit/xorg/bin/xlsclients/Makefile Sat Apr 16 20:52:07 2016
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/07/12 20:31:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
.include
PROG= xlsclients
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN \
- -DPACKAGE_STRING="\"xlsclients 1.1.3\""
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN
#BUILDSYMLINKS= xlscli.man xlsclients.man
@@ -14,5 +13,7 @@ DPADD+= ${LIBXCB} ${LIBXCB_ATOM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.7 src/external/mit/xorg/bin/xrdb/Makefile:1.8
--- src/external/mit/xorg/bin/xrdb/Makefile:1.7 Wed Apr 13 22:01:55 2016
+++ src/external/mit/xorg/bin/xrdb/Makefile Sat Apr 16 20:52:07 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2016/04/13 22:01:55 christos Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
.include
PROG= xrdb
CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAVE_MKSTEMP # XXX
-CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING="\"xrdb 1.1.0\""
+CPPFLAGS+=-DHAVE_ASPRINTF
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
@@ -13,5 +13,7 @@ DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${L
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.4 src/external/mit/xorg/bin/xset/Makefile:1.5
--- src/external/mit/xorg/bin/xset/Makefile:1.4 Sat Jul 12 20:31:04 2014
+++ src/external/mit/xorg/bin/xset/Makefile Sat Apr 16 20:52:07 2016
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.5 2016/04/16 20:52:07 nakayama Exp $
.include
PROG= xset
CPPFLAGS+=${X11F
CVS commit: src/external/mit/xorg/bin/smproxy
Module Name:src
Committed By: nakayama
Date: Sat Apr 16 16:57:06 UTC 2016
Modified Files:
src/external/mit/xorg/bin/smproxy: Makefile
Log Message:
Set PACKAGE_STRING properly.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/smproxy/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/bin/smproxy/Makefile
diff -u src/external/mit/xorg/bin/smproxy/Makefile:1.4 src/external/mit/xorg/bin/smproxy/Makefile:1.5
--- src/external/mit/xorg/bin/smproxy/Makefile:1.4 Sun Jul 19 19:49:17 2015
+++ src/external/mit/xorg/bin/smproxy/Makefile Sat Apr 16 16:57:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/19 19:49:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/04/16 16:57:06 nakayama Exp $
.include
@@ -6,9 +6,7 @@ PROG= smproxy
SRCS= smproxy.c save.c
CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
-
-STRING!= ${PRINT_PACKAGE_STRING}
-CPPFLAGS+= -DPACKAGE_STRING=\"${STRING}\"
+CPPFLAGS+= -DPACKAGE_STRING="\"smproxy 1.0.6\""
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
CVS commit: src/external/mit/ctwm/bin/ctwm
Module Name:src
Committed By: christos
Date: Wed Apr 13 22:26:48 UTC 2016
Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile
Log Message:
add HAVE_MKSTEMP
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/ctwm/bin/ctwm/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/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.3 src/external/mit/ctwm/bin/ctwm/Makefile:1.4
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.3 Tue Nov 10 18:57:00 2015
+++ src/external/mit/ctwm/bin/ctwm/Makefile Wed Apr 13 18:26:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/10 23:57:00 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2016/04/13 22:26:48 christos Exp $
.include
@@ -15,7 +15,7 @@ CTWMCONFIGDIR= ${X11ETCDIR}/ctwm
CTWMDIR= ${X11SRCDIR}/external/mit/ctwm/dist
XPMDIR= ${X11INCDIR}/X11/pixmaps/ctwm
-CPPFLAGS+= -I. -I${CTWMDIR}/src \
+CPPFLAGS+= -I. -I${CTWMDIR}/src -DHAVE_MKSTEMP \
-DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM
CPPFLAGS+= -DPIXMAP_DIRECTORY=\"${XPMDIR}\"
CVS commit: src/external/mit/xorg/bin/xrdb
Module Name:src Committed By: christos Date: Wed Apr 13 22:01:55 UTC 2016 Modified Files: src/external/mit/xorg/bin/xrdb: Makefile Log Message: Fix MKSTEMP To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xrdb/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/bin/xrdb/Makefile diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.6 src/external/mit/xorg/bin/xrdb/Makefile:1.7 --- src/external/mit/xorg/bin/xrdb/Makefile:1.6 Sat Jul 12 16:31:04 2014 +++ src/external/mit/xorg/bin/xrdb/Makefile Wed Apr 13 18:01:55 2016 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2014/07/12 20:31:04 nakayama Exp $ +# $NetBSD: Makefile,v 1.7 2016/04/13 22:01:55 christos Exp $ .include PROG= xrdb -CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAS_MKSTEMP # XXX +CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAVE_MKSTEMP # XXX CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING="\"xrdb 1.1.0\"" LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
CVS commit: src/external/mit/xorg/bin/xman
Module Name:src
Committed By: christos
Date: Wed Apr 13 21:54:25 UTC 2016
Modified Files:
src/external/mit/xorg/bin/xman: Makefile
Log Message:
We have MKSTEMP so use it!
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xman/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/bin/xman/Makefile
diff -u src/external/mit/xorg/bin/xman/Makefile:1.7 src/external/mit/xorg/bin/xman/Makefile:1.8
--- src/external/mit/xorg/bin/xman/Makefile:1.7 Mon Jul 20 19:50:23 2015
+++ src/external/mit/xorg/bin/xman/Makefile Wed Apr 13 17:54:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/20 23:50:23 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/13 21:54:25 christos Exp $
.include
@@ -6,7 +6,7 @@ PROG= xman
SRCS= ScrollByL.c handler.c man.c buttons.c help.c \
search.c globals.c main.c misc.c tkfuncs.c vendor.c
-CPPFLAGS+=${X11FLAGS.VERSION}
+CPPFLAGS+=${X11FLAGS.VERSION} -DHAVE_MKSTEMP
CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\"
CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
CVS commit: src/external/mit/xorg/bin/bitmap/bmtoa
Module Name:src
Committed By: christos
Date: Wed Apr 13 21:48:21 UTC 2016
Modified Files:
src/external/mit/xorg/bin/bitmap/bmtoa: Makefile
Log Message:
We have MKSTEMP so stop using mktemp!
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/bitmap/bmtoa/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/bin/bitmap/bmtoa/Makefile
diff -u src/external/mit/xorg/bin/bitmap/bmtoa/Makefile:1.1.1.1 src/external/mit/xorg/bin/bitmap/bmtoa/Makefile:1.2
--- src/external/mit/xorg/bin/bitmap/bmtoa/Makefile:1.1.1.1 Tue Jul 29 01:01:22 2008
+++ src/external/mit/xorg/bin/bitmap/bmtoa/Makefile Wed Apr 13 17:48:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/04/13 21:48:21 christos Exp $
NOMAN= 1
@@ -6,6 +6,7 @@ NOMAN= 1
PROG= bmtoa
+CPPFLAGS+=-DHAVE_MKSTEMP
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: macallan
Date: Wed Mar 30 16:19:06 UTC 2016
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
Loongson MMI code needs -Wa,-mhard-float now
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/pixman/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/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.34 src/external/mit/xorg/lib/pixman/Makefile:1.35
--- src/external/mit/xorg/lib/pixman/Makefile:1.34 Sat Nov 7 20:45:03 2015
+++ src/external/mit/xorg/lib/pixman/Makefile Wed Mar 30 16:19:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/11/07 20:45:03 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.35 2016/03/30 16:19:06 macallan Exp $
NOLINT= 1 # defined
@@ -95,7 +95,7 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f
SRCS+= pixman-mmx.c
CPPFLAGS+= -DUSE_LOONGSON_MMI
# SIMD instructions use floatpoint registers so we need to enable their use
-COPTS.pixman-mmx.c= -march=loongson2f -mhard-float
+COPTS.pixman-mmx.c= -march=loongson2f -mhard-float -Wa,-mhard-float
.endif
INCS= pixman.h pixman-version.h
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: mbalmer
Date: Fri Mar 25 08:15:20 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lparser.c lstrlib.c
Log Message:
Apply second and third patch from http://lua.org/bugs.html.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/src/lparser.c
cvs rdiff -u -r1.11 -r1.12 src/external/mit/lua/dist/src/lstrlib.c
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/lua/dist/src/lparser.c
diff -u src/external/mit/lua/dist/src/lparser.c:1.4 src/external/mit/lua/dist/src/lparser.c:1.5
--- src/external/mit/lua/dist/src/lparser.c:1.4 Thu Jan 28 14:41:39 2016
+++ src/external/mit/lua/dist/src/lparser.c Fri Mar 25 08:15:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lparser.c,v 1.4 2016/01/28 14:41:39 lneto Exp $ */
+/* $NetBSD: lparser.c,v 1.5 2016/03/25 08:15:20 mbalmer Exp $ */
/*
** Id: lparser.c,v 2.149 2015/11/02 16:09:30 roberto Exp
@@ -1240,7 +1240,7 @@ static void labelstat (LexState *ls, TSt
checkrepeated(fs, ll, label); /* check for repeated labels */
checknext(ls, TK_DBCOLON); /* skip double colon */
/* create new entry for this label */
- l = newlabelentry(ls, ll, label, line, fs->pc);
+ l = newlabelentry(ls, ll, label, line, luaK_getlabel(fs));
skipnoopstat(ls); /* skip other no-op statements */
if (block_follow(ls, 0)) { /* label is last no-op statement in the block? */
/* assume that locals are already out of scope */
Index: src/external/mit/lua/dist/src/lstrlib.c
diff -u src/external/mit/lua/dist/src/lstrlib.c:1.11 src/external/mit/lua/dist/src/lstrlib.c:1.12
--- src/external/mit/lua/dist/src/lstrlib.c:1.11 Thu Jan 28 14:41:39 2016
+++ src/external/mit/lua/dist/src/lstrlib.c Fri Mar 25 08:15:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lstrlib.c,v 1.11 2016/01/28 14:41:39 lneto Exp $ */
+/* $NetBSD: lstrlib.c,v 1.12 2016/03/25 08:15:20 mbalmer Exp $ */
/*
** Id: lstrlib.c,v 1.239 2015/11/25 16:28:17 roberto Exp
@@ -692,6 +692,7 @@ typedef struct GMatchState {
static int gmatch_aux (lua_State *L) {
GMatchState *gm = (GMatchState *)lua_touserdata(L, lua_upvalueindex(3));
const char *src;
+ gm->ms.L = L;
for (src = gm->src; src <= gm->ms.src_end; src++) {
const char *e;
reprepstate(&gm->ms);
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-geode
Module Name:src
Committed By: joerg
Date: Mon Mar 7 14:35:21 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile
Log Message:
Ignore clang's empty loop-body warning, it is used extensively via
macros.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-geode/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/drivers/xf86-video-geode/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.3 Mon Jul 20 06:34:29 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile Mon Mar 7 14:35:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/07/20 06:34:29 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/03/07 14:35:21 joerg Exp $
DRIVER= xf86-video-geode
DRIVER_NAME= geode_drv
@@ -44,6 +44,8 @@ COPTS.gx_randr.c+= -Wno-error # XXX
COPTS.lx_memory.c+= -Wno-error # XXX
COPTS.panel.c+= -Wno-error # XXX -- huh? don't get this one
+CWARNFLAGS.clang+= -Wno-empty-body
+
.include "../Makefile.xf86-driver"
XORG_PKG_VER_PROG= ${DRIVER}
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: joerg
Date: Sun Feb 28 22:55:21 UTC 2016
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Make using ! on the LHS of a compare non-fatal, even if it is not
cosher. It is currently not clear what the code is actually trying to
do.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/gallium/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/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.13 src/external/mit/xorg/lib/gallium/Makefile:1.14
--- src/external/mit/xorg/lib/gallium/Makefile:1.13 Fri Feb 26 18:29:55 2016
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Feb 28 22:55:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/02/26 18:29:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/28 22:55:21 joerg Exp $
# Link the gallium mega driver.
@@ -594,7 +594,8 @@ CWARNFLAGS.clang+= -Wno-error=constant-c
-Wno-error=switch \
-Wno-error=absolute-value \
-Wno-error=tautological-compare \
- -Wno-error=static-in-inline
+ -Wno-error=static-in-inline \
+ -Wno-error=logical-not-parentheses
.include
LIBDIR= ${X11USRLIBDIR}/modules/dri
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src
Committed By: riastradh
Date: Sun Feb 28 22:12:27 UTC 2016
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
Define FC_NO_MT=1 for tools mkfontscale build.
No idea what the host's atomic ops will be but we don't need them
because this tool is not multithreaded.
Fixes harmless warnings like
all ===> external/mit/xorg/tools/mkfontscale
/home/source/ab/HEAD-llvm/xsrc/external/mit/fontconfig/dist/src/fcinit.c:29:2:
warning: #warning Could not find any system to define atomic_int macros,
library may NOT be thread-safe. [-Wcpp]
#warning Could not find any system to define atomic_int macros, library may
NOT be thread-safe.
^
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/tools/mkfontscale/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/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.7 src/external/mit/xorg/tools/mkfontscale/Makefile:1.8
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.7 Thu Jul 23 08:03:26 2015
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Sun Feb 28 22:12:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/23 08:03:26 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/28 22:12:26 riastradh Exp $
NOMAN= 1
@@ -86,6 +86,11 @@ HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXF
-DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
-DPACKAGE_STRING=\"NetBSD\ tools\ version\"
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
+
+# If you make mkfontscale multithreaded, remove this and fix the
+# fontconfig atomic ops.
+HOST_CPPFLAGS+= -DFC_NO_MT=1
+
HOST_CPPFLAGS+= -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: joerg
Date: Sun Feb 28 15:15:42 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
Don't claim too much about empty loops, the SYSCALL macro is kind of
obnoxious like that...
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/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/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.40 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.41
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.40 Wed Nov 4 17:06:23 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sun Feb 28 15:15:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2015/11/04 17:06:23 phx Exp $
+# $NetBSD: Makefile,v 1.41 2016/02/28 15:15:42 joerg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -168,5 +168,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
+CWARNFLAGS.clang+= -Wno-error=empty-body
+
.include
.include
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: riastradh Date: Fri Feb 26 21:20:17 UTC 2016 Modified Files: src/external/mit/xorg/lib: libglsl.mk Log Message: Disable C++11 warnings about `register' qualifiers in glsl_lexer.cpp. glsl_lexer.cpp was generated by a flex that still uses it. It is harmless. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libglsl.mk 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/lib/libglsl.mk diff -u src/external/mit/xorg/lib/libglsl.mk:1.1 src/external/mit/xorg/lib/libglsl.mk:1.2 --- src/external/mit/xorg/lib/libglsl.mk:1.1 Thu Dec 18 06:24:28 2014 +++ src/external/mit/xorg/lib/libglsl.mk Fri Feb 26 21:20:17 2016 @@ -1,9 +1,11 @@ -# $NetBSD: libglsl.mk,v 1.1 2014/12/18 06:24:28 mrg Exp $ +# $NetBSD: libglsl.mk,v 1.2 2016/02/26 21:20:17 riastradh Exp $ LIBGLSL_GENERATED_CXX_FILES = \ glsl_lexer.cpp \ glsl_parser.cpp +COPTS.glsl_lexer.cpp+= -Wno-deprecated-register + LIBGLSL_FILES = \ ast_array_index.cpp \ ast_expr.cpp \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: riastradh
Date: Fri Feb 26 18:29:55 UTC 2016
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Use -std=c++11 unordered_set, not TR1 unordered_set.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/gallium/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/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.12 src/external/mit/xorg/lib/gallium/Makefile:1.13
--- src/external/mit/xorg/lib/gallium/Makefile:1.12 Tue Nov 3 10:43:31 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Feb 26 18:29:55 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/11/03 10:43:31 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/26 18:29:55 riastradh Exp $
# Link the gallium mega driver.
@@ -21,6 +21,7 @@ DRIVERS+= r600
DRIVERS+= nouveau
.endif
+CXXFLAGS+= -std=c++11
CPPFLAGS+= \
-I${DESTDIR}${X11INCDIR}/libdrm
CVS commit: src/external/mit/lua/dist/src
Module Name:src
Committed By: lneto
Date: Thu Jan 28 17:23:21 UTC 2016
Modified Files:
src/external/mit/lua/dist/src: lvm.c
Log Message:
fixed metatable access to deallocated field
author: Lua.org
see: http://www.lua.org/bugs.html#5.3.2-1
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lvm.c
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/lua/dist/src/lvm.c
diff -u src/external/mit/lua/dist/src/lvm.c:1.9 src/external/mit/lua/dist/src/lvm.c:1.10
--- src/external/mit/lua/dist/src/lvm.c:1.9 Thu Jan 28 14:41:39 2016
+++ src/external/mit/lua/dist/src/lvm.c Thu Jan 28 17:23:21 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lvm.c,v 1.9 2016/01/28 14:41:39 lneto Exp $ */
+/* $NetBSD: lvm.c,v 1.10 2016/01/28 17:23:21 lneto Exp $ */
/*
** Id: lvm.c,v 2.265 2015/11/23 11:30:45 roberto Exp
@@ -203,18 +203,19 @@ void luaV_finishset (lua_State *L, const
for (loop = 0; loop < MAXTAGLOOP; loop++) {
const TValue *tm;
if (oldval != NULL) {
- lua_assert(ttistable(t) && ttisnil(oldval));
+ Table *h = hvalue(t); /* save 't' table */
+ lua_assert(ttisnil(oldval));
/* must check the metamethod */
- if ((tm = fasttm(L, hvalue(t)->metatable, TM_NEWINDEX)) == NULL &&
+ if ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) == NULL &&
/* no metamethod; is there a previous entry in the table? */
(oldval != luaO_nilobject ||
/* no previous entry; must create one. (The next test is
always true; we only need the assignment.) */
- (oldval = luaH_newkey(L, hvalue(t), key), 1))) {
+ (oldval = luaH_newkey(L, h, key), 1))) {
/* no metamethod and (now) there is an entry with given key */
setobj2t(L, cast(TValue *, oldval), val);
-invalidateTMcache(hvalue(t));
-luaC_barrierback(L, hvalue(t), val);
+invalidateTMcache(h);
+luaC_barrierback(L, h, val);
return;
}
/* else will try the metamethod */
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: christos
Date: Mon Jan 25 18:00:26 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.serverlib
Makefile.servermod
Log Message:
Include before setting any MK variables, so that /etc/mk.conf
is processed first, and it's settings don't override ours.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/Makefile.servermod
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.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.8 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.9
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.8 Sat Jul 18 04:56:06 2015
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib Mon Jan 25 13:00:26 2016
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.serverlib,v 1.8 2015/07/18 08:56:06 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.9 2016/01/25 18:00:26 christos Exp $
+
+.include # for NETBSDSRCDIR and mk.conf processing
# We can't use LIBISPRIVATE here as we need the ".so" installed.
MKPICINSTALL:= no
@@ -6,7 +8,6 @@ MKLINT:= no
MKDEBUGLIB:= no
MKPROFILE:= no
-.include # for NETBSDSRCDIR
.include
.if ${TARGET_ENDIANNESS} == "1234"
Index: src/external/mit/xorg/server/xorg-server/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.3 src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.4
--- src/external/mit/xorg/server/xorg-server/Makefile.servermod:1.3 Sat Jul 18 04:56:06 2015
+++ src/external/mit/xorg/server/xorg-server/Makefile.servermod Mon Jan 25 13:00:26 2016
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.servermod,v 1.3 2015/07/18 08:56:06 mrg Exp $
+# $NetBSD: Makefile.servermod,v 1.4 2016/01/25 18:00:26 christos Exp $
+
+.include # For /etc/mk.conf processing
.if defined(XMODULEDIR)
SHLIB_MAJOR=0
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: christos
Date: Fri Dec 25 18:50:48 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile.inc
Log Message:
PR/50593: dieter roelants: fix unexpanded definitions in xterm(1)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/xterm/Makefile.inc
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/bin/xterm/Makefile.inc
diff -u src/external/mit/xorg/bin/xterm/Makefile.inc:1.1 src/external/mit/xorg/bin/xterm/Makefile.inc:1.2
--- src/external/mit/xorg/bin/xterm/Makefile.inc:1.1 Tue Oct 14 19:37:19 2008
+++ src/external/mit/xorg/bin/xterm/Makefile.inc Fri Dec 25 13:50:48 2015
@@ -1,3 +1,20 @@
-# $NetBSD: Makefile.inc,v 1.1 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile.inc,v 1.2 2015/12/25 18:50:48 christos Exp $
-X11EXTRAMANDEFS+= -e 's,__mansuffix__,1,g'
+VERSION_H= ${X11SRCDIR.xterm}/version.h
+XTERM_DATE= ${:!${TOOL_GREP} XTERM_DATE ${VERSION_H}!:C/^[^0-9]*//}
+XTERM_PATCH= ${:!${TOOL_GREP} XTERM_PATCH ${VERSION_H}!:C/^[^0-9]*//}
+
+X11EXTRAMANDEFS+= \
+ -e 's,__app_version__,Patch \#${XTERM_PATCH},g' \
+ -e 's,__app_date__,${XTERM_DATE},g' \
+ -e 's,__default_termname__,xterm,g' \
+ -e 's,__default_termid__,420,g' \
+ -e 's,__alt_sends_esc__,False,g' \
+ -e 's,__meta_sends_esc__,False,g' \
+ -e 's,__backarrow_is_bs__,True,g' \
+ -e 's,__backarrow_is_erase__,False,g' \
+ -e 's,__delete_is_del__,Maybe,g' \
+ -e 's,__initial_erase__,False,g' \
+ -e 's,__default_class__,XTerm,g' \
+ -e 's,__mansuffix__,1,g' \
+ -e 's,__pixmapsdir__,${X11INCDIR}/X11/pixmaps,g'
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel-old
Module Name:src
Committed By: christos
Date: Sun Dec 20 01:07:58 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel-old: Makefile
Log Message:
name the man page intel_old, so that we don't install it over the new
one depending on the build order.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel-old/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/drivers/xf86-video-intel-old/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile:1.1 Wed May 20 20:12:10 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile Sat Dec 19 20:07:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/21 00:12:10 rjs Exp $
+# $NetBSD: Makefile,v 1.2 2015/12/20 01:07:58 christos Exp $
.include
@@ -21,7 +21,8 @@ SRCS+= i830_dri.c
.PATH: ${X11SRCDIR.${DRIVER}}/uxa
SRCS+= uxa-accel.c uxa-unaccel.c uxa-glyphs.c uxa-render.c uxa.c
-MAN= intel.4
+MAN= intel_old.4
+CLEANFILES+= intel_old.man
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
@@ -41,3 +42,7 @@ CWARNFLAGS.clang+= -Wno-parentheses -Wno
-Wno-empty-body -Wno-error
.include
+
+intel_old.man: intel.man
+ ${_MKTARGET_CREATE}
+ ${TOOL_SED} -e 's/[[:<:]]intel[[:>:]]/intel_old/g' ${.ALLSRC} > ${.TARGET}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-suncg6
Module Name:src
Committed By: macallan
Date: Wed Nov 25 18:02:08 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
Log Message:
build EXA support
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/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/drivers/xf86-video-suncg6/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.3 Tue Jun 4 22:45:08 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Wed Nov 25 18:02:08 2015
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2013/06/04 22:45:08 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/25 18:02:08 macallan Exp $
DRIVER= xf86-video-suncg6
DRIVER_NAME= suncg6_drv
-SRCS= cg6_driver.c cg6_cursor.c cg6_accel.c
+SRCS= cg6_driver.c cg6_cursor.c cg6_accel.c cg6_exa.c
CPPFLAGS+= ${X11FLAGS.DRI}
CPPFLAGS+= -DHAVE_XAA_H
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: tsutsui
Date: Sat Nov 21 11:15:31 UTC 2015
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11
Log Message:
Disable UIThrStubs.c, which is unnecessary on NetBSD.
This fixes xterm startup failure on NetBSD/m68k 7.0.
See PR/50386 for details.
Should be pulled up to netbsd-7 and netbsd-7-0.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libX11/Makefile.libx11
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/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.16 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.17
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.16 Tue Nov 3 10:26:06 2015
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Sat Nov 21 11:15:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.16 2015/11/03 10:26:06 szptvlfn Exp $
+# $NetBSD: Makefile.libx11,v 1.17 2015/11/21 11:15:31 tsutsui Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -265,8 +265,9 @@ SRCS= \
XlibInt.c \
Xrm.c
-SRCS+= \
- UIThrStubs.c
+# We have own pthread stubs in src/lib/libc/thread-stub. See PR/50386.
+#SRCS+= \
+# UIThrStubs.c
SRCS+= \
AddDIC.c \
CVS commit: src/external/mit/ctwm/bin/ctwm
Module Name:src
Committed By: jmcneill
Date: Tue Nov 10 23:57:00 UTC 2015
Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile
Log Message:
use NetBSD-inv.xpm for CTWM_WELCOME_FILE
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/ctwm/bin/ctwm/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/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.2 src/external/mit/ctwm/bin/ctwm/Makefile:1.3
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.2 Tue Nov 10 23:09:13 2015
+++ src/external/mit/ctwm/bin/ctwm/Makefile Tue Nov 10 23:57:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/11/10 23:09:13 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2015/11/10 23:57:00 jmcneill Exp $
.include
@@ -19,6 +19,7 @@ CPPFLAGS+= -I. -I${CTWMDIR}/src \
-DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM
CPPFLAGS+= -DPIXMAP_DIRECTORY=\"${XPMDIR}\"
+CPPFLAGS+= -DCTWM_WELCOME_FILE=\"xpm:${X11INCDIR}/X11/pixmaps/NetBSD-inv.xpm\"
CPPFLAGS.parse.c= -DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.twmrc\" \
-DM4CMD=\"m4\"
CVS commit: src/external/mit/ctwm/bin/ctwm
Module Name:src
Committed By: jmcneill
Date: Tue Nov 10 23:09:13 UTC 2015
Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile
Log Message:
fix default pixmap search directory
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/ctwm/bin/ctwm/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/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.1 src/external/mit/ctwm/bin/ctwm/Makefile:1.2
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.1 Thu Sep 3 22:24:02 2015
+++ src/external/mit/ctwm/bin/ctwm/Makefile Tue Nov 10 23:09:13 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/09/03 22:24:02 youri Exp $
+# $NetBSD: Makefile,v 1.2 2015/11/10 23:09:13 jmcneill Exp $
.include
@@ -16,11 +16,12 @@ CTWMDIR= ${X11SRCDIR}/external/mit/ctwm
XPMDIR= ${X11INCDIR}/X11/pixmaps/ctwm
CPPFLAGS+= -I. -I${CTWMDIR}/src \
- -DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM \
+ -DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM
+
+CPPFLAGS+= -DPIXMAP_DIRECTORY=\"${XPMDIR}\"
CPPFLAGS.parse.c= -DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.twmrc\" \
- -DM4CMD=\"m4\" \
- -DPIXMAP_DIRECTORY=\"${XPMDIR}\"
+ -DM4CMD=\"m4\"
FILESDIR= ${XPMDIR}
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: szptvlfn
Date: Sat Nov 7 20:45:03 UTC 2015
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
change MKDEPFLAGS from
-msse2 -mssse3 -mssse3 -fvisibility=hidden
to
-msse2 -msse3 -mssse3 -fvisibility=hidden
OK dholland@ at tech-x11@
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/pixman/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/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.33 src/external/mit/xorg/lib/pixman/Makefile:1.34
--- src/external/mit/xorg/lib/pixman/Makefile:1.33 Fri Nov 6 21:32:22 2015
+++ src/external/mit/xorg/lib/pixman/Makefile Sat Nov 7 20:45:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/11/06 21:32:22 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.34 2015/11/07 20:45:03 szptvlfn Exp $
NOLINT= 1 # defined
@@ -61,7 +61,7 @@ SRCS+= pixman-sse2.c pixman-ssse3.c
COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden
CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3
-MKDEPFLAGS+= -msse2 -mssse3 -mssse3 -fvisibility=hidden
+MKDEPFLAGS+= -msse2 -msse3 -mssse3 -fvisibility=hidden
.endif
.if ${MACHINE_ARCH} == "powerpc"
