CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: maya
Date: Wed Aug 11 23:02:39 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server/glamor: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
Log Message:
Fix glamor - don't use stub functions
${LDADD.gbm} seems to be empty - use -lgbm directly (couldn't find a better
fix)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/glamor/Makefile
cvs rdiff -u -r1.18 -r1.19 \
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/glamor/Makefile
diff -u src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 Fri Sep 2 03:58:59 2016
+++ src/external/mit/xorg/server/xorg-server/glamor/Makefile Wed Aug 11 23:02:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/09/02 03:58:59 jakllsch Exp $
+# $NetBSD: Makefile,v 1.4 2021/08/11 23:02:39 maya Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -42,13 +42,19 @@ SRCS= \
glamor_sync.c
SRCS+= \
glamor_xv.c
+.if ${HAVE_XORG_GLAMOR} == "no"
SRCS+= \
glamor_egl_stubs.c
-SRCS.EGL= \
- glamor_egl.c
+.else
+SRCS+= \
+ glamor_egl.c \
+ glamor_eglmodule.c
+.endif
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${DESTDIR}${X11INCDIR}/libdrm \
+ -I${X11SRCDIR.xorg-server}/glamor \
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
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.18 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 Sun Sep 13 23:01:02 2020
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Wed Aug 11 23:02:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/09/13 23:01:02 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2021/08/11 23:02:39 maya Exp $
.include
@@ -33,7 +33,7 @@ LDADD+= ${LDADD.dix}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
-LDADD+= ${LDADD.glamor} ${LDADD.gbm}
+LDADD+= ${LDADD.glamor} -lgbm
.endif
LDADD+= ${LDADD.record}
LDADD+= ${LDADD.hw/xfree86/loader}
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl
Module Name:src
Committed By: mrg
Date: Wed Jul 14 06:34:33 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl:
Makefile
Log Message:
find libgbm in libgbm.old.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/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/glamor_egl/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.1 Tue Apr 16 21:21:51 2019
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile Wed Jul 14 06:34:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2021/07/14 06:34:33 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -30,8 +30,10 @@ CPPFLAGS+= \
CPPFLAGS+= \
-DGLAMOR_HAS_GBM
+.include "../../../../../lib/mesa-which.mk"
+
LIBDPLIBS= \
- gbm ${.CURDIR}/../../../../../lib/libgbm
+ gbm ${.CURDIR}/../../../../../lib/libgbm${OLD_SUFFIX}
.include
LIBDIR= ${XMODULEDIR}
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src
Committed By: rin
Date: Thu Jun 3 07:37:01 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
Log Message:
Sort ${MACHINE}'s. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.18 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.19
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.18 Thu Jun 3 07:34:29 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Thu Jun 3 07:37:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/06/03 07:34:29 rin Exp $
+# $NetBSD: Makefile,v 1.19 2021/06/03 07:37:00 rin Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -13,11 +13,15 @@ CPPFLAGS+= -DPCVT_SUPPORT
# turns out we can't use wskbd everywhere without a couple more translation
# tables in the X driver so make it the default only where we know it will work
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
-${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
-${MACHINE} == "shark" || ${MACHINE} == "vax" || \
-${MACHINE} == "evbarm" || ${MACHINE} == "mac68k" || \
-${MACHINE} == "amiga"
+.if ${MACHINE_ARCH} == "powerpc" || \
+${MACHINE} == "amiga" || \
+${MACHINE} == "evbarm" || \
+${MACHINE} == "mac68k" || \
+${MACHINE} == "sgimips" || \
+${MACHINE} == "shark" || \
+${MACHINE} == "sparc" || \
+${MACHINE} == "sparc64" || \
+${MACHINE} == "vax"
CPPFLAGS+= -DDEFAULT_TO_WSKBD
.endif
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src
Committed By: rin
Date: Thu Jun 3 07:34:30 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
Log Message:
For amiga, use wskbd as default, which is only supported protocol today.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.17 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.18
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.17 Sat May 29 12:15:32 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Thu Jun 3 07:34:29 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/05/29 12:15:32 rin Exp $
+# $NetBSD: Makefile,v 1.18 2021/06/03 07:34:29 rin Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -16,7 +16,8 @@ CPPFLAGS+= -DPCVT_SUPPORT
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
${MACHINE} == "shark" || ${MACHINE} == "vax" || \
-${MACHINE} == "evbarm" || ${MACHINE} == "mac68k"
+${MACHINE} == "evbarm" || ${MACHINE} == "mac68k" || \
+${MACHINE} == "amiga"
CPPFLAGS+= -DDEFAULT_TO_WSKBD
.endif
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: joerg
Date: Mon May 31 21:45:41 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile
Log Message:
Stop using -fcommon, xsrc should be fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.2 -r1.3 \
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.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.27 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.28
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.27 Mon Apr 12 03:57:06 2021
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Mon May 31 21:45:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.27 2021/04/12 03:57:06 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.28 2021/05/31 21:45:41 joerg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -49,9 +49,6 @@ CPPFLAGS+= -DPACKAGE_VERSION_MINOR=${PAC
CPPFLAGS+= -DPACKAGE_VERSION_PATCHLEVEL=${PACKAGE_PATCH}
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
-# IOPortBase is particularly annoying to fix
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
-
.PATH: ${X11SRCDIR.${DRIVER}}/src
.PATH: ${X11SRCDIR.${DRIVER}}/man
.PATH: ${X11SRCDIR.${DRIVER}}
Index: src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.2 Sun May 30 22:24:35 2021
+++ src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile Mon May 31 21:45:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/05/30 22:24:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2021/05/31 21:45:41 joerg Exp $
.include
@@ -26,6 +26,5 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
# XXX
COPTS+= -Wno-error
-COPTS+= -fcommon
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-geode
Module Name:src
Committed By: joerg
Date: Mon May 31 00:04:15 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile
Log Message:
Use -fcommon
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
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.6 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.6 Tue Jan 1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile Mon May 31 00:04:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/01/01 00:37:06 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2021/05/31 00:04:15 joerg Exp $
DRIVER= xf86-video-geode
DRIVER_NAME= geode_drv
@@ -54,6 +54,8 @@ COPTS.lx_panel.c+= -Wno-error # XXX
CWARNFLAGS.clang+= -Wno-empty-body
+COPTS+= -fcommon
+
.include "../Makefile.xf86-driver"
XORG_PKG_VER_PROG= ${DRIVER}
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: joerg
Date: Sun May 30 22:24:36 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
Various X drivers still need -fcommon, so add it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
cvs rdiff -u -r1.33 -r1.34 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.12 -r1.13 \
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-amdgpu/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.1 Thu Aug 18 07:49:09 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile Sun May 30 22:24:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/18 07:49:09 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2021/05/30 22:24:35 joerg Exp $
.include
@@ -25,6 +25,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${X11SRCDIR.${DRIVER}}/../include
# XXX
-COPTS+= -Wno-error
+COPTS+= -Wno-error
+COPTS+= -fcommon
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.33 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.34
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.33 Mon Sep 7 00:24:37 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sun May 30 22:24:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2020/09/07 00:24:37 mrg Exp $
+# $NetBSD: Makefile,v 1.34 2021/05/30 22:24:35 joerg Exp $
.include
@@ -218,6 +218,8 @@ SRCS+= i810_xaa.c
CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-compare \
-Wno-empty-body -Wno-error
+COPTS+= -fcommon
+
COPTS.sna_display.c+= -Wno-stack-protector
COPTS.sna_threads.c+= -Wno-stack-protector
COPTS.sna_trapezoids.c+= -Wno-stack-protector
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.16 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.16 Tue Jan 1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Sun May 30 22:24:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/01/01 00:37:06 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2021/05/30 22:24:36 joerg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -43,6 +43,8 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
CPPFLAGS+= -DHAVE_XF86_CURSOR_RESET_CURSOR
+COPTS+= -fcommon
+
.include "../Makefile.xf86-driver"
# XXX
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.12 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.12 Sun Feb 9 12:28:28 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Sun May 30 22:24:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/02/09 12:28:28 jmcneill Exp $
+# $NetBSD: Makefile,v 1.13 2021/05/30 22:24:36 joerg Exp $
.include
@@ -61,4 +61,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
LIBDPLIBS+= gbm ${.CURDIR}/../../../lib/libgbm${OLD_PREFIX}
+COPTS+= -fcommon
+
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-pnozz
Module Name:src
Committed By: joerg
Date: Sun May 30 02:22:19 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-pnozz: Makefile
Log Message:
Ignore pointer sign cast issues with clang.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-pnozz/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-pnozz/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.2 Thu May 27 04:53:44 2021
+++ src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile Sun May 30 02:22:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/05/27 04:53:44 jdc Exp $
+# $NetBSD: Makefile,v 1.3 2021/05/30 02:22:19 joerg Exp $
DRIVER= xf86-video-pnozz
DRIVER_NAME= pnozz_drv
@@ -14,3 +14,4 @@ MAN= pnozz.4
# XXX
COPTS.pnozz_accel.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.pnozz_accel.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+COPTS.pnozz_cursor.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=pointer-sign :}
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src
Committed By: rin
Date: Sat May 29 12:15:32 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
Log Message:
Make wskbd(4) default for mac68k; no other protocol is available.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16 Mon Dec 31 11:58:43 2018
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Sat May 29 12:15:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/12/31 11:58:43 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2021/05/29 12:15:32 rin Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -16,7 +16,7 @@ CPPFLAGS+= -DPCVT_SUPPORT
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
${MACHINE} == "shark" || ${MACHINE} == "vax" || \
-${MACHINE} == "evbarm"
+${MACHINE} == "evbarm" || ${MACHINE} == "mac68k"
CPPFLAGS+= -DDEFAULT_TO_WSKBD
.endif
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: jdc
Date: Thu May 27 04:54:21 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
Restore the build of the pnozz driver on sparc, now that it has EXA support.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 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.101 src/external/mit/xorg/server/drivers/Makefile:1.102
--- src/external/mit/xorg/server/drivers/Makefile:1.101 Sun Mar 7 10:42:27 2021
+++ src/external/mit/xorg/server/drivers/Makefile Thu May 27 04:54:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2021/03/07 10:42:27 rin Exp $
+# $NetBSD: Makefile,v 1.102 2021/05/27 04:54:21 jdc Exp $
.include
@@ -335,6 +335,7 @@ SUBDIR+= \
.if ${MACHINE} == "sparc"
SUBDIR+= \
+ xf86-video-pnozz \
xf86-video-suncg14 \
xf86-video-suntcx
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-pnozz
Module Name:src
Committed By: jdc
Date: Thu May 27 04:53:44 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-pnozz: Makefile
Log Message:
Update the pnozz files list for EXA support.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-pnozz/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-pnozz/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.1 Wed Aug 26 22:30:46 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile Thu May 27 04:53:44 2021
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2009/08/26 22:30:46 macallan Exp $
+# $NetBSD: Makefile,v 1.2 2021/05/27 04:53:44 jdc Exp $
DRIVER= xf86-video-pnozz
DRIVER_NAME= pnozz_drv
-SRCS= pnozz_driver.c pnozz_cursor.c pnozz_accel.c
+SRCS= pnozz_driver.c pnozz_cursor.c pnozz_accel.c pnozz_exa.c
CPPFLAGS+= ${X11FLAGS.DRI}
MAN= pnozz.4
.include "../Makefile.xf86-driver"
+
+# XXX
+COPTS.pnozz_accel.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.pnozz_accel.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src
Committed By: nakayama
Date: Mon May 3 08:44:05 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server.old: Makefile.serverlib
Makefile.servermod
Log Message:
Remove duplicate lines.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib \
src/external/mit/xorg/server/xorg-server.old/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.old/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.4
--- src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3 Tue Apr 13 07:53:59 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib Mon May 3 08:44:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.3 2021/04/13 07:53:59 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.4 2021/05/03 08:44:05 nakayama Exp $
.include # for NETBSDSRCDIR and mk.conf processing
@@ -27,6 +27,3 @@ CPPFLAGS+= -D__GLX_ALIGN64
# IOPortBase is particularly annoying to fix
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
-
-# IOPortBase is particularly annoying to fix
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.4
--- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3 Tue Apr 13 07:53:59 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Mon May 3 08:44:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.3 2021/04/13 07:53:59 mrg Exp $
+# $NetBSD: Makefile.servermod,v 1.4 2021/05/03 08:44:05 nakayama Exp $
.include # For /etc/mk.conf processing
@@ -25,7 +25,4 @@ CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
# IOPortBase is particularly annoying to fix
-
-# IOPortBase is particularly annoying to fix
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src
Committed By: mrg
Date: Tue Apr 13 07:53:59 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server.old: Makefile.serverlib
Makefile.servermod
Log Message:
apply -fcommon here as well.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib \
src/external/mit/xorg/server/xorg-server.old/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.old/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.2 src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3
--- src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.2 Mon Apr 12 03:57:06 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib Tue Apr 13 07:53:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.2 2021/04/12 03:57:06 mrg Exp $
+# $NetBSD: Makefile.serverlib,v 1.3 2021/04/13 07:53:59 mrg Exp $
.include # for NETBSDSRCDIR and mk.conf processing
@@ -27,3 +27,6 @@ CPPFLAGS+= -D__GLX_ALIGN64
# IOPortBase is particularly annoying to fix
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
+
+# IOPortBase is particularly annoying to fix
+COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.2 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3
--- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.2 Mon Apr 12 03:57:06 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Tue Apr 13 07:53:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.2 2021/04/12 03:57:06 mrg Exp $
+# $NetBSD: Makefile.servermod,v 1.3 2021/04/13 07:53:59 mrg Exp $
.include # For /etc/mk.conf processing
@@ -25,4 +25,7 @@ CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
# IOPortBase is particularly annoying to fix
+
+# IOPortBase is particularly annoying to fix
+COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Mon Mar 22 14:11:02 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
Remove -DHAVE_STRCASECMP from CPPFLAGS that is defined in dix-config.h.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
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.10 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.10 Sun Feb 7 16:56:00 2021
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Mon Mar 22 14:11:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/02/07 16:56:00 tsutsui Exp $
+# $NetBSD: Makefile,v 1.11 2021/03/22 14:11:02 tsutsui Exp $
.include
@@ -33,7 +33,6 @@ CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE
-UXF86DRI -UXF86BIGFONT
CPPFLAGS+= -UHAVE_XORG_CONFIG_H
-CPPFLAGS+= -DHAVE_STRCASECMP
CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\"
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Sun Feb 7 16:56:00 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
Build mouseEmu3btn.c for added Emulate3Buttons support.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
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.9 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.9 Wed Aug 5 15:48:09 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Sun Feb 7 16:56:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/08/05 15:48:09 tsutsui Exp $
+# $NetBSD: Makefile,v 1.10 2021/02/07 16:56:00 tsutsui Exp $
.include
@@ -18,6 +18,7 @@ WARNS?= 2
.PATH: ${X11SRCDIR.xorg-server}/hw/netbsd/x68k
SRCS= x68kInit.c x68kConfig.c x68kIo.c x68kMouse.c x68kKbd.c x68kKeyMap.c \
x68kFb.c x68kGraph.c x68kText.c
+SRCS+= mouseEmu3btn.c
.PATH: ${X11SRCDIR.xorg-server}/Xi
SRCS+= stubs.c
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Thu Nov 5 16:06:41 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile
Log Message:
Cherry-pick Xorg version independent changes from xorg-server.
Reorganize CPPFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/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.old/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2 Sat Jul 18 15:24:31 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Thu Nov 5 16:06:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/07/18 15:24:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/05 16:06:41 tsutsui Exp $
.include
@@ -31,16 +31,14 @@ SRCS+= miinitext.c
.PATH: ${X11SRCDIR.xorg-server}/fb
SRCS+= fbcmap_mi.c
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
- -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
- -I${X11SRCDIR.xorg-server}/fb \
- -I${X11SRCDIR.xorg-server}/mi \
- -I${X11SRCDIR.xorg-server}/render \
- -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+ ${X11INCS.DIX}
CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
-UXF86DRI -UXF86BIGFONT
+CPPFLAGS+= -UHAVE_XORG_CONFIG_H
+
CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\"
.include "../../../Makefile.Xserver"
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: macallan
Date: Fri Oct 9 17:01:29 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
build ppc_video.c etc. on hppa
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 \
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.47 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.48
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.47 Mon Dec 31 11:14:05 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Fri Oct 9 17:01:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2018/12/31 11:14:05 mrg Exp $
+# $NetBSD: Makefile,v 1.48 2020/10/09 17:01:29 macallan Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -35,7 +35,8 @@ CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCON
.endfor
.endif
-.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || ${MACHINE} == "ibmnws"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || \
+ ${MACHINE} == "ibmnws" || ${MACHINE} == "hppa"
SRCS.bsd+= ppc_video.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: macallan
Date: Fri Oct 9 04:28:38 UTC 2020
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
build some potentially useful drivers on hppa
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 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.99 src/external/mit/xorg/server/drivers/Makefile:1.100
--- src/external/mit/xorg/server/drivers/Makefile:1.99 Sun Jan 19 10:45:50 2020
+++ src/external/mit/xorg/server/drivers/Makefile Fri Oct 9 04:28:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2020/01/19 10:45:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.100 2020/10/09 04:28:38 macallan Exp $
.include
@@ -212,6 +212,13 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+.if ${MACHINE} == "hppa"
+SUBDIR+= \
+ xf86-video-mga \
+ xf86-video-r128 \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "hppa"
+
.if ${MACHINE} == "ibmnws"
SUBDIR+= \
xf86-video-s3
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Sun Sep 13 23:01:03 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/Xext: Makefile
src/external/mit/xorg/server/xorg-server/fb: Makefile.fb
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/record: Makefile
Log Message:
remove additional -DHAVE_DIX_CONFIG_H.
add ${X11FLAGS.DIX} ${X11INCS.DIX} to record. fixes build on riscv64.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.19 -r1.20 \
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/xfree86/Xorg/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/record/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.7 src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.7 Sat Aug 20 01:03:34 2016
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile Sun Sep 13 23:01:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/20 01:03:34 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2020/09/13 23:01:02 mrg Exp $
LIBISPRIVATE= yes
LIB= Xext
@@ -28,7 +28,6 @@ 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}
.PATH: ${X11SRCDIR.xorg-server}/Xext
Index: src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.12 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.13
--- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.12 Sun Aug 9 15:02:52 2020
+++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Sun Sep 13 23:01:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.fb,v 1.12 2020/08/09 15:02:52 tsutsui Exp $
+# $NetBSD: Makefile.fb,v 1.13 2020/09/13 23:01:02 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/fb
SRCS.fb= fballpriv.c \
@@ -30,13 +30,11 @@ SRCS.fb= fballpriv.c \
fbutil.c\
fbwindow.c
-CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} -DHAVE_DIX_CONFIG_H
+CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
-CPPFLAGS+= -DHAVE_DIX_CONFIG_H
-
# XXX
COPTS.fbpict.c= -Wno-error
COPTS.fbwindow.c= -Wno-error
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.19 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.20
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.19 Wed Aug 5 15:48:09 2020
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Sun Sep 13 23:01:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/08/05 15:48:09 tsutsui Exp $
+# $NetBSD: Makefile,v 1.20 2020/09/13 23:01:02 mrg Exp $
.include
@@ -25,7 +25,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/render \
- -DHAVE_DIX_CONFIG_H \
-UGLXEXT
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
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.17 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.17 Tue Apr 16 21:20:52 2019
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Sun Sep 13 23:01:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/04/16 21:20:52 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2020/09/13 23:01:02 mrg Exp $
.include
@@ -21,8 +21,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${DESTDIR}${X11INCDIR}/libdrm \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg \
- -I${X11SRCDIR.xorg-server}/render \
- -DHAVE_DIX_CONFIG_H
+ -I${X11SRCDIR.xorg-server}/render
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
${X11FLAGS.EXTENSION}
Index: src/external/mit/xorg/server/xorg-server/record/Makefile
diff -u src/external/mit/xorg/server/xorg-server/record/Makefile:1.2 src/external/mit/xorg/server/xorg-server/record/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/record/Makefile:1.2 Sun Aug 10 06:42:39 2008
+++
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Mon Sep 7 00:24:37 UTC 2020
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
Log Message:
use GCC_NO_ADDR_OF_PACKED_MEMBER.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.13 -r1.14 \
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-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.32 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.33
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.32 Fri May 10 06:25:58 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Mon Sep 7 00:24:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/05/10 06:25:58 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2020/09/07 00:24:37 mrg Exp $
.include
@@ -227,5 +227,6 @@ COPTS.sna_trapezoids_mono.c+= -Wno-stack
COPTS.sna_trapezoids_precise.c+= -Wno-stack-protector
COPTS.i965_video.c+= -Wno-stack-protector
+COPTS.sna_damage.c+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
COPTS.sna_display.c+= -Wno-error # XXX deprecated
COPTS.intel_driver.c+= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.13 Mon Dec 31 12:13:50 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile Mon Sep 7 00:24:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/12/31 12:13:50 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2020/09/07 00:24:37 mrg Exp $
DRIVER= xf86-video-vmware
DRIVER_NAME= vmware_drv
@@ -25,3 +25,5 @@ COPTS.vmware.c+= -Wno-error # XXX deprec
COPTS.vmwaremodes.c+= -Wno-error
.include "../Makefile.xf86-driver"
+
+CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
CVS commit: src/external/mit/xorg/server/xorg-server/fb
Module Name:src
Committed By: tsutsui
Date: Sun Aug 9 15:02:53 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/fb: Makefile.fb
Log Message:
Put back fbtile.c to SRCS.fb per xsrc dist file changes:
https://mail-index.netbsd.org/source-changes/2020/08/09/msg120399.html
> Revert upstream "fb: Remove even/odd tile slow-pathing" changes.
>
> https://gitlab.freedesktop.org/xorg/xserver/-/commit/e572bcc7f4236b7e0f23ab762f225b3bce37db59
> >> fb: Remove even/odd tile slow-pathing
> >>
> >> Again, clearly meant to be a fast path, but this turns out not to be the
> >> case.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
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/fb/Makefile.fb
diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.11 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.12
--- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.11 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Sun Aug 9 15:02:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.fb,v 1.11 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile.fb,v 1.12 2020/08/09 15:02:52 tsutsui Exp $
.PATH: ${X11SRCDIR.xorg-server}/fb
SRCS.fb= fballpriv.c \
@@ -25,6 +25,7 @@ SRCS.fb= fballpriv.c \
fbseg.c \
fbsetsp.c \
fbsolid.c \
+ fbtile.c\
fbtrap.c\
fbutil.c\
fbwindow.c
CVS commit: src/external/mit/xorg/server/xorg-server/hw
Module Name:src
Committed By: tsutsui
Date: Wed Aug 5 15:48:09 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
Log Message:
No need to build fbcmap_mi.c in each DDX server.
Per upstream commit:
https://cgit.freedesktop.org/xorg/xserver/commit/?id=432fc37e2ca833f1ec3cb614cbdc3a7ae13f22b7
> Build fbcmap_mi.c once, rather than once for each DDX, and make it part of
> libfb
> or libwfb convenience library.
Tested on sun3 and x68k.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.22 -r1.23 \
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/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8 Wed Jul 22 21:25:03 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Wed Aug 5 15:48:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/07/22 21:25:03 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2020/08/05 15:48:09 tsutsui Exp $
.include
@@ -25,9 +25,6 @@ SRCS+= stubs.c
.PATH: ${X11SRCDIR.xorg-server}/mi
SRCS+= miinitext.c
-.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS+= fbcmap_mi.c
-
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
${X11INCS.DIX}
Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.5
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4 Tue Aug 4 14:31:58 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Wed Aug 5 15:48:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.4 2020/08/04 14:31:58 tsutsui Exp $
+# $NetBSD: Makefile.Xsun,v 1.5 2020/08/05 15:48:09 tsutsui Exp $
.include
@@ -70,9 +70,6 @@ SRCS+= sunFbs.c sunIo.c sunKbd.c sunKeyM
.PATH: ${X11SRCDIR.xorg-server}/Xi
SRCS+= stubs.c
-.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS+= fbcmap_mi.c
-
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \
${X11INCS.DIX}
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.18 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Wed Aug 5 15:48:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2020/08/05 15:48:09 tsutsui Exp $
.include
@@ -13,10 +13,6 @@ PROG= Xvfb
.PATH: ${X11SRCDIR.xorg-server}/mi
SRCS= InitInput.c InitOutput.c miinitext.c stubs.c
-# XXX should not be needed now
-#.PATH: ${X11SRCDIR.xorg-server}/fb
-#SRCS+= fbcmap_mi.c
-
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xorg-server}/fb \
-I${X11SRCDIR.xorg-server}/mfb \
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.23
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22 Mon Jul 20 13:59:57 2020
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Wed Aug 5 15:48:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/07/20 13:59:57 tsutsui Exp $
+# $NetBSD: Makefile,v 1.23 2020/08/05 15:48:09 tsutsui Exp $
.include
@@ -16,8 +16,7 @@ PROG= Xnest
SRCS= Args.c Color.c Cursor.c Display.c Events.c Font.c \
GC.c GCOps.c Handlers.c Init.c Keyboard.c \
Pixmap.c Pointer.c Screen.c Visual.c Window.c \
- stubs.c miinitext.c \
- fbcmap_mi.c
+ stubs.c miinitext.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xnest \
-I${DESTDIR}${X11INCDIR}/X11 \
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/sun
Module Name:src
Committed By: tsutsui
Date: Tue Aug 4 14:35:24 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/sun: Makefile.Xsun
Log Message:
Sync with xorg-server:
> Specify default /var/log/Xsun.%s.log path definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun
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/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.1 src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.1 Wed Jul 22 19:26:37 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun Tue Aug 4 14:35:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 19:26:37 tsutsui Exp $
+# $NetBSD: Makefile.Xsun,v 1.2 2020/08/04 14:35:24 tsutsui Exp $
.include
@@ -13,6 +13,7 @@ WARNS?= 2
.PATH: ${X11SRCDIR.xorg-server}/hw/sun
BUILDSYMLINKS=
+CPPFLAGS+= -DDEFAULT_LOGDIR=\"/var/log\" -DDEFAULT_LOGPREFIX=\"${PROG}.\"
CPPFLAGS+= -DINCLUDE_CG2_HEADER
#CPPFLAGS+= -DLOWMEMFTPT
CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun
Module Name:src
Committed By: tsutsui
Date: Tue Aug 4 14:31:58 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
Log Message:
Specify default /var/log/Xsun.%s.log path definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
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/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3 Fri Jul 24 02:25:58 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Tue Aug 4 14:31:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.3 2020/07/24 02:25:58 tsutsui Exp $
+# $NetBSD: Makefile.Xsun,v 1.4 2020/08/04 14:31:58 tsutsui Exp $
.include
@@ -13,6 +13,7 @@ WARNS?= 2
.PATH: ${X11SRCDIR.xorg-server}/hw/sun
BUILDSYMLINKS=
+CPPFLAGS+= -DDEFAULT_LOGDIR=\"/var/log\" -DDEFAULT_LOGPREFIX=\"${PROG}.\"
CPPFLAGS+= -DINCLUDE_CG2_HEADER
#CPPFLAGS+= -DLOWMEMFTPT
CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun
Module Name:src
Committed By: tsutsui
Date: Fri Jul 24 02:25:58 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
Log Message:
Explicitly disable dbe, record, and present DIX extentions.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
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/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2 Thu Jul 23 09:59:36 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Fri Jul 24 02:25:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.2 2020/07/23 09:59:36 mrg Exp $
+# $NetBSD: Makefile.Xsun,v 1.3 2020/07/24 02:25:58 tsutsui Exp $
.include
@@ -73,11 +73,10 @@ SRCS+= stubs.c
SRCS+= fbcmap_mi.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \
- -I${DESTDIR}${X11INCDIR}/xorg \
${X11INCS.DIX}
CPPFLAGS+= -UHAVE_XORG_CONFIG_H
-
+CPPFLAGS+= -UDBE -UXRECORD -UPRESENT
CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
-UXF86DRI -UXF86BIGFONT
@@ -90,9 +89,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.xkbstubs} \
${LDADD.randr} \
${LDADD.Xext} \
- ${LDADD.dbe} \
${LDADD.composite} \
- ${LDADD.record} \
${LDADD.render} \
${LDADD.os} \
${LDADD.xfixes} \
@@ -100,7 +97,6 @@ LDADD+= ${LDADD.dix} \
${LDADD.miext/damage} \
${LDADD.miext/sync} \
${LDADD.Xi} \
- ${LDADD.present} \
-lXfont2 \
-lpixman-1 \
-lX11 \
@@ -113,9 +109,7 @@ DPADD+= ${LDADD.dix} \
${DPADD.xkb} \
${DPADD.randr} \
${DPADD.Xext} \
- ${DPADD.dbe} \
${DPADD.composite} \
- ${DPADD.record} \
${DPADD.render} \
${DPADD.os} \
${DPADD.xfixes} \
@@ -123,10 +117,8 @@ DPADD+= ${LDADD.dix} \
${DPADD.miext/damage} \
${DPADD.miext/sync} \
${DPADD.Xi} \
- ${DPADD.present} \
${LIBXFONT2} \
${LIBPIXMAN-1} \
- ${LIBXEXT} \
${LIBX11} \
${LIBZ} \
${LIBM}
CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun
Module Name:src
Committed By: mrg
Date: Thu Jul 23 09:59:36 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
Log Message:
fix build:
- add .../xorg subdir to the path
- add dbe and present extensions, both wanted via linkage
.. but maybe these shouldn't be built? they're not in sets.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
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/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.1 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.1 Wed Jul 22 20:54:08 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Thu Jul 23 09:59:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 20:54:08 tsutsui Exp $
+# $NetBSD: Makefile.Xsun,v 1.2 2020/07/23 09:59:36 mrg Exp $
.include
@@ -73,6 +73,7 @@ SRCS+= stubs.c
SRCS+= fbcmap_mi.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \
+ -I${DESTDIR}${X11INCDIR}/xorg \
${X11INCS.DIX}
CPPFLAGS+= -UHAVE_XORG_CONFIG_H
@@ -89,6 +90,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.xkbstubs} \
${LDADD.randr} \
${LDADD.Xext} \
+ ${LDADD.dbe} \
${LDADD.composite} \
${LDADD.record} \
${LDADD.render} \
@@ -98,9 +100,9 @@ LDADD+= ${LDADD.dix} \
${LDADD.miext/damage} \
${LDADD.miext/sync} \
${LDADD.Xi} \
+ ${LDADD.present} \
-lXfont2 \
-lpixman-1 \
- -lXext \
-lX11 \
-lz \
-lm
@@ -111,6 +113,7 @@ DPADD+= ${LDADD.dix} \
${DPADD.xkb} \
${DPADD.randr} \
${DPADD.Xext} \
+ ${DPADD.dbe} \
${DPADD.composite} \
${DPADD.record} \
${DPADD.render} \
@@ -120,6 +123,7 @@ DPADD+= ${LDADD.dix} \
${DPADD.miext/damage} \
${DPADD.miext/sync} \
${DPADD.Xi} \
+ ${DPADD.present} \
${LIBXFONT2} \
${LIBPIXMAN-1} \
${LIBXEXT} \
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: tsutsui
Date: Thu Jul 23 09:13:18 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw: Makefile
src/external/mit/xorg/server/xorg-server/hw: Makefile
Log Message:
Remove duplicated (and .if 0'ed out) ${XSERVER_XFREE86} checks.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/hw/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/server/xorg-server/hw/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/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.3 src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.3 Thu Jul 23 09:09:12 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/Makefile Thu Jul 23 09:13:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/07/23 09:09:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2020/07/23 09:13:18 tsutsui Exp $
.include "../Makefile.common"
@@ -34,10 +34,6 @@ SUBDIR+=netbsd/arm32vidc
SUBDIR+=netbsd/dec
.endif
-.if ${XSERVER_XFREE86} != "no"
-SUBDIR+=xfree86
-.endif
-
.if ${XSERVER_XMAC68K} != "no"
SUBDIR+=netbsd/mac68k
.endif
Index: src/external/mit/xorg/server/xorg-server/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/Makefile:1.7 Thu Jul 23 09:09:13 2020
+++ src/external/mit/xorg/server/xorg-server/hw/Makefile Thu Jul 23 09:13:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/07/23 09:09:13 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8 2020/07/23 09:13:18 tsutsui Exp $
.include "../Makefile.common"
@@ -34,10 +34,6 @@ SUBDIR+=netbsd/arm32vidc
SUBDIR+=netbsd/dec
.endif
-.if ${XSERVER_XFREE86} != "no"
-SUBDIR+=xfree86
-.endif
-
.if ${XSERVER_XMAC68K} != "no"
SUBDIR+=netbsd/mac68k
.endif
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: tsutsui
Date: Thu Jul 23 09:09:13 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server.old: Makefile.common
src/external/mit/xorg/server/xorg-server.old/hw: Makefile
src/external/mit/xorg/server/xorg-server/hw: Makefile
Log Message:
Remove definitions for Xdreamcast, Xhpc, Xmacppc, and Xnewsmips.
All these port specific X11R6 servers just used MI wscons, and
all of them have been switched to Xorg servers with wsfb driver etc.
Even if someone wants a smaller monolithic server, it should be
written as a MI "Xwscons" server.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/Makefile.common
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/hw/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/hw/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.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.28 src/external/mit/xorg/server/xorg-server/Makefile.common:1.29
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.28 Thu Jul 23 08:34:33 2020
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Thu Jul 23 09:09:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2020/07/23 08:34:33 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.29 2020/07/23 09:09:12 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -33,10 +33,6 @@ XSERVER_XAMIGA= yes
XSERVER_XMAC68K= yes
.endif
-.if ${MACHINE} == "macppc"
-XSERVER_XMACPPC= yes
-.endif
-
.if ${MACHINE} == "pmax"
XSERVER_XDECNETBSD= yes
XSERVER_XPMAX= no # XXX should be yes but may be obsoleted
@@ -73,10 +69,6 @@ XSERVER_XDECNETBSD?= no
XSERVER_XFREE68?= no
# Does this platform build the Xmac68k X server?
XSERVER_XMAC68K?= no
-# Does this platform build Xmacppc X server?
-XSERVER_XMACPPC?= no
-# Does this platform build the Xnewsmips server?
-XSERVER_XNEWSMIPS?= no
# Does this platform build Xpmax X servers?
XSERVER_XPMAX?= no
# Does this platform build Xsun* X servers?
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.4
--- src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.3 Thu Jul 23 08:34:33 2020
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.common Thu Jul 23 09:09:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2020/07/23 08:34:33 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.4 2020/07/23 09:09:12 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -32,10 +32,6 @@ XSERVER_XAMIGA= yes
XSERVER_XMAC68K= yes
.endif
-.if ${MACHINE} == "macppc"
-XSERVER_XMACPPC= yes
-.endif
-
.if ${MACHINE} == "pmax"
XSERVER_XDECNETBSD= yes
XSERVER_XPMAX= no # XXX should be yes but may be obsoleted
@@ -72,10 +68,6 @@ XSERVER_XDECNETBSD?= no
XSERVER_XFREE68?= no
# Does this platform build the Xmac68k X server?
XSERVER_XMAC68K?= no
-# Does this platform build Xmacppc X server?
-XSERVER_XMACPPC?= no
-# Does this platform build the Xnewsmips server?
-XSERVER_XNEWSMIPS?= no
# Does this platform build Xpmax X servers?
XSERVER_XPMAX?= no
# Does this platform build Xsun* X servers?
Index: src/external/mit/xorg/server/xorg-server.old/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.2 Wed Jul 22 19:26:37 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/Makefile Thu Jul 23 09:09:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/07/22 19:26:37 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2020/07/23 09:09:12 tsutsui Exp $
.include "../Makefile.common"
@@ -34,30 +34,14 @@ SUBDIR+=netbsd/arm32vidc
SUBDIR+=netbsd/dec
.endif
-.if ${XSERVER_XDREAMCAST} != "no"
-SUBDIR+=netbsd/dreamcast
-.endif
-
.if ${XSERVER_XFREE86} != "no"
SUBDIR+=xfree86
.endif
-.if ${XSERVER_XHPC} != "no"
-SUBDIR+=netbsd/hpc
-.endif
-
.if ${XSERVER_XMAC68K} != "no"
SUBDIR+=netbsd/mac68k
.endif
-.if ${XSERVER_XMACPPC} != "no"
-SUBDIR+=netbsd/macppc
-.endif
-
-.if ${XSERVER_XNEWSMIPS} != "no"
-SUBDIR+=netbsd/newsmips
-.endif
-
.if ${XSERVER_XVFB} != "no"
SUBDIR+=vfb
.endif
Index: src/external/mit/xorg/server/xorg-server/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/Makefile:1.6
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: tsutsui
Date: Thu Jul 23 08:34:33 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server.old: Makefile.common
Log Message:
Don't build Xsun servers for sparc and sparc64.
Not tested, and maybe not worth for wscons'fied ports.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/Makefile.common
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.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.27 src/external/mit/xorg/server/xorg-server/Makefile.common:1.28
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.27 Fri Aug 19 03:59:30 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Thu Jul 23 08:34:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2016/08/19 03:59:30 mrg Exp $
+# $NetBSD: Makefile.common,v 1.28 2020/07/23 08:34:33 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -43,9 +43,9 @@ XSERVER_XPMAX= no # XXX should be yes b
.endif
.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-XSERVER_XSUN= yes
-XSERVER_XSUNMONO= yes
-XSERVER_XSUN24= yes
+#XSERVER_XSUN= yes
+#XSERVER_XSUNMONO= yes
+#XSERVER_XSUN24= yes
.endif
.if ${MACHINE} == "sun3"
Index: src/external/mit/xorg/server/xorg-server.old/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.2 src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.3
--- src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.2 Fri Aug 19 03:59:31 2016
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.common Thu Jul 23 08:34:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2016/08/19 03:59:31 mrg Exp $
+# $NetBSD: Makefile.common,v 1.3 2020/07/23 08:34:33 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -42,9 +42,9 @@ XSERVER_XPMAX= no # XXX should be yes b
.endif
.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-XSERVER_XSUN= yes
-XSERVER_XSUNMONO= yes
-XSERVER_XSUN24= yes
+#XSERVER_XSUN= yes
+#XSERVER_XSUNMONO= yes
+#XSERVER_XSUN24= yes
.endif
.if ${MACHINE} == "sun3"
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Wed Jul 22 21:25:03 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
Reorganize CPPFLAGS.
- use ${X11INCS.DIX} in
- explicitly undef HAVE_XORG_CONFIG_H to avoid reference to
hw/xfree86/common in mi/miinitext.c
- remove -DHAVE_DIX_CONFIG_H which is already defined in
${X11FLAGS.DIX} and pulled via Makefile.servermod
XXX: -DHAVE_STRCASECMP should also be moved to ${X11FLAGS.DIX},
or should be pulled via include/dix-config.h?
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
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.7 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7 Sat Jul 18 16:07:15 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Wed Jul 22 21:25:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8 2020/07/22 21:25:03 tsutsui Exp $
.include
@@ -28,20 +28,13 @@ SRCS+= miinitext.c
.PATH: ${X11SRCDIR.xorg-server}/fb
SRCS+= fbcmap_mi.c
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
- -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
- -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+= -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+ ${X11INCS.DIX}
CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
-UXF86DRI -UXF86BIGFONT
-CPPFLAGS+= -DHAVE_DIX_CONFIG_H
+CPPFLAGS+= -UHAVE_XORG_CONFIG_H
CPPFLAGS+= -DHAVE_STRCASECMP
CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\"
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw
Module Name:src
Committed By: tsutsui
Date: Wed Jul 22 19:26:37 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server.old/hw/sun: Makefile
Makefile.Xsun
src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono: Makefile
Log Message:
Add build glue files for Xorg-Server-1.10'fied monolithic Xsun servers.
Not enabled and just for reference.
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/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono/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/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/Makefile Wed Jul 22 19:26:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2020/07/22 19:26:37 tsutsui Exp $
.include "../Makefile.common"
@@ -11,6 +11,12 @@ SUBDIR+= xfree86
SUBDIR+=netbsd/x68k
.endif
+.if ${XSERVER_XSUN} != "no" || \
+${XSERVER_XSUNMONO} != "no" || \
+${XSERVER_XSUN24} != "no"
+SUBDIR+=sun
+.endif
+
.if 0
.if ${XSERVER_XALPHANETBSD} != "no"
SUBDIR+=netbsd/alpha
@@ -52,10 +58,6 @@ SUBDIR+=netbsd/macppc
SUBDIR+=netbsd/newsmips
.endif
-.if ${XSERVER_XSUN} != "no"
-SUBDIR+=sun
-.endif
-
.if ${XSERVER_XVFB} != "no"
SUBDIR+=vfb
.endif
Added files:
Index: src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile:1.1
--- /dev/null Wed Jul 22 19:26:37 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile Wed Jul 22 19:26:37 2020
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2020/07/22 19:26:37 tsutsui Exp $
+
+.include "../../Makefile.common"
+
+SUBDIR= Xsun
+
+.if ${XSERVER_XSUNMONO} != "no"
+SUBDIR+= XsunMono
+.endif
+
+.if ${XSERVER_XSUN24} != "no"
+SUBDIR+= Xsun24
+.endif
+
+.include
Index: src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun
diff -u /dev/null src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.1
--- /dev/null Wed Jul 22 19:26:37 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun Wed Jul 22 19:26:37 2020
@@ -0,0 +1,134 @@
+# $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 19:26:37 tsutsui Exp $
+
+.include
+
+PROG?= Xsun
+BINMODE= 4711
+
+.include "../../../Makefile.serverlib"
+.include "../../../Makefile.servermod"
+
+WARNS?= 2
+
+.PATH: ${X11SRCDIR.xorg-server}/hw/sun
+
+BUILDSYMLINKS=
+CPPFLAGS+= -DINCLUDE_CG2_HEADER
+#CPPFLAGS+= -DLOWMEMFTPT
+
+# for Xsun (8bpp)
+.if ${PROG} == "Xsun"
+SRCS= sunInit.c
+SRCS+= sunCfb.c
+# XXX not yet
+#SRCS+= sunGX.c sunCursor.c
+SRCS+= sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+= sunInitExt.c
+.endif
+
+# for XsunMono (1bpp)
+.if ${PROG} == "XsunMono"
+BUILDSYMLINKS+= sunInit.c sunInitMono.c
+SRCS= sunInitMono.c
+SRCS+= sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInExMono.c
+SRCS+= sunInExMono.c
+
+CPPFLAGS.sunInitMono.c= -DSUNMAXDEPTH=1
+CPPFLAGS.sunInExMono.c= -URENDER
+.endif
+
+# for Xsun24 (24bpp)
+.if ${PROG} == "Xsun24"
+BUILDSYMLINKS+= sunInit.c sunInitMulti.c
+SRCS+= sunInitMulti.c
+SRCS+= sunCfb.c
+SRCS+= sunCfb24.c
+SRCS+= sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+= sunInitExt.c
+
+CPPFLAGS.sunInitMulti.c= -DSUNMAXDEPTH=32
+.endif
+
+# for XsunMulti (XXX: incomplete?)
+.if 0
+SRCS+= sunMultiDepth.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+= sunInitExt.c
+.endif
+
+# common sources
+SRCS+= sunFbs.c sunIo.c sunKbd.c sunKeyMap.c sunMouse.c
+
+.PATH: ${X11SRCDIR.xorg-server}/Xext
+SRCS+= dpmsstubs.c
+
+.PATH: ${X11SRCDIR.xorg-server}/Xi
+SRCS+= stubs.c
+
+.PATH: ${X11SRCDIR.xorg-server}/fb
+SRCS+= fbcmap_mi.c
+
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \
+ ${X11INCS.DIX}
+
+CPPFLAGS+= -UHAVE_XORG_CONFIG_H
+
+CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+ -UXF86DRI -UXF86BIGFONT
+
+.include "../../../Makefile.Xserver"
+
+LDADD+=
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: tsutsui
Date: Mon Jul 20 13:59:57 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/xnest: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
Log Message:
Remove extra "-I" for ${X11INCS.DIX} macro.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile
cvs rdiff -u -r1.21 -r1.22 \
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.old/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.3 src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.3 Sun May 21 15:28:40 2017
+++ src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile Mon Jul 20 13:59:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/05/21 15:28:40 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2020/07/20 13:59:57 tsutsui Exp $
.include
@@ -28,7 +28,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include \
- -I${X11INCS.DIX}
+ ${X11INCS.DIX}
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} \
${X11FLAGS.EXTENSION} \
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.21 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.21 Mon Dec 31 11:14:06 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Mon Jul 20 13:59:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/12/31 11:14:06 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2020/07/20 13:59:57 tsutsui Exp $
.include
@@ -30,7 +30,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include \
- -I${X11INCS.DIX}
+ ${X11INCS.DIX}
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} \
${X11FLAGS.EXTENSION} \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Sat Jul 18 16:07:15 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
Xorg 1.20 servers require libXfont2 instead of libXfont.
Per the following upstream commit:
https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7
> dix: Switch to the libXfont2 API (v2)
Now Xorg 1.20 based X68k server builds and confirmed working on XM6i.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
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.6 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6 Sat Jul 18 15:26:30 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Sat Jul 18 16:07:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $
.include
@@ -63,7 +63,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.miext/damage} \
${LDADD.miext/sync} \
${LDADD.Xi} \
- -lXfont \
+ -lXfont2 \
-lpixman-1 \
-lXext \
-lX11 \
@@ -84,7 +84,7 @@ DPADD+= ${LDADD.dix} \
${DPADD.miext/damage} \
${DPADD.miext/sync} \
${DPADD.Xi} \
- ${LIBXFONT} \
+ ${LIBXFONT2} \
${LIBPIXMAN-1} \
${LIBXEXT} \
${LIBX11} \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Sat Jul 18 15:26:30 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
Sync with xorg-server.old: No need to link miext/libshadow.a.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
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.5 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5 Thu Jan 3 23:26:58 2019
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Sat Jul 18 15:26:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/01/03 23:26:58 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $
.include
@@ -61,7 +61,6 @@ LDADD+= ${LDADD.dix} \
${LDADD.xfixes} \
${LDADD.damageext} \
${LDADD.miext/damage} \
- ${LDADD.miext/shadow} \
${LDADD.miext/sync} \
${LDADD.Xi} \
-lXfont \
@@ -83,7 +82,6 @@ DPADD+= ${LDADD.dix} \
${DPADD.xfixes} \
${DPADD.damageext} \
${DPADD.miext/damage} \
- ${DPADD.miext/shadow} \
${DPADD.miext/sync} \
${DPADD.Xi} \
${LIBXFONT} \
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Sat Jul 18 15:24:31 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile
Log Message:
No need to link miext/libshadow.a.
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/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.old/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Sat Jul 18 15:24:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2020/07/18 15:24:31 tsutsui Exp $
.include
@@ -58,7 +58,6 @@ LDADD+= ${LDADD.dix} \
${LDADD.xfixes} \
${LDADD.damageext} \
${LDADD.miext/damage} \
- ${LDADD.miext/shadow} \
${LDADD.miext/sync} \
${LDADD.Xi} \
-lXfont \
@@ -80,7 +79,6 @@ DPADD+= ${LDADD.dix} \
${DPADD.xfixes} \
${DPADD.damageext} \
${DPADD.miext/damage} \
- ${DPADD.miext/shadow} \
${DPADD.miext/sync} \
${DPADD.Xi} \
${LIBXFONT} \
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms
Module Name:src Committed By: jmcneill Date: Sun Feb 9 12:28:28 UTC 2020 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile Log Message: Do not define HAVE_DRI3_H To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ 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.11 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.12 --- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.11 Sun Jan 19 10:44:51 2020 +++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Sun Feb 9 12:28:28 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2020/01/19 10:44:51 martin Exp $ +# $NetBSD: Makefile,v 1.12 2020/02/09 12:28:28 jmcneill Exp $ .include @@ -16,7 +16,6 @@ CPPFLAGS+= \ -DHAS_DIRTYTRACKING2 \ -DHAVE_XORG_LIST \ -DHAVE_XF86_CURSOR_RESET_CURSOR \ - -DHAVE_DRI3_H \ -DHAVE_MISYNCSHM_H \ -DHAVE_PRESENT_H .endif
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms
Module Name:src
Committed By: martin
Date: Sun Jan 19 10:44:51 UTC 2020
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
Fix conditional in previous
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
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.10 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.10 Sun Jan 19 00:58:15 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Sun Jan 19 10:44:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/19 00:58:15 jmcneill Exp $
+# $NetBSD: Makefile,v 1.11 2020/01/19 10:44:51 martin Exp $
.include
@@ -47,7 +47,7 @@ SRCS= radeon_accel.c radeon_video.c \
MAN= radeon.4
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
MANSUBDIR= /x86
.else
MANSUBDIR= /${MACHINE}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: mrg
Date: Fri May 10 06:25:58 UTC 2019
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
add new INTEL_DRIVER_DATE variable that defaults to 2019, but can
be set to 2014 and the older KMS based driver will be used (which
is the last actual release.)
this fixes some display issues on older systems. for me, sandy
bridge has minor issues with the new drivrer, but kaby lake really
likes to have the newer driver.
perhaps change default later, but this enables simple testing.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 \
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.31 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.32
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.31 Sat Apr 13 09:29:49 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Fri May 10 06:25:58 2019
@@ -1,8 +1,16 @@
-# $NetBSD: Makefile,v 1.31 2019/04/13 09:29:49 maya Exp $
+# $NetBSD: Makefile,v 1.32 2019/05/10 06:25:58 mrg Exp $
.include
+# Set this to 2014 for the last release, which does not support newer
+# chipsets as well, but cause major problems on older chipsets.
+INTEL_DRIVER_DATE?= 2019
+
+.if ${INTEL_DRIVER_DATE} > 2014
DRIVER= xf86-video-intel
+.else
+DRIVER= xf86-video-intel-2014
+.endif
DRIVER_NAME= intel_drv
# main module
@@ -41,7 +49,9 @@ SRCS+= gen7_render.c
SRCS+= gen8_eu.c
SRCS+= gen8_render.c
SRCS+= gen8_vertex.c
+.if ${INTEL_DRIVER_DATE} > 2014
SRCS+= gen9_render.c
+.endif
SRCS+= sna_accel.c
SRCS+= sna_acpi.c
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: maya Date: Sat Apr 13 09:29:49 UTC 2019 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile Log Message: Enable TearFree by default. This avoids visual corruption that can be induced by, e.g., env LIBGL_ALWAYS_SOFTWARE=1 glmark2. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 \ 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.30 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.31 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.30 Wed Mar 20 07:18:07 2019 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sat Apr 13 09:29:49 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/03/20 07:18:07 mrg Exp $ +# $NetBSD: Makefile,v 1.31 2019/04/13 09:29:49 maya Exp $ .include @@ -179,6 +179,8 @@ CPPFLAGS+= -DUMS=1 CPPFLAGS+= -DUSE_BACKLIGHT=1 CPPFLAGS+= -DUSE_SNA=1 CPPFLAGS+= -DUSE_UXA=1 +# XXX without this we get visual corruption, but it doesn't seem to be tearing +CPPFLAGS+= -DTEARFREE # XXX This should not be hard-coded here... DRI_DRIVER_PATH= /usr/X11R7/lib/modules/dri
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: mrg
Date: Wed Mar 20 07:18:07 UTC 2019
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
updates for xf86-video-intel 6afed33b2d673d88674f0c76efe500ae414e8e1b.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 \
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.29 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.30
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.29 Wed Jan 2 22:58:44 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Wed Mar 20 07:18:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/01/02 22:58:44 mrg Exp $
+# $NetBSD: Makefile,v 1.30 2019/03/20 07:18:07 mrg Exp $
.include
@@ -41,6 +41,7 @@ SRCS+= gen7_render.c
SRCS+= gen8_eu.c
SRCS+= gen8_render.c
SRCS+= gen8_vertex.c
+SRCS+= gen9_render.c
SRCS+= sna_accel.c
SRCS+= sna_acpi.c
@@ -126,11 +127,11 @@ SRCS+= intel_uxa.c
SRCS+= intel_uxa_video.c
SRCS+= intel_video.c
SRCS+= intel_video_overlay.c
+SRCS+= uxa.c
SRCS+= uxa-accel.c
SRCS+= uxa-glyphs.c
SRCS+= uxa-render.c
SRCS+= uxa-unaccel.c
-SRCS+= uxa.c
MAN= intel.4
@@ -181,8 +182,12 @@ CPPFLAGS+= -DUSE_UXA=1
# XXX This should not be hard-coded here...
DRI_DRIVER_PATH= /usr/X11R7/lib/modules/dri
-CPPFLAGS+= -DDRI_DRIVER_PATH=\"${DRI_DRIVER_PATH:Q}\"
-CPPFLAGS+= -DHAVE_XF86_CURSOR_RESET_CURSOR
+CPPFLAGS+= -DDRI_DRIVER_PATH=\"${DRI_DRIVER_PATH:Q}\" \
+ -DHAVE_XF86_CURSOR_RESET_CURSOR \
+ -DDEFAULT_DRI_LEVEL=2
+
+# XXX new version things:
+CPPFLAGS+= -DHAVE_DEV_WSCONS_WSCONSIO_H
# XXX Probably better to set this in Makefile.xf86-driver, conditional
# on ELF
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src
Committed By: mrg
Date: Fri Mar 8 10:00:06 UTC 2019
Modified Files:
src/external/mit/xorg/server/xorg-server.old: Makefile.Xserver
Log Message:
turn on execinfo support.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/Makefile.Xserver
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/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.Xserver:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/Makefile.Xserver:1.2
--- src/external/mit/xorg/server/xorg-server.old/Makefile.Xserver:1.1.1.1 Fri Jun 10 03:42:13 2016
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.Xserver Fri Mar 8 10:00:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.2 2019/03/08 10:00:06 mrg Exp $
.for _SL in \
mi \
@@ -81,5 +81,5 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
-LDADD+= -lm
-DPADD+= ${LIBM}
+LDADD+= -lm -lexecinfo
+DPADD+= ${LIBM} ${LIBEXECINFO}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nouveau
Module Name:src
Committed By: mrg
Date: Tue Mar 5 09:08:51 UTC 2019
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
Log Message:
remove no longer used defines
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
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.9 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.9 Tue Jan 1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Tue Mar 5 09:08:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/01/01 00:37:06 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2019/03/05 09:08:51 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -39,10 +39,6 @@ LIBDPLIBS+= drm_nouveau ${.CURDIR}/../..
MAN= nouveau.4
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-
-CPPFLAGS+= -DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
-CPPFLAGS+= -DNV_MINOR_VERSION=${PACKAGE_MINOR}
-CPPFLAGS+= -DNV_PATCHLEVEL=${PACKAGE_PATCH}
CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DATE}
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-modesetting
Module Name:src
Committed By: mrg
Date: Mon Jan 28 18:50:39 UTC 2019
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile
Log Message:
.error out if attempting to use this with non xorg-server 1.10.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/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-modesetting/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile:1.1 Fri Nov 6 01:17:08 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile Mon Jan 28 18:50:39 2019
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2015/11/06 01:17:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2019/01/28 18:50:39 mrg Exp $
+
+# This is for xorg-server 1.10 only.
DRIVER= xf86-video-modesetting
DRIVER_NAME= modesetting_drv
@@ -10,3 +12,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
CPPFLAGS+= -DRANDR_12_INTERFACE
.include "../Makefile.xf86-driver"
+
+.if ${HAVE_XORG_SERVER_VER} != "110"
+.error "This subdirectory is for xorg-server 1.10 only."
+.endif
CVS commit: src/external/mit/xorg/server/xorg-server/os
Module Name:src Committed By: tron Date: Tue Jan 22 12:45:26 UTC 2019 Modified Files: src/external/mit/xorg/server/xorg-server/os: Makefile Log Message: Fix build with "USE_SSP" set to "yes" To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/external/mit/xorg/server/xorg-server/os/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/os/Makefile diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.16 src/external/mit/xorg/server/xorg-server/os/Makefile:1.17 --- src/external/mit/xorg/server/xorg-server/os/Makefile:1.16 Mon Dec 31 11:14:06 2018 +++ src/external/mit/xorg/server/xorg-server/os/Makefile Tue Jan 22 12:45:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2018/12/31 11:14:06 mrg Exp $ +# $NetBSD: Makefile,v 1.17 2019/01/22 12:45:25 tron Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" @@ -37,6 +37,7 @@ COPTS.xdmauth.c= -Wno-error # XXX COPTS.xstrans.c= -Wno-error # XXX COPTS.access.c= -Wno-error # XXX bigreqstr.h COPTS.io.c= -Wno-error # XXX bigreqstr.h +COPTS.backtrace.c= -Wno-stack-protector .include .include
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Fri Jan 18 23:05:31 UTC 2019
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
Log Message:
link in libexecinfo.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
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.21 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.22
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.21 Mon Dec 31 11:14:03 2018
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Fri Jan 18 23:05:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.21 2018/12/31 11:14:03 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.22 2019/01/18 23:05:30 mrg Exp $
.for _SL in \
mi \
@@ -74,5 +74,5 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
-LDADD+= -lm
-DPADD+= ${LIBM}
+LDADD+= -lm -lexecinfo
+DPADD+= ${LIBM} ${LIBEXECINFO}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-vboxvideo
Module Name:src
Committed By: mrg
Date: Thu Jan 10 00:05:57 UTC 2019
Added Files:
src/external/mit/xorg/server/drivers/xf86-video-vboxvideo: Makefile
Log Message:
build infrastructure for vboxvideo driver.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/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-vboxvideo/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile:1.1
--- /dev/null Thu Jan 10 00:05:57 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-vboxvideo/Makefile Thu Jan 10 00:05:57 2019
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2019/01/10 00:05:57 mrg Exp $
+
+DRIVER= xf86-video-vboxvideo
+DRIVER_NAME= vboxvideo_drv
+
+SRCS= \
+ HGSMIBase.c \
+ HGSMIBuffers.c \
+ HGSMICommon.c \
+ Modesetting.c \
+ VBVABase.c \
+ edid.c \
+ getmode.c \
+ helpers.c \
+ hgsmimemalloc.c \
+ pointer.c \
+ setmode.c \
+ vboxvideo.c \
+ vbva.c
+
+CPPFLAGS+= \
+ -I${X11SRCDIR.${DRIVER}}/src \
+ -DXORG_7X \
+ -DIN_RING3 \
+ -DPCIACCESS \
+ -DVBOXVIDEO_13 \
+ -include ${DESTDIR}/usr/X11R7/include/xorg/xorg-server.h
+
+MAN= vboxvideo.4
+
+.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: mrg
Date: Thu Jan 3 23:26:58 UTC 2019
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
XXX: add hw/xfree86/common to the include path.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
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.4 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.4 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Thu Jan 3 23:26:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/01/03 23:26:58 mrg Exp $
.include
@@ -30,6 +30,7 @@ SRCS+= fbcmap_mi.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/fb \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/render \
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: mrg
Date: Wed Jan 2 22:58:44 UTC 2019
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
explicitly link libXfont since it is used.
from Patrick Welche in private email.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
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.28 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.29
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.28 Tue Jan 1 00:37:06 2019
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Wed Jan 2 22:58:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/01/01 00:37:06 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2019/01/02 22:58:44 mrg Exp $
.include
@@ -188,6 +188,7 @@ CPPFLAGS+= -DHAVE_XF86_CURSOR_RESET_CUR
# on ELF
CFLAGS+= -fvisibility=hidden
+LIBDPLIBS+= Xfont ${.CURDIR}/../../../lib/libXfont
LIBDPLIBS+= drm_intel ${.CURDIR}/../../../lib/libdrm_intel
LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Jan 1 00:37:06 UTC 2019
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
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-radeon: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
build fixes for xorg-server 1.20 parts:
- define HAVE_XF86_CURSOR_RESET_CURSOR for several drivers that now
look for it.
- remove various -Wno* options no longer needed, in particular the
global -Wno-error in the radeon and radeon-kms drivers
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile
cvs rdiff -u -r1.27 -r1.28 \
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-nouveau/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
cvs rdiff -u -r1.7 -r1.8 \
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-geode/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.5 Tue Aug 16 06:54:12 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile Tue Jan 1 00:37:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/16 06:54:12 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2019/01/01 00:37:06 mrg Exp $
DRIVER= xf86-video-geode
DRIVER_NAME= geode_drv
@@ -32,6 +32,7 @@ NOMAN= # defined
CPPFLAGS+= -DHAVE_GX -DHAVE_LX -DAMD_V4L2_VIDEO -DOPT_ACCEL -DPNL_SUP
# This enables multi-mmap support; no idea why it is Linux 2.6 specific
CPPFLAGS+= -DLINUX_2_6
+CPPFLAGS+= -DHAVE_XF86_CURSOR_RESET_CURSOR
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/cim \
-I${X11SRCDIR.${DRIVER}}/src/gfx \
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.27 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.28
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.27 Mon Dec 31 13:05:07 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue Jan 1 00:37:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/12/31 13:05:07 mrg Exp $
+# $NetBSD: Makefile,v 1.28 2019/01/01 00:37:06 mrg Exp $
.include
@@ -182,6 +182,7 @@ CPPFLAGS+= -DUSE_UXA=1
# XXX This should not be hard-coded here...
DRI_DRIVER_PATH= /usr/X11R7/lib/modules/dri
CPPFLAGS+= -DDRI_DRIVER_PATH=\"${DRI_DRIVER_PATH:Q}\"
+CPPFLAGS+= -DHAVE_XF86_CURSOR_RESET_CURSOR
# XXX Probably better to set this in Makefile.xf86-driver, conditional
# on ELF
@@ -210,4 +211,3 @@ COPTS.i965_video.c+= -Wno-stack-protecto
COPTS.sna_display.c+= -Wno-error # XXX deprecated
COPTS.intel_driver.c+= -Wno-error # XXX deprecated
-COPTS.intel_display.c+= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.8 Mon Dec 31 21:38:39 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Tue Jan 1 00:37:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/12/31 21:38:39 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2019/01/01 00:37:06 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -48,12 +48,11 @@ CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DAT
.include "../Makefile.xf86-driver"
# XXX
-COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
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
-COPTS.drmmode_display.c+= -Wno-error # XXX deprecated
+CPPFLAGS+= -DHAVE_XF86_CURSOR_RESET_CURSOR
.endif
# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.16
---
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Mon Dec 31 21:38:39 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
Log Message:
more deprecated functions still used.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.14 -r1.15 \
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-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.7 Fri Feb 2 01:02:40 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Mon Dec 31 21:38:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/02/02 01:02:40 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/12/31 21:38:39 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -53,6 +53,7 @@ COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "
.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
CPPFLAGS+= -DHAVE_XORG_LIST
+COPTS.drmmode_display.c+= -Wno-error # XXX deprecated
.endif
# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.14 Tue Jul 10 17:36:38 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Mon Dec 31 21:38:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/07/10 17:36:38 maya Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/31 21:38:39 mrg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -50,4 +50,7 @@ COPTS.via_display.c+= -Wno-error=stack-p
COPTS.via_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.via_lvds.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.via_display.c+= -Wno-error # XXX deprecated
+COPTS.via_kms.c+= -Wno-error # XXX deprecated
+
CWARNFLAGS.clang+= -Wno-tautological-compare
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10
Module Name:src
Committed By: mrg
Date: Mon Dec 31 21:38:53 UTC 2018
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile
Log Message:
find all headers.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/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/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.9 Wed Jul 29 19:03:15 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Mon Dec 31 21:38:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/07/29 19:03:15 christos Exp $
+# $NetBSD: Makefile,v 1.10 2018/12/31 21:38:53 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -33,7 +33,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/xorg \
- -I${DESTDIR}${X11INCDIR}/pixman-1
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/../include
COPTS.xf86x86emu.c= -Wno-error # XXX?
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: mrg
Date: Mon Dec 31 13:05:08 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc: Makefile
src/external/mit/xorg/server/xorg-server/xkb: Makefile
src/external/mit/xorg/server/xorg-server/xkbstubs: Makefile
Log Message:
more xorg-server 1.20 updates:
- more -Wno-error for deprecated functions
- add missing header paths
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/xkb/Makefile
cvs rdiff -u -r1.3 -r1.4 \
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/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.26 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.27
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.26 Mon Dec 31 12:13:50 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Mon Dec 31 13:05:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/12/31 12:13:50 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2018/12/31 13:05:07 mrg Exp $
.include
@@ -210,3 +210,4 @@ COPTS.i965_video.c+= -Wno-stack-protecto
COPTS.sna_display.c+= -Wno-error # XXX deprecated
COPTS.intel_driver.c+= -Wno-error # XXX deprecated
+COPTS.intel_display.c+= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.7 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile Mon Dec 31 13:05:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/12/31 13:05:07 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -17,7 +17,9 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/miext/damage \
-I${X11SRCDIR.xorg-server}/render \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
+ -I${X11SRCDIR.xorg-server}/../include
CWARNFLAGS.clang+= -Wno-format
Index: src/external/mit/xorg/server/xorg-server/xkb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.10 src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.10 Sun Aug 14 00:03:59 2016
+++ src/external/mit/xorg/server/xorg-server/xkb/Makefile Mon Dec 31 13:05:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/14 00:03:59 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2018/12/31 13:05:08 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -21,6 +21,7 @@ SRCS= ${DDXSRCS} ${DIXSRCS} ${XKBFILESR
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
Index: src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.3 src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.3 Sun Aug 14 00:03:59 2016
+++ src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile Mon Dec 31 13:05:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/14 00:03:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 13:05:08 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -13,6 +13,7 @@ SRCS= ${DDXSRCS}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Mon Dec 31 12:13:50 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-mouse: Makefile
src/external/mit/xorg/server/drivers/xf86-input-synaptics: Makefile
src/external/mit/xorg/server/drivers/xf86-input-vmmouse: Makefile
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
Log Message:
-Wno-error for newly deprecated things.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.12 -r1.13 \
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-input-mouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8 Tue Aug 16 06:53:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/16 06:53:01 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2018/12/31 12:13:50 mrg Exp $
WARNS?= 2
@@ -22,5 +22,7 @@ PKGDIST.xorg-mouse= ${X11SRCDIR.${DRIVER
.PATH: ${X11SRCDIR.${DRIVER}}/include
.PATH: ${X11SRCDIR.${DRIVER}}
+COPTS.mouse.c+= -Wno-error # XXX deprecated
+
XORG_PKG_VER_PROG= ${DRIVER}
.include "../../../xorg-pkg-ver.mk"
Index: src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.1 Sat Jan 29 02:32:36 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/01/29 02:32:36 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-input-synaptics
DRIVER_NAME= synaptics_drv
@@ -11,4 +11,6 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
MAN= synaptics.4
+COPTS.synaptics.c+= -Wno-error # XXX deprecated
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.5 Wed Oct 19 23:07:34 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/10/19 23:07:34 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-input-vmmouse
DRIVER_NAME= vmmouse_drv
@@ -9,7 +9,7 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/shar
CPPFLAGS+= -DXINPUT -DHAVE_XORG_SERVER_1_5_0
CPPFLAGS+= -DABS_VALUATOR_AXES -DNO_MOUSE_MODULE
-COPTS.vmmouse.c= -Wno-error # XXX deprecated
+COPTS.vmmouse.c+= -Wno-error # XXX deprecated
.include "../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/shared
Index: src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14 Sat Dec 10 01:58:36 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/12/10 01:58:36 macallan Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-video-glint
DRIVER_NAME= glint_drv
@@ -22,7 +22,7 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-COPTS.glint_driver.c= -Wno-error # XXX xf86dgastr.h
+COPTS.glint_driver.c=
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Mon Dec 31 11:58:43 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile
Log Message:
fixes for xorg-server 1.20:
- XFree86LOADER is obsolete.
- some deprecated functions are used, we should fix them.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-input-ws/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.24 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.25
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24 Sat Oct 8 20:08:57 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Mon Dec 31 11:58:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.24 2016/10/08 20:08:57 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.25 2018/12/31 11:58:43 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -37,8 +37,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \
-DXSERVER_LIBPCIACCESS \
- -DHAVE_XEXTPROTO_71 \
- -DXFree86LOADER
+ -DHAVE_XEXTPROTO_71
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DHAVE_XAA_H
Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.15 Sat Jan 12 18:32:12 2013
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Mon Dec 31 11:58:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/01/12 18:32:12 macallan Exp $
+# $NetBSD: Makefile,v 1.16 2018/12/31 11:58:43 mrg Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -26,6 +26,7 @@ CPPFLAGS.kbd.c= -D__XKBDEFRULES__=${__XK
X11EXTRAMANDEFS+= -e 's,__xkb_path__,${X11LIBDIR}/xkb,g'
-COPTS.kbd.c= -Wno-error # XXX deprecated
+COPTS.kbd.c= -Wno-error # XXX deprecated
+COPTS.bsd_kbd.c= -Wno-error # XXX deprecated
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.3 Thu Mar 22 23:46:27 2012
+++ src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile Mon Dec 31 11:58:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/03/22 23:46:27 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 11:58:43 mrg Exp $
WARNS?= 2
@@ -14,4 +14,6 @@ CPPFLAGS+= -DHAVE_CONFIG_H \
CWARNFLAGS.clang+= -Wno-parentheses-equality
+COPTS.emumb.c= -Wno-error # XXX deprecated
+
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Mon Dec 31 11:14:06 UTC 2018
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
Makefile.servermod
src/external/mit/xorg/server/xorg-server/dix: Makefile
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/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
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/drivers/modesetting:
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/shadowfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes: 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/miext/shadow: Makefile.shadow
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/randr: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xkb: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb:
Makefile
Log Message:
build updates for xorg-server 1.20.3:
- moved/removed/new files
- don't define HAVE_XORG_CONFIG_H or HAVE_DIX_CONFIG_H if using
${X11FLAGS.DIX} -- already included.
put glxvnd into glx itself for now.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/Makefile.servermod
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.36 -r1.37 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xkb/Makefile
cvs rdiff -u -r1.46 -r1.47 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.20 -r1.21 \
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms
Module Name:src
Committed By: mrg
Date: Sun Dec 30 08:34:29 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
link against libgbm.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
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.6 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6 Fri Aug 19 16:33:23 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Sun Dec 30 08:34:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/19 16:33:23 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/12/30 08:34:29 mrg Exp $
.include
@@ -54,6 +54,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.${DRIVER}}/../include
+LIBDPLIBS+= gbm ${.CURDIR}/../../../lib/libgbm
+
# XXX
COPTS+= -Wno-error
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: mrg Date: Sun Dec 30 07:13:15 UTC 2018 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile Log Message: updates for new mga and r128 drivers. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/drivers/xf86-video-r128/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-mga/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.14 --- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.13 Tue Aug 16 06:24:02 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Sun Dec 30 07:13:15 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2016/08/16 06:24:02 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2018/12/30 07:13:15 mrg Exp $ .include @@ -7,7 +7,7 @@ DRIVER_NAME= mga_drv SRCS= mga_bios.c mga_dac3026.c mga_dacG.c SRCS+= mga_dga.c mga_dh.c mga_driver.c mga_g450pll.c -SRCS+= mga_halmod.c mga_hwcurs.c mga_merge.c mga_shadow.c +SRCS+= mga_hwcurs.c mga_merge.c mga_shadow.c SRCS+= mga_vga.c mga_video.c mga_storm.c MAN= mga.4 Index: src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.12 --- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.11 Tue Aug 16 06:24:02 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Sun Dec 30 07:13:15 2018 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.11 2016/08/16 06:24:02 mrg Exp $ +# $NetBSD: Makefile,v 1.12 2018/12/30 07:13:15 mrg Exp $ DRIVER= xf86-video-r128 DRIVER_NAME= r128_drv SRCS= r128_accel.c r128_cursor.c r128_driver.c r128_exa.c \ - r128_crtc.c r128_output.c \ + r128_exa_render.c r128_crtc.c r128_output.c \ r128_video.c r128_misc.c r128_probe.c r128_dri.c MAN= r128.4
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: macallan
Date: Sat Nov 10 01:38:02 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
build Xorg with nv and wsfb drivers on iyonix
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.45 -r1.46 \
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/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.95 src/external/mit/xorg/server/drivers/Makefile:1.96
--- src/external/mit/xorg/server/drivers/Makefile:1.95 Sat Dec 23 10:15:52 2017
+++ src/external/mit/xorg/server/drivers/Makefile Sat Nov 10 01:38:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2017/12/23 10:15:52 nakayama Exp $
+# $NetBSD: Makefile,v 1.96 2018/11/10 01:38:02 macallan Exp $
.include
@@ -212,6 +212,12 @@ SUBDIR+= \
xf86-video-s3
.endif # ${MACHINE} == "ibmnws"
+.if ${MACHINE} == "iyonix"
+SUBDIR+= \
+ xf86-video-nv \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "iyonix"
+
.if ${MACHINE} == "luna68k"
SUBDIR+= \
xf86-video-wsfb
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.45 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.46
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.45 Tue Aug 16 19:09:48 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Sat Nov 10 01:38:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2016/08/16 19:09:48 mrg Exp $
+# $NetBSD: Makefile,v 1.46 2018/11/10 01:38:02 macallan Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -71,6 +71,7 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT
.if ${MACHINE} == "cats" || \
${MACHINE} == "evbarm" || \
${MACHINE} == "hpcarm" || \
+${MACHINE} == "iyonix" || \
${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "zaurus"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-wsfb
Module Name:src
Committed By: kamil
Date: Fri Aug 3 02:26:00 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-wsfb: Makefile
Log Message:
Fix xf86-video-wsfb build with Clang/LLVM
The code uses non-orthodox types in format strings.
Add a compiler flag to disable a warning that is turned into a fatal error.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-wsfb/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-wsfb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.4 Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile Fri Aug 3 02:26:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:04 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2018/08/03 02:26:00 kamil Exp $
DRIVER= xf86-video-wsfb
DRIVER_NAME= wsfb_drv
@@ -8,4 +8,6 @@ MAN= wsfb.4
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
+CWARNFLAGS.clang+= -Wno-format
+
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nv
Module Name:src
Committed By: macallan
Date: Thu Jul 12 21:22:20 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
Log Message:
build EXA support for nv driver
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
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-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.12 Wed Sep 21 18:00:26 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Thu Jul 12 21:22:20 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2016/09/21 18:00:26 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/12 21:22:20 macallan Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
-SRCS= nv_cursor.c nv_dac.c nv_dga.c nv_driver.c nv_hw.c
-SRCS+= nv_setup.c nv_shadow.c nv_video.c riva_cursor.c
+SRCS= nv_cursor.c nv_dac.c nv_dga.c nv_driver.c nv_exa.c nv_hw.c
+SRCS+= nv_setup.c nv_shadow.c nv_video.c nv_xaa.c riva_cursor.c
SRCS+= riva_dac.c riva_dga.c riva_driver.c riva_hw.c
SRCS+= riva_setup.c riva_shadow.c g80_cursor.c
SRCS+= g80_dac.c g80_display.c g80_dma.c g80_driver.c g80_exa.c
@@ -13,7 +13,7 @@ MAN= nv.4
# XAA files have generic functions as well
#.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SRCS+= nv_xaa.c riva_xaa.c g80_xaa.c
+SRCS+= riva_xaa.c g80_xaa.c
#.endif
.if ${MACHINE} == "macppc"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src Committed By: maya Date: Tue Jul 10 17:36:38 UTC 2018 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile Log Message: Add missing file to openchrome driver. Prior to this commit, startx failed with a missing symbol. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ 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.13 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.14 --- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.13 Fri Feb 2 01:02:40 2018 +++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Tue Jul 10 17:36:38 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/02/02 01:02:40 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2018/07/10 17:36:38 maya Exp $ DRIVER= xf86-video-openchrome DRIVER_NAME= openchrome_drv @@ -24,6 +24,7 @@ SRCS= \ via_tv.c \ via_vgahw.c \ via_vt162x.c \ + via_vt1632.c \ via_xv_overlay.c \ via_xv.c
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: nakayama
Date: Sat Dec 23 10:15:52 UTC 2017
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
Remove duplicates.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 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.94 src/external/mit/xorg/server/drivers/Makefile:1.95
--- src/external/mit/xorg/server/drivers/Makefile:1.94 Mon Aug 7 06:51:13 2017
+++ src/external/mit/xorg/server/drivers/Makefile Sat Dec 23 10:15:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2017/08/07 06:51:13 mrg Exp $
+# $NetBSD: Makefile,v 1.95 2017/12/23 10:15:52 nakayama Exp $
.include
@@ -307,19 +307,14 @@ SUBDIR+= \
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
xf86-video-ag10e \
- xf86-video-glint \
xf86-video-sunleo
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.if ${MACHINE} == "sparc"
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
- xf86-video-pnozz
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-
SUBDIR+= \
xf86-video-suncg14 \
xf86-video-suntcx
+
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
xf86-video-pnozz
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src
Committed By: christos
Date: Fri Sep 1 14:38:24 UTC 2017
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
Log Message:
more no-error-ssp
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
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.11 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.11 Tue Aug 29 00:58:38 2017
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Fri Sep 1 10:38:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/08/29 04:58:38 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/01 14:38:23 christos Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -45,6 +45,7 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
# XXX
COPTS.via_dri.c+= -Wno-error
+COPTS.via_display.c+= -Wno-error=stack-protector
.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 :}
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: ryoon
Date: Tue Aug 29 18:19:49 UTC 2017
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile
Log Message:
xorg-server.pc should include pixman-1 dependency because
include/xorg/miscstruct.h includes pixman.h
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 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.28 src/external/mit/xorg/server/xorg-server/Makefile:1.29
--- src/external/mit/xorg/server/xorg-server/Makefile:1.28 Sun Mar 5 11:52:39 2017
+++ src/external/mit/xorg/server/xorg-server/Makefile Tue Aug 29 18:19:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/03/05 11:52:39 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2017/08/29 18:19:49 ryoon Exp $
.include
@@ -30,7 +30,7 @@ PKGCONFIG= xorg-server
PKGCONFIG_SED_FLAGS= \
-e "s,@sysconfigdir@,${X11ETCDIR},; \
s,@XORG_DRIVER_LIBS@,,; \
- s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
+ s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 pixman-1 >= 0.27.2 fixesproto >= 5.0 damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
s,@symbol_visibility@,,"
.include
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src Committed By: mrg Date: Tue Aug 29 04:58:38 UTC 2017 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile Log Message: updates for xf86-video-openchrome 0.6.0 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ 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.10 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.11 --- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.10 Sun Aug 21 12:39:17 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Tue Aug 29 04:58:38 2017 @@ -1,28 +1,31 @@ -# $NetBSD: Makefile,v 1.10 2016/08/21 12:39:17 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2017/08/29 04:58:38 mrg Exp $ DRIVER= xf86-video-openchrome DRIVER_NAME= openchrome_drv SRCS= \ via_3d.c \ - via_exa.c \ - via_exa_h2.c \ - via_exa_h6.c \ - via_bandwidth.c \ + via_analog.c \ via_ch7xxx.c \ via_display.c \ via_driver.c \ + via_exa.c \ + via_exa_h2.c \ + via_exa_h6.c \ + via_fp.c \ via_i2c.c \ via_id.c \ - via_lvds.c \ via_memcpy.c \ via_memmgr.c \ via_outputs.c \ - via_xv_overlay.c \ via_ums.c \ + via_sii164.c \ + via_tmds.c \ + via_tv.c \ via_vgahw.c \ - via_xv.c \ - via_vt162x.c + via_vt162x.c \ + via_xv_overlay.c \ + via_xv.c # DRI SRCS+= \
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Mon Aug 7 06:51:13 UTC 2017
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
don't build apm, ark or glint on cats for xorg-server 1.18.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 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.93 src/external/mit/xorg/server/drivers/Makefile:1.94
--- src/external/mit/xorg/server/drivers/Makefile:1.93 Sat Dec 3 16:38:15 2016
+++ src/external/mit/xorg/server/drivers/Makefile Mon Aug 7 06:51:13 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2016/12/03 16:38:15 macallan Exp $
+# $NetBSD: Makefile,v 1.94 2017/08/07 06:51:13 mrg Exp $
.include
@@ -142,15 +142,12 @@ SUBDIR+= \
.if ${MACHINE} == "cats"
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 \
xf86-video-mga \
@@ -167,6 +164,12 @@ SUBDIR+= \
xf86-video-tseng \
xf86-video-vesa \
xf86-video-wsfb
+# needs porting for xorg-server 1.18
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+ xf86-video-apm \
+ xf86-video-ark \
+ xf86-video-glint
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "cats"
.if ${MACHINE} == "dreamcast"
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/vfb
Module Name:src
Committed By: riastradh
Date: Sat Jul 15 13:54:07 UTC 2017
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile
Log Message:
Missed a MKCRYPTO spot.
...although if nobody noticed, maybe that means this doesn't actually
use libcrypto?
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/hw/vfb/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.3 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.3 Sat Oct 8 20:03:04 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile Sat Jul 15 13:54:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/10/08 20:03:04 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2017/07/15 13:54:07 riastradh Exp $
.include
@@ -111,10 +111,8 @@ DPADD+= ${DPADD.dix} \
${LIBZ} \
${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: Wed Mar 8 07:45:11 UTC 2017
Modified Files:
src/external/mit/xorg/server/xorg-server.old/os: Makefile
src/external/mit/xorg/server/xorg-server/os: Makefile
Log Message:
build timingsafe_memcpy.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/os/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/os/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/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/os/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/os/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/os/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/os/Makefile Wed Mar 8 07:45:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2017/03/08 07:45:11 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -9,7 +9,8 @@ LIB= os
SRCS= WaitFor.c access.c auth.c connection.c io.c mitauth.c \
oscolor.c osinit.c utils.c xdmauth.c \
xstrans.c xprintf.c log.c xdmcp.c \
- rpcauth.c backtrace.c xprintf.c xsha1.c
+ rpcauth.c backtrace.c xprintf.c xsha1.c \
+ timingsafe_memcmp.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.14 src/external/mit/xorg/server/xorg-server/os/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.14 Sun Aug 14 03:43:05 2016
+++ src/external/mit/xorg/server/xorg-server/os/Makefile Wed Mar 8 07:45:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/08/14 03:43:05 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2017/03/08 07:45:11 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -11,7 +11,8 @@ SRCS= WaitFor.c access.c auth.c backtrac
oscolor.c osinit.c utils.c xdmauth.c \
xstrans.c xprintf.c log.c xdmcp.c busfault.c \
rpcauth.c xsha1.c \
- reallocarray.c
+ reallocarray.c \
+ timingsafe_memcmp.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-chips
Module Name:src Committed By: macallan Date: Thu Jan 19 23:51:16 UTC 2017 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-chips: Makefile Log Message: build EXA support To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ 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.7 src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.8 --- src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.7 Sat Aug 27 03:58:13 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile Thu Jan 19 23:51:16 2017 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2016/08/27 03:58:13 macallan Exp $ +# $NetBSD: Makefile,v 1.8 2017/01/19 23:51:16 macallan Exp $ DRIVER= xf86-video-chips DRIVER_NAME= chips_drv SRCS= ct_accel.c ct_bank.c ct_cursor.c ct_ddc.c ct_dga.c -SRCS+= ct_driver.c ct_regs.c ct_shadow.c ct_video.c +SRCS+= ct_driver.c ct_exa.c ct_regs.c ct_shadow.c ct_video.c SRCS+= ct_accelmm.c ct_accelhi.c MAN= chips.4
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-glint
Module Name:src Committed By: macallan Date: Sat Dec 10 01:58:36 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile Log Message: now we have pm2_exa.c To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/server/drivers/xf86-video-glint/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-glint/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14 --- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.13 Sat Dec 3 16:41:34 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Sat Dec 10 01:58:36 2016 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2016/12/03 16:41:34 macallan Exp $ +# $NetBSD: Makefile,v 1.14 2016/12/10 01:58:36 macallan Exp $ DRIVER= xf86-video-glint DRIVER_NAME= glint_drv SRCS= glint_dga.c glint_driver.c glint_shadow.c -SRCS+= IBMramdac.c pm2_accel.c pm2_common.c pm2_dac.c +SRCS+= IBMramdac.c pm2_accel.c pm2_common.c pm2_dac.c pm2_exa.c SRCS+= pm2ramdac.c pm2v_dac.c pm2_video.c pm2vramdac.c pm3_accel.c SRCS+= pm3_dac.c pm3_exa.c pm3_video.c pm_accel.c pm_dac.c SRCS+= sx_accel.c TIramdac.c tx_accel.c tx_dac.c
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-glint
Module Name:src Committed By: macallan Date: Sat Dec 3 16:41:34 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile Log Message: there is no pm2_exa.c yet To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/server/drivers/xf86-video-glint/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-glint/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.13 --- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.12 Fri Dec 2 22:59:17 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Sat Dec 3 16:41:34 2016 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2016/12/02 22:59:17 macallan Exp $ +# $NetBSD: Makefile,v 1.13 2016/12/03 16:41:34 macallan Exp $ DRIVER= xf86-video-glint DRIVER_NAME= glint_drv SRCS= glint_dga.c glint_driver.c glint_shadow.c -SRCS+= IBMramdac.c pm2_accel.c pm2_common.c pm2_dac.c pm2_exa.c +SRCS+= IBMramdac.c pm2_accel.c pm2_common.c pm2_dac.c SRCS+= pm2ramdac.c pm2v_dac.c pm2_video.c pm2vramdac.c pm3_accel.c SRCS+= pm3_dac.c pm3_exa.c pm3_video.c pm_accel.c pm_dac.c SRCS+= sx_accel.c TIramdac.c tx_accel.c tx_dac.c
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-glint
Module Name:src
Committed By: macallan
Date: Fri Dec 2 22:59:17 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile
Log Message:
build pm3_exa
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-glint/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-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.11 Sun Jun 2 07:41:35 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Fri Dec 2 22:59:17 2016
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2013/06/02 07:41:35 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/12/02 22:59:17 macallan Exp $
DRIVER= xf86-video-glint
DRIVER_NAME= glint_drv
SRCS= glint_dga.c glint_driver.c glint_shadow.c
-SRCS+= IBMramdac.c pm2_accel.c pm2_dac.c pm2ramdac.c pm2v_dac.c
-SRCS+= pm2_video.c pm2vramdac.c pm3_accel.c pm3_dac.c pm3_video.c
-SRCS+= pm_accel.c pm_dac.c sx_accel.c TIramdac.c tx_accel.c tx_dac.c
+SRCS+= IBMramdac.c pm2_accel.c pm2_common.c pm2_dac.c pm2_exa.c
+SRCS+= pm2ramdac.c pm2v_dac.c pm2_video.c pm2vramdac.c pm3_accel.c
+SRCS+= pm3_dac.c pm3_exa.c pm3_video.c pm_accel.c pm_dac.c
+SRCS+= sx_accel.c TIramdac.c tx_accel.c tx_dac.c
MAN= glint.4
.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: snj
Date: Tue Nov 22 10:34:57 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
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
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
Log Message:
follow upstream change from 2009: build xf86Init.c with the rest of the
common code.
remove not-reproducible-build-friendly goop that set a build date for
the the x server. the static date (which we've already been using) in
xf86Build.h does just fine, although all it really does is add one
useless line to the X log.
fix whitespace around OSVENDOR
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.35 -r1.36 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.30 -r1.31 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.12 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/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.19 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.20
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.19 Thu Aug 18 18:42:09 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Tue Nov 22 10:34:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.19 2016/08/18 18:42:09 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.20 2016/11/22 10:34:57 snj Exp $
.for _SL in \
mi \
@@ -40,7 +40,6 @@
hw/xfree86/dri2 \
hw/xfree86/dummy \
hw/xfree86/i2c \
- hw/xfree86/init \
hw/xfree86/int10 \
hw/xfree86/loader \
hw/xfree86/xorgos \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.35 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.36
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.35 Mon Sep 26 22:37:31 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Tue Nov 22 10:34:57 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2016/09/26 22:37:31 mrg Exp $
+# $NetBSD: Makefile,v 1.36 2016/11/22 10:34:57 snj Exp $
-SUBDIR= common init ddc dixmods doc dri dri2 i2c loader \
+SUBDIR= common ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
x86emu xf86config \
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.13 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.13 Fri Aug 19 03:59:31 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Tue Nov 22 10:34:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/19 03:59:31 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/11/22 10:34:57 snj Exp $
.include
@@ -31,7 +31,6 @@ LDFLAGS+= -rdynamic
LDADD+= -Wl,--whole-archive
LDADD+= ${LDADD.dix}
-LDADD+= ${LDADD.hw/xfree86/init}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
@@ -121,7 +120,6 @@ DPADD+= \
${DPADD.hw/xfree86/dri2} \
${DPADD.hw/xfree86/dixmods/fb} \
${DPADD.hw/xfree86/fb} \
- ${DPADD.hw/xfree86/init} \
${DPADD.hw/xfree86/common} \
${DPADD.hw/xfree86/loader} \
${DPADD.hw/xfree86/xf86config} \
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.30 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.31
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.30 Mon Nov 21 08:43:49 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Tue Nov 22 10:34:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/11/21 08:43:49 snj Exp $
+# $NetBSD: Makefile,v 1.31 2016/11/22 10:34:57 snj Exp $
.include
@@ -15,7 +15,7 @@ SRCS.randr= xf86RandR.c
SRCS= xf86Configure.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c \
xf86Events.c xf86Globals.c xf86AutoConfig.c \
- xf86Option.c \
+ xf86Option.c xf86Init.c \
xf86VidMode.c xf86fbman.c xf86cmap.c \
xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
xf86Mode.c xorgHelper.c \
@@ -29,18 +29,6 @@ SRCS= xf86Configure.c xf86Bus.c xf86Conf
SRCS.bus+= xf86sbusBus.c
.endif
-# Rebuild xf86Build.h on every make
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: snj
Date: Tue Nov 22 06:51:14 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/init: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
Log Message:
remove another outdated and unused XORG_RELEASE define
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/xfree86/init/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/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/xfree86/init/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/init/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/init/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/init/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/init/Makefile Tue Nov 22 06:51:14 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/11/22 06:51:14 snj Exp $
.include
@@ -56,7 +56,6 @@ CPPFLAGS+= -DPCVT_SUPPORT
.endif
CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
- -DXORG_RELEASE='"Release 1.4.2"' \
-DBUILDERADDR='"x...@xorg.org"' \
-DDEFAULT_MODULE_PATH=\"${X11USRLIBDIR}/modules\" \
-DDEFAULT_LIBRARY_PATH=\"${X11USRLIBDIR}\"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.11 src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.11 Sat Oct 8 20:08:57 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Tue Nov 22 06:51:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/10/08 20:08:57 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/11/22 06:51:14 snj Exp $
.include
@@ -55,7 +55,6 @@ CPPFLAGS+= -DPCVT_SUPPORT
.endif
CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
- -DXORG_RELEASE='"Release 1.4.2"' \
-DBUILDERADDR='"x...@xorg.org"' \
-DDEFAULT_MODULE_PATH=\"${X11USRLIBDIR}/modules\" \
-DDEFAULT_LIBRARY_PATH=\"${X11USRLIBDIR}\"
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: snj
Date: Mon Nov 21 09:14:12 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/xorgconfig:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig:
Makefile
Log Message:
xorgconfig got nuked upstream in 2008
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/xfree86/utils/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/xorgconfig/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
cvs rdiff -u -r1.8 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/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/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile Mon Nov 21 09:14:12 2016
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/11/21 09:14:12 snj Exp $
SUBDIR= cvt gtf
-#SUBDIR= cvt gtf xorgconfig
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
#SUBDIR+=ioport pcitweak scanpci
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.16 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.16 Tue Aug 16 07:56:47 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Mon Nov 21 09:14:12 2016
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.16 2016/08/16 07:56:47 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2016/11/21 09:14:12 snj Exp $
SUBDIR= cvt gtf
-#SUBDIR+= xorgconfig
.include
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: snj
Date: Mon Nov 21 08:43:50 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/common:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Log Message:
don't bother defining XORG_RELEASE. not only was the value wrong, it's
not used anymore.
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/xfree86/common/Makefile
cvs rdiff -u -r1.29 -r1.30 \
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.old/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/common/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/common/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/common/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/common/Makefile Mon Nov 21 08:43:49 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/11/21 08:43:49 snj Exp $
.include
@@ -110,7 +110,6 @@ IDRIVERS= mouse keyboard acecad calcomp
CPPFLAGS.xf86Bus.c= -DBUILDERADDR='"xfre...@xfree86.org"'
CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
--DXORG_RELEASE='"Release 1.4.2"' \
-DBUILDERADDR='"x...@xorg.org"' \
-DOSVENDOR='" The NetBSD Foundation, Inc."'
CPPFLAGS.xf86Globals.c= -DDEFAULT_LOGPREFIX='"/var/log/Xorg."' \
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.29 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.30
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.29 Mon Nov 21 08:09:54 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Mon Nov 21 08:43:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/11/21 08:09:54 snj Exp $
+# $NetBSD: Makefile,v 1.30 2016/11/21 08:43:49 snj Exp $
.include
@@ -110,7 +110,6 @@ IDRIVERS= mouse keyboard acecad calcomp
CPPFLAGS.xf86Bus.c= -DBUILDERADDR='"xfre...@xfree86.org"'
CPPFLAGS.xf86Init.c= -DOSNAME='"NetBSD/${MACHINE} ${OS_RELEASE} -"' \
--DXORG_RELEASE='"Release 1.4.2"' \
-DBUILDERADDR='"x...@xorg.org"' \
-DOSVENDOR='" The NetBSD Foundation, Inc."'
CPPFLAGS.xf86Globals.c= -DDEFAULT_MODULE_PATH='"${X11USRLIBDIR}/modules"'
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common
Module Name:src
Committed By: snj
Date: Mon Nov 21 08:09:54 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Log Message:
no need to define HAVE_PCI_DEVICE_IS_BOOT_VGA with xorg-server 1.18.
libpciaccess, which provides pci_device_is_boot_vga, is always present.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
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.28 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.29
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.28 Sat Oct 8 20:08:57 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Mon Nov 21 08:09:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/10/08 20:08:57 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2016/11/21 08:09:54 snj Exp $
.include
@@ -85,8 +85,7 @@ CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FL
-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org;' \
-DXVENDORNAME='"The X.Org Foundation"' \
- -DHAVE_XORG_CONFIG_H \
- -DHAVE_PCI_DEVICE_IS_BOOT_VGA
+ -DHAVE_XORG_CONFIG_H
.if ${MACHINE_ARCH} == "i386"
CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT
CVS commit: src/external/mit/xorg/server/xorg-server/dix
Module Name:src
Committed By: snj
Date: Thu Nov 17 07:58:24 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/dix: Makefile
Log Message:
let there be a sane font path!
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/dix/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/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.16 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.16 Thu Nov 17 06:58:39 2016
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Thu Nov 17 07:58:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/11/17 06:58:39 snj Exp $
+# $NetBSD: Makefile,v 1.17 2016/11/17 07:58:24 snj Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -22,9 +22,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/mi
CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION}
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX}
-.if 0
CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\"
-.endif
# XXX make user variables
CPPFLAGS.dispatch.c= -DVENDOR_NAME="\"The Xorg Foundation\""
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: snj
Date: Thu Nov 17 06:58:40 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/dix: Makefile
src/external/mit/xorg/server/xorg-server/dix: Makefile
Log Message:
the last release of xorg-server that cared about RGB_DB was 1.4.2,
back in 2008
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/dix/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/dix/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/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/dix/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/dix/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/dix/Makefile:1.1.1.1 Fri Jun 10 03:42:13 2016
+++ src/external/mit/xorg/server/xorg-server.old/dix/Makefile Thu Nov 17 06:58:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:13 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/11/17 06:58:40 snj Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -21,8 +21,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg
CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSION}
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX}
-CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\" \
- -DRGB_DB=\"${X11LIBDIR}/rgb\"
+CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\"
# XXX make user variables
CPPFLAGS.dispatch.c= -DVENDOR_NAME="\"The Xorg Foundation\""
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.15 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.15 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Thu Nov 17 06:58:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2016/11/17 06:58:39 snj Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -23,8 +23,7 @@ CPPFLAGS+= ${X11FLAGS.PERVASIVE_EXTENSIO
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX}
.if 0
-CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\" \
- -DRGB_DB=\"${X11LIBDIR}/rgb\"
+CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\"
.endif
# XXX make user variables
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nouveau
Module Name:src
Committed By: snj
Date: Thu Nov 17 05:28:43 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
Log Message:
1. only xorg-server.old has xaa.h, so -DHAVE_XAA_H would make sense
there, but it doesn't with 1.18
2. it t matter anyway. xf86-video-nouveau removed all XAA support
in 2007, and as such, nothing here is conditional upon HAVE_XAA_H
3. is a magic number
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
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.5 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.5 Fri Sep 2 04:27:13 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Thu Nov 17 05:28:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/09/02 04:27:13 jakllsch Exp $
+# $NetBSD: Makefile,v 1.6 2016/11/17 05:28:43 snj Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -55,7 +55,6 @@ COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "
.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
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Sun Oct 16 06:23:48 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
begin to get alpha to xorg-server 1.18 - disable the known problematic
drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 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.90 src/external/mit/xorg/server/drivers/Makefile:1.91
--- src/external/mit/xorg/server/drivers/Makefile:1.90 Tue Oct 4 21:37:10 2016
+++ src/external/mit/xorg/server/drivers/Makefile Sun Oct 16 06:23:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2016/10/04 21:37:10 mrg Exp $
+# $NetBSD: Makefile,v 1.91 2016/10/16 06:23:48 mrg Exp $
.include
@@ -93,15 +93,12 @@ SUBDIR+= \
.if ${MACHINE} == "alpha"
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 \
xf86-video-mach64 \
@@ -120,6 +117,13 @@ SUBDIR+= \
xf86-video-tseng \
xf86-video-wsfb
# xf86-video-imstt
+# needs porting for xorg-server 1.18
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
+ xf86-video-apm \
+ xf86-video-ark \
+ xf86-video-glint
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "alpha"
.if ${MACHINE} == "amiga"
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: mrg
Date: Sat Oct 8 20:08:57 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vesa: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: 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/init: Makefile
Log Message:
set XFree86LOADER for all xorg-server driver builds again,
it's still needed for many drivers and would normally be
set in xorg-server.h.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/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.23 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.23 Mon Sep 26 22:37:31 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.23 2016/09/26 22:37:31 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.24 2016/10/08 20:08:57 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -37,10 +37,11 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \
-DXSERVER_LIBPCIACCESS \
- -DHAVE_XEXTPROTO_71
+ -DHAVE_XEXTPROTO_71 \
+ -DXFree86LOADER
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-CPPFLAGS+= -DHAVE_XAA_H -DXFree86LOADER
+CPPFLAGS+= -DHAVE_XAA_H
.endif
CPPFLAGS+= -DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.24 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.25
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.24 Mon Sep 19 19:15:04 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/09/19 19:15:04 christos Exp $
+# $NetBSD: Makefile,v 1.25 2016/10/08 20:08:57 mrg Exp $
.include
@@ -178,7 +178,6 @@ CPPFLAGS+= -DUMS=1
CPPFLAGS+= -DUSE_BACKLIGHT=1
CPPFLAGS+= -DUSE_SNA=1
CPPFLAGS+= -DUSE_UXA=1
-CPPFLAGS+= -DXFree86LOADER
# XXX This should not be hard-coded here...
DRI_DRIVER_PATH= /usr/X11R7/lib/modules/dri
Index: src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.6 Tue Sep 27 02:33:16 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/09/27 02:33:16 christos Exp $
+# $NetBSD: Makefile,v 1.7 2016/10/08 20:08:57 mrg Exp $
DRIVER= xf86-video-vesa
DRIVER_NAME= vesa_drv
@@ -7,6 +7,5 @@ SRCS= vesa.c
MAN= vesa.4
COPTS.vesa.c+= -Wno-error
-CPPFLAGS+=-DXFree86LOADER
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.11 Sat Oct 8 10:21:18 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/10/08 10:21:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2016/10/08 20:08:57 mrg Exp $
DRIVER= xf86-video-vmware
DRIVER_NAME= vmware_drv
@@ -19,7 +19,6 @@ MAN= vmware.4
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H \
-I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+= -DXFree86LOADER
# XXX
COPTS.vmware.c+= -Wno-error
Index:
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: mrg
Date: Sat Oct 8 20:03:04 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
Log Message:
don't undefine XFree86LOADER twice.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/vfb/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.2 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.2 Wed Jun 29 19:36:35 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile Sat Oct 8 20:03:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
+# $NetBSD: Makefile,v 1.3 2016/10/08 20:03:04 mrg Exp $
.include
@@ -45,7 +45,6 @@ CPPFLAGS.InitInput.c= ${X11FLAGS.EXTENSI
-UGLXEXT
CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} \
-DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
- -UXFree86LOADER \
-UGLXEXT
CPPFLAGS.dpmsstubs.c= ${X11FLAGS.EXTENSION} \
-UGLXEXT
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.15 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Sat Oct 8 20:03:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2016/10/08 20:03:04 mrg Exp $
.include
@@ -44,7 +44,6 @@ CPPFLAGS+= -UDDXTIME
CPPFLAGS.InitInput.c= ${X11FLAGS.EXTENSION} \
-UGLXEXT
CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} \
- -UXFree86LOADER \
-UGLXEXT
CPPFLAGS.dpmsstubs.c= ${X11FLAGS.EXTENSION} \
-UGLXEXT
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-vmware
Module Name:src
Committed By: ryoon
Date: Sat Oct 8 10:21:18 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
Log Message:
Fix module load error of vmware_drv.so
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
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-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.10 Tue Aug 16 07:10:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile Sat Oct 8 10:21:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/16 07:10:01 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/10/08 10:21:18 ryoon Exp $
DRIVER= xf86-video-vmware
DRIVER_NAME= vmware_drv
@@ -19,6 +19,7 @@ MAN= vmware.4
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H \
-I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+= -DXFree86LOADER
# XXX
COPTS.vmware.c+= -Wno-error
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Oct 4 21:37:10 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
build pnozz for xorg-server 1.10 and sparc.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 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.89 src/external/mit/xorg/server/drivers/Makefile:1.90
--- src/external/mit/xorg/server/drivers/Makefile:1.89 Wed Sep 28 18:12:06 2016
+++ src/external/mit/xorg/server/drivers/Makefile Tue Oct 4 21:37:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2016/09/28 18:12:06 macallan Exp $
+# $NetBSD: Makefile,v 1.90 2016/10/04 21:37:10 mrg Exp $
.include
@@ -309,6 +309,10 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-suncg14 \
xf86-video-suntcx
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
+ xf86-video-pnozz
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "sparc"
.endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: macallan
Date: Wed Sep 28 18:12:06 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
enable igs driver on shark, build pnozz and ag10e drivers only for old xorg
for now
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 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.88 src/external/mit/xorg/server/drivers/Makefile:1.89
--- src/external/mit/xorg/server/drivers/Makefile:1.88 Mon Sep 26 22:37:31 2016
+++ src/external/mit/xorg/server/drivers/Makefile Wed Sep 28 18:12:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2016/09/26 22:37:31 mrg Exp $
+# $NetBSD: Makefile,v 1.89 2016/09/28 18:12:06 macallan Exp $
.include
@@ -275,12 +275,8 @@ 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-igs
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "shark"
.if ${MACHINE} == "sparc" || \
@@ -294,15 +290,23 @@ SUBDIR+= \
xf86-video-suncg6 \
xf86-video-sunffb \
xf86-video-wsfb
+# xf86-video-ag10e \
+# xf86-video-glint \
+
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
xf86-video-ag10e \
xf86-video-glint \
xf86-video-sunleo
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+
.if ${MACHINE} == "sparc"
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
+ xf86-video-pnozz
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+
SUBDIR+= \
- xf86-video-pnozz \
xf86-video-suncg14 \
xf86-video-suntcx
.endif # ${MACHINE} == "sparc"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-sunffb
Module Name:src
Committed By: joerg
Date: Tue Sep 27 19:26:06 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
Split -mv8plus into the appropiate flags for GCC and clang.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
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.12 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.12 Tue Sep 27 19:24:19 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Tue Sep 27 19:26:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/09/27 19:24:19 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2016/09/27 19:26:06 joerg Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
@@ -14,7 +14,8 @@ AFLAGS+= -x assembler-with-cpp -Wa,-Av9a
.if ${MACHINE_ARCH} == "sparc"
AFLAGS+= -x assembler-with-cpp -Wa,-Av8plusa
-COPTS= -mv8plus
+COPTS+= ${${ACTIVE_CC} == "gcc" :? -mv8plus :}
+COPTS+= ${${ACTIVE_CC} == "clang" :? -Wa,-Av8plusa :}
.endif
CPPFLAGS+= ${X11FLAGS.DRI} -DUSE_VIS
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: joerg
Date: Tue Sep 27 19:24:19 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:
Don't bail out on the const lose for the driver name for clang. Also
accepts differences in pointer signs.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.11 -r1.12 \
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.8 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.8 Mon Sep 5 06:30:40 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Tue Sep 27 19:24:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/09/05 06:30:40 martin Exp $
+# $NetBSD: Makefile,v 1.9 2016/09/27 19:24:19 joerg Exp $
DRIVER= xf86-video-suncg6
DRIVER_NAME= suncg6_drv
@@ -15,3 +15,4 @@ MAN= suncg6.4
.if ${HAVE_GCC:U0} > 48
COPTS.cg6_accel.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
+COPTS.cg6_accel.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.11 Mon Sep 5 06:30:40 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Tue Sep 27 19:24:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/09/05 06:30:40 martin Exp $
+# $NetBSD: Makefile,v 1.12 2016/09/27 19:24:19 joerg Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
@@ -28,3 +28,6 @@ MAN= sunffb.4
COPTS.ffb_dac.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.ffb_dga.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
+COPTS.ffb_dac.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+COPTS.ffb_dga.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+COPTS.ffb_exa.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=pointer-sign :}
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: joerg
Date: Tue Sep 27 19:15:10 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-suncg14: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suntcx: Makefile
Log Message:
Disable pointer sign warnings for clang.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-suntcx/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-suncg14/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.6 Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile Tue Sep 27 19:15:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/16 06:24:02 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/09/27 19:15:10 joerg Exp $
DRIVER= xf86-video-suncg14
DRIVER_NAME= suncg14_drv
@@ -7,5 +7,6 @@ SRCS= cg14_driver.c cg14_cursor.c cg14_
MAN= suncg14.4
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include
+CWARNFLAGS.clang+= -Wno-pointer-sign
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.3 Tue Aug 16 06:24:03 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile Tue Sep 27 19:15:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/16 06:24:03 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/09/27 19:15:09 joerg Exp $
DRIVER= xf86-video-suntcx
DRIVER_NAME= suntcx_drv
@@ -9,4 +9,6 @@ CPPFLAGS+= ${X11FLAGS.DRI}
MAN= suntcx.4
+CWARNFLAGS.clang+= -Wno-pointer-sign
+
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-vesa
Module Name:src Committed By: christos Date: Tue Sep 27 02:33:16 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-vesa: Makefile Log Message: need XFree86LOADER To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-vesa/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-vesa/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.5 Tue Aug 16 03:10:01 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile Mon Sep 26 22:33:16 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/08/16 07:10:01 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2016/09/27 02:33:16 christos Exp $ DRIVER= xf86-video-vesa DRIVER_NAME= vesa_drv @@ -7,5 +7,6 @@ SRCS= vesa.c MAN= vesa.4 COPTS.vesa.c+= -Wno-error +CPPFLAGS+=-DXFree86LOADER .include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nv
Module Name:src
Committed By: mrg
Date: Wed Sep 21 18:00:26 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
Log Message:
always build the XAA files as well. they have functions used
by the EXA code and besides a minor fix, were already setup to
build with HAVE_XAA_H not defined.
this should really fix PR#51480.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
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-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.11 Fri Sep 2 03:49:56 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Wed Sep 21 18:00:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/09/02 03:49:56 jakllsch Exp $
+# $NetBSD: Makefile,v 1.12 2016/09/21 18:00:26 mrg Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -11,6 +11,11 @@ SRCS+= g80_dac.c g80_display.c g80_dma.
SRCS+= g80_output.c g80_sor.c
MAN= nv.4
+# XAA files have generic functions as well
+#.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SRCS+= nv_xaa.c riva_xaa.c g80_xaa.c
+#.endif
+
.if ${MACHINE} == "macppc"
CPPFLAGS+= -DAVOID_VGAHW
.endif
@@ -30,7 +35,3 @@ COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-
COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
.include "../Makefile.xf86-driver"
-
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SRCS+= nv_xaa.c riva_xaa.c g80_xaa.c
-.endif
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: christos Date: Mon Sep 19 19:15:04 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile Log Message: XXX: This driver still needs XFree86LOADER defined to expose intelModuleData. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 \ 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.23 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.24 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.23 Tue Aug 16 02:24:02 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Mon Sep 19 15:15:04 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2016/08/16 06:24:02 mrg Exp $ +# $NetBSD: Makefile,v 1.24 2016/09/19 19:15:04 christos Exp $ .include @@ -178,6 +178,7 @@ CPPFLAGS+= -DUMS=1 CPPFLAGS+= -DUSE_BACKLIGHT=1 CPPFLAGS+= -DUSE_SNA=1 CPPFLAGS+= -DUSE_UXA=1 +CPPFLAGS+= -DXFree86LOADER # XXX This should not be hard-coded here... DRI_DRIVER_PATH= /usr/X11R7/lib/modules/dri
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/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.
