CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src Committed By: maya Date: Wed Aug 11 23:02:39 UTC 2021 Modified Files: src/external/mit/xorg/server/xorg-server/glamor: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile Log Message: Fix glamor - don't use stub functions ${LDADD.gbm} seems to be empty - use -lgbm directly (couldn't find a better fix) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server/glamor/Makefile cvs rdiff -u -r1.18 -r1.19 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/glamor/Makefile diff -u src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.4 --- src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 Fri Sep 2 03:58:59 2016 +++ src/external/mit/xorg/server/xorg-server/glamor/Makefile Wed Aug 11 23:02:39 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/09/02 03:58:59 jakllsch Exp $ +# $NetBSD: Makefile,v 1.4 2021/08/11 23:02:39 maya Exp $ .include "../Makefile.serverlib" .include "../Makefile.servermod" @@ -42,13 +42,19 @@ SRCS= \ glamor_sync.c SRCS+= \ glamor_xv.c +.if ${HAVE_XORG_GLAMOR} == "no" SRCS+= \ glamor_egl_stubs.c -SRCS.EGL= \ - glamor_egl.c +.else +SRCS+= \ + glamor_egl.c \ + glamor_eglmodule.c +.endif CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ + -I${DESTDIR}${X11INCDIR}/libdrm \ + -I${X11SRCDIR.xorg-server}/glamor \ -I${X11SRCDIR.xorg-server}/../include CPPFLAGS+= ${X11FLAGS.DIX} Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.19 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 Sun Sep 13 23:01:02 2020 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Wed Aug 11 23:02:39 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2020/09/13 23:01:02 mrg Exp $ +# $NetBSD: Makefile,v 1.19 2021/08/11 23:02:39 maya Exp $ .include @@ -33,7 +33,7 @@ LDADD+= ${LDADD.dix} LDADD+= ${LDADD.config} LDADD+= ${LDADD.dbe} .if ${HAVE_XORG_GLAMOR} != "no" -LDADD+= ${LDADD.glamor} ${LDADD.gbm} +LDADD+= ${LDADD.glamor} -lgbm .endif LDADD+= ${LDADD.record} LDADD+= ${LDADD.hw/xfree86/loader}
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl
Module Name:src Committed By: mrg Date: Wed Jul 14 06:34:33 UTC 2021 Modified Files: src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl: Makefile Log Message: find libgbm in libgbm.old. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.2 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.1 Tue Apr 16 21:21:51 2019 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile Wed Jul 14 06:34:33 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2021/07/14 06:34:33 mrg Exp $ XMODULEDIR= ${X11USRLIBDIR}/modules @@ -30,8 +30,10 @@ CPPFLAGS+= \ CPPFLAGS+= \ -DGLAMOR_HAS_GBM +.include "../../../../../lib/mesa-which.mk" + LIBDPLIBS= \ - gbm ${.CURDIR}/../../../../../lib/libgbm + gbm ${.CURDIR}/../../../../../lib/libgbm${OLD_SUFFIX} .include LIBDIR= ${XMODULEDIR}
CVS commit: src/external/mit/xorg/lib/libEGL
Module Name:src Committed By: mrg Date: Tue Jul 13 05:22:27 UTC 2021 Modified Files: src/external/mit/xorg/lib/libEGL: Makefile Log Message: also look for libgbm in ${OLD_SUFFIX}. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libEGL/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libEGL/Makefile diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.6 src/external/mit/xorg/lib/libEGL/Makefile:1.7 --- src/external/mit/xorg/lib/libEGL/Makefile:1.6 Mon Jul 12 09:40:31 2021 +++ src/external/mit/xorg/lib/libEGL/Makefile Tue Jul 13 05:22:27 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2021/07/12 09:40:31 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2021/07/13 05:22:27 mrg Exp $ .include @@ -102,7 +102,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \ Xdmcp ${.CURDIR}/../libXdmcp \ glapi ${.CURDIR}/../libglapi${OLD_SUFFIX} \ drm ${.CURDIR}/../libdrm \ - gbm ${.CURDIR}/../libgbm \ + gbm ${.CURDIR}/../libgbm${OLD_SUFFIX} \ xshmfence ${.CURDIR}/../libxshmfence \ X11-xcb ${.CURDIR}/../libX11/libX11-xcb \ xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
CVS commit: src/external/mit/xorg/lib/libEGL
Module Name:src Committed By: mrg Date: Mon Jul 12 09:40:31 UTC 2021 Modified Files: src/external/mit/xorg/lib/libEGL: Makefile Log Message: look for libglapi in ${OLD_SUFFIX}. noted by gson. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libEGL/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libEGL/Makefile diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.5 src/external/mit/xorg/lib/libEGL/Makefile:1.6 --- src/external/mit/xorg/lib/libEGL/Makefile:1.5 Tue Sep 24 19:29:42 2019 +++ src/external/mit/xorg/lib/libEGL/Makefile Mon Jul 12 09:40:31 2021 @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2019/09/24 19:29:42 maya Exp $ +# $NetBSD: Makefile,v 1.6 2021/07/12 09:40:31 mrg Exp $ .include +.include "../mesa-which.mk" + LIB= EGL LIBISCXX= yes @@ -98,7 +100,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \ Xfixes ${.CURDIR}/../libXfixes \ Xdamage ${.CURDIR}/../libXdamage \ Xdmcp ${.CURDIR}/../libXdmcp \ - glapi ${.CURDIR}/../libglapi \ + glapi ${.CURDIR}/../libglapi${OLD_SUFFIX} \ drm ${.CURDIR}/../libdrm \ gbm ${.CURDIR}/../libgbm \ xshmfence ${.CURDIR}/../libxshmfence \
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: mrg Date: Sun Jul 11 20:53:35 UTC 2021 Modified Files: src/external/mit/xorg/lib: driver.old.mk libglsl.old.mk libloader.old.mk libmesa.old.mk src/external/mit/xorg/lib/dri.old: Makefile src/external/mit/xorg/lib/gallium.old: Makefile src/external/mit/xorg/lib/libGL.old: Makefile mesa-ver.mk shlib_version src/external/mit/xorg/lib/libGL.old/internal: Makefile src/external/mit/xorg/lib/libgbm.old: Makefile shlib_version src/external/mit/xorg/lib/libglapi.old: Makefile Log Message: copy the Mesa 19.7.1 build framework into .old. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/driver.old.mk \ src/external/mit/xorg/lib/libglsl.old.mk \ src/external/mit/xorg/lib/libloader.old.mk \ src/external/mit/xorg/lib/libmesa.old.mk cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/dri.old/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/gallium.old/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libGL.old/Makefile \ src/external/mit/xorg/lib/libGL.old/mesa-ver.mk \ src/external/mit/xorg/lib/libGL.old/shlib_version cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/libGL.old/internal/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libgbm.old/Makefile \ src/external/mit/xorg/lib/libgbm.old/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libglapi.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/lib/driver.old.mk diff -u src/external/mit/xorg/lib/driver.old.mk:1.1 src/external/mit/xorg/lib/driver.old.mk:1.2 --- src/external/mit/xorg/lib/driver.old.mk:1.1 Sun Mar 10 02:29:52 2019 +++ src/external/mit/xorg/lib/driver.old.mk Sun Jul 11 20:53:35 2021 @@ -1,20 +1,48 @@ -# $NetBSD: driver.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $ +# $NetBSD: driver.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $ # stuff both dri and gallium drivers need. # util .PATH: ${X11SRCDIR.Mesa}/src/util -SRCS.util= \ - hash_table.c\ -MESAralloc.c .PATH: ${X11SRCDIR.Mesa}/../src/util -SRCS.util+= \ - format_srgb.c + +SRCS.util= \ + hash_table.c \ + build_id.c \ + crc32.c \ + disk_cache.c \ + fast_idiv_by_const.c \ + half_float.c \ + format_srgb.c \ + mesa-sha1.c \ + os_time.c \ + ralloc.c \ + UTILdebug.c \ + rand_xor.c \ + rb_tree.c \ + register_allocate.c \ + rgtc.c \ + set.c \ + slab.c \ + string_buffer.c \ + strtod.c \ + u_atomic.c \ + u_cpu_detect.c \ + u_math.c \ + u_queue.c \ + u_process.c \ + u_vector.c \ + vma.c + CPPFLAGS.format_srgb.c+= -I${X11SRCDIR.Mesa}/src/util CPPFLAGS.hash_table.c+= -I${X11SRCDIR.Mesa}/src/util CPPFLAGS.MESAralloc.c+= -I${X11SRCDIR.Mesa}/src/util +CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \ +-I${X11SRCDIR.Mesa}/src/mesa \ +-I${X11SRCDIR.Mesa}/src \ +-I${X11SRCDIR.Mesa}/src/gallium/include -BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/ralloc.c MESAralloc.c +BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c SRCS+= ${SRCS.util} @@ -22,3 +50,6 @@ SRCS+= ${SRCS.util} .PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common SRCS+= utils.c dri_util.c xmlconfig.c SRCS+= megadriver_stub.c + +CPPFLAGS.dri_util.c+= -I${X11SRCDIR.Mesa}/../src/util + Index: src/external/mit/xorg/lib/libglsl.old.mk diff -u src/external/mit/xorg/lib/libglsl.old.mk:1.1 src/external/mit/xorg/lib/libglsl.old.mk:1.2 --- src/external/mit/xorg/lib/libglsl.old.mk:1.1 Sun Mar 10 02:29:52 2019 +++ src/external/mit/xorg/lib/libglsl.old.mk Sun Jul 11 20:53:35 2021 @@ -1,10 +1,21 @@ -# $NetBSD: libglsl.old.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $ +# $NetBSD: libglsl.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $ LIBGLSL_GENERATED_CXX_FILES = \ glsl_lexer.cpp \ glsl_parser.cpp -COPTS.glsl_lexer.cpp+= -Wno-deprecated-register +#COPTS.glsl_lexer.cpp+= -Wno-deprecated-register +COPTS.vtn_glsl450.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :} + +CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/compiler \ + -I${X11SRCDIR.Mesa}/../src/compiler \ + -I${X11SRCDIR.Mesa}/src/compiler/nir \ + -I${X11SRCDIR.Mesa}/../src/compiler/nir \ + -I${X11SRCDIR.Mesa}/src/compiler/glsl \ + -I${X11SRCDIR.Mesa}/../src/compiler/glsl \ + -I${X11SRCDIR.Mesa}/src/compiler/glsl/glcpp \ + -I${X11SRCDIR.Mesa}/../src/compiler/glsl/glcpp \ + -I${X11SRCDIR.Mesa}/src/compiler/spirv LIBGLSL_FILES = \ ast_array_index.cpp \ @@ -15,23 +26,34 @@ LIBGLSL_FILES = \ builtin_functions.cpp \ builtin_types.cpp \ builtin_variables.cpp \ + generate_ir.cpp \ + gl_nir_lower_atomics.c \ + gl_nir_link_atomics.c \ + gl_nir_link_uniform_initializers.c \ + gl_nir_link_uniforms.c \ + gl_nir_link_xfb.c \ + gl_nir_linker.c \ + gl_nir_lower_bindless_images.c \ + gl_nir_lower_buffers.c \ + gl_nir_lower_samplers.c \ + gl_nir_lower_samplers_as_deref.c \ glsl_parser_extras.cpp \ -
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Sun Jul 11 20:52:07 UTC 2021 Modified Files: src/external/mit/xorg/include: Makefile src/external/mit/xorg/lib: Makefile mesa-which.mk src/external/mit/xorg/lib/dri: Makefile src/external/mit/xorg/lib/gallium: Makefile src/external/mit/xorg/lib/libGL: Makefile src/external/mit/xorg/lib/libGLU: Makefile src/external/mit/xorg/lib/libGLw: Makefile src/external/mit/xorg/lib/libgbm: Makefile src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile Log Message: xorg/lib stuff to enable mesa.old, prepare for new mesa - rename OLD_PREFIX to OLD_SUFFIX, since it is - include mesa-which.mk and use ${OLD_SUFFIX} in several places - remove mesa < 18 support To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/include/Makefile cvs rdiff -u -r1.55 -r1.56 src/external/mit/xorg/lib/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/mesa-which.mk cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/dri/Makefile cvs rdiff -u -r1.47 -r1.48 src/external/mit/xorg/lib/gallium/Makefile cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/libGL/Makefile cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/libGLU/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libGLw/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libgbm/Makefile cvs rdiff -u -r1.13 -r1.14 \ 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/include/Makefile diff -u src/external/mit/xorg/include/Makefile:1.9 src/external/mit/xorg/include/Makefile:1.10 --- src/external/mit/xorg/include/Makefile:1.9 Sun Mar 10 13:52:11 2019 +++ src/external/mit/xorg/include/Makefile Sun Jul 11 20:52:06 2021 @@ -1,15 +1,13 @@ -# $NetBSD: Makefile,v 1.9 2019/03/10 13:52:11 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2021/07/11 20:52:06 mrg Exp $ # *proto packages for xorg .include -.if ${HAVE_MESA_VER} == 18 -SUBDIR= KHR -.endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm" SUBDIR+= libvdpau .endif +SUBDIR+= KHR SUBDIR+= xorgproto xbitmaps xcb-proto SUBDIR+= .WAIT xtrans Index: src/external/mit/xorg/lib/Makefile diff -u src/external/mit/xorg/lib/Makefile:1.55 src/external/mit/xorg/lib/Makefile:1.56 --- src/external/mit/xorg/lib/Makefile:1.55 Sun Jul 11 01:13:26 2021 +++ src/external/mit/xorg/lib/Makefile Sun Jul 11 20:52:06 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2021/07/11 01:13:26 mrg Exp $ +# $NetBSD: Makefile,v 1.56 2021/07/11 20:52:06 mrg Exp $ # build libraries for xorg @@ -6,7 +6,7 @@ .include "mesa-which.mk" -SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_PREFIX} \ +SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_SUFFIX} \ libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" SUBDIR+=libdrm_intel @@ -23,7 +23,7 @@ SUBDIR+=libxcb \ libX11 \ .WAIT .if !defined(MLIBDIR) -SUBDIR+=dri${OLD_PREFIX} gallium${OLD_PREFIX} +SUBDIR+=dri${OLD_SUFFIX} gallium${OLD_SUFFIX} .endif SUBDIR+=fontconfig libSM \ .WAIT \ @@ -36,7 +36,7 @@ SUBDIR+=libvdpau \ .WAIT .endif SUBDIR+=libXi libXxf86vm \ - libGL${OLD_PREFIX} libXScrnSaver libXfont libXfont2 \ + libGL${OLD_SUFFIX} libXScrnSaver libXfont libXfont2 \ libXinerama libXmu libXmuu libXpm libXrender \ libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \ libxkbui \ @@ -54,7 +54,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib .WAIT \ libXdmGreet \ xcb-util -SUBDIR+=libgbm${OLD_PREFIX} +SUBDIR+=libgbm${OLD_SUFFIX} .if ${HAVE_XORG_GLAMOR} != "no" # libEGL depends upon libgbm SUBDIR+=.WAIT libEGL Index: src/external/mit/xorg/lib/mesa-which.mk diff -u src/external/mit/xorg/lib/mesa-which.mk:1.2 src/external/mit/xorg/lib/mesa-which.mk:1.3 --- src/external/mit/xorg/lib/mesa-which.mk:1.2 Sun Jul 11 01:13:26 2021 +++ src/external/mit/xorg/lib/mesa-which.mk Sun Jul 11 20:52:06 2021 @@ -1,6 +1,6 @@ -# $NetBSD: mesa-which.mk,v 1.2 2021/07/11 01:13:26 mrg Exp $ +# $NetBSD: mesa-which.mk,v 1.3 2021/07/11 20:52:06 mrg Exp $ -OLD_PREFIX= +OLD_SUFFIX= .if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old" -OLD_PREFIX=.old +OLD_SUFFIX=.old .endif Index: src/external/mit/xorg/lib/dri/Makefile diff -u src/external/mit/xorg/lib/dri/Makefile:1.37 src/external/mit/xorg/lib/dri/Makefile:1.38 --- src/external/mit/xorg/lib/dri/Makefile:1.37 Tue Apr 13 04:58:59 2021 +++ src/external/mit/xorg/lib/dri/Makefile Sun Jul 11 20:52:06 2021 @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.37 2021/04/13 04:58:59 mrg Exp $ +# $NetBSD: Makefile,v 1.38 2021/07/11 20:52:06 mrg Exp $ # Link the mesa_dri_drivers mega driver. .include +.include "../mesa-which.mk" + .if ${MACHINE_ARCH} == "i386" ||
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: mrg Date: Sun Jul 11 01:13:27 UTC 2021 Modified Files: src/external/mit/xorg/lib: Makefile mesa-which.mk Removed Files: src/external/mit/xorg/lib/dri7: Makefile dri.mk libglsl7.mk libmesa7.mk src/external/mit/xorg/lib/dri7/libmesa: Makefile src/external/mit/xorg/lib/dri7/r300: Makefile Log Message: remove dead mesa7 support. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/external/mit/xorg/lib/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/mesa-which.mk cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/dri7/Makefile \ src/external/mit/xorg/lib/dri7/dri.mk \ src/external/mit/xorg/lib/dri7/libmesa7.mk cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/dri7/libglsl7.mk cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/dri7/libmesa/Makefile cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/dri7/r300/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/Makefile diff -u src/external/mit/xorg/lib/Makefile:1.54 src/external/mit/xorg/lib/Makefile:1.55 --- src/external/mit/xorg/lib/Makefile:1.54 Wed Oct 28 08:10:10 2020 +++ src/external/mit/xorg/lib/Makefile Sun Jul 11 01:13:26 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2020/10/28 08:10:10 nia Exp $ +# $NetBSD: Makefile,v 1.55 2021/07/11 01:13:26 mrg Exp $ # build libraries for xorg @@ -23,7 +23,7 @@ SUBDIR+=libxcb \ libX11 \ .WAIT .if !defined(MLIBDIR) -SUBDIR+=${EXTRA_DRI_DIRS} dri${OLD_PREFIX} gallium${OLD_PREFIX} +SUBDIR+=dri${OLD_PREFIX} gallium${OLD_PREFIX} .endif SUBDIR+=fontconfig libSM \ .WAIT \ Index: src/external/mit/xorg/lib/mesa-which.mk diff -u src/external/mit/xorg/lib/mesa-which.mk:1.1 src/external/mit/xorg/lib/mesa-which.mk:1.2 --- src/external/mit/xorg/lib/mesa-which.mk:1.1 Sun Mar 10 02:29:52 2019 +++ src/external/mit/xorg/lib/mesa-which.mk Sun Jul 11 01:13:26 2021 @@ -1,7 +1,6 @@ -# $NetBSD: mesa-which.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $ +# $NetBSD: mesa-which.mk,v 1.2 2021/07/11 01:13:26 mrg Exp $ OLD_PREFIX= .if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old" OLD_PREFIX=.old -EXTRA_DRI_DIRS=dri7 .endif
CVS commit: src/external/mit/xorg/lib/libdrm
Module Name:src Committed By: mrg Date: Sun Jul 11 00:43:40 UTC 2021 Modified Files: src/external/mit/xorg/lib/libdrm: Makefile Log Message: also look in dist/../include. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/libdrm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libdrm/Makefile diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.17 src/external/mit/xorg/lib/libdrm/Makefile:1.18 --- src/external/mit/xorg/lib/libdrm/Makefile:1.17 Mon Aug 12 14:21:54 2019 +++ src/external/mit/xorg/lib/libdrm/Makefile Sun Jul 11 00:43:40 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/08/12 14:21:54 maya Exp $ +# $NetBSD: Makefile,v 1.18 2021/07/11 00:43:40 mrg Exp $ .include @@ -10,7 +10,7 @@ SRCS= xf86drm.c xf86drmHash.c xf86drmMod INCS= xf86drm.h xf86drmMode.h libsync.h INCSDIR=${X11INCDIR} -CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm +CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm -I${X11SRCDIR.${LIB}}/../include SUBDIR= drm kms
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/lib/libXaw
Module Name:src Committed By: joerg Date: Sun May 30 02:20:09 UTC 2021 Modified Files: src/external/mit/xorg/lib/libXaw: Makefile Makefile.common Log Message: Ignore pointer cast warnings for clang, too. Use -Wno-format more selectively. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libXaw/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXaw/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libXaw/Makefile diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.16 src/external/mit/xorg/lib/libXaw/Makefile:1.17 --- src/external/mit/xorg/lib/libXaw/Makefile:1.16 Mon Apr 26 21:53:53 2021 +++ src/external/mit/xorg/lib/libXaw/Makefile Sun May 30 02:20:09 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2021/04/26 21:53:53 mrg Exp $ +# $NetBSD: Makefile,v 1.17 2021/05/30 02:20:09 joerg Exp $ .include @@ -66,5 +66,3 @@ X11EXTRAMANTRANSFORMS+= \ .include .include - -CWARNFLAGS.clang+= -Wno-format Index: src/external/mit/xorg/lib/libXaw/Makefile.common diff -u src/external/mit/xorg/lib/libXaw/Makefile.common:1.2 src/external/mit/xorg/lib/libXaw/Makefile.common:1.3 --- src/external/mit/xorg/lib/libXaw/Makefile.common:1.2 Tue May 4 17:47:05 2021 +++ src/external/mit/xorg/lib/libXaw/Makefile.common Sun May 30 02:20:09 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2021/05/04 17:47:05 rillig Exp $ +# $NetBSD: Makefile.common,v 1.3 2021/05/30 02:20:09 joerg Exp $ CPPFLAGS+= -DHAVE_WCHAR_H \ -DHAVE_WCTYPE_H \ @@ -17,5 +17,8 @@ LIBDPLIBS=\ Xext ${.CURDIR}/../libXext \ X11 ${.CURDIR}/../libX11/dynamic +COPTS.Converters.c+= ${${ACTIVE_CC} == "clang":? -Wno-format :} COPTS.Pixmap.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :} +COPTS.Pixmap.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :} COPTS.TextAction.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :} +COPTS.TextAction.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :}
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/lib/libXaw
Module Name:src Committed By: rillig Date: Tue May 4 17:47:05 UTC 2021 Modified Files: src/external/mit/xorg/lib/libXaw: Makefile.common Log Message: libXaw: fix Clang build --- Pixmap.pico --- error: unknown warning option '-Wno-discarded-qualifiers'; did you mean '-Wno-ignored-qualifiers'? [-Werror,-Wunknown-warning-option] To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXaw/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libXaw/Makefile.common diff -u src/external/mit/xorg/lib/libXaw/Makefile.common:1.1 src/external/mit/xorg/lib/libXaw/Makefile.common:1.2 --- src/external/mit/xorg/lib/libXaw/Makefile.common:1.1 Mon Apr 26 21:53:53 2021 +++ src/external/mit/xorg/lib/libXaw/Makefile.common Tue May 4 17:47:05 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2021/04/26 21:53:53 mrg Exp $ +# $NetBSD: Makefile.common,v 1.2 2021/05/04 17:47:05 rillig Exp $ CPPFLAGS+= -DHAVE_WCHAR_H \ -DHAVE_WCTYPE_H \ @@ -17,5 +17,5 @@ LIBDPLIBS=\ Xext ${.CURDIR}/../libXext \ X11 ${.CURDIR}/../libX11/dynamic -COPTS.Pixmap.c+= -Wno-discarded-qualifiers -COPTS.TextAction.c+= -Wno-discarded-qualifiers +COPTS.Pixmap.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :} +COPTS.TextAction.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src Committed By: nakayama Date: Mon May 3 08:44:05 UTC 2021 Modified Files: src/external/mit/xorg/server/xorg-server.old: Makefile.serverlib Makefile.servermod Log Message: Remove duplicate lines. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib \ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.4 --- src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3 Tue Apr 13 07:53:59 2021 +++ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib Mon May 3 08:44:05 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.serverlib,v 1.3 2021/04/13 07:53:59 mrg Exp $ +# $NetBSD: Makefile.serverlib,v 1.4 2021/05/03 08:44:05 nakayama Exp $ .include # for NETBSDSRCDIR and mk.conf processing @@ -27,6 +27,3 @@ CPPFLAGS+= -D__GLX_ALIGN64 # IOPortBase is particularly annoying to fix COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :} - -# IOPortBase is particularly annoying to fix -COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :} Index: src/external/mit/xorg/server/xorg-server.old/Makefile.servermod diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.4 --- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3 Tue Apr 13 07:53:59 2021 +++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Mon May 3 08:44:05 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.servermod,v 1.3 2021/04/13 07:53:59 mrg Exp $ +# $NetBSD: Makefile.servermod,v 1.4 2021/05/03 08:44:05 nakayama Exp $ .include # For /etc/mk.conf processing @@ -25,7 +25,4 @@ CPPFLAGS+= ${X11FLAGS.LOADABLE} .endif # IOPortBase is particularly annoying to fix - -# IOPortBase is particularly annoying to fix -COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :} COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Tue Apr 27 03:58:55 UTC 2021 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile base base.lst evdev evdev.lst Log Message: updates for xkeyboard-config 2.32. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.14 -r1.15 \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.9 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 Sun Nov 1 12:07:09 2020 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Tue Apr 27 03:58:55 2021 @@ -1,11 +1,11 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG @miscmansuffix@ @vendorversion@ +.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.32" "X Version 11" .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION xkeyboard-config provides the description files for the X Keyboard Extension (XKB). The configuration options below are usually applied with -setxkbmap(@appmansuffix@). +setxkbmap(1). .SH MODELS .TS left,box; @@ -203,8 +203,6 @@ teck227 Truly Ergonomic 227 teck229 Truly Ergonomic 229 apex300 SteelSeries Apex 300 (Apex RAW) chromebook Chromebook -teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys) -teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key) .TE .SH LAYOUTS @@ -221,6 +219,7 @@ us(euro) English (US, euro on 5) us(intl) English (US, intl., with dead keys) us(alt-intl) English (US, alt. intl.) us(colemak) English (Colemak) +us(colemak_dh) English (Colemak-DH) us(dvorak) English (Dvorak) us(dvorak-intl) English (Dvorak, intl., with dead keys) us(dvorak-alt-intl) English (Dvorak, alt. intl.) @@ -273,7 +272,6 @@ am(eastern-alt) Armenian (alt. eastern) _ at German (Austria) at(nodeadkeys) German (Austria, no dead keys) -at(sundeadkeys) German (Austria, Sun dead keys) at(mac) German (Austria, Macintosh) _ @@ -294,10 +292,8 @@ _ be Belgian be(oss) Belgian (alt.) be(oss_latin9) Belgian (Latin-9 only, alt.) -be(oss_sundeadkeys) Belgian (Sun dead keys, alt.) be(iso-alternate) Belgian (ISO, alt.) be(nodeadkeys) Belgian (no dead keys) -be(sundeadkeys) Belgian (Sun dead keys) be(wang) Belgian (Wang 724 AZERTY) _ @@ -340,7 +336,7 @@ in(hin-kagapa) Hindi (KaGaPa, phonetic) in(san-kagapa) Sanskrit (KaGaPa, phonetic) in(mar-kagapa) Marathi (KaGaPa, phonetic) in(eng) English (India, with rupee) -in(iipa) Indic (phonetic, IPA) +in(iipa) Indic IPA in(marathi) Marathi (enhanced Inscript) _ @@ -366,11 +362,11 @@ bg(bas_phonetic) Bulgarian (new phonetic bg(bekl) Bulgarian (enhanced) _ -dz Kabylian (azerty layout, no dead keys) -dz(azerty-deadkeys) Kabylian (azerty layout, with dead keys) -dz(qwerty-gb-deadkeys) Kabylian (qwerty-gb layout, with dead keys) -dz(qwerty-us-deadkeys) Kabylian (qwerty-us layout, with dead keys) -dz(ber) Kabylian (Algeria, Tifinagh) +dz Berber (Algeria, Latin) +dz(azerty-deadkeys) Kabyle (azerty layout, dead keys) +dz(qwerty-gb-deadkeys) Kabyle (qwerty-gb layout, dead keys) +dz(qwerty-us-deadkeys) Kabyle (qwerty-us layout, dead keys) +dz(ber) Berber (Algeria, Tifinagh) dz(ar) Arabic (Algeria) _ @@ -449,7 +445,6 @@ dk(dvorak) Danish (Dvorak) _ nl Dutch -nl(sundeadkeys) Dutch (Sun dead keys) nl(mac) Dutch (Macintosh) nl(std) Dutch (standard) @@ -492,14 +487,11 @@ fi(mac) Finnish (Macintosh) _ fr French fr(nodeadkeys) French (no dead keys) -fr(sundeadkeys) French (Sun dead keys) fr(oss) French (alt.) fr(oss_latin9) French (alt., Latin-9 only) fr(oss_nodeadkeys) French (alt., no dead keys) -fr(oss_sundeadkeys) French (alt., Sun dead keys) fr(latin9) French (legacy, alt.) fr(latin9_nodeadkeys) French (legacy, alt., no dead keys) -fr(latin9_sundeadkeys) French (legacy, alt., Sun dead keys) fr(bepo) French (BEPO) fr(bepo_latin9) French (BEPO, Latin-9 only) fr(bepo_afnor) French (BEPO, AFNOR) @@ -524,7 +516,7 @@ gh(avn) Avatime gh(gillbt) English (Ghana, GILLBT) _ -gn French (Guinea) +gn N'Ko (azerty) _ ge Georgian @@ -545,7 +537,6 @@ de(us) German (US) de(ro) Romanian (Germany)
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src Committed By: mrg Date: Tue Apr 27 02:11:55 UTC 2021 Modified Files: src/external/mit/xorg/bin/xterm: Makefile Log Message: disable attribute warnings. new libXt triggers them for now.. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/bin/xterm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xterm/Makefile diff -u src/external/mit/xorg/bin/xterm/Makefile:1.21 src/external/mit/xorg/bin/xterm/Makefile:1.22 --- src/external/mit/xorg/bin/xterm/Makefile:1.21 Wed Feb 17 03:06:07 2021 +++ src/external/mit/xorg/bin/xterm/Makefile Tue Apr 27 02:11:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2021/02/17 03:06:07 mrg Exp $ +# $NetBSD: Makefile,v 1.22 2021/04/27 02:11:55 mrg Exp $ .include @@ -24,6 +24,7 @@ CPPFLAGS+= -I. \ ${X11FLAGS.VERSION} CWARNFLAGS.clang+= -Wno-empty-body +CWARNFLAGS.gcc+= -Wno-error=attributes APPDEFS=XTerm.ad XTerm-color.ad
CVS commit: src/external/mit/xorg/bin
Module Name:src Committed By: mrg Date: Mon Apr 26 22:04:51 UTC 2021 Modified Files: src/external/mit/xorg/bin/xdm/chooser: Makefile src/external/mit/xorg/bin/xsm: Makefile Log Message: make build with new libXt. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/chooser/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xsm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/chooser/Makefile diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.6 --- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5 Wed Mar 6 12:40:23 2019 +++ src/external/mit/xorg/bin/xdm/chooser/Makefile Mon Apr 26 22:04:51 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/03/06 12:40:23 nakayama Exp $ +# $NetBSD: Makefile,v 1.6 2021/04/26 22:04:51 mrg Exp $ NOMAN= 1 @@ -6,7 +6,8 @@ NOMAN= 1 PROG= chooser -CPPFLAGS.chooser.c+= -DBSD44SOCKETS -DRETSIGTYPE=void +CPPFLAGS+= -DBSD44SOCKETS -DRETSIGTYPE=void +CPPFLAGS+= -D_CONST_X_STRING=1 APPDEFS=Chooser @@ -21,3 +22,6 @@ BINDIR= ${XDMCHOOSERPATH:H} .include .PATH: ${X11SRCDIR.xdm}/app-defaults + +# XXX libXt +COPTS.chooser.c+= -Wno-incompatible-pointer-types Index: src/external/mit/xorg/bin/xsm/Makefile diff -u src/external/mit/xorg/bin/xsm/Makefile:1.3 src/external/mit/xorg/bin/xsm/Makefile:1.4 --- src/external/mit/xorg/bin/xsm/Makefile:1.3 Fri May 31 08:02:00 2013 +++ src/external/mit/xorg/bin/xsm/Makefile Mon Apr 26 22:04:51 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2021/04/26 22:04:51 mrg Exp $ .include @@ -26,5 +26,8 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L .PATH: ${X11SRCDIR.${PROG}} .PATH: ${X11SRCDIR.${PROG}}/man +# XXX libXt +COPTS+= -Wno-incompatible-pointer-types + .include .include
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: mrg Date: Mon Apr 26 21:53:54 UTC 2021 Modified Files: src/external/mit/xorg/lib/libXaw: Makefile src/external/mit/xorg/lib/libXaw6: Makefile Added Files: src/external/mit/xorg/lib/libXaw: Makefile.common Log Message: make libXaw6 build with the new libXt as well. consolidate common code. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/libXaw/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXaw/Makefile.common cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXaw6/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libXaw/Makefile diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.15 src/external/mit/xorg/lib/libXaw/Makefile:1.16 --- src/external/mit/xorg/lib/libXaw/Makefile:1.15 Mon Apr 26 21:43:19 2021 +++ src/external/mit/xorg/lib/libXaw/Makefile Mon Apr 26 21:53:53 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2021/04/26 21:43:19 mrg Exp $ +# $NetBSD: Makefile,v 1.16 2021/04/26 21:53:53 mrg Exp $ .include @@ -49,23 +49,14 @@ INCS= AllWidgets.h AsciiSink.h AsciiSink INCSDIR=${X11INCDIR}/X11/Xaw +.include "Makefile.common" -CPPFLAGS+= -DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM -CPPFLAGS+= -DHAVE_GETPAGESIZE -CPPFLAGS+= -DHAVE_UNISTD_H -CPPFLAGS+= -D_CONST_X_STRING=1 -CPPFLAGS+= -DPROJECT_ROOT=\"${X11ROOTDIR}\" -DXAW7 -CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xaw -CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions - -LIBDPLIBS=\ - Xmu ${.CURDIR}/../libXmu \ - Xt ${.CURDIR}/../libXt \ - SM ${.CURDIR}/../libSM \ - ICE ${.CURDIR}/../libICE \ - Xpm ${.CURDIR}/../libXpm \ - Xext ${.CURDIR}/../libXext \ - X11 ${.CURDIR}/../libX11/dynamic +CPPFLAGS+= -DXAW7 \ + -I${DESTDIR}${X11INCDIR}/X11/Xaw \ + -I${DESTDIR}${X11INCDIR}/X11/extensions + +LIBDPLIBS+=\ + Xpm ${.CURDIR}/../libXpm PKGCONFIG= xaw7 PKGDIST= ${LIBOLD} @@ -77,6 +68,3 @@ X11EXTRAMANTRANSFORMS+= \ .include CWARNFLAGS.clang+= -Wno-format - -COPTS.Pixmap.c+= -Wno-discarded-qualifiers -COPTS.TextAction.c+= -Wno-discarded-qualifiers Index: src/external/mit/xorg/lib/libXaw6/Makefile diff -u src/external/mit/xorg/lib/libXaw6/Makefile:1.10 src/external/mit/xorg/lib/libXaw6/Makefile:1.11 --- src/external/mit/xorg/lib/libXaw6/Makefile:1.10 Tue Jan 7 07:27:50 2020 +++ src/external/mit/xorg/lib/libXaw6/Makefile Mon Apr 26 21:53:54 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2020/01/07 07:27:50 mrg Exp $ +# $NetBSD: Makefile,v 1.11 2021/04/26 21:53:54 mrg Exp $ NOCHECKVER= yes # we want to install an older version ... MKLINKLIB= no @@ -19,18 +19,9 @@ SRCS= Actions.c AllWidgets.c AsciiSink.c TextSrc.c TextTr.c Toggle.c Tree.c Vendor.c Viewport.c \ XawI18n.c XawIm.c XawInit.c -CPPFLAGS+= -DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DOLDXAW \ - -DHAVE_GETPAGESIZE \ - -DHAVE_UNISTD_H \ - -DHAVE_ISWALNUM -DPROJECT_ROOT=\"${X11ROOTDIR}\" - -LIBDPLIBS=\ - Xmu ${.CURDIR}/../libXmu \ - Xt ${.CURDIR}/../libXt \ - SM ${.CURDIR}/../libSM \ - ICE ${.CURDIR}/../libICE \ - Xext ${.CURDIR}/../libXext \ - X11 ${.CURDIR}/../libX11/dynamic +.include "../libXaw/Makefile.common" + +CPPFLAGS+= -DOLDXAW PKGCONFIG= xaw6 PKGDIST= ${LIBOLD} Added files: Index: src/external/mit/xorg/lib/libXaw/Makefile.common diff -u /dev/null src/external/mit/xorg/lib/libXaw/Makefile.common:1.1 --- /dev/null Mon Apr 26 21:53:54 2021 +++ src/external/mit/xorg/lib/libXaw/Makefile.common Mon Apr 26 21:53:53 2021 @@ -0,0 +1,21 @@ +# $NetBSD: Makefile.common,v 1.1 2021/04/26 21:53:53 mrg Exp $ + +CPPFLAGS+= -DHAVE_WCHAR_H \ + -DHAVE_WCTYPE_H \ + -DNO_WIDEC_H \ + -DHAVE_ISWALNUM \ + -DHAVE_GETPAGESIZE \ + -DHAVE_UNISTD_H \ + -D_CONST_X_STRING=1 \ + -DPROJECT_ROOT=\"${X11ROOTDIR}\" + +LIBDPLIBS=\ + Xmu ${.CURDIR}/../libXmu \ + Xt ${.CURDIR}/../libXt \ + SM ${.CURDIR}/../libSM \ + ICE ${.CURDIR}/../libICE \ + Xext ${.CURDIR}/../libXext \ + X11 ${.CURDIR}/../libX11/dynamic + +COPTS.Pixmap.c+= -Wno-discarded-qualifiers +COPTS.TextAction.c+= -Wno-discarded-qualifiers
CVS commit: src/external/mit/xorg/lib/libXaw
Module Name:src Committed By: mrg Date: Mon Apr 26 21:43:19 UTC 2021 Modified Files: src/external/mit/xorg/lib/libXaw: Makefile Log Message: define _CONST_X_STRING. avoid remaining const issues new libXt. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libXaw/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libXaw/Makefile diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.14 src/external/mit/xorg/lib/libXaw/Makefile:1.15 --- src/external/mit/xorg/lib/libXaw/Makefile:1.14 Tue Jan 7 07:27:50 2020 +++ src/external/mit/xorg/lib/libXaw/Makefile Mon Apr 26 21:43:19 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2020/01/07 07:27:50 mrg Exp $ +# $NetBSD: Makefile,v 1.15 2021/04/26 21:43:19 mrg Exp $ .include @@ -53,6 +53,7 @@ INCSDIR=${X11INCDIR}/X11/Xaw CPPFLAGS+= -DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM CPPFLAGS+= -DHAVE_GETPAGESIZE CPPFLAGS+= -DHAVE_UNISTD_H +CPPFLAGS+= -D_CONST_X_STRING=1 CPPFLAGS+= -DPROJECT_ROOT=\"${X11ROOTDIR}\" -DXAW7 CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xaw CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions @@ -76,3 +77,6 @@ X11EXTRAMANTRANSFORMS+= \ .include CWARNFLAGS.clang+= -Wno-format + +COPTS.Pixmap.c+= -Wno-discarded-qualifiers +COPTS.TextAction.c+= -Wno-discarded-qualifiers
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: christos Date: Mon Apr 26 21:32:49 UTC 2021 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: Don't try to override an existing -march To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/pixman/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/pixman/Makefile diff -u src/external/mit/xorg/lib/pixman/Makefile:1.37 src/external/mit/xorg/lib/pixman/Makefile:1.38 --- src/external/mit/xorg/lib/pixman/Makefile:1.37 Sun Apr 25 19:23:19 2021 +++ src/external/mit/xorg/lib/pixman/Makefile Mon Apr 26 17:32:49 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2021/04/25 23:23:19 christos Exp $ +# $NetBSD: Makefile,v 1.38 2021/04/26 21:32:49 christos Exp $ NOLINT= 1 # defined @@ -90,7 +90,7 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f #CPPFLAGS+= -DUSE_ARM_IWMMXT .endif -.if !empty(MACHINE_ARCH:Mmips*64el) +.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*) # Loongson MMI SRCS+= pixman-mmx.c CPPFLAGS+= -DUSE_LOONGSON_MMI
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: christos Date: Sun Apr 25 23:23:19 UTC 2021 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: handle mipsn64el To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/external/mit/xorg/lib/pixman/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/pixman/Makefile diff -u src/external/mit/xorg/lib/pixman/Makefile:1.36 src/external/mit/xorg/lib/pixman/Makefile:1.37 --- src/external/mit/xorg/lib/pixman/Makefile:1.36 Tue Sep 15 01:14:19 2020 +++ src/external/mit/xorg/lib/pixman/Makefile Sun Apr 25 19:23:19 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2020/09/15 05:14:19 mrg Exp $ +# $NetBSD: Makefile,v 1.37 2021/04/25 23:23:19 christos Exp $ NOLINT= 1 # defined @@ -90,7 +90,7 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f #CPPFLAGS+= -DUSE_ARM_IWMMXT .endif -.if ${MACHINE_ARCH} == "mips64el" +.if !empty(MACHINE_ARCH:Mmips*64el) # Loongson MMI SRCS+= pixman-mmx.c CPPFLAGS+= -DUSE_LOONGSON_MMI
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src Committed By: mrg Date: Tue Apr 13 07:53:59 UTC 2021 Modified Files: src/external/mit/xorg/server/xorg-server.old: Makefile.serverlib Makefile.servermod Log Message: apply -fcommon here as well. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib \ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.2 src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.3 --- src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib:1.2 Mon Apr 12 03:57:06 2021 +++ src/external/mit/xorg/server/xorg-server.old/Makefile.serverlib Tue Apr 13 07:53:59 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.serverlib,v 1.2 2021/04/12 03:57:06 mrg Exp $ +# $NetBSD: Makefile.serverlib,v 1.3 2021/04/13 07:53:59 mrg Exp $ .include # for NETBSDSRCDIR and mk.conf processing @@ -27,3 +27,6 @@ CPPFLAGS+= -D__GLX_ALIGN64 # IOPortBase is particularly annoying to fix COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :} + +# IOPortBase is particularly annoying to fix +COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :} Index: src/external/mit/xorg/server/xorg-server.old/Makefile.servermod diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.2 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.3 --- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.2 Mon Apr 12 03:57:06 2021 +++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Tue Apr 13 07:53:59 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.servermod,v 1.2 2021/04/12 03:57:06 mrg Exp $ +# $NetBSD: Makefile.servermod,v 1.3 2021/04/13 07:53:59 mrg Exp $ .include # For /etc/mk.conf processing @@ -25,4 +25,7 @@ CPPFLAGS+= ${X11FLAGS.LOADABLE} .endif # IOPortBase is particularly annoying to fix + +# IOPortBase is particularly annoying to fix +COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :} COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Mon Mar 22 14:11:02 UTC 2021 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile Log Message: Remove -DHAVE_STRCASECMP from CPPFLAGS that is defined in dix-config.h. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.11 --- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.10 Sun Feb 7 16:56:00 2021 +++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Mon Mar 22 14:11:02 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2021/02/07 16:56:00 tsutsui Exp $ +# $NetBSD: Makefile,v 1.11 2021/03/22 14:11:02 tsutsui Exp $ .include @@ -33,7 +33,6 @@ CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXF86DRI -UXF86BIGFONT CPPFLAGS+= -UHAVE_XORG_CONFIG_H -CPPFLAGS+= -DHAVE_STRCASECMP CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\"
CVS commit: src/external/mit/xorg/bin/xterm/resize
Module Name:src Committed By: rin Date: Sat Feb 27 21:13:09 UTC 2021 Removed Files: src/external/mit/xorg/bin/xterm/resize: Makefile Log Message: Clean up file obsoleted by migration to usr.bin/resize. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/external/mit/xorg/bin/xterm/resize/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/lib/gallium
Module Name:src Committed By: joerg Date: Tue Feb 23 15:16:43 UTC 2021 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Don't hard-code LLVM version, but pick it up from build glue. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/gallium/Makefile diff -u src/external/mit/xorg/lib/gallium/Makefile:1.44 src/external/mit/xorg/lib/gallium/Makefile:1.45 --- src/external/mit/xorg/lib/gallium/Makefile:1.44 Sat Apr 4 03:04:58 2020 +++ src/external/mit/xorg/lib/gallium/Makefile Tue Feb 23 15:16:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2020/04/04 03:04:58 christos Exp $ +# $NetBSD: Makefile,v 1.45 2021/02/23 15:16:43 joerg Exp $ # Link the gallium mega driver. @@ -1114,8 +1114,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse CPPFLAGS.i386+= -march=i586 CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}} -CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"9.0.0\" -CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"9.0.0\" +CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\" +CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\" .include "../driver.mk"
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src Committed By: mrg Date: Wed Feb 17 03:06:07 UTC 2021 Modified Files: src/external/mit/xorg/bin/xterm: Makefile Log Message: remove -DOPT_* from here (now in xtermcfg.h). restore comment lost in rev 1.18. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/bin/xterm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xterm/Makefile diff -u src/external/mit/xorg/bin/xterm/Makefile:1.20 src/external/mit/xorg/bin/xterm/Makefile:1.21 --- src/external/mit/xorg/bin/xterm/Makefile:1.20 Thu Feb 11 12:30:08 2021 +++ src/external/mit/xorg/bin/xterm/Makefile Wed Feb 17 03:06:07 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2021/02/11 12:30:08 mrg Exp $ +# $NetBSD: Makefile,v 1.21 2021/02/17 03:06:07 mrg Exp $ .include @@ -10,6 +10,9 @@ SRCS= button.c charproc.c charsets.c cur charclass.c precompose.c wcwidth.c xutf8.c cachedGCs.c xtermcap.c \ svg.c html.c version.c +# XXX +# xterm.appdata.xml + CPPFLAGS+= -I. \ -I${X11SRCDIR.${PROG}} \ -I${X11SRCDIR.${PROG}}/../include \ @@ -17,8 +20,6 @@ CPPFLAGS+= -I. \ -I${DESTDIR}${X11INCDIR}/freetype2/freetype \ -DPROJECTROOT=${X11ROOTDIR} \ -DHAVE_CONFIG_H \ - -DOPT_GRAPHICS \ - -DOPT_SIXEL_GRAPHICS \ -D_REENTRANT \ ${X11FLAGS.VERSION}
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src Committed By: mrg Date: Thu Feb 11 12:30:08 UTC 2021 Modified Files: src/external/mit/xorg/bin/xterm: Makefile Log Message: add new files for xterm 366. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/bin/xterm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xterm/Makefile diff -u src/external/mit/xorg/bin/xterm/Makefile:1.19 src/external/mit/xorg/bin/xterm/Makefile:1.20 --- src/external/mit/xorg/bin/xterm/Makefile:1.19 Sun Dec 27 21:13:18 2020 +++ src/external/mit/xorg/bin/xterm/Makefile Thu Feb 11 12:30:08 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2020/12/27 21:13:18 reinoud Exp $ +# $NetBSD: Makefile,v 1.20 2021/02/11 12:30:08 mrg Exp $ .include @@ -8,7 +8,7 @@ SRCS= button.c charproc.c charsets.c cur misc.c print.c ptydata.c screen.c scrollback.c scrollbar.c tabs.c \ util.c xstrings.c TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c \ charclass.c precompose.c wcwidth.c xutf8.c cachedGCs.c xtermcap.c \ - version.c + svg.c html.c version.c CPPFLAGS+= -I. \ -I${X11SRCDIR.${PROG}} \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Sun Feb 7 16:56:00 UTC 2021 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile Log Message: Build mouseEmu3btn.c for added Emulate3Buttons support. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.10 --- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.9 Wed Aug 5 15:48:09 2020 +++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Sun Feb 7 16:56:00 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2020/08/05 15:48:09 tsutsui Exp $ +# $NetBSD: Makefile,v 1.10 2021/02/07 16:56:00 tsutsui Exp $ .include @@ -18,6 +18,7 @@ WARNS?= 2 .PATH: ${X11SRCDIR.xorg-server}/hw/netbsd/x68k SRCS= x68kInit.c x68kConfig.c x68kIo.c x68kMouse.c x68kKbd.c x68kKeyMap.c \ x68kFb.c x68kGraph.c x68kText.c +SRCS+= mouseEmu3btn.c .PATH: ${X11SRCDIR.xorg-server}/Xi SRCS+= stubs.c
CVS commit: src/external/mit/xorg/include/xorgproto/X11/extensions
Module Name:src Committed By: nia Date: Sat Dec 5 21:36:21 UTC 2020 Modified Files: src/external/mit/xorg/include/xorgproto/X11/extensions: Makefile Log Message: Don't install header marked obsolete pointed out by mrg To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile diff -u src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.2 src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.3 --- src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.2 Sun Feb 23 09:10:50 2020 +++ src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile Sat Dec 5 21:36:21 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2020/02/23 09:10:50 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2020/12/05 21:36:21 nia Exp $ .include @@ -15,7 +15,6 @@ INCS= EVI.h \ XKBsrv.h \ XKBstr.h \ XResproto.h \ - Xeviestr.h \ Xv.h \ XvMC.h \ XvMCproto.h \
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src Committed By: nia Date: Sat Nov 7 18:12:16 UTC 2020 Modified Files: src/external/mit/xorg/lib/libepoxy: Makefile Log Message: libepoxy: Only require egl on ports with egl support. Reported by martin. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libepoxy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libepoxy/Makefile diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.8 src/external/mit/xorg/lib/libepoxy/Makefile:1.9 --- src/external/mit/xorg/lib/libepoxy/Makefile:1.8 Mon Nov 2 06:25:24 2020 +++ src/external/mit/xorg/lib/libepoxy/Makefile Sat Nov 7 18:12:16 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/11/02 06:25:24 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2020/11/07 18:12:16 nia Exp $ .include @@ -40,8 +40,15 @@ PKGCONFIG_SED_FLAGS= \ -e "s,@DLOPEN_LIBS@,," \ -e "s,@epoxy_has_glx@,1," \ -e "s,@epoxy_has_egl@,${EGL}," \ - -e "s,@epoxy_has_wgl@,0," \ + -e "s,@epoxy_has_wgl@,0," + +.if ${HAVE_XORG_GLAMOR} != "no" +PKGCONFIG_SED_FLAGS+= \ -e "s,@GL_REQS@, gl egl," +.else +PKGCONFIG_SED_FLAGS+= \ + -e "s,@GL_REQS@, gl," +.endif .include .include
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Thu Nov 5 16:06:41 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile Log Message: Cherry-pick Xorg version independent changes from xorg-server. Reorganize CPPFLAGS. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile diff -u src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.3 --- src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2 Sat Jul 18 15:24:31 2020 +++ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Thu Nov 5 16:06:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2020/07/18 15:24:31 tsutsui Exp $ +# $NetBSD: Makefile,v 1.3 2020/11/05 16:06:41 tsutsui Exp $ .include @@ -31,16 +31,14 @@ SRCS+= miinitext.c .PATH: ${X11SRCDIR.xorg-server}/fb SRCS+= fbcmap_mi.c -CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ - -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \ - -I${X11SRCDIR.xorg-server}/fb \ - -I${X11SRCDIR.xorg-server}/mi \ - -I${X11SRCDIR.xorg-server}/render \ - -I${DESTDIR}${X11INCDIR}/X11 +CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \ + ${X11INCS.DIX} CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ -UXF86DRI -UXF86BIGFONT +CPPFLAGS+= -UHAVE_XORG_CONFIG_H + CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\" .include "../../../Makefile.Xserver"
CVS commit: src/external/mit/xorg/lib/fontconfig/etc/conf.avail
Module Name:src Committed By: nia Date: Thu Nov 5 12:13:02 UTC 2020 Modified Files: src/external/mit/xorg/lib/fontconfig/etc/conf.avail: 70-no-bitmap-webfonts.conf Log Message: Also deny bitmap Lucida, Utopia from being selected through fontconfig. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf:1.1 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf:1.2 --- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf:1.1 Sat Oct 10 09:17:33 2020 +++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf Thu Nov 5 12:13:02 2020 @@ -1,5 +1,5 @@ - +
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src Committed By: mrg Date: Mon Nov 2 06:25:24 UTC 2020 Modified Files: src/external/mit/xorg/lib/libepoxy: Makefile Log Message: ensure PLATFORM_HAS_EGL and ENABLE_EGL are set consistently. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libepoxy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libepoxy/Makefile diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.7 src/external/mit/xorg/lib/libepoxy/Makefile:1.8 --- src/external/mit/xorg/lib/libepoxy/Makefile:1.7 Mon Nov 2 04:48:54 2020 +++ src/external/mit/xorg/lib/libepoxy/Makefile Mon Nov 2 06:25:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2020/11/02 04:48:54 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2020/11/02 06:25:24 mrg Exp $ .include @@ -17,11 +17,12 @@ SRCS= \ SRCS+= \ dispatch_egl.c \ egl_generated_dispatch.c -CPPFLAGS+= -DENABLE_EGL=1 EGL=1 .else EGL=0 .endif +CPPFLAGS+= -DPLATFORM_HAS_EGL=${EGL} +CPPFLAGS+= -DENABLE_EGL=${EGL} INCSDIR=${X11INCDIR}/epoxy INCS= \
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src Committed By: mrg Date: Mon Nov 2 04:48:54 UTC 2020 Modified Files: src/external/mit/xorg/lib/libepoxy: Makefile Log Message: adjust for libepoxy 1.5.4. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libepoxy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libepoxy/Makefile diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.6 src/external/mit/xorg/lib/libepoxy/Makefile:1.7 --- src/external/mit/xorg/lib/libepoxy/Makefile:1.6 Wed Jul 10 21:32:22 2019 +++ src/external/mit/xorg/lib/libepoxy/Makefile Mon Nov 2 04:48:54 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/07/10 21:32:22 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2020/11/02 04:48:54 mrg Exp $ .include @@ -17,7 +17,7 @@ SRCS= \ SRCS+= \ dispatch_egl.c \ egl_generated_dispatch.c -CPPFLAGS+= -DPLATFORM_HAS_EGL=1 +CPPFLAGS+= -DENABLE_EGL=1 EGL=1 .else EGL=0 @@ -36,10 +36,11 @@ CPPFLAGS+= ${X11FLAGS.CONNECTION} PKGCONFIG= epoxy PKGCONFIG_SED_FLAGS= \ --e "s,@DLOPEN_LIBS@,," \ --e "s,@epoxy_has_glx@,1," \ --e "s,@epoxy_has_egl@,${EGL}," \ --e "s,@epoxy_has_wgl@,0," + -e "s,@DLOPEN_LIBS@,," \ + -e "s,@epoxy_has_glx@,1," \ + -e "s,@epoxy_has_egl@,${EGL}," \ + -e "s,@epoxy_has_wgl@,0," \ + -e "s,@GL_REQS@, gl egl," .include .include
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Mon Nov 2 00:25:46 UTC 2020 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: Makefile Log Message: transform @xkb_base@ instead of __xkb_base__ now. should fix build issues reported on -current. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/lib/xkeyboard-config/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.13 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.14 --- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.13 Mon Mar 11 06:25:55 2019 +++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Mon Nov 2 00:25:46 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/03/11 06:25:55 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2020/11/02 00:25:46 mrg Exp $ .include @@ -12,7 +12,7 @@ NOOBJ= # defined PKGCONFIG= xkeyboard-config X11EXTRAMANTRANSFORMS+= \ - __xkb_base__ ${X11LIBDIR}/xkb + @xkb_base@ ${X11LIBDIR}/xkb .include .include
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Nov 1 12:07:09 UTC 2020 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile Log Message: merge new xkeyboard-config 2.31 parts. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.14 -r1.15 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 Thu Mar 12 21:55:31 2020 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Sun Nov 1 12:07:09 2020 @@ -1,11 +1,11 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG __miscmansuffix__ __vendorversion__ +.TH XKEYBOARD-CONFIG @miscmansuffix@ @vendorversion@ .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION xkeyboard-config provides the description files for the X Keyboard Extension (XKB). The configuration options below are usually applied with -setxkbmap(__appmansuffix__). +setxkbmap(@appmansuffix@). .SH MODELS .TS left,box; @@ -13,10 +13,12 @@ lB lB ___ lB l. Model Description +pc86 Generic 86-key PC pc101 Generic 101-key PC -pc102 Generic 102-key PC (intl.) +pc102 Generic 102-key PC pc104 Generic 104-key PC -pc105 Generic 105-key PC (intl.) +pc104alt Generic 104-key PC with L-shaped Enter key +pc105 Generic 105-key PC dell101 Dell 101-key PC latitude Dell Latitude laptop dellm65 Dell Precision M65 laptop @@ -214,6 +216,7 @@ lB l. Layout(Variant) Description us English (US) us(chr) Cherokee +us(haw) Hawaiian us(euro) English (US, euro on 5) us(intl) English (US, intl., with dead keys) us(alt-intl) English (US, alt. intl.) @@ -225,10 +228,11 @@ us(dvorak-l) English (Dvorak, left-hande us(dvorak-r) English (Dvorak, right-handed) us(dvorak-classic) English (classic Dvorak) us(dvp) English (programmer Dvorak) +us(symbolic) English (US, Symbolic) us(rus) Russian (US, phonetic) us(mac) English (Macintosh) us(altgr-intl) English (intl., with AltGr dead keys) -us(olpc2) English (the divide/multiply keys toggle the layout) +us(olpc2) English (the divide/multiply toggle the layout) us(hbs) Serbo-Croatian (US) us(norman) English (Norman) us(workman) English (Workman) @@ -245,10 +249,10 @@ af(uz-olpc) Uzbek (Afghanistan, OLPC) _ ara Arabic ara(azerty) Arabic (AZERTY) -ara(azerty_digits) Arabic (AZERTY/digits) -ara(digits) Arabic (digits) +ara(azerty_digits) Arabic (AZERTY, Eastern Arabic numerals) +ara(digits) Arabic (Eastern Arabic numerals) ara(qwerty) Arabic (QWERTY) -ara(qwerty_digits) Arabic (qwerty/digits) +ara(qwerty_digits) Arabic (QWERTY, Eastern Arabic numerals) ara(buckwalter) Arabic (Buckwalter) ara(olpc) Arabic (OLPC) ara(mac) Arabic (Macintosh) @@ -269,7 +273,7 @@ am(eastern-alt) Armenian (alt. eastern) _ at German (Austria) at(nodeadkeys) German (Austria, no dead keys) -at(sundeadkeys) German (Austria, with Sun dead keys) +at(sundeadkeys) German (Austria, Sun dead keys) at(mac) German (Austria, Macintosh) _ @@ -283,15 +287,17 @@ _ by Belarusian by(legacy) Belarusian (legacy) by(latin) Belarusian (Latin) +by(ru) Russian (Belarus) +by(intl) Belarusian (intl.) _ be Belgian be(oss) Belgian (alt.) -be(oss_latin9) Belgian (alt., Latin-9 only) -be(oss_sundeadkeys) Belgian (alt., with Sun dead keys) -be(iso-alternate) Belgian (alt. ISO) +be(oss_latin9) Belgian (Latin-9 only, alt.) +be(oss_sundeadkeys) Belgian (Sun dead keys, alt.) +be(iso-alternate) Belgian (ISO, alt.) be(nodeadkeys) Belgian (no dead keys) -be(sundeadkeys) Belgian (with Sun dead keys) +be(sundeadkeys) Belgian (Sun dead keys) be(wang) Belgian (Wang 724 AZERTY) _ @@ -304,14 +310,14 @@ in(ben) Bangla (India) in(ben_probhat) Bangla (India, Probhat) in(ben_baishakhi) Bangla (India, Baishakhi) in(ben_bornona) Bangla (India, Bornona) -in(ben_gitanjali) Bangla (India, Uni Gitanjali) +in(ben_gitanjali) Bangla (India, Gitanjali) in(ben_inscript) Bangla (India, Baishakhi Inscript) in(eeyek) Manipuri (Eeyek) in(guj) Gujarati in(guru) Punjabi (Gurmukhi) in(jhelum)
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: nia Date: Sat Oct 31 13:28:22 UTC 2020 Modified Files: src/external/mit/xorg/lib: libmesa.mk src/external/mit/xorg/lib/libGL: Makefile src/external/mit/xorg/lib/libglapi: Makefile Log Message: mesa: re-enable GLX TLS to help i386 mesa's assembly code for i386 only seems to be position independent when compiled with ELF TLS, so having it disabled causes worse problems than the edge cases ELF TLS causes. potentially the assembly code could be fixed (it looks like it not being safe is a bug), it could also be disabled, but i don't currently have the means to measure the impact of that. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/libmesa.mk cvs rdiff -u -r1.30 -r1.31 src/external/mit/xorg/lib/libGL/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libglapi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libmesa.mk diff -u src/external/mit/xorg/lib/libmesa.mk:1.12 src/external/mit/xorg/lib/libmesa.mk:1.13 --- src/external/mit/xorg/lib/libmesa.mk:1.12 Wed Sep 16 18:19:23 2020 +++ src/external/mit/xorg/lib/libmesa.mk Sat Oct 31 13:28:22 2020 @@ -1,4 +1,4 @@ -# $NetBSD: libmesa.mk,v 1.12 2020/09/16 18:19:23 nia Exp $ +# $NetBSD: libmesa.mk,v 1.13 2020/10/31 13:28:22 nia Exp $ # # Consumer of this Makefile should set MESA_SRC_MODULES. @@ -526,6 +526,7 @@ CPPFLAGS+= \ -DHAVE_LIBDRM -DGLX_USE_DRM \ -DGLX_INDIRECT_RENDERING \ -DGLX_DIRECT_RENDERING \ + -DGLX_USE_TLS \ -DHAVE_X11_PLATFORM \ -DHAVE_DRM_PLATFORM \ -DENABLE_SHADER_CACHE \ Index: src/external/mit/xorg/lib/libGL/Makefile diff -u src/external/mit/xorg/lib/libGL/Makefile:1.30 src/external/mit/xorg/lib/libGL/Makefile:1.31 --- src/external/mit/xorg/lib/libGL/Makefile:1.30 Wed Sep 16 18:19:23 2020 +++ src/external/mit/xorg/lib/libGL/Makefile Sat Oct 31 13:28:22 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2020/09/16 18:19:23 nia Exp $ +# $NetBSD: Makefile,v 1.31 2020/10/31 13:28:22 nia Exp $ .include @@ -180,7 +180,7 @@ CPPFLAGS+= \ -DHAVE_FUNC_ATTRIBUTE_NORETURN=1 -DHAVE_ENDIAN_H=1 -DHAVE_DLADDR=1 \ -DHAVE_CLOCK_GETTIME=1 -DHAVE_PTHREAD_PRIO_INHERIT=1 \ -DHAVE_PTHREAD=1 -DENABLE_ST_OMX_BELLAGIO=0 -DENABLE_ST_OMX_TIZONIA=0 \ - -DHAVE_TIMESPEC_GET + -DHAVE_TIMESPEC_GET -DGLX_USE_TLS .include "../asm.mk" @@ -224,7 +224,7 @@ PKGCONFIG_SED_FLAGS= \ s,@GL_PKGCONF_LIB@,GL,; \ s,@GL_PC_LIB_PRIV@,-lm -lpthread -pthread,; \ s,@GL_PC_CFLAGS@,,; \ - s,@GLX_TLS@,no," + s,@GLX_TLS@,yes," CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion \ Index: src/external/mit/xorg/lib/libglapi/Makefile diff -u src/external/mit/xorg/lib/libglapi/Makefile:1.8 src/external/mit/xorg/lib/libglapi/Makefile:1.9 --- src/external/mit/xorg/lib/libglapi/Makefile:1.8 Wed Sep 16 18:19:24 2020 +++ src/external/mit/xorg/lib/libglapi/Makefile Sat Oct 31 13:28:22 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/09/16 18:19:24 nia Exp $ +# $NetBSD: Makefile,v 1.9 2020/10/31 13:28:22 nia Exp $ .include @@ -68,6 +68,7 @@ CPPFLAGS+= \ -DGLX_USE_DRM \ -DGLX_INDIRECT_RENDERING \ -DGLX_DIRECT_RENDERING \ + -DGLX_USE_TLS \ -DHAVE_X11_PLATFORM \ -DHAVE_DRM_PLATFORM \ -DENABLE_SHADER_CACHE \
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Mon Oct 26 16:24:09 UTC 2020 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: xdm(8): fix definitions of truetype fonts in the default resource file we don't ship with a truetype helvetica. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/config/Xresources.in diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.4 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.5 --- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.4 Fri Mar 29 16:07:01 2019 +++ src/external/mit/xorg/bin/xdm/config/Xresources.in Mon Oct 26 16:24:09 2020 @@ -22,19 +22,19 @@ xlogin*greetFont: -adobe-helvetica-bold- xlogin*font: -adobe-helvetica-medium-o-normal-*-14-*-*-*-*-*-iso8859-1 xlogin*promptFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 xlogin*failFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*greetFace: Serif-24:bold:italic -xlogin*face: Helvetica-14 -xlogin*promptFace: Helvetica-14:bold -xlogin*failFace: Helvetica-14:bold +xlogin*greetFace: Sans-24 +xlogin*face: Sans-14 +xlogin*promptFace: Sans-14:bold +xlogin*failFace: Sans-14:bold XHASHelse xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1 xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1 xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1 xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1 -xlogin*greetFace: Serif-18:bold:italic -xlogin*face: Helvetica-12 -xlogin*promptFace: Helvetica-12:bold -xlogin*failFace: Helvetica-14:bold +xlogin*greetFace: Sans-18 +xlogin*face: Sans-12 +xlogin*promptFace: Sans-12:bold +xlogin*failFace: Sans-14:bold XHASHendif XHASHifdef COLOR
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src Committed By: nia Date: Mon Oct 12 11:43:11 UTC 2020 Modified Files: src/external/mit/xorg/bin/xinit: Makefile Log Message: define xsetroot in the right place To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xinit/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xinit/Makefile diff -u src/external/mit/xorg/bin/xinit/Makefile:1.10 src/external/mit/xorg/bin/xinit/Makefile:1.11 --- src/external/mit/xorg/bin/xinit/Makefile:1.10 Sun Oct 11 10:08:26 2020 +++ src/external/mit/xorg/bin/xinit/Makefile Mon Oct 12 11:43:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2020/10/11 10:08:26 nia Exp $ +# $NetBSD: Makefile,v 1.11 2020/10/12 11:43:11 nia Exp $ .include @@ -14,6 +14,7 @@ CPPSCRIPTS= startx xinitrc CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \ -DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \ -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \ + -DXSETROOT=${X11BINDIR}/xsetroot \ -DUXTERM=${X11BINDIR}/uxterm \ -DCTWM=${X11BINDIR}/ctwm CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src Committed By: nia Date: Sun Oct 11 10:08:26 UTC 2020 Modified Files: src/external/mit/xorg/bin/xinit: Makefile Log Message: allow xsetroot to be used in default xinitrc To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/bin/xinit/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xinit/Makefile diff -u src/external/mit/xorg/bin/xinit/Makefile:1.9 src/external/mit/xorg/bin/xinit/Makefile:1.10 --- src/external/mit/xorg/bin/xinit/Makefile:1.9 Mon Sep 21 13:51:55 2020 +++ src/external/mit/xorg/bin/xinit/Makefile Sun Oct 11 10:08:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2020/09/21 13:51:55 nia Exp $ +# $NetBSD: Makefile,v 1.10 2020/10/11 10:08:26 nia Exp $ .include @@ -21,6 +21,7 @@ CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINI -DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \ -DUXTERM=${X11BINDIR}/uxterm \ -DCTWM=${X11BINDIR}/ctwm \ + -DXSETROOT=${X11BINDIR}/xsetroot \ -DHAS_COOKIE_MAKER \ -DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/xorg/share/fonts/misc/font-spleen-misc
Module Name:src Committed By: nia Date: Sat Oct 10 07:28:04 UTC 2020 Added Files: src/external/mit/xorg/share/fonts/misc/font-spleen-misc: Makefile Log Message: Add Makefile for X11 Spleen fonts. Not integrated yet. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/share/fonts/misc/font-spleen-misc/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/share/fonts/misc/font-spleen-misc/Makefile diff -u /dev/null src/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile:1.1 --- /dev/null Sat Oct 10 07:28:04 2020 +++ src/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile Sat Oct 10 07:28:04 2020 @@ -0,0 +1,21 @@ +# $NetBSD: Makefile,v 1.1 2020/10/10 07:28:04 nia Exp $ + +.include + +FONTSUBDIR= misc +FONTSRCPKG= font-spleen-misc + +X11SRCDIR.font-spleen-misc= \ + ${X11SRCDIR}/external/bsd/${FONTSRCPKG} + +BDFFILES+= spleen-12x24.bdf +BDFFILES+= spleen-16x32.bdf +BDFFILES+= spleen-32x64.bdf +BDFFILES+= spleen-5x8.bdf +BDFFILES+= spleen-6x12.bdf +BDFFILES+= spleen-8x16.bdf + +.include "../../Makefile.bdf" + +.include +.include
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src Committed By: macallan Date: Fri Oct 9 17:01:29 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile Log Message: build ppc_video.c etc. on hppa To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.47 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.48 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.47 Mon Dec 31 11:14:05 2018 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Fri Oct 9 17:01:29 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2018/12/31 11:14:05 mrg Exp $ +# $NetBSD: Makefile,v 1.48 2020/10/09 17:01:29 macallan Exp $ .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" @@ -35,7 +35,8 @@ CPPFLAGS.${_FN}+= -DPCVT_SUPPORT -DWSCON .endfor .endif -.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || ${MACHINE} == "ibmnws" +.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || \ + ${MACHINE} == "ibmnws" || ${MACHINE} == "hppa" SRCS.bsd+= ppc_video.c pm_noop.c lnx_agp.c .for _FN in ${SRCS.bsd} CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: macallan Date: Fri Oct 9 04:28:38 UTC 2020 Modified Files: src/external/mit/xorg/server/drivers: Makefile Log Message: build some potentially useful drivers on hppa To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/external/mit/xorg/server/drivers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/Makefile diff -u src/external/mit/xorg/server/drivers/Makefile:1.99 src/external/mit/xorg/server/drivers/Makefile:1.100 --- src/external/mit/xorg/server/drivers/Makefile:1.99 Sun Jan 19 10:45:50 2020 +++ src/external/mit/xorg/server/drivers/Makefile Fri Oct 9 04:28:38 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2020/01/19 10:45:50 jmcneill Exp $ +# $NetBSD: Makefile,v 1.100 2020/10/09 04:28:38 macallan Exp $ .include @@ -212,6 +212,13 @@ SUBDIR+= \ xf86-video-wsfb .endif # ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh" +.if ${MACHINE} == "hppa" +SUBDIR+= \ + xf86-video-mga \ + xf86-video-r128 \ + xf86-video-wsfb +.endif # ${MACHINE} == "hppa" + .if ${MACHINE} == "ibmnws" SUBDIR+= \ xf86-video-s3
CVS commit: src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: nia Date: Mon Oct 5 09:16:26 UTC 2020 Modified Files: src/external/mit/xorg/lib/fontconfig/etc: fonts.conf Log Message: Adjust the default fontconfig fonts.conf to avoid selecting bitmap fonts included as part of X11 that are also included as scalable fonts as part of macOS. Many websites will attempt to select these fonts, which results in very strange, poor quality rendering. This should keep legacy X11 applications that want the old "Helvetica" and "Times" fonts working, but prevent them from being selected by applications that want scalable fonts. It should not prevent "Helvetica" or "Times" from being selected if the user installs a scalable version. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.8 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.9 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.8 Tue Aug 29 20:53:56 2017 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Mon Oct 5 09:16:26 2020 @@ -66,6 +66,33 @@ + + + + Charter + false + + + Courier + false + + + Helvetica + false + + + Times + false + + + + + conf.d
CVS commit: src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: nia Date: Mon Oct 5 09:16:53 UTC 2020 Modified Files: src/external/mit/xorg/lib/fontconfig/etc: fonts.conf Log Message: fix indentation To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.9 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.10 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.9 Mon Oct 5 09:16:26 2020 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Mon Oct 5 09:16:53 2020 @@ -90,7 +90,7 @@ false - +
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src Committed By: nia Date: Fri Oct 2 13:08:07 UTC 2020 Modified Files: src/external/mit/xorg/bin/xterm: Makefile Log Message: xterm: Enable SIXEL graphics support. could also enable REGIS, it will require -lm and i suppose isn't a default upstream yet(?) test with "-ti vt340". To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/bin/xterm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xterm/Makefile diff -u src/external/mit/xorg/bin/xterm/Makefile:1.17 src/external/mit/xorg/bin/xterm/Makefile:1.18 --- src/external/mit/xorg/bin/xterm/Makefile:1.17 Wed May 9 08:39:55 2018 +++ src/external/mit/xorg/bin/xterm/Makefile Fri Oct 2 13:08:07 2020 @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.17 2018/05/09 08:39:55 mrg Exp $ +# $NetBSD: Makefile,v 1.18 2020/10/02 13:08:07 nia Exp $ .include PROG= xterm SRCS= button.c charproc.c charsets.c cursor.c data.c doublechr.c \ - fontutils.c input.c linedata.c menu.c misc.c print.c ptydata.c \ - screen.c scrollback.c scrollbar.c tabs.c util.c xstrings.c \ - TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \ - wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c - -# graphics_regis.c graphics_sixel.c -# xterm.appdata.xml + graphics.c graphics_sixel.c fontutils.c input.c linedata.c menu.c \ + misc.c print.c ptydata.c screen.c scrollback.c scrollbar.c tabs.c \ + util.c xstrings.c TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c \ + charclass.c precompose.c wcwidth.c xutf8.c cachedGCs.c xtermcap.c \ + version.c CPPFLAGS+= -I. \ -I${X11SRCDIR.${PROG}} \ @@ -19,6 +17,8 @@ CPPFLAGS+= -I. \ -I${DESTDIR}${X11INCDIR}/freetype2/freetype \ -DPROJECTROOT=${X11ROOTDIR} \ -DHAVE_CONFIG_H \ + -DOPT_GRAPHICS \ + -DOPT_SIXEL_GRAPHICS \ -D_REENTRANT \ ${X11FLAGS.VERSION}
CVS commit: src/external/mit/xorg/bin/xeyes
Module Name:src Committed By: nia Date: Thu Oct 1 21:22:47 UTC 2020 Modified Files: src/external/mit/xorg/bin/xeyes: Makefile Log Message: xeyes: Enable anti-aliasing with XRENDER If you prefer the "classic" look, "xeyes +render" To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xeyes/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xeyes/Makefile diff -u src/external/mit/xorg/bin/xeyes/Makefile:1.2 src/external/mit/xorg/bin/xeyes/Makefile:1.3 --- src/external/mit/xorg/bin/xeyes/Makefile:1.2 Sun Mar 11 08:21:24 2018 +++ src/external/mit/xorg/bin/xeyes/Makefile Thu Oct 1 21:22:47 2020 @@ -1,11 +1,13 @@ -# $NetBSD: Makefile,v 1.2 2018/03/11 08:21:24 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2020/10/01 21:22:47 nia Exp $ .include +CPPFLAGS+=-DXRENDER + PROG= xeyes SRCS= xeyes.c Eyes.c transform.c -LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11 -lm +LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11 -lm DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM} .PATH: ${X11SRCDIR.${PROG}}
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src Committed By: nia Date: Mon Sep 21 13:51:55 UTC 2020 Modified Files: src/external/mit/xorg/bin/xinit: Makefile Log Message: also allow uxterm to be used in the default xinitrc To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xinit/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xinit/Makefile diff -u src/external/mit/xorg/bin/xinit/Makefile:1.8 src/external/mit/xorg/bin/xinit/Makefile:1.9 --- src/external/mit/xorg/bin/xinit/Makefile:1.8 Mon Sep 21 08:20:04 2020 +++ src/external/mit/xorg/bin/xinit/Makefile Mon Sep 21 13:51:55 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/09/21 08:20:04 nia Exp $ +# $NetBSD: Makefile,v 1.9 2020/09/21 13:51:55 nia Exp $ .include @@ -14,10 +14,12 @@ CPPSCRIPTS= startx xinitrc CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \ -DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \ -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \ + -DUXTERM=${X11BINDIR}/uxterm \ -DCTWM=${X11BINDIR}/ctwm CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \ -DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \ -DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \ + -DUXTERM=${X11BINDIR}/uxterm \ -DCTWM=${X11BINDIR}/ctwm \ -DHAS_COOKIE_MAKER \ -DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src Committed By: nia Date: Mon Sep 21 08:20:05 UTC 2020 Modified Files: src/external/mit/xorg/bin/xinit: Makefile Log Message: Define CTWM when building xinit This will allow ctwm to eventually be used in the default xinitrc. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xinit/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xinit/Makefile diff -u src/external/mit/xorg/bin/xinit/Makefile:1.7 src/external/mit/xorg/bin/xinit/Makefile:1.8 --- src/external/mit/xorg/bin/xinit/Makefile:1.7 Mon Mar 11 06:25:55 2019 +++ src/external/mit/xorg/bin/xinit/Makefile Mon Sep 21 08:20:04 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2020/09/21 08:20:04 nia Exp $ .include @@ -13,10 +13,12 @@ CPPFLAGS+= ${X11FLAGS.CONNECTION} -DBIND CPPSCRIPTS= startx xinitrc CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \ -DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \ - -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm + -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \ + -DCTWM=${X11BINDIR}/ctwm CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \ -DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \ -DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \ + -DCTWM=${X11BINDIR}/ctwm \ -DHAS_COOKIE_MAKER \ -DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: nia Date: Wed Sep 16 18:19:24 UTC 2020 Modified Files: src/external/mit/xorg/lib: libmesa.mk src/external/mit/xorg/lib/libGL: Makefile src/external/mit/xorg/lib/libglapi: Makefile Log Message: disable use of ELF TLS in Mesa/libGL this is an optimization that primarily benefits linux/glibc - most other systems have this disabled. in netbsd we've tried to patch around it to make things work, but there still appears to be some edge cases where libGL mysteriously crashes. discussed on tech-x11 some time ago. already in place in pkgsrc. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libmesa.mk cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/lib/libGL/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libglapi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libmesa.mk diff -u src/external/mit/xorg/lib/libmesa.mk:1.11 src/external/mit/xorg/lib/libmesa.mk:1.12 --- src/external/mit/xorg/lib/libmesa.mk:1.11 Sun Feb 23 02:03:19 2020 +++ src/external/mit/xorg/lib/libmesa.mk Wed Sep 16 18:19:23 2020 @@ -1,4 +1,4 @@ -# $NetBSD: libmesa.mk,v 1.11 2020/02/23 02:03:19 joerg Exp $ +# $NetBSD: libmesa.mk,v 1.12 2020/09/16 18:19:23 nia Exp $ # # Consumer of this Makefile should set MESA_SRC_MODULES. @@ -526,7 +526,6 @@ CPPFLAGS+= \ -DHAVE_LIBDRM -DGLX_USE_DRM \ -DGLX_INDIRECT_RENDERING \ -DGLX_DIRECT_RENDERING \ - -DGLX_USE_TLS \ -DHAVE_X11_PLATFORM \ -DHAVE_DRM_PLATFORM \ -DENABLE_SHADER_CACHE \ Index: src/external/mit/xorg/lib/libGL/Makefile diff -u src/external/mit/xorg/lib/libGL/Makefile:1.29 src/external/mit/xorg/lib/libGL/Makefile:1.30 --- src/external/mit/xorg/lib/libGL/Makefile:1.29 Sun Mar 29 21:06:03 2020 +++ src/external/mit/xorg/lib/libGL/Makefile Wed Sep 16 18:19:23 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2020/03/29 21:06:03 maya Exp $ +# $NetBSD: Makefile,v 1.30 2020/09/16 18:19:23 nia Exp $ .include @@ -180,7 +180,7 @@ CPPFLAGS+= \ -DHAVE_FUNC_ATTRIBUTE_NORETURN=1 -DHAVE_ENDIAN_H=1 -DHAVE_DLADDR=1 \ -DHAVE_CLOCK_GETTIME=1 -DHAVE_PTHREAD_PRIO_INHERIT=1 \ -DHAVE_PTHREAD=1 -DENABLE_ST_OMX_BELLAGIO=0 -DENABLE_ST_OMX_TIZONIA=0 \ - -DHAVE_TIMESPEC_GET -DGLX_USE_TLS + -DHAVE_TIMESPEC_GET .include "../asm.mk" @@ -224,7 +224,7 @@ PKGCONFIG_SED_FLAGS= \ s,@GL_PKGCONF_LIB@,GL,; \ s,@GL_PC_LIB_PRIV@,-lm -lpthread -pthread,; \ s,@GL_PC_CFLAGS@,,; \ - s,@GLX_TLS@,yes," + s,@GLX_TLS@,no," CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion \ Index: src/external/mit/xorg/lib/libglapi/Makefile diff -u src/external/mit/xorg/lib/libglapi/Makefile:1.7 src/external/mit/xorg/lib/libglapi/Makefile:1.8 --- src/external/mit/xorg/lib/libglapi/Makefile:1.7 Sun Feb 23 02:02:32 2020 +++ src/external/mit/xorg/lib/libglapi/Makefile Wed Sep 16 18:19:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2020/02/23 02:02:32 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2020/09/16 18:19:24 nia Exp $ .include @@ -68,7 +68,6 @@ CPPFLAGS+= \ -DGLX_USE_DRM \ -DGLX_INDIRECT_RENDERING \ -DGLX_DIRECT_RENDERING \ - -DGLX_USE_TLS \ -DHAVE_X11_PLATFORM \ -DHAVE_DRM_PLATFORM \ -DENABLE_SHADER_CACHE \
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src Committed By: nia Date: Wed Sep 16 10:02:22 UTC 2020 Modified Files: src/external/mit/xorg/lib/libX11: Makefile.libx11 Log Message: someone pointed out it makes sense to load the exact libXcursor version To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/lib/libX11/Makefile.libx11 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libX11/Makefile.libx11 diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.20 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.21 --- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.20 Tue Sep 15 23:34:16 2020 +++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Wed Sep 16 10:02:22 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.libx11,v 1.20 2020/09/15 23:34:16 nia Exp $ +# $NetBSD: Makefile.libx11,v 1.21 2020/09/16 10:02:22 nia Exp $ LIB= X11 .PATH: ${X11SRCDIR.${LIB}}/src @@ -423,7 +423,7 @@ SETID_DEFINES= -DHASSETUGID SHM_DEFINES= -DHAS_SHM SOCK_DEFINES= -DBSD44SOCKETS TRANS_INCLUDES= -I${X11SRCDIR.xtrans} -XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so\" +XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.2\" XDMAUTHDEFS= -DHASXDMAUTH XF86BIGFONT_DEFINES= -DXF86BIGFONT XKB_DEFINES= -DXKB
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src Committed By: nia Date: Tue Sep 15 23:34:16 UTC 2020 Modified Files: src/external/mit/xorg/lib/libX11: Makefile.libx11 Log Message: libx11: Dynamically load unversioned libxcursor shared object the version number is wrong for NetBSD, should be libXcursor.so.2 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/lib/libX11/Makefile.libx11 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libX11/Makefile.libx11 diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.19 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.20 --- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.19 Mon Jul 8 23:06:15 2019 +++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Tue Sep 15 23:34:16 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.libx11,v 1.19 2019/07/08 23:06:15 mrg Exp $ +# $NetBSD: Makefile.libx11,v 1.20 2020/09/15 23:34:16 nia Exp $ LIB= X11 .PATH: ${X11SRCDIR.${LIB}}/src @@ -423,7 +423,7 @@ SETID_DEFINES= -DHASSETUGID SHM_DEFINES= -DHAS_SHM SOCK_DEFINES= -DBSD44SOCKETS TRANS_INCLUDES= -I${X11SRCDIR.xtrans} -XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.1\" +XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so\" XDMAUTHDEFS= -DHASXDMAUTH XF86BIGFONT_DEFINES= -DXF86BIGFONT XKB_DEFINES= -DXKB
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Tue Sep 15 05:14:19 UTC 2020 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: avoid ICE on sh3. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/pixman/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/pixman/Makefile diff -u src/external/mit/xorg/lib/pixman/Makefile:1.35 src/external/mit/xorg/lib/pixman/Makefile:1.36 --- src/external/mit/xorg/lib/pixman/Makefile:1.35 Wed Mar 30 16:19:06 2016 +++ src/external/mit/xorg/lib/pixman/Makefile Tue Sep 15 05:14:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2016/03/30 16:19:06 macallan Exp $ +# $NetBSD: Makefile,v 1.36 2020/09/15 05:14:19 mrg Exp $ NOLINT= 1 # defined @@ -98,6 +98,11 @@ CPPFLAGS+= -DUSE_LOONGSON_MMI COPTS.pixman-mmx.c= -march=loongson2f -mhard-float -Wa,-mhard-float .endif +.if ${MACHINE_CPU} == "sh3" +# XXX pixman-fast-path.c:1204:1: internal compiler error: Segmentation fault +COPTS.pixman-fast-path.c+= -O1 +.endif + INCS= pixman.h pixman-version.h INCSDIR=${X11INCDIR}/pixman-1
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src Committed By: mrg Date: Sun Sep 13 23:01:03 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/Xext: Makefile src/external/mit/xorg/server/xorg-server/fb: Makefile.fb src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile src/external/mit/xorg/server/xorg-server/record: Makefile Log Message: remove additional -DHAVE_DIX_CONFIG_H. add ${X11FLAGS.DIX} ${X11INCS.DIX} to record. fixes build on riscv64. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/xorg-server/Xext/Makefile cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb cvs rdiff -u -r1.19 -r1.20 \ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile cvs rdiff -u -r1.17 -r1.18 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/record/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/Xext/Makefile diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.7 src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.8 --- src/external/mit/xorg/server/xorg-server/Xext/Makefile:1.7 Sat Aug 20 01:03:34 2016 +++ src/external/mit/xorg/server/xorg-server/Xext/Makefile Sun Sep 13 23:01:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/08/20 01:03:34 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2020/09/13 23:01:02 mrg Exp $ LIBISPRIVATE= yes LIB= Xext @@ -28,7 +28,6 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/xf CPPFLAGS+= -I${X11SRCDIR.xorg-server}/miext/sync CPPFLAGS+= -I${X11SRCDIR.xorg-server}/composite CPPFLAGS+= -I${X11SRCDIR.xorg-server}/damageext -#CPPFLAGS+= -DHAVE_DIX_CONFIG_H CPPFLAGS+= -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX} .PATH: ${X11SRCDIR.xorg-server}/Xext Index: src/external/mit/xorg/server/xorg-server/fb/Makefile.fb diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.12 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.13 --- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.12 Sun Aug 9 15:02:52 2020 +++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Sun Sep 13 23:01:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.fb,v 1.12 2020/08/09 15:02:52 tsutsui Exp $ +# $NetBSD: Makefile.fb,v 1.13 2020/09/13 23:01:02 mrg Exp $ .PATH: ${X11SRCDIR.xorg-server}/fb SRCS.fb= fballpriv.c \ @@ -30,13 +30,11 @@ SRCS.fb= fballpriv.c \ fbutil.c\ fbwindow.c -CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} -DHAVE_DIX_CONFIG_H +CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg -CPPFLAGS+= -DHAVE_DIX_CONFIG_H - # XXX COPTS.fbpict.c= -Wno-error COPTS.fbwindow.c= -Wno-error Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.19 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.20 --- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.19 Wed Aug 5 15:48:09 2020 +++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Sun Sep 13 23:01:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2020/08/05 15:48:09 tsutsui Exp $ +# $NetBSD: Makefile,v 1.20 2020/09/13 23:01:02 mrg Exp $ .include @@ -25,7 +25,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg \ -I${X11SRCDIR.xorg-server}/render \ - -DHAVE_DIX_CONFIG_H \ -UGLXEXT CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \ Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.17 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.17 Tue Apr 16 21:20:52 2019 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Sun Sep 13 23:01:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/04/16 21:20:52 mrg Exp $ +# $NetBSD: Makefile,v 1.18 2020/09/13 23:01:02 mrg Exp $ .include @@ -21,8 +21,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${DESTDIR}${X11INCDIR}/libdrm \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${DESTDIR}${X11INCDIR}/xorg \ - -I${X11SRCDIR.xorg-server}/render \ - -DHAVE_DIX_CONFIG_H + -I${X11SRCDIR.xorg-server}/render CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \ ${X11FLAGS.EXTENSION} Index: src/external/mit/xorg/server/xorg-server/record/Makefile diff -u src/external/mit/xorg/server/xorg-server/record/Makefile:1.2 src/external/mit/xorg/server/xorg-server/record/Makefile:1.3 --- src/external/mit/xorg/server/xorg-server/record/Makefile:1.2 Sun Aug 10 06:42:39 2008 +++
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: mrg Date: Mon Sep 7 00:24:37 UTC 2020 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile Log Message: use GCC_NO_ADDR_OF_PACKED_MEMBER. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 \ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.32 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.33 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.32 Fri May 10 06:25:58 2019 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Mon Sep 7 00:24:37 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/05/10 06:25:58 mrg Exp $ +# $NetBSD: Makefile,v 1.33 2020/09/07 00:24:37 mrg Exp $ .include @@ -227,5 +227,6 @@ COPTS.sna_trapezoids_mono.c+= -Wno-stack COPTS.sna_trapezoids_precise.c+= -Wno-stack-protector COPTS.i965_video.c+= -Wno-stack-protector +COPTS.sna_damage.c+= ${GCC_NO_ADDR_OF_PACKED_MEMBER} COPTS.sna_display.c+= -Wno-error # XXX deprecated COPTS.intel_driver.c+= -Wno-error # XXX deprecated Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.14 --- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.13 Mon Dec 31 12:13:50 2018 +++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile Mon Sep 7 00:24:37 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/12/31 12:13:50 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2020/09/07 00:24:37 mrg Exp $ DRIVER= xf86-video-vmware DRIVER_NAME= vmware_drv @@ -25,3 +25,5 @@ COPTS.vmware.c+= -Wno-error # XXX deprec COPTS.vmwaremodes.c+= -Wno-error .include "../Makefile.xf86-driver" + +CWARNFLAGS.gcc+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
CVS commit: src/external/mit/xorg/server/xorg-server/fb
Module Name:src Committed By: tsutsui Date: Sun Aug 9 15:02:53 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/fb: Makefile.fb Log Message: Put back fbtile.c to SRCS.fb per xsrc dist file changes: https://mail-index.netbsd.org/source-changes/2020/08/09/msg120399.html > Revert upstream "fb: Remove even/odd tile slow-pathing" changes. > > https://gitlab.freedesktop.org/xorg/xserver/-/commit/e572bcc7f4236b7e0f23ab762f225b3bce37db59 > >> fb: Remove even/odd tile slow-pathing > >> > >> Again, clearly meant to be a fast path, but this turns out not to be the > >> case. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/fb/Makefile.fb diff -u src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.11 src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.12 --- src/external/mit/xorg/server/xorg-server/fb/Makefile.fb:1.11 Mon Dec 31 11:14:04 2018 +++ src/external/mit/xorg/server/xorg-server/fb/Makefile.fb Sun Aug 9 15:02:52 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.fb,v 1.11 2018/12/31 11:14:04 mrg Exp $ +# $NetBSD: Makefile.fb,v 1.12 2020/08/09 15:02:52 tsutsui Exp $ .PATH: ${X11SRCDIR.xorg-server}/fb SRCS.fb= fballpriv.c \ @@ -25,6 +25,7 @@ SRCS.fb= fballpriv.c \ fbseg.c \ fbsetsp.c \ fbsolid.c \ + fbtile.c\ fbtrap.c\ fbutil.c\ fbwindow.c
CVS commit: src/external/mit/xorg/server/xorg-server/hw
Module Name:src Committed By: tsutsui Date: Wed Aug 5 15:48:09 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile Log Message: No need to build fbcmap_mi.c in each DDX server. Per upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=432fc37e2ca833f1ec3cb614cbdc3a7ae13f22b7 > Build fbcmap_mi.c once, rather than once for each DDX, and make it part of > libfb > or libwfb convenience library. Tested on sun3 and x68k. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun cvs rdiff -u -r1.18 -r1.19 \ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile cvs rdiff -u -r1.22 -r1.23 \ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.9 --- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8 Wed Jul 22 21:25:03 2020 +++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Wed Aug 5 15:48:09 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/07/22 21:25:03 tsutsui Exp $ +# $NetBSD: Makefile,v 1.9 2020/08/05 15:48:09 tsutsui Exp $ .include @@ -25,9 +25,6 @@ SRCS+= stubs.c .PATH: ${X11SRCDIR.xorg-server}/mi SRCS+= miinitext.c -.PATH: ${X11SRCDIR.xorg-server}/fb -SRCS+= fbcmap_mi.c - CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \ ${X11INCS.DIX} Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.5 --- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4 Tue Aug 4 14:31:58 2020 +++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Wed Aug 5 15:48:09 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.Xsun,v 1.4 2020/08/04 14:31:58 tsutsui Exp $ +# $NetBSD: Makefile.Xsun,v 1.5 2020/08/05 15:48:09 tsutsui Exp $ .include @@ -70,9 +70,6 @@ SRCS+= sunFbs.c sunIo.c sunKbd.c sunKeyM .PATH: ${X11SRCDIR.xorg-server}/Xi SRCS+= stubs.c -.PATH: ${X11SRCDIR.xorg-server}/fb -SRCS+= fbcmap_mi.c - CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \ ${X11INCS.DIX} Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.19 --- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.18 Mon Dec 31 11:14:04 2018 +++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Wed Aug 5 15:48:09 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/12/31 11:14:04 mrg Exp $ +# $NetBSD: Makefile,v 1.19 2020/08/05 15:48:09 tsutsui Exp $ .include @@ -13,10 +13,6 @@ PROG= Xvfb .PATH: ${X11SRCDIR.xorg-server}/mi SRCS= InitInput.c InitOutput.c miinitext.c stubs.c -# XXX should not be needed now -#.PATH: ${X11SRCDIR.xorg-server}/fb -#SRCS+= fbcmap_mi.c - CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \ -I${X11SRCDIR.xorg-server}/fb \ -I${X11SRCDIR.xorg-server}/mfb \ Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.23 --- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22 Mon Jul 20 13:59:57 2020 +++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Wed Aug 5 15:48:09 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2020/07/20 13:59:57 tsutsui Exp $ +# $NetBSD: Makefile,v 1.23 2020/08/05 15:48:09 tsutsui Exp $ .include @@ -16,8 +16,7 @@ PROG= Xnest SRCS= Args.c Color.c Cursor.c Display.c Events.c Font.c \ GC.c GCOps.c Handlers.c Init.c Keyboard.c \ Pixmap.c Pointer.c Screen.c Visual.c Window.c \ - stubs.c miinitext.c \ - fbcmap_mi.c + stubs.c miinitext.c CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xnest \ -I${DESTDIR}${X11INCDIR}/X11 \
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/sun
Module Name:src Committed By: tsutsui Date: Tue Aug 4 14:35:24 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/sun: Makefile.Xsun Log Message: Sync with xorg-server: > Specify default /var/log/Xsun.%s.log path definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun diff -u src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.1 src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.2 --- src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.1 Wed Jul 22 19:26:37 2020 +++ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun Tue Aug 4 14:35:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 19:26:37 tsutsui Exp $ +# $NetBSD: Makefile.Xsun,v 1.2 2020/08/04 14:35:24 tsutsui Exp $ .include @@ -13,6 +13,7 @@ WARNS?= 2 .PATH: ${X11SRCDIR.xorg-server}/hw/sun BUILDSYMLINKS= +CPPFLAGS+= -DDEFAULT_LOGDIR=\"/var/log\" -DDEFAULT_LOGPREFIX=\"${PROG}.\" CPPFLAGS+= -DINCLUDE_CG2_HEADER #CPPFLAGS+= -DLOWMEMFTPT
CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun
Module Name:src Committed By: tsutsui Date: Tue Aug 4 14:31:58 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun Log Message: Specify default /var/log/Xsun.%s.log path definitions. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4 --- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3 Fri Jul 24 02:25:58 2020 +++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Tue Aug 4 14:31:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.Xsun,v 1.3 2020/07/24 02:25:58 tsutsui Exp $ +# $NetBSD: Makefile.Xsun,v 1.4 2020/08/04 14:31:58 tsutsui Exp $ .include @@ -13,6 +13,7 @@ WARNS?= 2 .PATH: ${X11SRCDIR.xorg-server}/hw/sun BUILDSYMLINKS= +CPPFLAGS+= -DDEFAULT_LOGDIR=\"/var/log\" -DDEFAULT_LOGPREFIX=\"${PROG}.\" CPPFLAGS+= -DINCLUDE_CG2_HEADER #CPPFLAGS+= -DLOWMEMFTPT
CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun
Module Name:src Committed By: tsutsui Date: Fri Jul 24 02:25:58 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun Log Message: Explicitly disable dbe, record, and present DIX extentions. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3 --- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2 Thu Jul 23 09:59:36 2020 +++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Fri Jul 24 02:25:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.Xsun,v 1.2 2020/07/23 09:59:36 mrg Exp $ +# $NetBSD: Makefile.Xsun,v 1.3 2020/07/24 02:25:58 tsutsui Exp $ .include @@ -73,11 +73,10 @@ SRCS+= stubs.c SRCS+= fbcmap_mi.c CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \ - -I${DESTDIR}${X11INCDIR}/xorg \ ${X11INCS.DIX} CPPFLAGS+= -UHAVE_XORG_CONFIG_H - +CPPFLAGS+= -UDBE -UXRECORD -UPRESENT CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ -UXF86DRI -UXF86BIGFONT @@ -90,9 +89,7 @@ LDADD+= ${LDADD.dix} \ ${LDADD.xkbstubs} \ ${LDADD.randr} \ ${LDADD.Xext} \ - ${LDADD.dbe} \ ${LDADD.composite} \ - ${LDADD.record} \ ${LDADD.render} \ ${LDADD.os} \ ${LDADD.xfixes} \ @@ -100,7 +97,6 @@ LDADD+= ${LDADD.dix} \ ${LDADD.miext/damage} \ ${LDADD.miext/sync} \ ${LDADD.Xi} \ - ${LDADD.present} \ -lXfont2 \ -lpixman-1 \ -lX11 \ @@ -113,9 +109,7 @@ DPADD+= ${LDADD.dix} \ ${DPADD.xkb} \ ${DPADD.randr} \ ${DPADD.Xext} \ - ${DPADD.dbe} \ ${DPADD.composite} \ - ${DPADD.record} \ ${DPADD.render} \ ${DPADD.os} \ ${DPADD.xfixes} \ @@ -123,10 +117,8 @@ DPADD+= ${LDADD.dix} \ ${DPADD.miext/damage} \ ${DPADD.miext/sync} \ ${DPADD.Xi} \ - ${DPADD.present} \ ${LIBXFONT2} \ ${LIBPIXMAN-1} \ - ${LIBXEXT} \ ${LIBX11} \ ${LIBZ} \ ${LIBM}
CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun
Module Name:src Committed By: mrg Date: Thu Jul 23 09:59:36 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun Log Message: fix build: - add .../xorg subdir to the path - add dbe and present extensions, both wanted via linkage .. but maybe these shouldn't be built? they're not in sets. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.1 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2 --- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.1 Wed Jul 22 20:54:08 2020 +++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Thu Jul 23 09:59:36 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 20:54:08 tsutsui Exp $ +# $NetBSD: Makefile.Xsun,v 1.2 2020/07/23 09:59:36 mrg Exp $ .include @@ -73,6 +73,7 @@ SRCS+= stubs.c SRCS+= fbcmap_mi.c CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \ + -I${DESTDIR}${X11INCDIR}/xorg \ ${X11INCS.DIX} CPPFLAGS+= -UHAVE_XORG_CONFIG_H @@ -89,6 +90,7 @@ LDADD+= ${LDADD.dix} \ ${LDADD.xkbstubs} \ ${LDADD.randr} \ ${LDADD.Xext} \ + ${LDADD.dbe} \ ${LDADD.composite} \ ${LDADD.record} \ ${LDADD.render} \ @@ -98,9 +100,9 @@ LDADD+= ${LDADD.dix} \ ${LDADD.miext/damage} \ ${LDADD.miext/sync} \ ${LDADD.Xi} \ + ${LDADD.present} \ -lXfont2 \ -lpixman-1 \ - -lXext \ -lX11 \ -lz \ -lm @@ -111,6 +113,7 @@ DPADD+= ${LDADD.dix} \ ${DPADD.xkb} \ ${DPADD.randr} \ ${DPADD.Xext} \ + ${DPADD.dbe} \ ${DPADD.composite} \ ${DPADD.record} \ ${DPADD.render} \ @@ -120,6 +123,7 @@ DPADD+= ${LDADD.dix} \ ${DPADD.miext/damage} \ ${DPADD.miext/sync} \ ${DPADD.Xi} \ + ${DPADD.present} \ ${LIBXFONT2} \ ${LIBPIXMAN-1} \ ${LIBXEXT} \
CVS commit: src/external/mit/xorg/server
Module Name:src Committed By: tsutsui Date: Thu Jul 23 09:13:18 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw: Makefile src/external/mit/xorg/server/xorg-server/hw: Makefile Log Message: Remove duplicated (and .if 0'ed out) ${XSERVER_XFREE86} checks. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server.old/hw/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/server/xorg-server/hw/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server.old/hw/Makefile diff -u src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.3 src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.4 --- src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.3 Thu Jul 23 09:09:12 2020 +++ src/external/mit/xorg/server/xorg-server.old/hw/Makefile Thu Jul 23 09:13:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2020/07/23 09:09:12 tsutsui Exp $ +# $NetBSD: Makefile,v 1.4 2020/07/23 09:13:18 tsutsui Exp $ .include "../Makefile.common" @@ -34,10 +34,6 @@ SUBDIR+=netbsd/arm32vidc SUBDIR+=netbsd/dec .endif -.if ${XSERVER_XFREE86} != "no" -SUBDIR+=xfree86 -.endif - .if ${XSERVER_XMAC68K} != "no" SUBDIR+=netbsd/mac68k .endif Index: src/external/mit/xorg/server/xorg-server/hw/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/Makefile:1.8 --- src/external/mit/xorg/server/xorg-server/hw/Makefile:1.7 Thu Jul 23 09:09:13 2020 +++ src/external/mit/xorg/server/xorg-server/hw/Makefile Thu Jul 23 09:13:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2020/07/23 09:09:13 tsutsui Exp $ +# $NetBSD: Makefile,v 1.8 2020/07/23 09:13:18 tsutsui Exp $ .include "../Makefile.common" @@ -34,10 +34,6 @@ SUBDIR+=netbsd/arm32vidc SUBDIR+=netbsd/dec .endif -.if ${XSERVER_XFREE86} != "no" -SUBDIR+=xfree86 -.endif - .if ${XSERVER_XMAC68K} != "no" SUBDIR+=netbsd/mac68k .endif
CVS commit: src/external/mit/xorg/server
Module Name:src Committed By: tsutsui Date: Thu Jul 23 09:09:13 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server: Makefile.common src/external/mit/xorg/server/xorg-server.old: Makefile.common src/external/mit/xorg/server/xorg-server.old/hw: Makefile src/external/mit/xorg/server/xorg-server/hw: Makefile Log Message: Remove definitions for Xdreamcast, Xhpc, Xmacppc, and Xnewsmips. All these port specific X11R6 servers just used MI wscons, and all of them have been switched to Xorg servers with wsfb driver etc. Even if someone wants a smaller monolithic server, it should be written as a MI "Xwscons" server. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 \ src/external/mit/xorg/server/xorg-server/Makefile.common cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server.old/Makefile.common cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server.old/hw/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/hw/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/Makefile.common diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.28 src/external/mit/xorg/server/xorg-server/Makefile.common:1.29 --- src/external/mit/xorg/server/xorg-server/Makefile.common:1.28 Thu Jul 23 08:34:33 2020 +++ src/external/mit/xorg/server/xorg-server/Makefile.common Thu Jul 23 09:09:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2020/07/23 08:34:33 tsutsui Exp $ +# $NetBSD: Makefile.common,v 1.29 2020/07/23 09:09:12 tsutsui Exp $ # These define parts of the Xserver tree that are to be # conditionally compiled for different platforms. See @@ -33,10 +33,6 @@ XSERVER_XAMIGA= yes XSERVER_XMAC68K= yes .endif -.if ${MACHINE} == "macppc" -XSERVER_XMACPPC= yes -.endif - .if ${MACHINE} == "pmax" XSERVER_XDECNETBSD= yes XSERVER_XPMAX= no # XXX should be yes but may be obsoleted @@ -73,10 +69,6 @@ XSERVER_XDECNETBSD?= no XSERVER_XFREE68?= no # Does this platform build the Xmac68k X server? XSERVER_XMAC68K?= no -# Does this platform build Xmacppc X server? -XSERVER_XMACPPC?= no -# Does this platform build the Xnewsmips server? -XSERVER_XNEWSMIPS?= no # Does this platform build Xpmax X servers? XSERVER_XPMAX?= no # Does this platform build Xsun* X servers? Index: src/external/mit/xorg/server/xorg-server.old/Makefile.common diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.4 --- src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.3 Thu Jul 23 08:34:33 2020 +++ src/external/mit/xorg/server/xorg-server.old/Makefile.common Thu Jul 23 09:09:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2020/07/23 08:34:33 tsutsui Exp $ +# $NetBSD: Makefile.common,v 1.4 2020/07/23 09:09:12 tsutsui Exp $ # These define parts of the Xserver tree that are to be # conditionally compiled for different platforms. See @@ -32,10 +32,6 @@ XSERVER_XAMIGA= yes XSERVER_XMAC68K= yes .endif -.if ${MACHINE} == "macppc" -XSERVER_XMACPPC= yes -.endif - .if ${MACHINE} == "pmax" XSERVER_XDECNETBSD= yes XSERVER_XPMAX= no # XXX should be yes but may be obsoleted @@ -72,10 +68,6 @@ XSERVER_XDECNETBSD?= no XSERVER_XFREE68?= no # Does this platform build the Xmac68k X server? XSERVER_XMAC68K?= no -# Does this platform build Xmacppc X server? -XSERVER_XMACPPC?= no -# Does this platform build the Xnewsmips server? -XSERVER_XNEWSMIPS?= no # Does this platform build Xpmax X servers? XSERVER_XPMAX?= no # Does this platform build Xsun* X servers? Index: src/external/mit/xorg/server/xorg-server.old/hw/Makefile diff -u src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.3 --- src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.2 Wed Jul 22 19:26:37 2020 +++ src/external/mit/xorg/server/xorg-server.old/hw/Makefile Thu Jul 23 09:09:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2020/07/22 19:26:37 tsutsui Exp $ +# $NetBSD: Makefile,v 1.3 2020/07/23 09:09:12 tsutsui Exp $ .include "../Makefile.common" @@ -34,30 +34,14 @@ SUBDIR+=netbsd/arm32vidc SUBDIR+=netbsd/dec .endif -.if ${XSERVER_XDREAMCAST} != "no" -SUBDIR+=netbsd/dreamcast -.endif - .if ${XSERVER_XFREE86} != "no" SUBDIR+=xfree86 .endif -.if ${XSERVER_XHPC} != "no" -SUBDIR+=netbsd/hpc -.endif - .if ${XSERVER_XMAC68K} != "no" SUBDIR+=netbsd/mac68k .endif -.if ${XSERVER_XMACPPC} != "no" -SUBDIR+=netbsd/macppc -.endif - -.if ${XSERVER_XNEWSMIPS} != "no" -SUBDIR+=netbsd/newsmips -.endif - .if ${XSERVER_XVFB} != "no" SUBDIR+=vfb .endif Index: src/external/mit/xorg/server/xorg-server/hw/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/Makefile:1.6
CVS commit: src/external/mit/xorg/server
Module Name:src Committed By: tsutsui Date: Thu Jul 23 08:34:33 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server: Makefile.common src/external/mit/xorg/server/xorg-server.old: Makefile.common Log Message: Don't build Xsun servers for sparc and sparc64. Not tested, and maybe not worth for wscons'fied ports. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 \ src/external/mit/xorg/server/xorg-server/Makefile.common cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server.old/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/Makefile.common diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.27 src/external/mit/xorg/server/xorg-server/Makefile.common:1.28 --- src/external/mit/xorg/server/xorg-server/Makefile.common:1.27 Fri Aug 19 03:59:30 2016 +++ src/external/mit/xorg/server/xorg-server/Makefile.common Thu Jul 23 08:34:33 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2016/08/19 03:59:30 mrg Exp $ +# $NetBSD: Makefile.common,v 1.28 2020/07/23 08:34:33 tsutsui Exp $ # These define parts of the Xserver tree that are to be # conditionally compiled for different platforms. See @@ -43,9 +43,9 @@ XSERVER_XPMAX= no # XXX should be yes b .endif .if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" -XSERVER_XSUN= yes -XSERVER_XSUNMONO= yes -XSERVER_XSUN24= yes +#XSERVER_XSUN= yes +#XSERVER_XSUNMONO= yes +#XSERVER_XSUN24= yes .endif .if ${MACHINE} == "sun3" Index: src/external/mit/xorg/server/xorg-server.old/Makefile.common diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.2 src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.3 --- src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.2 Fri Aug 19 03:59:31 2016 +++ src/external/mit/xorg/server/xorg-server.old/Makefile.common Thu Jul 23 08:34:33 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2016/08/19 03:59:31 mrg Exp $ +# $NetBSD: Makefile.common,v 1.3 2020/07/23 08:34:33 tsutsui Exp $ # These define parts of the Xserver tree that are to be # conditionally compiled for different platforms. See @@ -42,9 +42,9 @@ XSERVER_XPMAX= no # XXX should be yes b .endif .if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" -XSERVER_XSUN= yes -XSERVER_XSUNMONO= yes -XSERVER_XSUN24= yes +#XSERVER_XSUN= yes +#XSERVER_XSUNMONO= yes +#XSERVER_XSUN24= yes .endif .if ${MACHINE} == "sun3"
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Wed Jul 22 21:25:03 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile Log Message: Reorganize CPPFLAGS. - use ${X11INCS.DIX} in - explicitly undef HAVE_XORG_CONFIG_H to avoid reference to hw/xfree86/common in mi/miinitext.c - remove -DHAVE_DIX_CONFIG_H which is already defined in ${X11FLAGS.DIX} and pulled via Makefile.servermod XXX: -DHAVE_STRCASECMP should also be moved to ${X11FLAGS.DIX}, or should be pulled via include/dix-config.h? To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8 --- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7 Sat Jul 18 16:07:15 2020 +++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Wed Jul 22 21:25:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $ +# $NetBSD: Makefile,v 1.8 2020/07/22 21:25:03 tsutsui Exp $ .include @@ -28,20 +28,13 @@ SRCS+= miinitext.c .PATH: ${X11SRCDIR.xorg-server}/fb SRCS+= fbcmap_mi.c -CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ - -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \ - -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ - -I${X11SRCDIR.xorg-server}/fb \ - -I${X11SRCDIR.xorg-server}/mi \ - -I${X11SRCDIR.xorg-server}/render \ - -I${X11SRCDIR.xorg-server}/present \ - -I${X11SRCDIR.xorg-server}/miext/damage \ - -I${DESTDIR}${X11INCDIR}/X11 +CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \ + ${X11INCS.DIX} CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ -UXF86DRI -UXF86BIGFONT -CPPFLAGS+= -DHAVE_DIX_CONFIG_H +CPPFLAGS+= -UHAVE_XORG_CONFIG_H CPPFLAGS+= -DHAVE_STRCASECMP CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\"
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw
Module Name:src Committed By: tsutsui Date: Wed Jul 22 19:26:37 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw: Makefile Added Files: src/external/mit/xorg/server/xorg-server.old/hw/sun: Makefile Makefile.Xsun src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun: Makefile src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24: Makefile src/external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono: Makefile Log Message: Add build glue files for Xorg-Server-1.10'fied monolithic Xsun servers. Not enabled and just for reference. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server.old/hw/Makefile diff -u src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.2 --- src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016 +++ src/external/mit/xorg/server/xorg-server.old/hw/Makefile Wed Jul 22 19:26:37 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2020/07/22 19:26:37 tsutsui Exp $ .include "../Makefile.common" @@ -11,6 +11,12 @@ SUBDIR+= xfree86 SUBDIR+=netbsd/x68k .endif +.if ${XSERVER_XSUN} != "no" || \ +${XSERVER_XSUNMONO} != "no" || \ +${XSERVER_XSUN24} != "no" +SUBDIR+=sun +.endif + .if 0 .if ${XSERVER_XALPHANETBSD} != "no" SUBDIR+=netbsd/alpha @@ -52,10 +58,6 @@ SUBDIR+=netbsd/macppc SUBDIR+=netbsd/newsmips .endif -.if ${XSERVER_XSUN} != "no" -SUBDIR+=sun -.endif - .if ${XSERVER_XVFB} != "no" SUBDIR+=vfb .endif Added files: Index: src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile diff -u /dev/null src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile:1.1 --- /dev/null Wed Jul 22 19:26:37 2020 +++ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile Wed Jul 22 19:26:37 2020 @@ -0,0 +1,15 @@ +# $NetBSD: Makefile,v 1.1 2020/07/22 19:26:37 tsutsui Exp $ + +.include "../../Makefile.common" + +SUBDIR= Xsun + +.if ${XSERVER_XSUNMONO} != "no" +SUBDIR+= XsunMono +.endif + +.if ${XSERVER_XSUN24} != "no" +SUBDIR+= Xsun24 +.endif + +.include Index: src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun diff -u /dev/null src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.1 --- /dev/null Wed Jul 22 19:26:37 2020 +++ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun Wed Jul 22 19:26:37 2020 @@ -0,0 +1,134 @@ +# $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 19:26:37 tsutsui Exp $ + +.include + +PROG?= Xsun +BINMODE= 4711 + +.include "../../../Makefile.serverlib" +.include "../../../Makefile.servermod" + +WARNS?= 2 + +.PATH: ${X11SRCDIR.xorg-server}/hw/sun + +BUILDSYMLINKS= +CPPFLAGS+= -DINCLUDE_CG2_HEADER +#CPPFLAGS+= -DLOWMEMFTPT + +# for Xsun (8bpp) +.if ${PROG} == "Xsun" +SRCS= sunInit.c +SRCS+= sunCfb.c +# XXX not yet +#SRCS+= sunGX.c sunCursor.c +SRCS+= sunMfb.c + +BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c +SRCS+= sunInitExt.c +.endif + +# for XsunMono (1bpp) +.if ${PROG} == "XsunMono" +BUILDSYMLINKS+= sunInit.c sunInitMono.c +SRCS= sunInitMono.c +SRCS+= sunMfb.c + +BUILDSYMLINKS+= ../../mi/miinitext.c sunInExMono.c +SRCS+= sunInExMono.c + +CPPFLAGS.sunInitMono.c= -DSUNMAXDEPTH=1 +CPPFLAGS.sunInExMono.c= -URENDER +.endif + +# for Xsun24 (24bpp) +.if ${PROG} == "Xsun24" +BUILDSYMLINKS+= sunInit.c sunInitMulti.c +SRCS+= sunInitMulti.c +SRCS+= sunCfb.c +SRCS+= sunCfb24.c +SRCS+= sunMfb.c + +BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c +SRCS+= sunInitExt.c + +CPPFLAGS.sunInitMulti.c= -DSUNMAXDEPTH=32 +.endif + +# for XsunMulti (XXX: incomplete?) +.if 0 +SRCS+= sunMultiDepth.c + +BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c +SRCS+= sunInitExt.c +.endif + +# common sources +SRCS+= sunFbs.c sunIo.c sunKbd.c sunKeyMap.c sunMouse.c + +.PATH: ${X11SRCDIR.xorg-server}/Xext +SRCS+= dpmsstubs.c + +.PATH: ${X11SRCDIR.xorg-server}/Xi +SRCS+= stubs.c + +.PATH: ${X11SRCDIR.xorg-server}/fb +SRCS+= fbcmap_mi.c + +CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \ + ${X11INCS.DIX} + +CPPFLAGS+= -UHAVE_XORG_CONFIG_H + +CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ + -UXF86DRI -UXF86BIGFONT + +.include "../../../Makefile.Xserver" + +LDADD+=
CVS commit: src/external/mit/xorg/server
Module Name:src Committed By: tsutsui Date: Mon Jul 20 13:59:57 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/xnest: Makefile src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile Log Message: Remove extra "-I" for ${X11INCS.DIX} macro. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile cvs rdiff -u -r1.21 -r1.22 \ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile diff -u src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.3 src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.4 --- src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.3 Sun May 21 15:28:40 2017 +++ src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile Mon Jul 20 13:59:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/05/21 15:28:40 riastradh Exp $ +# $NetBSD: Makefile,v 1.4 2020/07/20 13:59:57 tsutsui Exp $ .include @@ -28,7 +28,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw -I${DESTDIR}${X11INCDIR}/X11/extensions \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${X11SRCDIR.xorg-server}/../include \ - -I${X11INCS.DIX} + ${X11INCS.DIX} CPPFLAGS+= ${X11FLAGS.OS_DEFINES} \ ${X11FLAGS.EXTENSION} \ Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.21 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22 --- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.21 Mon Dec 31 11:14:06 2018 +++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Mon Jul 20 13:59:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2018/12/31 11:14:06 mrg Exp $ +# $NetBSD: Makefile,v 1.22 2020/07/20 13:59:57 tsutsui Exp $ .include @@ -30,7 +30,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw -I${DESTDIR}${X11INCDIR}/X11/extensions \ -I${DESTDIR}${X11INCDIR}/pixman-1 \ -I${X11SRCDIR.xorg-server}/../include \ - -I${X11INCS.DIX} + ${X11INCS.DIX} CPPFLAGS+= ${X11FLAGS.OS_DEFINES} \ ${X11FLAGS.EXTENSION} \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Sat Jul 18 16:07:15 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile Log Message: Xorg 1.20 servers require libXfont2 instead of libXfont. Per the following upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7 > dix: Switch to the libXfont2 API (v2) Now Xorg 1.20 based X68k server builds and confirmed working on XM6i. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7 --- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6 Sat Jul 18 15:26:30 2020 +++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Sat Jul 18 16:07:15 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $ +# $NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $ .include @@ -63,7 +63,7 @@ LDADD+= ${LDADD.dix} \ ${LDADD.miext/damage} \ ${LDADD.miext/sync} \ ${LDADD.Xi} \ - -lXfont \ + -lXfont2 \ -lpixman-1 \ -lXext \ -lX11 \ @@ -84,7 +84,7 @@ DPADD+= ${LDADD.dix} \ ${DPADD.miext/damage} \ ${DPADD.miext/sync} \ ${DPADD.Xi} \ - ${LIBXFONT} \ + ${LIBXFONT2} \ ${LIBPIXMAN-1} \ ${LIBXEXT} \ ${LIBX11} \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Sat Jul 18 15:26:30 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile Log Message: Sync with xorg-server.old: No need to link miext/libshadow.a. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6 --- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5 Thu Jan 3 23:26:58 2019 +++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Sat Jul 18 15:26:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/01/03 23:26:58 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $ .include @@ -61,7 +61,6 @@ LDADD+= ${LDADD.dix} \ ${LDADD.xfixes} \ ${LDADD.damageext} \ ${LDADD.miext/damage} \ - ${LDADD.miext/shadow} \ ${LDADD.miext/sync} \ ${LDADD.Xi} \ -lXfont \ @@ -83,7 +82,6 @@ DPADD+= ${LDADD.dix} \ ${DPADD.xfixes} \ ${DPADD.damageext} \ ${DPADD.miext/damage} \ - ${DPADD.miext/shadow} \ ${DPADD.miext/sync} \ ${DPADD.Xi} \ ${LIBXFONT} \
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Sat Jul 18 15:24:31 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile Log Message: No need to link miext/libshadow.a. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile diff -u src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2 --- src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016 +++ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Sat Jul 18 15:24:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2020/07/18 15:24:31 tsutsui Exp $ .include @@ -58,7 +58,6 @@ LDADD+= ${LDADD.dix} \ ${LDADD.xfixes} \ ${LDADD.damageext} \ ${LDADD.miext/damage} \ - ${LDADD.miext/shadow} \ ${LDADD.miext/sync} \ ${LDADD.Xi} \ -lXfont \ @@ -80,7 +79,6 @@ DPADD+= ${LDADD.dix} \ ${DPADD.xfixes} \ ${DPADD.damageext} \ ${DPADD.miext/damage} \ - ${DPADD.miext/shadow} \ ${DPADD.miext/sync} \ ${DPADD.Xi} \ ${LIBXFONT} \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Sat Apr 4 03:04:58 UTC 2020 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Add all the dependent libraries and sort To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/gallium/Makefile diff -u src/external/mit/xorg/lib/gallium/Makefile:1.43 src/external/mit/xorg/lib/gallium/Makefile:1.44 --- src/external/mit/xorg/lib/gallium/Makefile:1.43 Fri Jan 31 16:13:40 2020 +++ src/external/mit/xorg/lib/gallium/Makefile Fri Apr 3 23:04:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2020/01/31 21:13:40 jmcneill Exp $ +# $NetBSD: Makefile,v 1.44 2020/04/04 03:04:58 christos Exp $ # Link the gallium mega driver. @@ -25,7 +25,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd CFLAGS+= -pthread LDFLAGS+= -pthread -LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread GALLIUM_SUBDIRS= \ auxiliary \ @@ -953,10 +952,11 @@ CPPFLAGS.${_s}+= -I${X11SRCDIR.Mesa}/src .if ${BUILD_RADEON} == 1 CFLAGS+= -pthread LDFLAGS+= -pthread -LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread .endif -LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm +LIBDPLIBS+= X11-xcb ${.CURDIR}/../libX11/libX11-xcb +LIBDPLIBS+= xcb-dri2${.CURDIR}/../libxcb/dri2 +LIBDPLIBS+= xcb ${.CURDIR}/../libxcb/libxcb .if ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1 LIBDPLIBS+= drm ${.CURDIR}/../libdrm .if ${BUILD_I915} == 1 @@ -973,10 +973,11 @@ LIBDPLIBS+= drm_nouveau ${.CURDIR}/../l LIBDPLIBS+= glapi ${.CURDIR}/../libglapi LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat LIBDPLIBS+= terminfo ${.CURDIR}/../../../../../lib/libterminfo -LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz LIBDPLIBS+= execinfo ${.CURDIR}/../../../../../lib/libexecinfo -LIBDPLIBS+= X11-xcb ${.CURDIR}/../libX11/libX11-xcb -LIBDPLIBS+= xcb-dri2${.CURDIR}/../libxcb/dri2 + +LIBDPLIBS+= elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf +LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz +LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm # gallium drivers requiring LLVM .if ${BUILD_LLVMPIPE} == 1 || ${BUILD_RADEON} == 1
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: maya Date: Sun Mar 29 21:06:03 UTC 2020 Modified Files: src/external/mit/xorg/lib: libloader.mk src/external/mit/xorg/lib/libGL: Makefile Log Message: Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the file that needs it. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libloader.mk cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/lib/libGL/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libloader.mk diff -u src/external/mit/xorg/lib/libloader.mk:1.5 src/external/mit/xorg/lib/libloader.mk:1.6 --- src/external/mit/xorg/lib/libloader.mk:1.5 Fri Feb 7 19:00:18 2020 +++ src/external/mit/xorg/lib/libloader.mk Sun Mar 29 21:06:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: libloader.mk,v 1.5 2020/02/07 19:00:18 jmcneill Exp $ +# $NetBSD: libloader.mk,v 1.6 2020/03/29 21:06:03 maya Exp $ # makefile fragment for mesa src/loader @@ -15,7 +15,6 @@ CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/src -I${X11SRCDIR.Mesa}/../src/util \ -I${X11SRCDIR.Mesa}/src/mesa \ -I${X11SRCDIR.Mesa}/src \ - -DGL_LIB_NAME=\"libGL.so.3\" \ -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \ -DUSE_DRICONF \ -DHAVE_LIBDRM Index: src/external/mit/xorg/lib/libGL/Makefile diff -u src/external/mit/xorg/lib/libGL/Makefile:1.28 src/external/mit/xorg/lib/libGL/Makefile:1.29 --- src/external/mit/xorg/lib/libGL/Makefile:1.28 Tue Sep 24 19:29:42 2019 +++ src/external/mit/xorg/lib/libGL/Makefile Sun Mar 29 21:06:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2019/09/24 19:29:42 maya Exp $ +# $NetBSD: Makefile,v 1.29 2020/03/29 21:06:03 maya Exp $ .include @@ -117,7 +117,8 @@ SRCS.dri= \ .for fn in ${SRCS.dri} CPPFLAGS.${fn}= \ - -I${X11SRCDIR.Mesa}/src + -I${X11SRCDIR.Mesa}/src \ + -DGL_LIB_NAME="\"libGL.so.${SHLIB_MAJOR}\"" .endfor .endif
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: snj Date: Thu Mar 12 21:55:31 UTC 2020 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man Log Message: regen for xkeyboard-config 2.29 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.6 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.7 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.6 Wed Mar 6 11:05:18 2019 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Thu Mar 12 21:55:31 2020 @@ -77,7 +77,6 @@ geniuscomfy2 Genius Comfy KB-21e-Scroll geniuskb19e Genius KB-19e NB geniuskkb2050hs Genius KKB-2050HS gyration Gyration -htcdream HTC Dream kinesis Kinesis logitech_base Logitech logitech_g15 Logitech G15 extra keys via G15daemon @@ -136,6 +135,7 @@ vsonku306 ViewSonic KU-306 Internet microsoftprose Microsoft Internet Pro (Swedish) microsoftoffice Microsoft Office Keyboard microsoftmult Microsoft Wireless Multimedia 1.0A +microsoftsurface Microsoft Surface microsoftelite Microsoft Natural Elite microsoftccurve2k Microsoft Comfort Curve 2000 oretec Ortek Multimedia/Internet MCK-800 @@ -197,7 +197,6 @@ targa_v811 Targa Visionary 811 unitekkb1925 Unitek KB-1925 compalfl90 FL90 creativedw7000 Creative Desktop Wireless 7000 -htcdream Htc Dream phone teck227 Truly Ergonomic 227 teck229 Truly Ergonomic 229 apex300 SteelSeries Apex 300 (Apex RAW) @@ -231,6 +230,7 @@ us(mac) English (Macintosh) us(altgr-intl) English (intl., with AltGr dead keys) us(olpc2) English (the divide/multiply keys toggle the layout) us(hbs) Serbo-Croatian (US) +us(norman) English (Norman) us(workman) English (Workman) us(workman-intl) English (Workman, intl., with dead keys) @@ -256,6 +256,7 @@ ara(mac) Arabic (Macintosh) _ al Albanian al(plisi) Albanian (Plisi) +al(veqilharxhi) Albanian (Veqilharxhi) _ am Armenian @@ -311,7 +312,6 @@ in(guru) Punjabi (Gurmukhi) in(jhelum) Punjabi (Gurmukhi Jhelum) in(kan) Kannada in(kan-kagapa) Kannada (KaGaPa phonetic) -in(kan-kagapa) Kannada (KaGaPa phonetic) in(mal) Malayalam in(mal_lalitha) Malayalam (Lalitha) in(mal_enhanced) Malayalam (enhanced Inscript, with rupee) @@ -399,6 +399,13 @@ cd French (Democratic Republic of the Co _ cn Chinese +cn(mon_trad) Mongolian (Bichig) +cn(mon_trad_todo) Mongolian Todo +cn(mon_trad_xibe) Mongolian Xibe +cn(mon_trad_manchu) Mongolian Manchu +cn(mon_trad_galik) Mongolian Galik +cn(mon_todo_galik) Mongolian Todo Galik +cn(mon_manchu_galik) Mongolian Manchu Galik cn(tib) Tibetan cn(tib_asciinum) Tibetan (with ASCII numerals) cn(ug) Uyghur @@ -416,6 +423,7 @@ cz Czech cz(bksl) Czech (with <\|> key) cz(qwerty) Czech (QWERTY) cz(qwerty_bksl) Czech (QWERTY, extended backslash) +cz(qwerty-mac) Czech (QWERTY, Macintosh) cz(ucw) Czech (UCW, only accented letters) cz(dvorak-ucw) Czech (US, Dvorak, UCW support) cz(rus) Russian (Czech, phonetic) @@ -464,9 +472,9 @@ fo(nodeadkeys) Faroese (no dead keys) _ fi Finnish +fi(winkeys) Finnish (Winkeys) fi(classic) Finnish (classic) fi(nodeadkeys) Finnish (classic, no dead keys) -fi(winkeys) Finnish (Winkeys) fi(smi) Northern Saami (Finland) fi(mac) Finnish (Macintosh) @@ -483,9 +491,11 @@ fr(latin9_nodeadkeys) French (legacy, al fr(latin9_sundeadkeys) French (legacy, alt., with Sun dead keys) fr(bepo) French (Bepo, ergonomic, Dvorak way) fr(bepo_latin9) French (Bepo, ergonomic, Dvorak way, Latin-9 only) +fr(bepo_afnor) French (Bepo, ergonomic, Dvorak way, AFNOR) fr(dvorak) French (Dvorak) fr(mac) French (Macintosh) fr(azerty) French (AZERTY) +fr(afnor) French (AFNOR standardized AZERTY) fr(bre) French (Breton) fr(oci) Occitan fr(geo) Georgian (France, AZERTY Tskapo) @@ -585,6 +595,7 @@ it(geo) Georgian (Italy) it(ibm) Italian (IBM 142) it(intl) Italian (intl., with dead keys) it(scn) Sicilian +it(fur) Friulian (Italy) _ jp Japanese @@ -628,6 +639,7 @@ lt(us) Lithuanian (US, with Lithuanian l lt(ibm) Lithuanian (IBM LST 1205-92) lt(lekp) Lithuanian (LEKP) lt(lekpa) Lithuanian (LEKPa) +lt(sgs) Samogitian _ lv Latvian @@ -658,6 +670,8 @@ mk(nodeadkeys) Macedonian (no dead keys) _ mt Maltese mt(us) Maltese (with US layout) +mt(alt-us) Maltese (US layout with AltGr overrides) +mt(alt-gb) Maltese (UK layout with AltGr overrides) _ mn Mongolian @@ -950,7 +964,11 @@ md Moldavian md(gag) Moldavian (Gagauz) _ -id Indonesian (Jawi) +id Indonesian (Arab Melayu, phonetic) +id(phoneticx) Indonesian (Arab Melayu, ext. phonetic) + +_ +jv Indonesian (Javanese) _ my Malay (Jawi, Arabic Keyboard) @@ -973,7 +991,7 @@ Option Description grp:switch Right Alt (while
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: mrg Date: Sun Feb 23 09:24:12 UTC 2020 Modified Files: src/external/mit/xorg/lib/libXfont2: Makefile src/external/mit/xorg/lib/libXvMCW: Makefile Log Message: fix libXfont2 build, and (for now) remove new XvMCW pkg-config file. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXfont2/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXvMCW/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libXfont2/Makefile diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.5 src/external/mit/xorg/lib/libXfont2/Makefile:1.6 --- src/external/mit/xorg/lib/libXfont2/Makefile:1.5 Fri Aug 3 02:23:09 2018 +++ src/external/mit/xorg/lib/libXfont2/Makefile Sun Feb 23 09:24:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2018/08/03 02:23:09 kamil Exp $ +# $NetBSD: Makefile,v 1.6 2020/02/23 09:24:12 mrg Exp $ .include @@ -25,7 +25,8 @@ SRCS.util= \ miscutil.c \ patcache.c \ private.c \ - utilbitmap.c + utilbitmap.c \ + reallocarray.c .PATH: ${XFONT2DIR}/src/util SRCS.fontfile= \ @@ -104,6 +105,7 @@ CPPFLAGS+= -DHAS_SNPRINTF -DHAVE_CONFIG_ CPPFLAGS+= -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION CPPFLAGS+= -DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\" CPPFLAGS+= -I${XFONT2DIR}/src/stubs +CPPFLAGS+= -I${XFONT2DIR} CPPFLAGS+= -I${XFONT2DIR}/include CPPFLAGS+= -I${XFONT2DIR}/../include CPPFLAGS+= -I${DESTDIR}${X11INCDIR} Index: src/external/mit/xorg/lib/libXvMCW/Makefile diff -u src/external/mit/xorg/lib/libXvMCW/Makefile:1.4 src/external/mit/xorg/lib/libXvMCW/Makefile:1.5 --- src/external/mit/xorg/lib/libXvMCW/Makefile:1.4 Sun Feb 23 09:10:51 2020 +++ src/external/mit/xorg/lib/libXvMCW/Makefile Sun Feb 23 09:24:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/02/23 09:10:51 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2020/02/23 09:24:12 mrg Exp $ .include @@ -19,7 +19,9 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \ COPTS.XvMCWrapper.c= ${GCC_NO_STRINGOP_OVERFLOW} -PKGDIST= xvmc-wrapper +# XXX +#PKGDIST= xvmc-wrapper +#.PATH: ${X11SRCDIR.XvMC} .include .include
CVS commit: src/external/mit/xorg/lib/libX11/extensions
Module Name:src Committed By: mrg Date: Sun Feb 23 09:14:05 UTC 2020 Modified Files: src/external/mit/xorg/lib/libX11/extensions: Makefile Log Message: find the moved header. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libX11/extensions/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libX11/extensions/Makefile diff -u src/external/mit/xorg/lib/libX11/extensions/Makefile:1.1 src/external/mit/xorg/lib/libX11/extensions/Makefile:1.2 --- src/external/mit/xorg/lib/libX11/extensions/Makefile:1.1 Sun Feb 23 09:10:50 2020 +++ src/external/mit/xorg/lib/libX11/extensions/Makefile Sun Feb 23 09:14:05 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2020/02/23 09:10:50 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2020/02/23 09:14:05 mrg Exp $ NOPROG= yes @@ -6,4 +6,7 @@ INCS= XKBgeom.h INCSDIR=${X11INCDIR}/X11/extensions .include + +.PATH: ${X11SRCDIR.X11}/include/X11/extensions + .include
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Sun Feb 23 09:10:51 UTC 2020 Modified Files: src/external/mit/xorg/include/xorgproto/X11/extensions: Makefile src/external/mit/xorg/lib/libX11: Makefile src/external/mit/xorg/lib/libXvMC: Makefile src/external/mit/xorg/lib/libXvMCW: Makefile Added Files: src/external/mit/xorg/lib/libX11/extensions: Makefile Log Message: updates for xorgproto 2019.2, libX11 1.6.9, and libXvMC 1.0.12. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/libX11/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libX11/extensions/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXvMC/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXvMCW/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile diff -u src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.1 src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.2 --- src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.1 Wed Mar 14 08:55:36 2018 +++ src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile Sun Feb 23 09:10:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/03/14 08:55:36 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2020/02/23 09:10:50 mrg Exp $ .include @@ -11,7 +11,6 @@ INCS= EVI.h \ XI2proto.h \ XIproto.h \ XKB.h \ - XKBgeom.h \ XKBproto.h \ XKBsrv.h \ XKBstr.h \ @@ -70,7 +69,6 @@ INCS= EVI.h \ syncconst.h \ syncproto.h \ syncstr.h \ - vldXvMC.h \ xcmiscproto.h \ xcmiscstr.h \ xf86bigfont.h \ Index: src/external/mit/xorg/lib/libX11/Makefile diff -u src/external/mit/xorg/lib/libX11/Makefile:1.13 src/external/mit/xorg/lib/libX11/Makefile:1.14 --- src/external/mit/xorg/lib/libX11/Makefile:1.13 Sun Jul 19 08:18:32 2015 +++ src/external/mit/xorg/lib/libX11/Makefile Sun Feb 23 09:10:50 2020 @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2015/07/19 08:18:32 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2020/02/23 09:10:50 mrg Exp $ .include SUBDIR= dynamic .WAIT libX11-xcb static \ - ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric + ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric \ + extensions INCS= ImUtil.h XKBlib.h Xcms.h Xlib-xcb.h Xlib.h XlibConf.h \ Xlibint.h Xlocale.h Xregion.h Xresource.h Xutil.h \ Index: src/external/mit/xorg/lib/libXvMC/Makefile diff -u src/external/mit/xorg/lib/libXvMC/Makefile:1.4 src/external/mit/xorg/lib/libXvMC/Makefile:1.5 --- src/external/mit/xorg/lib/libXvMC/Makefile:1.4 Sun Mar 16 22:53:17 2014 +++ src/external/mit/xorg/lib/libXvMC/Makefile Sun Feb 23 09:10:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/03/16 22:53:17 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2020/02/23 09:10:50 mrg Exp $ .include @@ -8,7 +8,7 @@ LIB= XvMC SRCS= XvMC.c -INCS= XvMClib.h +INCS= XvMClib.h vldXvMC.h INCSDIR=${X11INCDIR}/X11/extensions CPPFLAGS+= ${X11FLAGS.THREADLIB} Index: src/external/mit/xorg/lib/libXvMCW/Makefile diff -u src/external/mit/xorg/lib/libXvMCW/Makefile:1.3 src/external/mit/xorg/lib/libXvMCW/Makefile:1.4 --- src/external/mit/xorg/lib/libXvMCW/Makefile:1.3 Sun Oct 13 07:28:08 2019 +++ src/external/mit/xorg/lib/libXvMCW/Makefile Sun Feb 23 09:10:51 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:08 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2020/02/23 09:10:51 mrg Exp $ .include @@ -19,5 +19,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \ COPTS.XvMCWrapper.c= ${GCC_NO_STRINGOP_OVERFLOW} +PKGDIST= xvmc-wrapper + .include .include Added files: Index: src/external/mit/xorg/lib/libX11/extensions/Makefile diff -u /dev/null src/external/mit/xorg/lib/libX11/extensions/Makefile:1.1 --- /dev/null Sun Feb 23 09:10:51 2020 +++ src/external/mit/xorg/lib/libX11/extensions/Makefile Sun Feb 23 09:10:50 2020 @@ -0,0 +1,9 @@ +# $NetBSD: Makefile,v 1.1 2020/02/23 09:10:50 mrg Exp $ + +NOPROG= yes + +INCS= XKBgeom.h +INCSDIR=${X11INCDIR}/X11/extensions + +.include +.include
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: joerg Date: Sun Feb 23 02:03:19 UTC 2020 Modified Files: src/external/mit/xorg/lib: libmesa.mk Log Message: Don't hard-code LLVM version, extract it from external/apache2/llvm. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libmesa.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libmesa.mk diff -u src/external/mit/xorg/lib/libmesa.mk:1.10 src/external/mit/xorg/lib/libmesa.mk:1.11 --- src/external/mit/xorg/lib/libmesa.mk:1.10 Fri Jan 31 20:58:18 2020 +++ src/external/mit/xorg/lib/libmesa.mk Sun Feb 23 02:03:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD: libmesa.mk,v 1.10 2020/01/31 20:58:18 jmcneill Exp $ +# $NetBSD: libmesa.mk,v 1.11 2020/02/23 02:03:19 joerg Exp $ # # Consumer of this Makefile should set MESA_SRC_MODULES. @@ -533,8 +533,10 @@ CPPFLAGS+= \ -DHAVE_MINCORE .if ${MKLLVMRT} != "no" +LLVM_VERSION!= cd ${NETBSDSRCDIR}/external/apache2/llvm && ${MAKE} -V LLVM_VERSION +HAVE_LLVM_VERSION!= expr ${LLVM_VERSION:R:R} \* 256 + ${LLVM_VERSION:R:E} \* 16 CPPFLAGS+= \ - -DHAVE_LLVM=0x0900 + -DHAVE_LLVM=${HAVE_LLVM_VERSION} CXXFLAGS+= -fno-rtti .endif
CVS commit: src/external/mit/xorg/lib/libglapi
Module Name:src Committed By: joerg Date: Sun Feb 23 02:02:33 UTC 2020 Modified Files: src/external/mit/xorg/lib/libglapi: Makefile Log Message: Doesn't need or use HAVE_LLVM. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libglapi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libglapi/Makefile diff -u src/external/mit/xorg/lib/libglapi/Makefile:1.6 src/external/mit/xorg/lib/libglapi/Makefile:1.7 --- src/external/mit/xorg/lib/libglapi/Makefile:1.6 Fri Jan 31 20:58:18 2020 +++ src/external/mit/xorg/lib/libglapi/Makefile Sun Feb 23 02:02:32 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/01/31 20:58:18 jmcneill Exp $ +# $NetBSD: Makefile,v 1.7 2020/02/23 02:02:32 joerg Exp $ .include @@ -73,7 +73,6 @@ CPPFLAGS+= \ -DHAVE_DRM_PLATFORM \ -DENABLE_SHADER_CACHE \ -DHAVE_MINCORE \ - -DHAVE_LLVM=0x0900 \ -DMESA_LLVM_VERSION_PATCH=0 \ -I. \ -DSTDC_HEADERS=1 \
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/lib
Module Name:src Committed By: jmcneill Date: Fri Feb 7 19:00:18 UTC 2020 Modified Files: src/external/mit/xorg/lib: libloader.mk Log Message: Define HAVE_LIBDRM (required for loader_get_pci_id_for_fd) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libloader.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libloader.mk diff -u src/external/mit/xorg/lib/libloader.mk:1.4 src/external/mit/xorg/lib/libloader.mk:1.5 --- src/external/mit/xorg/lib/libloader.mk:1.4 Tue Sep 24 19:29:41 2019 +++ src/external/mit/xorg/lib/libloader.mk Fri Feb 7 19:00:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: libloader.mk,v 1.4 2019/09/24 19:29:41 maya Exp $ +# $NetBSD: libloader.mk,v 1.5 2020/02/07 19:00:18 jmcneill Exp $ # makefile fragment for mesa src/loader @@ -17,7 +17,8 @@ CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/src -I${X11SRCDIR.Mesa}/src \ -DGL_LIB_NAME=\"libGL.so.3\" \ -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \ - -DUSE_DRICONF + -DUSE_DRICONF \ + -DHAVE_LIBDRM .endfor SRCS+= ${SRCS.loader}
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: jmcneill Date: Fri Jan 31 21:13:40 UTC 2020 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Bump MESA_LLVM_VERSION_STRING To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/gallium/Makefile diff -u src/external/mit/xorg/lib/gallium/Makefile:1.42 src/external/mit/xorg/lib/gallium/Makefile:1.43 --- src/external/mit/xorg/lib/gallium/Makefile:1.42 Fri Jan 31 20:56:03 2020 +++ src/external/mit/xorg/lib/gallium/Makefile Fri Jan 31 21:13:40 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2020/01/31 20:56:03 jmcneill Exp $ +# $NetBSD: Makefile,v 1.43 2020/01/31 21:13:40 jmcneill Exp $ # Link the gallium mega driver. @@ -1113,8 +1113,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse CPPFLAGS.i386+= -march=i586 CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}} -CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"7.0.0\" -CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"7.0.0\" +CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"9.0.0\" +CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"9.0.0\" .include "../driver.mk"
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: jmcneill Date: Fri Jan 31 20:58:18 UTC 2020 Modified Files: src/external/mit/xorg/lib: libmesa.mk src/external/mit/xorg/lib/libglapi: Makefile Log Message: Change HAVE_LLVM from 0x0700 to 0x0900. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libmesa.mk cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libglapi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libmesa.mk diff -u src/external/mit/xorg/lib/libmesa.mk:1.9 src/external/mit/xorg/lib/libmesa.mk:1.10 --- src/external/mit/xorg/lib/libmesa.mk:1.9 Tue Sep 24 21:33:48 2019 +++ src/external/mit/xorg/lib/libmesa.mk Fri Jan 31 20:58:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: libmesa.mk,v 1.9 2019/09/24 21:33:48 maya Exp $ +# $NetBSD: libmesa.mk,v 1.10 2020/01/31 20:58:18 jmcneill Exp $ # # Consumer of this Makefile should set MESA_SRC_MODULES. @@ -534,7 +534,7 @@ CPPFLAGS+= \ .if ${MKLLVMRT} != "no" CPPFLAGS+= \ - -DHAVE_LLVM=0x0700 + -DHAVE_LLVM=0x0900 CXXFLAGS+= -fno-rtti .endif Index: src/external/mit/xorg/lib/libglapi/Makefile diff -u src/external/mit/xorg/lib/libglapi/Makefile:1.5 src/external/mit/xorg/lib/libglapi/Makefile:1.6 --- src/external/mit/xorg/lib/libglapi/Makefile:1.5 Tue Sep 24 19:29:42 2019 +++ src/external/mit/xorg/lib/libglapi/Makefile Fri Jan 31 20:58:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/09/24 19:29:42 maya Exp $ +# $NetBSD: Makefile,v 1.6 2020/01/31 20:58:18 jmcneill Exp $ .include @@ -73,7 +73,7 @@ CPPFLAGS+= \ -DHAVE_DRM_PLATFORM \ -DENABLE_SHADER_CACHE \ -DHAVE_MINCORE \ - -DHAVE_LLVM=0x0700 \ + -DHAVE_LLVM=0x0900 \ -DMESA_LLVM_VERSION_PATCH=0 \ -I. \ -DSTDC_HEADERS=1 \
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: christos Date: Sat Jan 25 19:05:08 UTC 2020 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: try to fix the clang build To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/dri/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/dri/Makefile diff -u src/external/mit/xorg/lib/dri/Makefile:1.35 src/external/mit/xorg/lib/dri/Makefile:1.36 --- src/external/mit/xorg/lib/dri/Makefile:1.35 Sat Jan 18 19:58:14 2020 +++ src/external/mit/xorg/lib/dri/Makefile Sat Jan 25 14:05:08 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2020/01/19 00:58:14 jmcneill Exp $ +# $NetBSD: Makefile,v 1.36 2020/01/25 19:05:08 christos Exp $ # Link the mesa_dri_drivers mega driver. @@ -421,6 +421,7 @@ SRCS+= ${DRI_SOURCES.${_d}} .PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/${_d} .endfor + LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread @@ -441,6 +442,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse CPPFLAGS.isl_tiled_memcpy_sse41.c+= -msse4.1 .endif +CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wno-error=atomic-alignment :} + .include "../driver.mk" .for _d in ${DRIVERS}
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
Module Name:src Committed By: mrg Date: Tue Jan 7 07:27:51 UTC 2020 Modified Files: src/external/mit/xorg/bin/xtrap: Makefile.xtrap src/external/mit/xorg/lib/libXaw: Makefile src/external/mit/xorg/lib/libXaw6: Makefile Log Message: remove no longer necessary -Wno-error usage. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xtrap/Makefile.xtrap cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/libXaw/Makefile cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libXaw6/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xtrap/Makefile.xtrap diff -u src/external/mit/xorg/bin/xtrap/Makefile.xtrap:1.2 src/external/mit/xorg/bin/xtrap/Makefile.xtrap:1.3 --- src/external/mit/xorg/bin/xtrap/Makefile.xtrap:1.2 Fri Jul 1 01:25:52 2011 +++ src/external/mit/xorg/bin/xtrap/Makefile.xtrap Tue Jan 7 07:27:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.xtrap,v 1.2 2011/07/01 01:25:52 mrg Exp $ +# $NetBSD: Makefile.xtrap,v 1.3 2020/01/07 07:27:50 mrg Exp $ NOMAN= 1 @@ -15,8 +15,3 @@ DPADD+= ${LIBXTRAP} ${LIBXT} ${LIBSM} ${ .include .include - -# XXX -.if defined(HAVE_GCC) -COPTS+= -Wno-error -.endif Index: src/external/mit/xorg/lib/libXaw/Makefile diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.13 src/external/mit/xorg/lib/libXaw/Makefile:1.14 --- src/external/mit/xorg/lib/libXaw/Makefile:1.13 Tue Mar 19 06:19:44 2019 +++ src/external/mit/xorg/lib/libXaw/Makefile Tue Jan 7 07:27:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/03/19 06:19:44 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2020/01/07 07:27:50 mrg Exp $ .include @@ -75,9 +75,4 @@ X11EXTRAMANTRANSFORMS+= \ .include .include -# XXX -.if defined(HAVE_GCC) -COPTS.XawIm.c+= -Wno-error -.endif - CWARNFLAGS.clang+= -Wno-format Index: src/external/mit/xorg/lib/libXaw6/Makefile diff -u src/external/mit/xorg/lib/libXaw6/Makefile:1.9 src/external/mit/xorg/lib/libXaw6/Makefile:1.10 --- src/external/mit/xorg/lib/libXaw6/Makefile:1.9 Sun Jul 19 07:55:07 2015 +++ src/external/mit/xorg/lib/libXaw6/Makefile Tue Jan 7 07:27:50 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2015/07/19 07:55:07 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2020/01/07 07:27:50 mrg Exp $ NOCHECKVER= yes # we want to install an older version ... MKLINKLIB= no @@ -37,8 +37,3 @@ PKGDIST= ${LIBOLD} .include .include - -# XXX -.if defined(HAVE_GCC) -COPTS.XawIm.c+= -Wno-error -.endif
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/lib/libEGL
Module Name:src Committed By: christos Date: Fri Apr 26 19:42:27 UTC 2019 Modified Files: src/external/mit/xorg/lib/libEGL: Makefile Log Message: Fix stack protector build To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libEGL/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libEGL/Makefile diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.3 src/external/mit/xorg/lib/libEGL/Makefile:1.4 --- src/external/mit/xorg/lib/libEGL/Makefile:1.3 Sat Apr 20 13:31:22 2019 +++ src/external/mit/xorg/lib/libEGL/Makefile Fri Apr 26 15:42:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/04/20 17:31:22 maya Exp $ +# $NetBSD: Makefile,v 1.4 2019/04/26 19:42:27 christos Exp $ .include @@ -120,6 +120,7 @@ PKGDIST.egl= ${X11SRCDIR.Mesa}/src/egl/m PKGCONFIG_VERSION.egl= ${MESA_VER} CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion +COPTS.platform_drm.c+= -Wno-error=stack-protector .include .include
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: christos Date: Fri Apr 26 18:49:35 UTC 2019 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Amputate stack protector warnings, instead of trying more band-aids. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/dri/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/dri/Makefile diff -u src/external/mit/xorg/lib/dri/Makefile:1.31 src/external/mit/xorg/lib/dri/Makefile:1.32 --- src/external/mit/xorg/lib/dri/Makefile:1.31 Tue Apr 9 10:47:14 2019 +++ src/external/mit/xorg/lib/dri/Makefile Fri Apr 26 14:49:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2019/04/09 14:47:14 maya Exp $ +# $NetBSD: Makefile,v 1.32 2019/04/26 18:49:35 christos Exp $ # Link the mesa_dri_drivers mega driver. @@ -465,17 +465,7 @@ CWARNFLAGS.clang+= -Wno-error=initialize -Wno-error=tautological-constant-out-of-range-compare \ -Wno-error=enum-conversion -COPTS.brw_state_batch.c += -Wno-stack-protector -COPTS.brw_eu_compact.c += -Wno-stack-protector -COPTS.brw_fs.cpp += -Wno-stack-protector -COPTS.brw_fs_copy_propagation.cpp += -Wno-stack-protector -COPTS.brw_fs_reg_allocate.cpp += -Wno-stack-protector -COPTS.brw_program.c += -Wno-stack-protector -COPTS.brw_schedule_instructions.cpp += -Wno-stack-protector -COPTS.brw_vec4.cpp += -Wno-stack-protector -COPTS.brw_vec4_copy_propagation.cpp += -Wno-stack-protector -COPTS.brw_vec4_reg_allocate.cpp += -Wno-stack-protector -COPTS.brw_vec4_visitor.cpp += -Wno-stack-protector +COPTS+= -Wno-error=stack-protector .include .else
CVS commit: src/external/mit/xorg/lib/libgbm
Module Name:src Committed By: maya Date: Thu Apr 25 09:03:54 UTC 2019 Modified Files: src/external/mit/xorg/lib/libgbm: Makefile Log Message: Link against expat. Helps us pass a qt5-qtbase gbm configure check, and avoid PLIST issues. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libgbm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libgbm/Makefile diff -u src/external/mit/xorg/lib/libgbm/Makefile:1.5 src/external/mit/xorg/lib/libgbm/Makefile:1.6 --- src/external/mit/xorg/lib/libgbm/Makefile:1.5 Sat Apr 20 17:31:22 2019 +++ src/external/mit/xorg/lib/libgbm/Makefile Thu Apr 25 09:03:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/04/20 17:31:22 maya Exp $ +# $NetBSD: Makefile,v 1.6 2019/04/25 09:03:54 maya Exp $ .include @@ -47,6 +47,7 @@ INCSDIR= ${X11INCDIR} LIBDPLIBS= glapi ${.CURDIR}/../libglapi LIBDPLIBS+= drm ${.CURDIR}/../libdrm +LIBDPLIBS+= expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat PKGCONFIG= gbm PKGDIST.gbm= ${X11SRCDIR.Mesa}/src/gbm/main
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: maya Date: Sat Apr 20 17:31:22 UTC 2019 Modified Files: src/external/mit/xorg/lib/libEGL: Makefile src/external/mit/xorg/lib/libgbm: Makefile Log Message: Add missing file. Allows linking webkit-gtk (which has a process link against libEGL/libgbm). Thanks leot@ for the report! To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libEGL/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libgbm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libEGL/Makefile diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.2 src/external/mit/xorg/lib/libEGL/Makefile:1.3 --- src/external/mit/xorg/lib/libEGL/Makefile:1.2 Thu Apr 18 10:42:25 2019 +++ src/external/mit/xorg/lib/libEGL/Makefile Sat Apr 20 17:31:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/04/18 10:42:25 maya Exp $ +# $NetBSD: Makefile,v 1.3 2019/04/20 17:31:22 maya Exp $ .include @@ -38,13 +38,18 @@ SRCS.drivers/dri2= \ #SRCS.drivers/dri2+= \ # platform_x11_dri3.c +.PATH: ${X11SRCDIR.Mesa}/src/util BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c SRCS.util= \ - UTILdebug.c -CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \ + UTILdebug.c \ + u_process.c + +.for file in ${SRCS.util} +CPPFLAGS.${file}+= -I${X11SRCDIR.Mesa}/src/util \ -I${X11SRCDIR.Mesa}/src/mesa \ -I${X11SRCDIR.Mesa}/src \ -I${X11SRCDIR.Mesa}/src/gallium/include +.endfor .PATH: ${X11SRCDIR.Mesa}/include/EGL INCS= \ Index: src/external/mit/xorg/lib/libgbm/Makefile diff -u src/external/mit/xorg/lib/libgbm/Makefile:1.4 src/external/mit/xorg/lib/libgbm/Makefile:1.5 --- src/external/mit/xorg/lib/libgbm/Makefile:1.4 Tue Apr 16 21:20:51 2019 +++ src/external/mit/xorg/lib/libgbm/Makefile Sat Apr 20 17:31:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/04/16 21:20:51 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2019/04/20 17:31:22 maya Exp $ .include @@ -15,7 +15,8 @@ SRCS.dri= \ BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c SRCS.util= \ - UTILdebug.c + UTILdebug.c \ + u_process.c CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \ -I${X11SRCDIR.Mesa}/src/mesa \ -I${X11SRCDIR.Mesa}/src \
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src Committed By: mrg Date: Thu Apr 18 22:49:08 UTC 2019 Modified Files: src/external/mit/xorg/lib/libGL: Makefile Log Message: remove now dated comment. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/libGL/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libGL/Makefile diff -u src/external/mit/xorg/lib/libGL/Makefile:1.25 src/external/mit/xorg/lib/libGL/Makefile:1.26 --- src/external/mit/xorg/lib/libGL/Makefile:1.25 Thu Apr 11 10:15:53 2019 +++ src/external/mit/xorg/lib/libGL/Makefile Thu Apr 18 22:49:08 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/04/11 10:15:53 maya Exp $ +# $NetBSD: Makefile,v 1.26 2019/04/18 22:49:08 mrg Exp $ .include @@ -202,7 +202,7 @@ PKGDIST.gl= ${X11SRCDIR.Mesa}/src/mesa PKGCONFIG_VERSION.gl= ${MESA_VER} # XXX remove these from bsd.x11.mk -# XXX enable GLX TLS? it's enabled in the code, but not here.. + PKGCONFIG_SED_FLAGS= \ -e "s,@GL_PC_REQ_PRIV@,libdrm x11 xext xdamage xfixes xcb-glx xcb-dri2 xxf86vm,; \ s,@GL_PKGCONF_LIB@,GL,; \
CVS commit: src/external/mit/xorg/lib/libEGL
Module Name:src Committed By: maya Date: Thu Apr 18 10:42:25 UTC 2019 Modified Files: src/external/mit/xorg/lib/libEGL: Makefile Log Message: We use pthread functions, link against pthread. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libEGL/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libEGL/Makefile diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.1 src/external/mit/xorg/lib/libEGL/Makefile:1.2 --- src/external/mit/xorg/lib/libEGL/Makefile:1.1 Tue Apr 16 21:21:51 2019 +++ src/external/mit/xorg/lib/libEGL/Makefile Thu Apr 18 10:42:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2019/04/18 10:42:25 maya Exp $ .include @@ -104,7 +104,8 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \ xcb-sync ${.CURDIR}/../libxcb/sync \ xcb ${.CURDIR}/../libxcb/libxcb \ expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \ - m ${NETBSDSRCDIR}/lib/libm + m ${NETBSDSRCDIR}/lib/libm \ + pthread ${NETBSDSRCDIR}/lib/libpthread MKLINT=no
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src Committed By: mrg Date: Thu Apr 18 10:10:33 UTC 2019 Modified Files: src/external/mit/xorg/lib/libepoxy: Makefile Log Message: if HAVE_XORG_GLAMOR != no, set define PLATFORM_HAS_EGL=1. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libepoxy/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libepoxy/Makefile diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.3 src/external/mit/xorg/lib/libepoxy/Makefile:1.4 --- src/external/mit/xorg/lib/libepoxy/Makefile:1.3 Tue Apr 16 21:20:51 2019 +++ src/external/mit/xorg/lib/libepoxy/Makefile Thu Apr 18 10:10:33 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/04/16 21:20:51 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2019/04/18 10:10:33 mrg Exp $ .include @@ -17,6 +17,7 @@ SRCS= \ SRCS+= \ dispatch_egl.c \ egl_generated_dispatch.c +CPPFLAGS+= -DPLATFORM_HAS_EGL=1 .endif INCSDIR=${X11INCDIR}/epoxy
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Tue Apr 16 21:21:51 UTC 2019 Added Files: src/external/mit/xorg/lib/libEGL: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl: Makefile Log Message: enable EGL and glamor. partly from maya@. for x86 and evbarm: - install headers and libEGL - install xorg-server glamoregl component - link xorg drivers against gbm/egl bonus fix: - fix some wrongly marked compatx11file files build tested on shark, sgimips, evbarm64-el, amd64 and i386. run tested on radeon, intel and nvidia on amd64, including 'modesetting' driver on amd64. however, my systems disable it due to llvmpipe so i'm not sure what is happening. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libEGL/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/mit/xorg/lib/libEGL/Makefile diff -u /dev/null src/external/mit/xorg/lib/libEGL/Makefile:1.1 --- /dev/null Tue Apr 16 21:21:51 2019 +++ src/external/mit/xorg/lib/libEGL/Makefile Tue Apr 16 21:21:51 2019 @@ -0,0 +1,120 @@ +# $NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $ + +.include + +LIB= EGL +LIBISCXX= yes + +SHLIB_MAJOR= 0 +SHLIB_MINOR= 0 + +#SUBDIR= internal + +# egl +.PATH: ${X11SRCDIR.Mesa}/src/egl/main +SRCS.egl= \ + eglapi.c \ + eglarray.c \ + eglconfig.c \ + eglcontext.c \ + eglcurrent.c \ + egldevice.c \ + egldisplay.c \ + egldriver.c \ + eglfallbacks.c \ + eglglobals.c \ + eglimage.c \ + egllog.c \ + eglsurface.c \ + eglsync.c + +.PATH: ${X11SRCDIR.Mesa}/src/egl/drivers/dri2 +SRCS.drivers/dri2= \ + egl_dri2.c \ + platform_x11.c \ + platform_drm.c + +# XXX notyet +#SRCS.drivers/dri2+= \ +# platform_x11_dri3.c + +BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c +SRCS.util= \ + UTILdebug.c +CPPFLAGS.UTILdebug.c+= -I${X11SRCDIR.Mesa}/src/util \ +-I${X11SRCDIR.Mesa}/src/mesa \ +-I${X11SRCDIR.Mesa}/src \ +-I${X11SRCDIR.Mesa}/src/gallium/include + +.PATH: ${X11SRCDIR.Mesa}/include/EGL +INCS= \ + egl.h \ + eglext.h \ + eglextchromium.h \ + eglmesaext.h \ + eglplatform.h +INCSDIR=${X11INCDIR}/EGL + +SRCS+= ${SRCS.egl} ${SRCS.drivers/dri2} ${SRCS.util} + +CPPFLAGS+= \ + -I${X11SRCDIR.Mesa}/include \ + -I${X11SRCDIR.Mesa}/include/drm-uapi \ + -I${X11SRCDIR.Mesa}/src/gbm/main \ + -I${X11SRCDIR.Mesa}/src/egl/main \ + -I${X11SRCDIR.Mesa}/src/gbm/backends/dri \ + -I${X11SRCDIR.Mesa}/src/loader \ + -I${X11SRCDIR.Mesa}/src \ + -I${DESTDIR}${X11INCDIR}/libdrm + +EGL_DRIVER_INSTALL_DIR=${X11ROOTDIR}/lib +CPPFLAGS+= \ + -DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \ + -D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11 \ + -D_EGL_DRIVER_SEARCH_DIR=\"$(EGL_DRIVER_INSTALL_DIR)\" \ + -D_EGL_OS_UNIX=1 + +CPPFLAGS+= ${X11FLAGS.THREADLIB} \ + -DHAVE_X11_PLATFORM \ + -DHAVE_DRM_PLATFORM \ + -DHAVE_TIMESPEC_GET \ + -DHAVE_PTHREAD \ + -DHAVE_LIBDRM \ + -DHAVE_MINCORE + +.include "../libloader.mk" + +CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp +CFLAGS+= -pthread + +# XXX missing: xcb-present +LIBDPLIBS= Xext ${.CURDIR}/../libXext \ + X11 ${.CURDIR}/../libX11/dynamic \ + Xfixes ${.CURDIR}/../libXfixes \ + Xdamage ${.CURDIR}/../libXdamage \ + Xdmcp ${.CURDIR}/../libXdmcp \ + glapi ${.CURDIR}/../libglapi \ + drm ${.CURDIR}/../libdrm \ + gbm ${.CURDIR}/../libgbm \ + xshmfence ${.CURDIR}/../libxshmfence \ + X11-xcb ${.CURDIR}/../libX11/libX11-xcb \ + xcb-dri2 ${.CURDIR}/../libxcb/dri2 \ + xcb-glx ${.CURDIR}/../libxcb/glx \ + xcb-xfixes ${.CURDIR}/../libxcb/xfixes \ + xcb-sync ${.CURDIR}/../libxcb/sync \ + xcb ${.CURDIR}/../libxcb/libxcb \ + expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \ + m ${NETBSDSRCDIR}/lib/libm + +MKLINT=no + +PKGCONFIG= egl +PKGDIST.egl= ${X11SRCDIR.Mesa}/src/egl/main +.include "${.CURDIR}/../libGL/mesa-ver.mk" +PKGCONFIG_VERSION.egl= ${MESA_VER} + +CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion + +.include +.include +.include Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.1 --- /dev/null Tue Apr 16 21:21:51 2019 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile Tue Apr 16 21:21:51 2019 @@ -0,0 +1,38 @@ +# $NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $ + +XMODULEDIR= ${X11USRLIBDIR}/modules + +.include "../../../Makefile.serverlib" +.include "../../../Makefile.servermod" + +LIB= glamoregl + +.PATH: ${X11SRCDIR.xorg-server}/glamor +.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/glamor_egl +SRCS= glamor_egl.c \ + glamor_eglmodule.c \ + glamor_xf86_xv.c + +CPPFLAGS+= \ + -I${X11SRCDIR.xorg-server}/hw/xfree86/common \ + -I${X11SRCDIR.xorg-server}/Xext \ +