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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/drivers/xf86-video-chips
Module Name:src
Committed By: macallan
Date: Sat Aug 27 03:58:13 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-chips: Makefile
Log Message:
pass -DAVOID_VGAHW on shark
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.6 Sun May 15 22:55:01 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile Sat Aug 27 03:58:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/05/15 22:55:01 christos Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/27 03:58:13 macallan Exp $
DRIVER= xf86-video-chips
DRIVER_NAME= chips_drv
@@ -9,7 +9,7 @@ SRCS+= ct_accelmm.c ct_accelhi.c
MAN= chips.4
.if ${MACHINE} == "shark"
-CPPFLAGS+= -DHAVE_ISA
+CPPFLAGS+= -DHAVE_ISA -DAVOID_VGAHW
.endif
CPPFLAGS.ct_driver.c= -DVERSION=${PACKAGE_MAJOR} -I${X11SRCDIR.xorg-server}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-sunffb
Module Name:src
Committed By: mrg
Date: Mon Aug 22 08:39:20 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
ffb_dga.c has const issues as well
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.9 Sat Aug 20 20:22:54 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Mon Aug 22 08:39:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:54 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/22 08:39:20 mrg Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
@@ -26,4 +26,5 @@ MAN= sunffb.4
# XXX
.if ${HAVE_GCC} > 48
COPTS.ffb_dac.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.ffb_dga.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: joerg
Date: Sun Aug 21 18:23:58 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
Log Message:
HAVE_GCC may be undefined.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.3 Sat Aug 20 20:22:53 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Sun Aug 21 18:23:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/20 20:22:53 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/21 18:23:58 joerg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -48,7 +48,7 @@ CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DAT
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.9 Sat Aug 20 20:22:53 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Sun Aug 21 18:23:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/21 18:23:58 joerg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -14,7 +14,7 @@ CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROT
.include "../Makefile.xf86-driver"
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.smi_video.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.13 Sat Aug 20 20:22:54 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Sun Aug 21 18:23:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/20 20:22:54 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/21 18:23:58 joerg Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -23,7 +23,7 @@ CWARNFLAGS.clang+= -Wno-parentheses
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.initextx.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src
Committed By: joerg
Date: Sun Aug 21 12:39:18 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
Log Message:
HAVE_GCC may be undefined.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.9 Sat Aug 20 20:22:53 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Sun Aug 21 12:39:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/21 12:39:17 joerg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -42,7 +42,7 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
# XXX
COPTS.via_dri.c+= -Wno-error
-.if ${HAVE_GCC} > 48
+.if ${HAVE_GCC:U0} > 48
COPTS.via_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.via_lvds.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Sat Aug 20 20:22:54 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
apply -Wno-error=discarded-qualifiers only with GCC > 4.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2 Mon Aug 15 17:01:25 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Sat Aug 20 20:22:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/08/15 17:01:25 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/20 20:22:53 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -45,11 +45,13 @@ CPPFLAGS+= -DNV_MINOR_VERSION=${PACKAGE_
CPPFLAGS+= -DNV_PATCHLEVEL=${PACKAGE_PATCH}
CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DATE}
-# XXX
-COPTS.nouveau_xv.c+= -Wno-error=discarded-qualifiers
-
.include "../Makefile.xf86-driver"
+# XXX
+.if ${HAVE_GCC} > 48
+COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
+
.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
CPPFLAGS+= -DHAVE_XORG_LIST
CPPFLAGS+= -DHAVE_XAA_H
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8 Fri Aug 19 23:51:44 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Sat Aug 20 20:22:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/19 23:51:44 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -41,10 +41,10 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
.include "../Makefile.xf86-driver"
# XXX
-.if defined(HAVE_GCC)
COPTS.via_dri.c+= -Wno-error
-COPTS.via_driver.c+= -Wno-error=discarded-qualifiers
-COPTS.via_lvds.c+= -Wno-error=discarded-qualifiers
+.if ${HAVE_GCC} > 48
+COPTS.via_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.via_lvds.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
.endif
CWARNFLAGS.clang+= -Wno-tautological-compare
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8 Tue Aug 16 07:10:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Sat Aug 20 20:22:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/20 20:22:53 mrg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -12,9 +12,11 @@ MAN= siliconmotion.4
CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROTO_71
-COPTS.smi_video.c+= -Wno-error=discarded-qualifiers
-
.include "../Makefile.xf86-driver"
+.if ${HAVE_GCC} > 48
+COPTS.smi_video.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
+
XORG_PKG_VER_PROG= ${DRIVER}
.include "../../../xorg-pkg-ver.mk"
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12 Tue Aug 16 08:37:47 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Sat Aug 20 20:22:54 2016
@@ -1,4 +1,4 @@
-# $NetBSD:
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Sat Aug 20 03:44:19 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
Log Message:
use and force evaluation of ${.PARSEDIR}. fixes build for some drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.21 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.22
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.21 Sat Aug 20 00:22:02 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Sat Aug 20 03:44:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.21 2016/08/20 00:22:02 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.22 2016/08/20 03:44:19 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -51,8 +51,9 @@ CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG
.PATH: ${X11SRCDIR.${DRIVER}}/src
.PATH: ${X11SRCDIR.${DRIVER}}/man
+DRIVER_TOPDIR:=${.PARSEDIR}
.if !exists(${X11SRCDIR.${DRIVER}}/../include)
-CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../fake-include
+CPPFLAGS+= -DHAVE_CONFIG_H -I${DRIVER_TOPDIR}/fake-include
.endif
.include
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-s3
Module Name:src
Committed By: mrg
Date: Sat Aug 20 00:48:23 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
Log Message:
apply -Wno-error=cpp due to this driver using xf86PciInfo.h.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.12 Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile Sat Aug 20 00:48:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/16 06:24:02 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/20 00:48:23 mrg Exp $
DRIVER= xf86-video-s3
DRIVER_NAME= s3_drv
@@ -21,6 +21,9 @@ CPPFLAGS.s3_video.c+= -DS3_NEWMMIO=1 \
CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\"
+# XXX xf86PciInfo.h
+COPTS+= -Wno-error=cpp
+
CWARNFLAGS.clang+= -Wno-parentheses
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Sat Aug 20 00:22:03 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
Added Files:
src/external/mit/xorg/server/drivers/fake-include: config.h
Log Message:
instead of including xorg-server.h manually all over the places we
don't have a generated config.h, provide a fake one that does.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/fake-include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.20 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.21
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.20 Tue Aug 16 06:24:03 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Sat Aug 20 00:22:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.20 2016/08/16 06:24:03 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.21 2016/08/20 00:22:02 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -51,4 +51,8 @@ CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG
.PATH: ${X11SRCDIR.${DRIVER}}/src
.PATH: ${X11SRCDIR.${DRIVER}}/man
+.if !exists(${X11SRCDIR.${DRIVER}}/../include)
+CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../fake-include
+.endif
+
.include
Added files:
Index: src/external/mit/xorg/server/drivers/fake-include/config.h
diff -u /dev/null src/external/mit/xorg/server/drivers/fake-include/config.h:1.1
--- /dev/null Sat Aug 20 00:22:03 2016
+++ src/external/mit/xorg/server/drivers/fake-include/config.h Sat Aug 20 00:22:02 2016
@@ -0,0 +1,7 @@
+/* $NetBSD: config.h,v 1.1 2016/08/20 00:22:02 mrg Exp $ */
+
+/*
+ * Fake header for drivers missing generated config.h and need it for
+ * the xorg-server.h include.
+ */
+#include "xorg-server.h"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src Committed By: mrg Date: Fri Aug 19 23:51:45 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile Log Message: update for openchrome 0.4.0: remove via_vbe.c To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.8 --- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.7 Tue Aug 16 07:10:01 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Fri Aug 19 23:51:44 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/08/16 07:10:01 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2016/08/19 23:51:44 mrg Exp $ DRIVER= xf86-video-openchrome DRIVER_NAME= openchrome_drv @@ -20,7 +20,6 @@ SRCS= \ via_outputs.c \ via_xv_overlay.c \ via_ums.c \ - via_vbe.c \ via_vgahw.c \ via_xv.c \ via_vt162x.c
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms
Module Name:src
Committed By: christos
Date: Fri Aug 19 16:33:23 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
fix reversed test
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.5 Thu Aug 18 23:59:30 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Fri Aug 19 12:33:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/19 03:59:30 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/19 16:33:23 christos Exp $
.include
@@ -29,12 +29,12 @@ SRCS.KMS= radeon_dri2.c radeon_dri3.c ra
drmmode_display.c
.if ${HAVE_XORG_GLAMOR} != "no"
-SRCS.GLAMOR=
-.else
SRCS.GLAMOR= radeon_glamor.c radeon_glamor_wrappers.c
CPPFLAGS+= \
-DHAVE_GLAMOR_H \
-DUSE_GLAMOR
+.else
+SRCS.GLAMOR=
.endif
SRCS= radeon_accel.c radeon_video.c \
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-igs
Module Name:src
Committed By: mrg
Date: Thu Aug 18 09:34:02 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-igs: Makefile
Log Message:
don't need HAVE_CONFIG_H any more
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile:1.1 Tue Nov 10 21:44:11 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-igs/Makefile Thu Aug 18 09:34:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/11/10 21:44:11 macallan Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/18 09:34:02 mrg Exp $
DRIVER= xf86-video-igs
DRIVER_NAME= igs_drv
@@ -6,6 +6,4 @@ DRIVER_NAME= igs_drv
SRCS= igs_driver.c igs_cursor.c igs_accel.c
MAN= igs.4
-CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
-
.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-amdgpu
Module Name:src
Committed By: mrg
Date: Thu Aug 18 07:49:09 UTC 2016
Added Files:
src/external/mit/xorg/server/drivers/xf86-video-amdgpu: Makefile
Log Message:
build glue for xf86-video-amdgpu
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile:1.1
--- /dev/null Thu Aug 18 07:49:09 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-amdgpu/Makefile Thu Aug 18 07:49:09 2016
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2016/08/18 07:49:09 mrg Exp $
+
+.include
+
+DRIVER= xf86-video-amdgpu
+DRIVER_NAME= amdgpu_drv
+
+LIBDPLIBS+= drm_amdgpu ${.CURDIR}/../../../lib/libdrm_amdgpu
+
+SRCS.KMS= amdgpu_bo_helper.c amdgpu_dri2.c amdgpu_dri3.c \
+ amdgpu_drm_queue.c amdgpu_kms.c amdgpu_present.c \
+ amdgpu_sync.c drmmode_display.c
+SRCS.GLAMOR= amdgpu_glamor.c amdgpu_glamor_wrappers.c amdgpu_pixmap.c
+
+SRCS= amdgpu_video.c amdgpu_misc.c amdgpu_probe.c \
+ $(SRCS.KMS) $(SRCS.GLAMOR)
+
+MAN= amdgpu.4
+
+CPPFLAGS+= -DHAVE_CONFIG_H
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/dri \
+ -I${DESTDIR}${X11INCDIR}/libdrm \
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.${DRIVER}}/../include
+
+# XXX
+COPTS+= -Wno-error
+
+.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms
Module Name:src
Committed By: mrg
Date: Wed Aug 17 00:10:19 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
clean up some obsolete and duplicated code. port to xf86-video-ati 7.7.0.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.3 Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Wed Aug 17 00:10:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/16 06:24:02 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/17 00:10:19 mrg Exp $
.include
@@ -11,34 +11,30 @@ SRCS.ATOMBIOS= \
Decoder.c \
hwserv_drv.c
-.if ${X11DRI} != "no"
-SRCS.DRI= radeon_dri.c
-CPPFLAGS+= ${X11FLAGS.DRI}
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
.endif
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DUSE_XAA
.else
-CPPFLAGS+= -DHAS_DIRTYTRACKING2 -DHAVE_XORG_LIST
-.endif
-
-.if ${X11DRI} != "no"
-# XXX
-. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
-CPPFLAGS+= -DXF86DRM_MODE
-LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
-. endif
+CPPFLAGS+= -DHAS_DIRTYTRACKING2 \
+ -DHAVE_XORG_LIST \
+ -DHAVE_XF86_CURSOR_RESET_CURSOR \
+ -DHAVE_DRI3_H \
+ -DHAVE_MISYNCSHM_H \
+ -DHAVE_PRESENT_H
.endif
SRCS.EXA= radeon_exa.c r600_exa.c r6xx_accel.c \
r600_textured_videofuncs.c r600_shader.c radeon_exa_shared.c \
evergreen_exa.c evergreen_accel.c evergreen_shader.c \
evergreen_textured_videofuncs.c cayman_accel.c cayman_shader.c
-SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c \
- radeon_bo_helper.c
+SRCS.KMS= radeon_dri2.c radeon_dri3.c radeon_drm_queue.c radeon_kms.c \
+ radeon_present.c radeon_sync.c radeon_vbo.c radeon_bo_helper.c \
+ drmmode_display.c
# XXX not yet
-SRCS.GLAMOR= radeon_glamor.c
+SRCS.GLAMOR= radeon_glamor.c radeon_glamor_wrappers.c
SRCS= radeon_accel.c radeon_video.c \
radeon_misc.c radeon_probe.c \
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Aug 16 19:45:33 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
disable chips and igs drivers on shark and xorg-server 1.18 for now.
fortunately, wsfb works.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/external/mit/xorg/server/drivers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.76 src/external/mit/xorg/server/drivers/Makefile:1.77
--- src/external/mit/xorg/server/drivers/Makefile:1.76 Tue Aug 16 07:20:25 2016
+++ src/external/mit/xorg/server/drivers/Makefile Tue Aug 16 19:45:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2016/08/16 07:20:25 mrg Exp $
+# $NetBSD: Makefile,v 1.77 2016/08/16 19:45:33 mrg Exp $
# xf86-input drivers
@@ -262,9 +262,13 @@ SUBDIR+= \
.if ${MACHINE} == "shark"
SUBDIR+= \
- xf86-video-chips \
-xf86-video-igs \
xf86-video-wsfb
+# needs porting for xorg-server 1.18
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
+ xf86-video-chips \
+xf86-video-igs
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "shark"
.if ${MACHINE} == "sparc" || \
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-sis
Module Name:src
Committed By: mrg
Date: Tue Aug 16 08:37:47 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
Log Message:
revert part of previous
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.11 Tue Aug 16 07:10:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Tue Aug 16 08:37:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/08/16 07:10:01 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/16 08:37:47 mrg Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -11,7 +11,6 @@ SRCS+= sis_vga.c sis_video.c
MAN= sis.4
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
-CPPFLAGS+= -DSIS_USE_EXA
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Aug 16 07:20:25 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
don't build a bunch of drivers for xorg-server 1.18 and x86:
xf86-video-apm
xf86-video-ark
xf86-video-ast
xf86-video-chips
xf86-video-cirrus
xf86-video-cirrus_alpine
xf86-video-cirrus_laguna
xf86-video-glint
xf86-video-i128
xf86-video-i740
xf86-video-intel-old
xf86-video-mach64
xf86-video-mga
xf86-video-neomagic
xf86-video-s3
xf86-video-s3virge
xf86-video-tdfx
xf86-video-tseng
xf86-video-xgi
some of them could be ported. future work!
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/external/mit/xorg/server/drivers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.75 src/external/mit/xorg/server/drivers/Makefile:1.76
--- src/external/mit/xorg/server/drivers/Makefile:1.75 Fri Nov 6 21:32:22 2015
+++ src/external/mit/xorg/server/drivers/Makefile Tue Aug 16 07:20:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2015/11/06 21:32:22 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.76 2016/08/16 07:20:25 mrg Exp $
# xf86-input drivers
@@ -26,47 +26,51 @@ SUBDIR+= \
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
+ xf86-video-ati \
+ xf86-video-intel \
+ xf86-video-nv \
+ xf86-video-nouveau \
+ xf86-video-openchrome \
+ xf86-video-r128 \
+ xf86-video-radeon \
+ xf86-video-radeon-kms \
+ xf86-video-savage \
+ xf86-video-siliconmotion \
+ xf86-video-sis \
+ xf86-video-tga \
+ xf86-video-trident \
+ xf86-video-vmware \
+ xf86-video-vesa \
+ xf86-video-wsfb
+
+# needs porting for xorg-server 1.6
+# xf86-video-imstt
+# xf86-video-rendition
+
+# needs porting for xorg-server 1.18
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
xf86-video-apm \
xf86-video-ark \
xf86-video-ast \
- xf86-video-ati \
xf86-video-chips \
xf86-video-cirrus \
xf86-video-cirrus_alpine \
xf86-video-cirrus_laguna \
xf86-video-glint \
xf86-video-i128 \
- xf86-video-i740
-
-# needs porting for xorg-server 1.6
-# xf86-video-imstt \
-
-SUBDIR+= \
- xf86-video-intel \
+ xf86-video-i740 \
xf86-video-intel-old \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-neomagic \
- xf86-video-nv \
- xf86-video-nouveau \
- xf86-video-openchrome \
- xf86-video-r128 \
- xf86-video-radeon \
- xf86-video-radeon-kms \
xf86-video-s3 \
xf86-video-s3virge \
- xf86-video-savage \
- xf86-video-siliconmotion \
- xf86-video-sis \
xf86-video-tdfx \
- xf86-video-tga \
- xf86-video-trident \
xf86-video-tseng \
- xf86-video-vmware \
- xf86-video-vesa \
- xf86-video-wsfb \
xf86-video-xgi
-# xf86-video-rendition
+
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.if ${MACHINE_ARCH} == "i386"
SUBDIR+= \
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Aug 16 07:10:01 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vesa: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
Log Message:
apply -Wno-error more liberally for xorg-server 1.18 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.6 Sun Aug 24 06:13:36 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Tue Aug 16 07:10:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/08/24 06:13:36 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/16 07:10:01 mrg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -44,6 +44,8 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
# XXX
.if defined(HAVE_GCC)
COPTS.via_dri.c+= -Wno-error
+COPTS.via_driver.c+= -Wno-error=discarded-qualifiers
+COPTS.via_lvds.c+= -Wno-error=discarded-qualifiers
.endif
CWARNFLAGS.clang+= -Wno-tautological-compare
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.7 Mon Jul 20 02:07:36 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Tue Aug 16 07:10:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/20 02:07:36 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -10,7 +10,9 @@ SRCS+= smilynx_output.c smilynx_hw.c sm
SRCS+= smi501_crtc.c smi501_output.c
MAN= siliconmotion.4
-CPPFLAGS+= -DHAVE_XAA_H -DHAVE_XMODES -DHAVE_XEXTPROTO_71
+CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROTO_71
+
+COPTS.smi_video.c+= -Wno-error=discarded-qualifiers
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.10 Thu Aug 11 23:15:40 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Tue Aug 16 07:10:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/16 07:10:01 mrg Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -11,13 +11,16 @@ SRCS+= sis_vga.c sis_video.c
MAN= sis.4
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
+CPPFLAGS+= -DSIS_USE_EXA
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
# XXX
-COPTS.sis_driver.c= -Wno-error
+COPTS.sis_driver.c+= -Wno-error=discarded-qualifiers
+COPTS.sis_utility.c+= -Wno-error=discarded-qualifiers
+COPTS.initextx.c+= -Wno-error=discarded-qualifiers
X11MANCPP= yes
Index: src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.7 Mon Jun 3 10:03:14 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile Tue Aug 16 07:10:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/06/03 10:03:14 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
DRIVER= xf86-video-tga
DRIVER_NAME= tga_drv
@@ -7,8 +7,13 @@ SRCS= BT463ramdac.c BTramdac.c IBM561ra
SRCS+= tga_accel.c
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: mrg Date: Tue Aug 16 07:09:28 UTC 2016 Removed Files: src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel/ivch: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel/sil164: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410: Makefile Log Message: remove stuff only present in the old intel driver To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon
Module Name:src
Committed By: mrg
Date: Tue Aug 16 07:08:17 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
Log Message:
define USE_XAA here for xorg-server 1.10.
for xorg-server 1.18 builds, copy some files from xorg-server 1.10.
this may not work with xorg-server 1.18, i'll test later.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.19 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.20
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.19 Thu May 28 14:36:45 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Tue Aug 16 07:08:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/05/28 14:36:45 rjs Exp $
+# $NetBSD: Makefile,v 1.20 2016/08/16 07:08:17 mrg Exp $
.include
@@ -20,6 +20,11 @@ SRCS.DRI= radeon_dri.c
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
+# XXX
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+= -DUSE_XAA
+.endif
+
.if ${X11DRI} != "no"
# XXX
. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -54,7 +59,14 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/libdrm \
- -I${X11SRCDIR.${DRIVER}}/../include
+ -I${X11SRCDIR.${DRIVER}}/../include \
+ -I${X11SRCDIR.${DRIVER}}/../xorg-server-copy
+.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
+CPPFLAGS+= -DHAVE_XORG_LIST
+# XXX These have been copied from xorg-server 1.10.6.
+SRCS+= fi1236.c msp3430.c tda9885.c uda1380.c
+.PATH: ${X11SRCDIR.${DRIVER}}/../xorg-server-copy
+.endif
# XXX
COPTS+= -Wno-error
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-geode
Module Name:src Committed By: mrg Date: Tue Aug 16 06:54:12 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile Log Message: apply -Wno-error more liberally, needed for xorg-server 1.18 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.5 --- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.4 Mon Mar 7 14:35:21 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile Tue Aug 16 06:54:12 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/03/07 14:35:21 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2016/08/16 06:54:12 mrg Exp $ DRIVER= xf86-video-geode DRIVER_NAME= geode_drv @@ -43,6 +43,13 @@ CPPFLAGS+= -Doff64_t=off_t -Dlseek64=lse COPTS.gx_randr.c+= -Wno-error # XXX COPTS.lx_memory.c+= -Wno-error # XXX COPTS.panel.c+= -Wno-error # XXX -- huh? don't get this one +COPTS.geode_driver.c+= -Wno-error # XXX +COPTS.gx_accel.c+= -Wno-error # XXX +COPTS.gx_cursor.c+= -Wno-error # XXX +COPTS.gx_video.c+= -Wno-error # XXX +COPTS.lx_video.c+= -Wno-error # XXX +COPTS.lx_driver.c+= -Wno-error # XXX +COPTS.lx_panel.c+= -Wno-error # XXX CWARNFLAGS.clang+= -Wno-empty-body
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-mouse
Module Name:src
Committed By: mrg
Date: Tue Aug 16 06:53:01 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-mouse: Makefile
Log Message:
drivers should not define HAVE_XORG_CONFIG_H
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.7 Wed Jul 22 09:49:51 2015
+++ src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile Tue Aug 16 06:53:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/22 09:49:51 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/16 06:53:01 mrg Exp $
WARNS?= 2
@@ -8,7 +8,7 @@ DRIVER_NAME= mouse_drv
SRCS= mouse.c pnp.c bsd_mouse.c
MAN= mousedrv.4
-CPPFLAGS+= -DHAVE_XORG_CONFIG_H -DHAVE_ASPRINTF
+CPPFLAGS+= -DHAVE_ASPRINTF
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/include
INCSDIR= ${X11INCDIR}/xorg
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Aug 16 06:24:03 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-ark: Makefile
src/external/mit/xorg/server/drivers/xf86-video-ast: Makefile
src/external/mit/xorg/server/drivers/xf86-video-ati: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i740: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-mach64: Makefile
src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-neomagic: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile
src/external/mit/xorg/server/drivers/xf86-video-savage: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg14: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunleo: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suntcx: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile
src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile
Log Message:
define HAVE_XAA_H in Makefile.xf86-driver for xorg-server 1.10 only,
move it out of many driver makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.19 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.20
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.19 Tue Nov 23 08:22:29 2010
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Tue Aug 16 06:24:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.19 2010/11/23 08:22:29 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.20 2016/08/16 06:24:03 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -37,9 +37,12 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \
-DXSERVER_LIBPCIACCESS \
- -DXFree86LOADER \
-DHAVE_XEXTPROTO_71
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+= -DHAVE_XAA_H -DXFree86LOADER
+.endif
+
CPPFLAGS+= -DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
CPPFLAGS+= -DPACKAGE_VERSION_MINOR=${PACKAGE_MINOR}
CPPFLAGS+= -DPACKAGE_VERSION_PATCHLEVEL=${PACKAGE_PATCH}
Index: src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile
diff -u
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-apm
Module Name:src Committed By: mrg Date: Tue Aug 16 06:19:47 UTC 2016 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-apm: Makefile Log Message: define XV_NEW_REPUT. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile:1.3 --- src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile:1.2 Sun Aug 3 07:32:03 2008 +++ src/external/mit/xorg/server/drivers/xf86-video-apm/Makefile Tue Aug 16 06:19:47 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/08/03 07:32:03 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2016/08/16 06:19:47 mrg Exp $ DRIVER= xf86-video-apm DRIVER_NAME= apm_drv @@ -6,4 +6,6 @@ DRIVER_NAME= apm_drv SRCS= apm_accel.c apm_cursor.c apm_dga.c apm_driver.c apm_i2c.c MAN= apm.4 +CPPFLAGS+= -DXV_NEW_REPUT + .include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nouveau
Module Name:src
Committed By: mrg
Date: Mon Aug 15 17:01:25 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
Log Message:
updates for xf86-video-nouveau 1.0.12.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.1 Tue Oct 13 04:33:22 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Mon Aug 15 17:01:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/10/13 04:33:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/15 17:01:25 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -10,7 +10,6 @@ SRCS= nouveau_copy.c \
nouveau_exa.c \
nouveau_xv.c \
nouveau_dri2.c \
- nouveau_glamor.c \
nouveau_present.c \
nouveau_sync.c \
nouveau_wfb.c \
@@ -39,7 +38,6 @@ LIBDPLIBS+= drm_nouveau ${.CURDIR}/../..
MAN= nouveau.4
-CPPFLAGS+= -DHAVE_XAA_H
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
@@ -47,7 +45,15 @@ CPPFLAGS+= -DNV_MINOR_VERSION=${PACKAGE_
CPPFLAGS+= -DNV_PATCHLEVEL=${PACKAGE_PATCH}
CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DATE}
+# XXX
+COPTS.nouveau_xv.c+= -Wno-error=discarded-qualifiers
+
.include "../Makefile.xf86-driver"
+.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
+CPPFLAGS+= -DHAVE_XORG_LIST
+CPPFLAGS+= -DHAVE_XAA_H
+.endif
+
# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
DRIVER_DATE!=awk '/^Date:/{print "\"" $0 "\"";exit}' ${X11SRCDIR.${DRIVER}}/ChangeLog
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-tdfx
Module Name:src
Committed By: macallan
Date: Fri Jul 1 23:29:17 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile
Log Message:
set USE_PCIVGAIO=0 on non-x86
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.12 Thu Mar 20 05:32:31 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Fri Jul 1 23:29:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/03/20 05:32:31 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2016/07/01 23:29:17 macallan Exp $
DRIVER= xf86-video-tdfx
DRIVER_NAME= tdfx_drv
@@ -11,6 +11,8 @@ MAN= tdfx.4
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DUSE_INT10
+.else
+CPPFLAGS+= -DUSE_PCIVGAIO=0
.endif
CPPFLAGS+= -DHAVE_XAA_H
CPPFLAGS+= -DTDFXDRI
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: christos
Date: Wed Jun 8 02:27:31 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
more -Wno-stack-protector
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.21 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.22
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.21 Wed May 13 22:43:33 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue Jun 7 22:27:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/05/14 02:43:33 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2016/06/08 02:27:31 christos Exp $
.include
@@ -197,6 +197,13 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib
CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-compare \
-Wno-empty-body -Wno-error
-COPTS.sna_display.c= -Wno-stack-protector
+COPTS.sna_display.c+= -Wno-stack-protector
+COPTS.sna_threads.c+= -Wno-stack-protector
+COPTS.sna_trapezoids.c+= -Wno-stack-protector
+COPTS.sna_trapezoids_boxes.c+= -Wno-stack-protector
+COPTS.sna_trapezoids_imprecise.c+= -Wno-stack-protector
+COPTS.sna_trapezoids_mono.c+= -Wno-stack-protector
+COPTS.sna_trapezoids_precise.c+= -Wno-stack-protector
+COPTS.i965_video.c+= -Wno-stack-protector
.include
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-geode
Module Name:src
Committed By: joerg
Date: Mon Mar 7 14:35:21 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile
Log Message:
Ignore clang's empty loop-body warning, it is used extensively via
macros.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.3 Mon Jul 20 06:34:29 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile Mon Mar 7 14:35:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/07/20 06:34:29 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/03/07 14:35:21 joerg Exp $
DRIVER= xf86-video-geode
DRIVER_NAME= geode_drv
@@ -44,6 +44,8 @@ COPTS.gx_randr.c+= -Wno-error # XXX
COPTS.lx_memory.c+= -Wno-error # XXX
COPTS.panel.c+= -Wno-error # XXX -- huh? don't get this one
+CWARNFLAGS.clang+= -Wno-empty-body
+
.include "../Makefile.xf86-driver"
XORG_PKG_VER_PROG= ${DRIVER}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel-old
Module Name:src
Committed By: christos
Date: Sun Dec 20 01:07:58 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel-old: Makefile
Log Message:
name the man page intel_old, so that we don't install it over the new
one depending on the build order.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile:1.1 Wed May 20 20:12:10 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel-old/Makefile Sat Dec 19 20:07:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/21 00:12:10 rjs Exp $
+# $NetBSD: Makefile,v 1.2 2015/12/20 01:07:58 christos Exp $
.include
@@ -21,7 +21,8 @@ SRCS+= i830_dri.c
.PATH: ${X11SRCDIR.${DRIVER}}/uxa
SRCS+= uxa-accel.c uxa-unaccel.c uxa-glyphs.c uxa-render.c uxa.c
-MAN= intel.4
+MAN= intel_old.4
+CLEANFILES+= intel_old.man
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
@@ -41,3 +42,7 @@ CWARNFLAGS.clang+= -Wno-parentheses -Wno
-Wno-empty-body -Wno-error
.include
+
+intel_old.man: intel.man
+ ${_MKTARGET_CREATE}
+ ${TOOL_SED} -e 's/[[:<:]]intel[[:>:]]/intel_old/g' ${.ALLSRC} > ${.TARGET}
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-suncg6
Module Name:src
Committed By: macallan
Date: Wed Nov 25 18:02:08 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
Log Message:
build EXA support
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.3 Tue Jun 4 22:45:08 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Wed Nov 25 18:02:08 2015
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2013/06/04 22:45:08 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/25 18:02:08 macallan Exp $
DRIVER= xf86-video-suncg6
DRIVER_NAME= suncg6_drv
-SRCS= cg6_driver.c cg6_cursor.c cg6_accel.c
+SRCS= cg6_driver.c cg6_cursor.c cg6_accel.c cg6_exa.c
CPPFLAGS+= ${X11FLAGS.DRI}
CPPFLAGS+= -DHAVE_XAA_H
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-sunffb
Module Name:src
Committed By: macallan
Date: Sun Aug 16 17:48:24 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
add ffb_accel_common.c
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
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.5 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.5 Tue Aug 11 03:58:18 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Sun Aug 16 17:48:24 2015
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/08/11 03:58:18 macallan Exp $
+# $NetBSD: Makefile,v 1.6 2015/08/16 17:48:24 macallan Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
SRCS= ffb_accel.c ffb_dac.c ffb_driver.c ffb_wid.c ffb_attr.c \
ffb_ddc.c ffb_cursor.c ffb_dga.c ffb_exa.c \
+ ffb_accel_common.c \
VISmoveImage.s ffb_asm.s
.if ${MACHINE_ARCH} == sparc64
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-sunffb
Module Name:src
Committed By: macallan
Date: Tue Aug 11 03:58:18 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
build EXA support
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
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.4 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.4 Tue Jun 4 22:45:08 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Tue Aug 11 03:58:18 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2013/06/04 22:45:08 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/11 03:58:18 macallan Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
SRCS= ffb_accel.c ffb_dac.c ffb_driver.c ffb_wid.c ffb_attr.c \
- ffb_ddc.c ffb_cursor.c ffb_dga.c \
+ ffb_ddc.c ffb_cursor.c ffb_dga.c ffb_exa.c \
VISmoveImage.s ffb_asm.s
.if ${MACHINE_ARCH} == sparc64
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-r128
Module Name:src
Committed By: macallan
Date: Thu Jul 30 02:58:00 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile
Log Message:
build EXA support
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
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-r128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.9 Mon Jul 20 01:17:46 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Thu Jul 30 02:58:00 2015
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2015/07/20 01:17:46 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2015/07/30 02:58:00 macallan Exp $
DRIVER= xf86-video-r128
DRIVER_NAME= r128_drv
-SRCS= r128_accel.c r128_cursor.c r128_driver.c \
+SRCS= r128_accel.c r128_cursor.c r128_driver.c r128_exa.c \
r128_crtc.c r128_output.c \
r128_video.c r128_misc.c r128_probe.c r128_dri.c
-#SRCS+= r128_exa.c r128_exa_render.c
-#CPPFLAGS+= -DUSE_EXA
-
MAN= r128.4
.if ${MACHINE_ARCH} == powerpc || ${MACHINE} == sparc64
@@ -23,7 +20,7 @@ CPPFLAGS+= -DWITH_VGAHW
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+= -DHAVE_XAA_H -DR128DRI
+CPPFLAGS+= -DHAVE_XAA_H -DUSE_EXA -DR128DRI
CWARNFLAGS.clang+= -Wno-format -Wno-pointer-sign
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-void
Module Name:src Committed By: mrg Date: Wed Jul 22 09:52:51 UTC 2015 Removed Files: src/external/mit/xorg/server/drivers/xf86-input-void: Makefile Log Message: remove unused makefile. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/server/drivers/xf86-input-void/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-mouse
Module Name:src
Committed By: mrg
Date: Wed Jul 22 09:49:51 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-mouse: Makefile
Log Message:
updates for xf86-input-mouse 1.9.1.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.6 Wed Jun 5 07:26:36 2013
+++ src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile Wed Jul 22 09:49:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/05 07:26:36 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/22 09:49:51 mrg Exp $
WARNS?= 2
@@ -8,9 +8,8 @@ DRIVER_NAME= mouse_drv
SRCS= mouse.c pnp.c bsd_mouse.c
MAN= mousedrv.4
-CPPFLAGS+= -DHAVE_CONFIG_H \
- -I${X11SRCDIR.${DRIVER}}/include \
- -I${X11SRCDIR.${DRIVER}}/../include
+CPPFLAGS+= -DHAVE_XORG_CONFIG_H -DHAVE_ASPRINTF
+CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/include
INCSDIR= ${X11INCDIR}/xorg
INCS= xf86-mouse-properties.h
@@ -22,3 +21,6 @@ PKGDIST.xorg-mouse= ${X11SRCDIR.${DRIVER
.PATH: ${X11SRCDIR.${DRIVER}}/include
.PATH: ${X11SRCDIR.${DRIVER}}
+
+XORG_PKG_VER_PROG= ${DRIVER}
+.include ../../../xorg-pkg-ver.mk
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-ark
Module Name:src
Committed By: mrg
Date: Thu Jul 23 02:04:09 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-ark: Makefile
Log Message:
update for ark 0.7.5.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-ark/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-ark/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.4 Wed Jun 10 01:59:09 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile Thu Jul 23 02:04:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/10 01:59:09 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/23 02:04:09 mrg Exp $
DRIVER= xf86-video-ark
DRIVER_NAME= ark_drv
@@ -6,5 +6,6 @@ DRIVER_NAME= ark_drv
SRCS= ark_accel.c ark_driver.c
CPPFLAGS+= -DPACKAGE_VERSION=\${PACKAGE_VERSION}\
+CPPFLAGS+= -DHAVE_XAA_H
.include ../Makefile.xf86-driver
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-geode
Module Name:src
Committed By: mrg
Date: Mon Jul 20 06:34:30 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile
Log Message:
use xorg-pkg-ver.mk
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
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.2 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.2 Wed May 18 20:55:09 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile Mon Jul 20 06:34:29 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/18 20:55:09 plunky Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/20 06:34:29 mrg Exp $
DRIVER= xf86-video-geode
DRIVER_NAME= geode_drv
@@ -37,8 +37,6 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/
-I${X11SRCDIR.${DRIVER}}/src/gfx \
-I${X11SRCDIR.${DRIVER}}/src/panel
-CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
-
# XXX ugh
CPPFLAGS+= -Doff64_t=off_t -Dlseek64=lseek
@@ -47,3 +45,6 @@ COPTS.lx_memory.c+= -Wno-error # XXX
COPTS.panel.c+= -Wno-error # XXX -- huh? don't get this one
.include ../Makefile.xf86-driver
+
+XORG_PKG_VER_PROG= ${DRIVER}
+.include ../../../xorg-pkg-ver.mk
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-trident
Module Name:src Committed By: mrg Date: Mon Jul 20 03:00:01 UTC 2015 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile Log Message: updates for xf86-video-trident 1.3.7. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.7 --- src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.6 Thu Mar 22 23:46:27 2012 +++ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Mon Jul 20 03:00:01 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/03/22 23:46:27 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2015/07/20 03:00:01 mrg Exp $ DRIVER= xf86-video-trident DRIVER_NAME= trident_drv @@ -11,6 +11,8 @@ SRCS+= trident_tv.c trident_video.c tvg SRCS+= xp4_accel.c xp4_accel_exa.c MAN= trident.4 +CPPFLAGS+= -DHAVE_XAA_H + COPTS.trident_driver.c= -Wno-error # XXX xf86dgastr.h CWARNFLAGS.clang+= -Wno-return-type -Wno-empty-body
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: mrg Date: Mon Jul 20 01:17:47 UTC 2015 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-mach64: Makefile src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile Log Message: updates for r128 6.10.0 and mach64 6.9.5. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile cvs rdiff -u -r1.8 -r1.9 \ 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-mach64/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.8 --- src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.7 Wed Nov 6 14:53:29 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile Mon Jul 20 01:17:46 2015 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.7 2013/11/06 14:53:29 macallan Exp $ +# $NetBSD: Makefile,v 1.8 2015/07/20 01:17:46 mrg Exp $ DRIVER= xf86-video-mach64 DRIVER_NAME= mach64_drv SRCS= atibus.c atichip.c atiprobe.c atividmem.c \ - atiadjust.c atiaudio.c aticlock.c aticonfig.c \ - aticonsole.c atidac.c atidecoder.c atidsp.c \ + atiadjust.c aticlock.c aticonfig.c \ + aticonsole.c atidac.c atidsp.c \ atii2c.c atilock.c atimach64.c atimach64accel.c \ atimach64cursor.c atimach64i2c.c atimach64io.c \ atimach64xv.c atimode.c atipreinit.c atiprint.c \ Index: src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.9 --- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.8 Wed Mar 19 23:46:05 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Mon Jul 20 01:17:46 2015 @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2014/03/19 23:46:05 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2015/07/20 01:17:46 mrg Exp $ DRIVER= xf86-video-r128 DRIVER_NAME= r128_drv -SRCS= r128_accel.c r128_cursor.c r128_dga.c r128_driver.c \ +SRCS= r128_accel.c r128_cursor.c r128_driver.c \ + r128_crtc.c r128_output.c \ r128_video.c r128_misc.c r128_probe.c r128_dri.c #SRCS+= r128_exa.c r128_exa_render.c
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: mrg
Date: Thu May 14 02:43:33 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
switch the default method to SNA.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
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.20 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.21
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.20 Fri Jan 16 21:35:34 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu May 14 02:43:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/01/16 21:35:34 snj Exp $
+# $NetBSD: Makefile,v 1.21 2015/05/14 02:43:33 mrg Exp $
.include bsd.own.mk
@@ -144,7 +144,7 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/xvmc
# Use the Intel-style __sync_* atomic primitives.
-CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA
+CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=SNA
CPPFLAGS+= -DENABLE_XVMC=1
CPPFLAGS+= -DHAS_PIXMAN_GLYPHS=1
CPPFLAGS+= -DHAS_PIXMAN_TRIANGLES=1
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Sun Mar 1 11:19:08 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
fix the previous; it had a reversed test and was also missing bsd.own.mk
before checking MK* values.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 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.64 src/external/mit/xorg/server/drivers/Makefile:1.65
--- src/external/mit/xorg/server/drivers/Makefile:1.64 Sun Mar 1 07:46:04 2015
+++ src/external/mit/xorg/server/drivers/Makefile Sun Mar 1 11:19:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2015/03/01 07:46:04 mrg Exp $
+# $NetBSD: Makefile,v 1.65 2015/03/01 11:19:08 mrg Exp $
# xf86-input drivers
@@ -19,14 +19,15 @@ SUBDIR+= \
.endif
-
# xf86-video drivers
+.include bsd.own.mk
+
# Set this to no to build the UMS-happy 6.x driver, vs KMS 7.x
-.if ${MKX11RADEONKMS:U} != no
-RADEON_SUBDIR=radeon
-.else
+.if ${MKX11RADEONKMS} != no
RADEON_SUBDIR=radeon-kms
+.else
+RADEON_SUBDIR=radeon
.endif
.if ${MACHINE_ARCH} == i386 || \
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: snj Date: Fri Jan 16 21:35:34 UTC 2015 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile Log Message: update for 2.99.917 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ 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.19 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.20 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.19 Tue Nov 11 11:30:55 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Fri Jan 16 21:35:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2014/11/11 11:30:55 tron Exp $ +# $NetBSD: Makefile,v 1.20 2015/01/16 21:35:34 snj Exp $ .include bsd.own.mk @@ -119,13 +119,14 @@ SRCS+= intel_batchbuffer.c SRCS+= intel_display.c SRCS+= intel_dri.c SRCS+= intel_driver.c -#SRCS+= intel_glamor.c SRCS+= intel_hwmc.c SRCS+= intel_memory.c #SRCS+= intel_present.c #SRCS+= intel_sync.c SRCS+= intel_uxa.c +SRCS+= intel_uxa_video.c SRCS+= intel_video.c +SRCS+= intel_video_overlay.c SRCS+= uxa-accel.c SRCS+= uxa-glyphs.c SRCS+= uxa-render.c
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: tron
Date: Tue Nov 11 11:30:56 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
Fix build with USE_SSP set to yes.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
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.18 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.19
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.18 Thu Nov 6 18:58:18 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue Nov 11 11:30:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/11/06 18:58:18 snj Exp $
+# $NetBSD: Makefile,v 1.19 2014/11/11 11:30:55 tron Exp $
.include bsd.own.mk
@@ -196,4 +196,6 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib
CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-compare \
-Wno-empty-body -Wno-error
+COPTS.sna_display.c= -Wno-stack-protector
+
.include bsd.subdir.mk
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: snj Date: Thu Nov 6 18:58:18 UTC 2014 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile Log Message: a single -DHAVE_GETLINE will suffice. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ 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.17 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.18 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.17 Wed Nov 5 18:01:16 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu Nov 6 18:58:18 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/11/05 18:01:16 christos Exp $ +# $NetBSD: Makefile,v 1.18 2014/11/06 18:58:18 snj Exp $ .include bsd.own.mk @@ -156,7 +156,6 @@ CPPFLAGS+= -DHAVE_DRI2=1 CPPFLAGS+= -DHAVE_DRI2_H=1 CPPFLAGS+= -DHAVE_DRISTRUCT_H=1 CPPFLAGS+= -DHAVE_DRI_H=1 -CPPFLAGS+= -DHAVE_GETLINE CPPFLAGS+= -DHAVE_GETLINE=1 CPPFLAGS+= -DHAVE_INTTYPES_H=1 CPPFLAGS+= -DHAVE_MEMORY_H=1
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: christos
Date: Wed Nov 5 18:01:16 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
adjust to newer sources
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
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.16 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.16 Thu Sep 11 13:26:30 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Wed Nov 5 13:01:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/09/11 17:26:30 riastradh Exp $
+# $NetBSD: Makefile,v 1.17 2014/11/05 18:01:16 christos Exp $
.include bsd.own.mk
@@ -9,59 +9,71 @@ DRIVER_NAME= intel_drv
SRCS+= intel_device.c
SRCS+= intel_options.c
SRCS+= intel_module.c
+SRCS+= backlight.c
+SRCS+= fd.c
# legacy/i810
.PATH: ${X11SRCDIR.${DRIVER}}/src/legacy/i810
SRCS+= i810_accel.c
SRCS+= i810_cursor.c
+SRCS+= i810_dga.c
+SRCS+= i810_dri.c
SRCS+= i810_driver.c
+SRCS+= i810_hwmc.c
SRCS+= i810_memory.c
SRCS+= i810_video.c
SRCS+= i810_wmark.c
-
SRCS+= i810_xaa.c
-SRCS+= i810_dga.c
-SRCS+= i810_dri.c
-SRCS+= i810_hwmc.c
# sna
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna
SRCS+= blt.c
SRCS+= kgem.c
+SRCS+= gen2_render.c
+SRCS+= gen3_render.c
+SRCS+= gen4_common.c
+SRCS+= gen4_render.c
+SRCS+= gen4_source.c
+SRCS+= gen4_vertex.c
+SRCS+= gen5_render.c
+SRCS+= gen6_common.c
+SRCS+= gen6_render.c
+SRCS+= gen7_render.c
+SRCS+= gen8_eu.c
+SRCS+= gen8_render.c
+SRCS+= gen8_vertex.c
+
SRCS+= sna_accel.c
+SRCS+= sna_acpi.c
SRCS+= sna_blt.c
SRCS+= sna_composite.c
SRCS+= sna_cpu.c
SRCS+= sna_damage.c
SRCS+= sna_display.c
SRCS+= sna_display_fake.c
+SRCS+= sna_dri2.c
+#SRCS+= sna_dri3.c
SRCS+= sna_driver.c
SRCS+= sna_glyphs.c
SRCS+= sna_gradient.c
SRCS+= sna_io.c
+#SRCS+= sna_present.c
SRCS+= sna_render.c
SRCS+= sna_stream.c
-SRCS+= sna_trapezoids.c
+SRCS+= sna_threads.c
SRCS+= sna_tiling.c
SRCS+= sna_transform.c
-SRCS+= sna_threads.c
+SRCS+= sna_trapezoids.c
+SRCS+= sna_trapezoids_boxes.c
+SRCS+= sna_trapezoids_imprecise.c
+SRCS+= sna_trapezoids_mono.c
+SRCS+= sna_trapezoids_precise.c
SRCS+= sna_vertex.c
SRCS+= sna_video.c
+SRCS+= sna_video_hwmc.c
SRCS+= sna_video_overlay.c
SRCS+= sna_video_sprite.c
SRCS+= sna_video_textured.c
-SRCS+= gen2_render.c
-SRCS+= gen3_render.c
-SRCS+= gen4_render.c
-SRCS+= gen4_source.c
-SRCS+= gen4_vertex.c
-SRCS+= gen5_render.c
-SRCS+= gen6_render.c
-SRCS+= gen7_render.c
-
-SRCS+= sna_dri.c
-
-SRCS+= sna_video_hwmc.c
# sna/brw
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna/brw
@@ -95,31 +107,30 @@ SRCS+= fbutil.c
# uxa
.PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
-SRCS+= intel_batchbuffer.c
-SRCS+= intel_display.c
-SRCS+= intel_driver.c
-SRCS+= intel_memory.c
-SRCS+= intel_uxa.c
-SRCS+= intel_video.c
SRCS+= i830_3d.c
SRCS+= i830_render.c
SRCS+= i915_3d.c
SRCS+= i915_render.c
SRCS+= i915_video.c
SRCS+= i965_3d.c
-SRCS+= i965_video.c
SRCS+= i965_render.c
-SRCS+= uxa.c
+SRCS+= i965_video.c
+SRCS+= intel_batchbuffer.c
+SRCS+= intel_display.c
+SRCS+= intel_dri.c
+SRCS+= intel_driver.c
+#SRCS+= intel_glamor.c
+SRCS+= intel_hwmc.c
+SRCS+= intel_memory.c
+#SRCS+= intel_present.c
+#SRCS+= intel_sync.c
+SRCS+= intel_uxa.c
+SRCS+= intel_video.c
SRCS+= uxa-accel.c
SRCS+= uxa-glyphs.c
SRCS+= uxa-render.c
SRCS+= uxa-unaccel.c
-
-#SRCS+= intel_glamor.c
-
-SRCS+= intel_dri.c
-
-SRCS+= intel_hwmc.c
+SRCS+= uxa.c
MAN= intel.4
@@ -131,18 +142,44 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/xvmc
# Use the Intel-style __sync_* atomic primitives.
-CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES
-CPPFLAGS+= -DENABLE_XVMC
-CPPFLAGS+= -DUSE_UXA
-CPPFLAGS+= -DUSE_SNA
CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA
+CPPFLAGS+= -DENABLE_XVMC=1
CPPFLAGS+= -DHAS_PIXMAN_GLYPHS=1
CPPFLAGS+= -DHAS_PIXMAN_TRIANGLES=1
-
-CPPFLAGS+= -DHAVE_DRI1
-CPPFLAGS+= -DHAVE_DRI2_H
-CPPFLAGS+= -DHAVE_XAA_H
+CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES=1
+CPPFLAGS+= -DHAVE_CPUID_H=1
+CPPFLAGS+= -DHAVE_DGAPROC_H=1
+CPPFLAGS+= -DHAVE_DLFCN_H=1
+CPPFLAGS+= -DHAVE_DRI1=1
+CPPFLAGS+= -DHAVE_DRI2=1
+CPPFLAGS+= -DHAVE_DRI2_H=1
+CPPFLAGS+= -DHAVE_DRISTRUCT_H=1
+CPPFLAGS+= -DHAVE_DRI_H=1
+CPPFLAGS+= -DHAVE_GETLINE
+CPPFLAGS+= -DHAVE_GETLINE=1
+CPPFLAGS+= -DHAVE_INTTYPES_H=1
+CPPFLAGS+= -DHAVE_MEMORY_H=1
+CPPFLAGS+= -DHAVE_SAREA_H=1
+CPPFLAGS+= -DHAVE_STDINT_H=1
+CPPFLAGS+= -DHAVE_STDLIB_H=1
+CPPFLAGS+= -DHAVE_STRINGS_H=1
+CPPFLAGS+= -DHAVE_STRING_H=1
+CPPFLAGS+= -DHAVE_STRLCAT=1
+CPPFLAGS+= -DHAVE_STRLCPY=1
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: riastradh Date: Thu Sep 11 17:26:30 UTC 2014 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile Log Message: Switch default accelmethod back to UXA until we import a stabler SNA. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ 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.15 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.16 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15 Sun Aug 10 14:17:19 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu Sep 11 17:26:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/08/10 14:17:19 jmcneill Exp $ +# $NetBSD: Makefile,v 1.16 2014/09/11 17:26:30 riastradh Exp $ .include bsd.own.mk @@ -136,7 +136,7 @@ CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES CPPFLAGS+= -DENABLE_XVMC CPPFLAGS+= -DUSE_UXA CPPFLAGS+= -DUSE_SNA -CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=SNA +CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA CPPFLAGS+= -DHAS_PIXMAN_GLYPHS=1 CPPFLAGS+= -DHAS_PIXMAN_TRIANGLES=1
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src Committed By: mrg Date: Sun Aug 24 06:13:36 UTC 2014 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile Log Message: fix the sources list to match the upstream Makefile.am. fixes problems reported by jdbaker. XXX: pullup-7. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ 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.5 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.5 Sat Jun 1 21:21:36 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Sun Aug 24 06:13:36 2014 @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.5 2013/06/01 21:21:36 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2014/08/24 06:13:36 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_ch7xxx.c \ via_display.c \ @@ -13,13 +16,19 @@ SRCS= \ via_id.c \ via_lvds.c \ via_memcpy.c \ + via_memmgr.c \ + via_outputs.c \ + via_xv_overlay.c \ + via_ums.c \ via_vbe.c \ via_vgahw.c \ + via_xv.c \ via_vt162x.c # DRI SRCS+= \ via_dri.c \ + via_kms.c \ via_xvmc.c MAN= openchrome.4
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nv
Module Name:src
Committed By: macallan
Date: Wed Aug 13 22:48:16 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
Log Message:
mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled for now
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
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.6 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6 Fri Jun 14 04:43:38 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Wed Aug 13 22:48:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/14 04:43:38 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/08/13 22:48:15 macallan Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -15,6 +15,16 @@ MAN= nv.4
CPPFLAGS+= -DAVOID_VGAHW
.endif
+.if ${MACHINE} == i386 || ${MACHINE} == amd64
+# XXX
+# the test uses pci_device_has_kernel_driver() which, for now at least, only
+# makes sense on x86 ( it just checks if the kernel driver handling the
+# device is vga ) - and even there, genfb and the like don't do anything
+# that would prevent this driver from working. Might need to revisit this once
+# the new DRM2 code has nvidia support
+#CPPFLAGS+= -DNV_TEST_FOR_KERNEL_DRIVER
+.endif
+
CPPFLAGS+= -DHAVE_XAA_H
.include ../Makefile.xf86-driver
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon
Module Name:src
Committed By: mrg
Date: Mon Aug 11 08:25:58 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
Log Message:
put KMS support under our X11DRI definition.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.17 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.18
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.17 Mon Aug 4 01:25:23 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Mon Aug 11 08:25:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/08/04 01:25:23 rjs Exp $
+# $NetBSD: Makefile,v 1.18 2014/08/11 08:25:58 mrg Exp $
.include bsd.own.mk
@@ -16,11 +16,13 @@ SRCS.DRI= radeon_dri.c
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
+.if ${X11DRI} != no
# XXX
-.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+. if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
SRCS.KMS= radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
CPPFLAGS+= -DXF86DRM_MODE
LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
+. endif
.endif
SRCS.EXA= radeon_exa.c r600_exa.c r6xx_accel.c \
