CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src Committed By: maya Date: Mon Apr 22 03:38:49 UTC 2024 Modified Files: src/external/mit/xorg/lib/libGL: Makefile Log Message: mesa21: link against libxcb-sync for missing symbols Not super obvious in practice, but it does show if you run GL programs with LD_BIND_NOW. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 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.
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src
Committed By: maya
Date: Mon Apr 22 03:38:49 UTC 2024
Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
mesa21: link against libxcb-sync for missing symbols
Not super obvious in practice, but it does show if you run GL programs
with LD_BIND_NOW.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 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.34 src/external/mit/xorg/lib/libGL/Makefile:1.35
--- src/external/mit/xorg/lib/libGL/Makefile:1.34 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/libGL/Makefile Mon Apr 22 03:38:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: Makefile,v 1.35 2024/04/22 03:38:49 maya Exp $
.include
@@ -217,6 +217,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
xcb-glx ${.CURDIR}/../libxcb/glx \
xcb-shm ${.CURDIR}/../libxcb/shm \
+ xcb-sync ${.CURDIR}/../libxcb/sync \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
m ${NETBSDSRCDIR}/lib/libm \
pthread ${NETBSDSRCDIR}/lib/libpthread
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: maya
Date: Sun Apr 21 00:23:23 UTC 2024
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
Mesa 21: Add some intel files so we don't have missing symbols
seen as error messages when running "glxgears" on intel.
This also avoids graphical corruption (changed areas of terminal
emulator take a few seconds to gradually update) when the modesetting
driver is explicitly chosen.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 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.39 src/external/mit/xorg/lib/dri/Makefile:1.40
--- src/external/mit/xorg/lib/dri/Makefile:1.39 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/dri/Makefile Sun Apr 21 00:23:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: Makefile,v 1.40 2024/04/21 00:23:23 maya Exp $
# Link the mesa_dri_drivers mega driver.
@@ -121,9 +121,11 @@ DRI_SOURCES.i965+= \
blorp.c \
blorp_blit.c \
blorp_clear.c \
+ brw_batch.c \
brw_binding_tables.c \
brw_blit.c \
brw_blorp.c \
+ brw_mipmap_tree.c \
brw_buffer_objects.c \
brw_buffers.c \
brw_bufmgr.c \
@@ -158,6 +160,7 @@ DRI_SOURCES.i965+= \
brw_eu_util.c \
brw_eu_validate.c \
brw_extensions.c \
+ brw_fbo.c \
brw_fs.cpp \
brw_fs_bank_conflicts.cpp \
brw_fs_cmod_propagation.cpp \
@@ -171,20 +174,22 @@ DRI_SOURCES.i965+= \
brw_fs_lower_regioning.cpp \
brw_fs_nir.cpp \
brw_fs_reg_allocate.cpp \
+ brw_ff_gs.c \
+ brw_formatquery.c \
brw_fs_register_coalesce.cpp \
brw_fs_saturate_propagation.cpp \
brw_fs_scoreboard.cpp \
brw_fs_sel_peephole.cpp \
brw_fs_validate.cpp \
brw_fs_visitor.cpp \
- brw_ff_gs.c \
- brw_formatquery.c \
brw_generate_mipmap.c \
brw_gs.c \
brw_gs_surface_state.c \
brw_interpolation_map.c \
brw_ir_performance.cpp \
+ brw_link.cpp \
brw_meta_util.c \
+ brw_mipmap_tree.c \
brw_misc_state.c \
brw_nir.c \
brw_nir_analyze_boolean_resolves.c \
@@ -204,6 +209,7 @@ DRI_SOURCES.i965+= \
brw_nir_rt.c \
brw_nir_tcs_workarounds.c \
brw_nir_trig_workarounds.c \
+ brw_nir_uniforms.cpp \
brw_object_purgeable.c \
brw_packed_float.c \
brw_performance_query.c \
@@ -277,6 +283,7 @@ DRI_SOURCES.i965+= \
gfx8_multisample_state.c \
hsw_queryobj.c \
hsw_sol.c \
+ intel_perf_metrics.c \
isl.c \
isl_aux_info.c \
isl_drm.c \
@@ -311,8 +318,9 @@ I965_INTEL_DEV_FILES = \
intel_device_info.c
I965_INTEL_PERF_FILES = \
- intel_pps_driver.cc \
- intel_pps_perf.cc
+ intel_perf.c \
+ intel_perf_query.c \
+ intel_perf_mdapi.c
INTEL_GENS_BLORP= 40 45 50 60 70 75 80 90 110
@@ -346,6 +354,11 @@ DRI_SOURCES.i965+= i965_${_f}
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/dev/${_f} i965_${_f}
DRI_SOURCES.i965+= i965_${_f}
.endfor
+.for _f in ${I965_INTEL_PERF_FILES}
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/intel/perf/${_f} i965_${_f}
+DRI_SOURCES.i965+= i965_${_f}
+CPPFLAGS.i965_${_f}+= -I${X11SRCDIR.Mesa}/src/intel/perf
+.endfor
.for _f in ${DRI_SOURCES.i965}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/mesa/drivers/dri/i965 \
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: maya Date: Sun Apr 21 00:23:23 UTC 2024 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Mesa 21: Add some intel files so we don't have missing symbols seen as error messages when running "glxgears" on intel. This also avoids graphical corruption (changed areas of terminal emulator take a few seconds to gradually update) when the modesetting driver is explicitly chosen. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 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.
CVS commit: src/external/mit/xorg/lib/gallium.old
Module Name:src
Committed By: christos
Date: Thu Apr 4 23:50:13 UTC 2024
Modified Files:
src/external/mit/xorg/lib/gallium.old: Makefile
Log Message:
Don't ccreate dwarf-4 on these files because it breaks ctfconvert.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/gallium.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/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.8 src/external/mit/xorg/lib/gallium.old/Makefile:1.9
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.8 Sat Oct 7 08:15:52 2023
+++ src/external/mit/xorg/lib/gallium.old/Makefile Thu Apr 4 19:50:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/10/07 12:15:52 rin Exp $
+# $NetBSD: Makefile,v 1.9 2024/04/04 23:50:13 christos Exp $
# Transparent struct/union broken
NOLINT=yes
@@ -33,8 +33,8 @@ LDFLAGS+= -pthread
# Reduce debugging for these extremely large objects.
.if ${MKDEBUG:Uno} != "no"
-CXXFLAGS+= -g1
-CFLAGS+= -g1
+CXXFLAGS+= -g1 -gdwarf-3
+CFLAGS+= -g1 -gdwarf-3
.endif
GALLIUM_SUBDIRS= \
CVS commit: src/external/mit/xorg/lib/gallium.old
Module Name:src Committed By: christos Date: Thu Apr 4 23:50:13 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium.old: Makefile Log Message: Don't ccreate dwarf-4 on these files because it breaks ctfconvert. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/gallium.old/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src
Committed By: tsutsui
Date: Sat Jan 27 10:57:05 UTC 2024
Modified Files:
src/external/mit/xorg/server/xorg-server.old: Makefile.servermod
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb:
Makefile
Log Message:
Revert previous (stop building static libfb.a module for Xorg 1.10).
It breaks builds in xorg-server.old/hw/xfree86/Xorg on alpha,
netwinder, and sgimips (but not vax).
>> dependall ===> external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg
>> nbmake[13]: don't know how to make
>> [...]/xorg-server.old/hw/xfree86/dixmods/fb/libfb.a. Stop
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile
Please note that 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.servermod
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.6 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.7
--- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.6 Fri Jan 26 11:32:12 2024
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Sat Jan 27 10:57:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.6 2024/01/26 11:32:12 tsutsui Exp $
+# $NetBSD: Makefile.servermod,v 1.7 2024/01/27 10:57:04 tsutsui Exp $
NOFULLRELRO= yes
@@ -7,7 +7,7 @@ NOFULLRELRO= yes
.if defined(XMODULEDIR)
SHLIB_MAJOR=0
-# dri and dri2 need to be linked statically as well?
+# dri, dri2 and fb need to be linked statically as well?
.if !defined(XMODULEDIRANDSTATIC)
MKSTATICLIB:= no
.endif
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile:1.2 Fri Jan 26 11:32:12 2024
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile Sat Jan 27 10:57:05 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2024/01/26 11:32:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2024/01/27 10:57:05 tsutsui Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
+XMODULEDIRANDSTATIC= # defined
.include "../../../../Makefile.serverlib"
.include "../../../../Makefile.servermod"
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src Committed By: tsutsui Date: Sat Jan 27 10:57:05 UTC 2024 Modified Files: src/external/mit/xorg/server/xorg-server.old: Makefile.servermod src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb: Makefile Log Message: Revert previous (stop building static libfb.a module for Xorg 1.10). It breaks builds in xorg-server.old/hw/xfree86/Xorg on alpha, netwinder, and sgimips (but not vax). >> dependall ===> external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg >> nbmake[13]: don't know how to make >> [...]/xorg-server.old/hw/xfree86/dixmods/fb/libfb.a. Stop To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src
Committed By: tsutsui
Date: Fri Jan 26 11:32:12 UTC 2024
Modified Files:
src/external/mit/xorg/server/xorg-server.old: Makefile.servermod
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb:
Makefile
Log Message:
Stop building static libfb.a module for Xorg server 1.10 ports.
It looks unused and marked as obsolete in
src/distrib/sets/lists/xserver/md.* list files since netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile
Please note that 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.servermod
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.5 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.6
--- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.5 Mon Nov 1 10:05:19 2021
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Fri Jan 26 11:32:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.5 2021/11/01 10:05:19 nia Exp $
+# $NetBSD: Makefile.servermod,v 1.6 2024/01/26 11:32:12 tsutsui Exp $
NOFULLRELRO= yes
@@ -7,7 +7,7 @@ NOFULLRELRO= yes
.if defined(XMODULEDIR)
SHLIB_MAJOR=0
-# dri, dri2 and fb need to be linked statically as well?
+# dri and dri2 need to be linked statically as well?
.if !defined(XMODULEDIRANDSTATIC)
MKSTATICLIB:= no
.endif
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile Fri Jan 26 11:32:12 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2024/01/26 11:32:12 tsutsui Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
-XMODULEDIRANDSTATIC= # defined
.include "../../../../Makefile.serverlib"
.include "../../../../Makefile.servermod"
CVS commit: src/external/mit/xorg/server/xorg-server.old
Module Name:src Committed By: tsutsui Date: Fri Jan 26 11:32:12 UTC 2024 Modified Files: src/external/mit/xorg/server/xorg-server.old: Makefile.servermod src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb: Makefile Log Message: Stop building static libfb.a module for Xorg server 1.10 ports. It looks unused and marked as obsolete in src/distrib/sets/lists/xserver/md.* list files since netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/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: rjs Date: Sat Nov 25 20:00:25 UTC 2023 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Make building of more files conditional on MKLLVMRT. Make r300_state_derived.c compile with gcc 12. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: rjs
Date: Sat Nov 25 20:00:25 UTC 2023
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Make building of more files conditional on MKLLVMRT.
Make r300_state_derived.c compile with gcc 12.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 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.52 src/external/mit/xorg/lib/gallium/Makefile:1.53
--- src/external/mit/xorg/lib/gallium/Makefile:1.52 Wed Nov 22 17:48:35 2023
+++ src/external/mit/xorg/lib/gallium/Makefile Sat Nov 25 20:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2023/11/22 17:48:35 rjs Exp $
+# $NetBSD: Makefile,v 1.53 2023/11/25 20:00:25 rjs Exp $
# Link the gallium mega driver.
@@ -343,8 +343,12 @@ GALLIUM_SOURCES.auxiliary/util= \
GALLIUM_SOURCES.auxiliary/nir = \
nir_draw_helpers.c \
nir_to_tgsi.c \
- nir_to_tgsi_info.c \
tgsi_to_nir.c
+
+.if ${MKLLVMRT} != "no"
+GALLIUM_SOURCES.auxiliary/nir+= nir_to_tgsi_info.c
+.endif
+
GALLIUM_SOURCES.auxiliary/vl= \
vl_bicubic_filter.c \
vl_compositor.c \
@@ -384,6 +388,7 @@ CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/sr
GALLIUM_SOURCES.auxiliary/renderonly= \
renderonly.c
+.if ${MKLLVMRT} != "no"
GALLIUM_SOURCES.auxiliary/gallivm= \
lp_bld_arit.c \
lp_bld_arit_overflow.c \
@@ -422,8 +427,9 @@ GALLIUM_SOURCES.auxiliary/gallivm= \
lp_bld_tgsi.c \
lp_bld_tgsi_info.c \
lp_bld_tgsi_soa.c \
- lp_bld_type.c
- #lp_bld_debug.cpp
+ lp_bld_type.c \
+ lp_bld_debug.cpp
+.endif
.for _f in ${GALLIUM_SOURCES.auxiliary/gallivm}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/auxiliary/util
@@ -736,6 +742,8 @@ GALLIUM_SOURCES.drivers/r300 = \
r300_vs.c \
r300_vs_draw.c
+CPPFLAGS.r300_state_derived.c = ${CC_WNO_STRINGOP_OVERREAD}
+
GALLIUM_SOURCES.drivers/r300/compiler = \
memory_pool.c \
r300_fragprog.c \
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: rjs
Date: Wed Nov 22 17:48:35 UTC 2023
Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libgbm: Makefile
Log Message:
Include some more files.
Add a build-id note to gallium.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/driver.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libglsl.mk
cvs rdiff -u -r1.51 -r1.52 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.9 -r1.10 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/driver.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.5 src/external/mit/xorg/lib/driver.mk:1.6
--- src/external/mit/xorg/lib/driver.mk:1.5 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/driver.mk Wed Nov 22 17:48:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: driver.mk,v 1.5 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: driver.mk,v 1.6 2023/11/22 17:48:35 rjs Exp $
# stuff both dri and gallium drivers need.
@@ -28,6 +28,7 @@ SRCS.util= \
mesa-sha1.c \
os_file.c \
os_memory_fd.c \
+ os_misc.c \
os_time.c \
ralloc.c \
UTILdebug.c \
@@ -39,6 +40,7 @@ SRCS.util= \
set.c \
slab.c \
softfloat.c \
+ sparse_array.c \
string_buffer.c \
strtod.c \
u_atomic.c \
Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.7 src/external/mit/xorg/lib/libglsl.mk:1.8
--- src/external/mit/xorg/lib/libglsl.mk:1.7 Sun Jul 16 22:20:54 2023
+++ src/external/mit/xorg/lib/libglsl.mk Wed Nov 22 17:48:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: libglsl.mk,v 1.7 2023/07/16 22:20:54 rjs Exp $
+# $NetBSD: libglsl.mk,v 1.8 2023/11/22 17:48:35 rjs Exp $
LIBGLSL_GENERATED_CXX_FILES = \
glsl_lexer.cpp \
@@ -56,6 +56,7 @@ LIBGLSL_FILES = \
ir_function_detect_recursion.cpp \
ir_hierarchical_visitor.cpp \
ir_hv_accept.cpp \
+ ir_builder_print_visitor.cpp \
ir_print_visitor.cpp \
ir_reader.cpp \
ir_rvalue_visitor.cpp \
@@ -159,10 +160,10 @@ NIR_GENERATED_FILES = \
nir_opcodes.c \
nir_opt_algebraic.c
-#BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/compiler/nir/nir.c nir_nir.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/compiler/nir/nir.c nir_nir.c
NIR_FILES = \
- nir.c \
+ nir_nir.c \
nir_builtin_builder.c \
nir_clone.c \
nir_control_flow.c \
@@ -187,6 +188,7 @@ NIR_FILES = \
nir_lower_atomics_to_ssbo.c \
nir_lower_bit_size.c \
nir_lower_bitmap.c \
+ nir_lower_blend.c \
nir_lower_bool_to_float.c \
nir_lower_bool_to_int32.c \
nir_lower_clamp_color_outputs.c \
@@ -199,6 +201,7 @@ NIR_FILES = \
nir_lower_flatshade.c \
nir_lower_flrp.c \
nir_lower_fp16_conv.c \
+ nir_lower_fragcolor.c \
nir_lower_fragcoord_wtrans.c \
nir_lower_frexp.c \
nir_lower_global_vars_to_local.c \
@@ -209,6 +212,7 @@ NIR_FILES = \
nir_lower_indirect_derefs.c \
nir_lower_int64.c \
nir_lower_int_to_float.c \
+ nir_lower_interpolation.c \
nir_lower_io.c \
nir_lower_io_arrays_to_elements.c \
nir_lower_io_to_scalar.c \
@@ -228,6 +232,7 @@ NIR_FILES = \
nir_lower_returns.c \
nir_lower_samplers.c \
nir_lower_scratch.c \
+ nir_lower_ssbo.c \
nir_lower_subgroups.c \
nir_lower_system_values.c \
nir_lower_sysvals_to_varyings.c \
@@ -236,6 +241,7 @@ NIR_FILES = \
nir_lower_to_source_mods.c \
nir_lower_two_sided_color.c \
nir_lower_ubo_vec4.c \
+ nir_lower_undef_to_zero.c \
nir_lower_uniforms_to_ubo.c \
nir_lower_var_copies.c \
nir_lower_variable_initializers.c \
@@ -244,6 +250,7 @@ NIR_FILES = \
nir_lower_viewport_transform.c \
nir_lower_wpos_center.c \
nir_lower_wpos_ytransform.c \
+ nir_lower_wrmasks.c \
nir_metadata.c \
nir_move_vec_src_uses_to_dest.c \
nir_normalize_cubemap_coords.c \
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.51 src/external/mit/xorg/lib/gallium/Makefile:1.52
--- src/external/mit/xorg/lib/gallium/Makefile:1.51 Sat Oct 7 12:15:52 2023
+++ src/external/mit/xorg/lib/gallium/Makefile Wed Nov 22 17:48:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2023/10/07 12:15:52 rin Exp $
+# $NetBSD: Makefile,v 1.52 2023/11/22 17:48:35 rjs Exp $
# Link the gallium mega driver.
@@ -28,6 +28,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
CFLAGS+= -pthread
LDFLAGS+= -pthread
+LDFLAGS+= -Wl,--build-id=sha1
+
# Reduce debugging for these extremely large objects.
.if ${MKDEBUG:Uno} != "no"
#CXXFLAGS+= -g1
@@ -296,7 +298,6 @@ GALLIUM_SOURCES.auxiliary/translate= \
translate_generic.c \
translate_sse.c
GALLIUM_SOURCES.auxiliary/util= \
- os_misc.c \
u_async_debug.c \
u_bitmask.c \
u_blitter.c \
Index: src/external/mit/xorg/lib/libEGL/Makefile
diff -u
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: rjs Date: Wed Nov 22 17:48:35 UTC 2023 Modified Files: src/external/mit/xorg/lib: driver.mk libglsl.mk src/external/mit/xorg/lib/gallium: Makefile src/external/mit/xorg/lib/libEGL: Makefile src/external/mit/xorg/lib/libgbm: Makefile Log Message: Include some more files. Add a build-id note to gallium. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/driver.mk cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libglsl.mk cvs rdiff -u -r1.51 -r1.52 src/external/mit/xorg/lib/gallium/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libEGL/Makefile cvs rdiff -u -r1.9 -r1.10 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.
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src Committed By: tsutsui Date: Tue Nov 7 14:34:36 UTC 2023 Modified Files: src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile Log Message: xf86-input-keyboard: add build glue to enable USE_WSKBD_GETMAP. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 \ 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.
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src
Committed By: tsutsui
Date: Tue Nov 7 14:34:36 UTC 2023
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
Log Message:
xf86-input-keyboard: add build glue to enable USE_WSKBD_GETMAP.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
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.22 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.23
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.22 Wed Dec 15 15:27:30 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Tue Nov 7 14:34:35 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/12/15 15:27:30 christos Exp $
+# $NetBSD: Makefile,v 1.23 2023/11/07 14:34:35 tsutsui Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -16,7 +16,9 @@ CPPFLAGS+= -DPCVT_SUPPORT
.if ${MACHINE_ARCH} == "powerpc" || \
${MACHINE} == "amiga" || \
${MACHINE} == "evbarm" || \
+${MACHINE} == "ews4800mips" || \
${MACHINE} == "mac68k" || \
+${MACHINE} == "newsmips" || \
${MACHINE} == "pmax" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "shark" || \
@@ -30,6 +32,14 @@ CPPFLAGS+= -DWSCONS_SUPPORT
CPPFLAGS+= -DXKB
CPPFLAGS.kbd.c= -D__XKBDEFRULES__=${__XKBDEFRULES__}
+.if \
+${MACHINE} == "ews4800mips" || \
+${MACHINE} == "newsmips" || \
+0
+CPPFLAGS+= -DUSE_WSKBD_GETMAP
+SRCS+= ws_KbdMap.c
+.endif
+
X11EXTRAMANDEFS+= -e 's,__xkb_path__,${X11LIBDIR}/xkb,g'
COPTS.kbd.c= -Wno-error # XXX deprecated
CVS commit: src/external/mit/xorg/lib/libxcb/xinput
Module Name:src
Committed By: mrg
Date: Tue Sep 5 04:16:56 UTC 2023
Modified Files:
src/external/mit/xorg/lib/libxcb/xinput: Makefile
Log Message:
turn off -Walloc-size-larger-than for xinput.c
on 32-bit platforms, an expression claims the input can exceed 2G,
more than malloc() can take. i'm pretty sure that the maximum is
actually quite a lot less (seems to be max 255*12 plus <100.)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libxcb/xinput/Makefile
Please note 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/libxcb/xinput/Makefile
diff -u src/external/mit/xorg/lib/libxcb/xinput/Makefile:1.4 src/external/mit/xorg/lib/libxcb/xinput/Makefile:1.5
--- src/external/mit/xorg/lib/libxcb/xinput/Makefile:1.4 Sun Mar 5 09:27:53 2017
+++ src/external/mit/xorg/lib/libxcb/xinput/Makefile Tue Sep 5 04:16:56 2023
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2017/03/05 09:27:53 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/09/05 04:16:56 mrg Exp $
XCBEXT= xinput
+# XXXGCC12: avoids
+# xinput.c:491:19: error: argument 1 value '4294967294' exceeds maximum object size 2147483647 [-Werror=alloc-size-larger-than=]
+# 491 | xcb_out = malloc(xcb_buffer_len);
+# it also does not check the return value of this malloc().
+COPTS.xinput.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 12:? -Wno-alloc-size-larger-than :}
+
.include "../xcb.mk"
CVS commit: src/external/mit/xorg/lib/libxcb/xinput
Module Name:src Committed By: mrg Date: Tue Sep 5 04:16:56 UTC 2023 Modified Files: src/external/mit/xorg/lib/libxcb/xinput: Makefile Log Message: turn off -Walloc-size-larger-than for xinput.c on 32-bit platforms, an expression claims the input can exceed 2G, more than malloc() can take. i'm pretty sure that the maximum is actually quite a lot less (seems to be max 255*12 plus <100.) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libxcb/xinput/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/etc
Module Name:src Committed By: tsutsui Date: Tue Aug 8 14:38:44 UTC 2023 Modified Files: src/external/mit/xorg/etc/etc.dreamcast: xorg.conf.jpkbd xorg.conf.uskbd src/external/mit/xorg/etc/etc.hpc: xorg.conf.640x240-jp xorg.conf.640x240-us xorg.conf.640x480-jp xorg.conf.640x480-us xorg.conf.800x600-jp xorg.conf.800x600-us src/external/mit/xorg/etc/etc.hpcarm: xorg.conf.ws003sh xorg.conf.ws007sh xorg.conf.ws011sh xorg.conf.ws020sh src/external/mit/xorg/etc/etc.zaurus: xorg.conf.C3x00 xorg.conf.C7x0 Log Message: Remove trailing tabs. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00 \ src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0 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/etc
Module Name:src Committed By: tsutsui Date: Tue Aug 8 14:38:44 UTC 2023 Modified Files: src/external/mit/xorg/etc/etc.dreamcast: xorg.conf.jpkbd xorg.conf.uskbd src/external/mit/xorg/etc/etc.hpc: xorg.conf.640x240-jp xorg.conf.640x240-us xorg.conf.640x480-jp xorg.conf.640x480-us xorg.conf.800x600-jp xorg.conf.800x600-us src/external/mit/xorg/etc/etc.hpcarm: xorg.conf.ws003sh xorg.conf.ws007sh xorg.conf.ws011sh xorg.conf.ws020sh src/external/mit/xorg/etc/etc.zaurus: xorg.conf.C3x00 xorg.conf.C7x0 Log Message: Remove trailing tabs. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00 \ src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd diff -u src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.4 src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.5 --- src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.4 Tue Aug 8 14:34:21 2023 +++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd Tue Aug 8 14:38:44 2023 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.conf.jpkbd,v 1.4 2023/08/08 14:34:21 tsutsui Exp $ +# $NetBSD: xorg.conf.jpkbd,v 1.5 2023/08/08 14:38:44 tsutsui Exp $ Section "ServerLayout" Identifier "wsfb" @@ -6,7 +6,7 @@ Section "ServerLayout" InputDevice "Mouse0" "CorePointer" InputDevice "Keyboard0" "CoreKeyboard" EndSection - + Section "Files" FontPath "/usr/pkg/share/fonts/X11/TTF/" EndSection Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd diff -u src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.4 src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.5 --- src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.4 Tue Aug 8 14:34:21 2023 +++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd Tue Aug 8 14:38:44 2023 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.conf.uskbd,v 1.4 2023/08/08 14:34:21 tsutsui Exp $ +# $NetBSD: xorg.conf.uskbd,v 1.5 2023/08/08 14:38:44 tsutsui Exp $ Section "ServerLayout" Identifier "wsfb" @@ -6,7 +6,7 @@ Section "ServerLayout" InputDevice "Mouse0" "CorePointer" InputDevice "Keyboard0" "CoreKeyboard" EndSection - + Section "Files" FontPath "/usr/pkg/share/fonts/X11/TTF/" EndSection Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.4 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.5 --- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.4 Tue Aug 8 14:34:21 2023 +++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp Tue Aug 8 14:38:44 2023 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.conf.640x240-jp,v 1.4 2023/08/08 14:34:21 tsutsui Exp $ +# $NetBSD: xorg.conf.640x240-jp,v 1.5 2023/08/08 14:38:44 tsutsui Exp $ Section "ServerLayout" Identifier "wsfb" @@ -7,7 +7,7 @@ Section "ServerLayout" InputDevice "Mouse0" InputDevice "Keyboard0" "CoreKeyboard" EndSection - + Section "Files" # FontPath "/usr/pkg/share/fonts/X11/TTF/" EndSection Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.4 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.5 --- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.4 Tue Aug 8 14:34:21 2023 +++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us Tue Aug 8 14:38:44 2023 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.conf.640x240-us,v 1.4 2023/08/08 14:34:21 tsutsui Exp $ +# $NetBSD: xorg.conf.640x240-us,v 1.5 2023/08/08 14:38:44 tsutsui Exp $ Section "ServerLayout" Identifier "wsfb" @@ -7,7 +7,7 @@ Section "ServerLayout" InputDevice "Mouse0" InputDevice "Keyboard0" "CoreKeyboard" EndSection - + Section "Files" # FontPath "/usr/pkg/share/fonts/X11/TTF/" EndSection Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp:1.4 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp:1.5
CVS commit: src/external/mit/xorg/etc
Module Name:src Committed By: tsutsui Date: Tue Aug 8 14:34:21 UTC 2023 Modified Files: src/external/mit/xorg/etc/etc.dreamcast: xorg.conf.jpkbd xorg.conf.uskbd src/external/mit/xorg/etc/etc.hpc: xorg.conf.640x240-jp xorg.conf.640x240-us xorg.conf.640x480-jp xorg.conf.640x480-us xorg.conf.800x600-jp xorg.conf.800x600-us src/external/mit/xorg/etc/etc.hpcarm: xorg.conf.ws003sh xorg.conf.ws007sh xorg.conf.ws011sh xorg.conf.ws020sh src/external/mit/xorg/etc/etc.zaurus: xorg.conf.C3x00 xorg.conf.C7x0 Log Message: Specify options "AutoAddDevices" to prefer xorg.conf keyboard options. Fixes PR/57346. Should be pulled up to netbsd-10. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00 \ src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd diff -u src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.3 src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.4 --- src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.3 Fri Jun 20 08:08:58 2014 +++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd Tue Aug 8 14:34:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.conf.jpkbd,v 1.3 2014/06/20 08:08:58 wiz Exp $ +# $NetBSD: xorg.conf.jpkbd,v 1.4 2023/08/08 14:34:21 tsutsui Exp $ Section "ServerLayout" Identifier "wsfb" @@ -11,6 +11,11 @@ Section "Files" FontPath "/usr/pkg/share/fonts/X11/TTF/" EndSection +Section "ServerFlags" + # Explicitly prefer keyboard options defined in xorg.conf + Option "AutoAddDevices" "false" +EndSection + Section "InputDevice" Identifier "Keyboard0" Driver "kbd" Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd diff -u src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.3 src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.4 --- src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.3 Fri Jun 20 08:08:58 2014 +++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd Tue Aug 8 14:34:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.conf.uskbd,v 1.3 2014/06/20 08:08:58 wiz Exp $ +# $NetBSD: xorg.conf.uskbd,v 1.4 2023/08/08 14:34:21 tsutsui Exp $ Section "ServerLayout" Identifier "wsfb" @@ -11,6 +11,11 @@ Section "Files" FontPath "/usr/pkg/share/fonts/X11/TTF/" EndSection +Section "ServerFlags" + # Explicitly prefer keyboard options defined in xorg.conf + Option "AutoAddDevices" "false" +EndSection + Section "InputDevice" Identifier "Keyboard0" Driver "kbd" Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.3 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.4 --- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp:1.3 Fri Jun 20 08:08:58 2014 +++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp Tue Aug 8 14:34:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.conf.640x240-jp,v 1.3 2014/06/20 08:08:58 wiz Exp $ +# $NetBSD: xorg.conf.640x240-jp,v 1.4 2023/08/08 14:34:21 tsutsui Exp $ Section "ServerLayout" Identifier "wsfb" @@ -12,6 +12,11 @@ Section "Files" # FontPath "/usr/pkg/share/fonts/X11/TTF/" EndSection +Section "ServerFlags" + # Explicitly prefer keyboard options defined in xorg.conf + Option "AutoAddDevices" "false" +EndSection + Section "InputDevice" Identifier "Keyboard0" Driver "kbd" Index: src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us diff -u src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.3 src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.4 --- src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us:1.3 Fri Jun 20 08:08:58 2014 +++ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us Tue Aug 8 14:34:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: xorg.conf.640x240-us,v 1.3 2014/06/20 08:08:58 wiz Exp $ +# $NetBSD: xorg.conf.640x240-us,v 1.4 2023/08/08 14:34:21 tsutsui Exp $ Section "ServerLayout" Identifier "wsfb" @@ -12,6 +12,11 @@ Section "Files" #
CVS commit: src/external/mit/xorg/etc
Module Name:src Committed By: tsutsui Date: Tue Aug 8 14:34:21 UTC 2023 Modified Files: src/external/mit/xorg/etc/etc.dreamcast: xorg.conf.jpkbd xorg.conf.uskbd src/external/mit/xorg/etc/etc.hpc: xorg.conf.640x240-jp xorg.conf.640x240-us xorg.conf.640x480-jp xorg.conf.640x480-us xorg.conf.800x600-jp xorg.conf.800x600-us src/external/mit/xorg/etc/etc.hpcarm: xorg.conf.ws003sh xorg.conf.ws007sh xorg.conf.ws011sh xorg.conf.ws020sh src/external/mit/xorg/etc/etc.zaurus: xorg.conf.C3x00 xorg.conf.C7x0 Log Message: Specify options "AutoAddDevices" to prefer xorg.conf keyboard options. Fixes PR/57346. Should be pulled up to netbsd-10. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd \ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp \ src/external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh \ src/external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00 \ src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0 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/freetype
Module Name:src Committed By: christos Date: Thu Jul 27 21:58:51 UTC 2023 Modified Files: src/external/mit/xorg/lib/freetype: Makefile Log Message: disable lint for arm To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/freetype/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/freetype/Makefile diff -u src/external/mit/xorg/lib/freetype/Makefile:1.24 src/external/mit/xorg/lib/freetype/Makefile:1.25 --- src/external/mit/xorg/lib/freetype/Makefile:1.24 Fri Feb 24 12:08:31 2023 +++ src/external/mit/xorg/lib/freetype/Makefile Thu Jul 27 17:58:51 2023 @@ -1,7 +1,11 @@ -# $NetBSD: Makefile,v 1.24 2023/02/24 17:08:31 mrg Exp $ +# $NetBSD: Makefile,v 1.25 2023/07/27 21:58:51 christos Exp $ USE_FORT?= yes # data-driven bugs? +.if !empty(MACHINE:M*arm*) +NOLINT=yes # We don't have the neon/simd builtins +.endif + .include LIB= freetype
CVS commit: src/external/mit/xorg/lib/freetype
Module Name:src Committed By: christos Date: Thu Jul 27 21:58:51 UTC 2023 Modified Files: src/external/mit/xorg/lib/freetype: Makefile Log Message: disable lint for arm To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/freetype/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/libEGL.old
Module Name:src
Committed By: mrg
Date: Mon Jul 17 04:24:34 UTC 2023
Added Files:
src/external/mit/xorg/lib/libEGL.old: Makefile
Log Message:
copy the old libEGL/Makefile here and subst .old in a couple of places.
should fix build.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libEGL.old/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.old/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libEGL.old/Makefile:1.1
--- /dev/null Mon Jul 17 04:24:34 2023
+++ src/external/mit/xorg/lib/libEGL.old/Makefile Mon Jul 17 04:24:34 2023
@@ -0,0 +1,129 @@
+# $NetBSD: Makefile,v 1.1 2023/07/17 04:24:34 mrg Exp $
+
+.include
+
+.include "../mesa-which.mk"
+
+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
+
+.PATH: ${X11SRCDIR.Mesa}/src/util
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
+SRCS.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= \
+ 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.old.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${OLD_SUFFIX} \
+ drm ${.CURDIR}/../libdrm \
+ gbm ${.CURDIR}/../libgbm${OLD_SUFFIX} \
+ 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 \
+ pthread ${NETBSDSRCDIR}/lib/libpthread
+
+MKLINT=no
+
+PKGCONFIG= egl
+PKGDIST.egl= ${X11SRCDIR.Mesa}/../src/pkgconfig
+.include "${.CURDIR}/../libGL.old/mesa-ver.mk"
+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
+.include
CVS commit: src/external/mit/xorg/lib/libEGL.old
Module Name:src Committed By: mrg Date: Mon Jul 17 04:24:34 UTC 2023 Added Files: src/external/mit/xorg/lib/libEGL.old: Makefile Log Message: copy the old libEGL/Makefile here and subst .old in a couple of places. should fix build. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libEGL.old/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
Module Name:src
Committed By: rjs
Date: Sun Jul 16 22:20:54 UTC 2023
Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk libloader.mk libmesa.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libGL: Makefile mesa-ver.mk
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/lib/libglapi: Makefile
Log Message:
Make most of MesaLib build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/driver.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libglsl.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.49 -r1.50 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.9 -r1.10 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/driver.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.4 src/external/mit/xorg/lib/driver.mk:1.5
--- src/external/mit/xorg/lib/driver.mk:1.4 Tue Sep 24 19:29:41 2019
+++ src/external/mit/xorg/lib/driver.mk Sun Jul 16 22:20:54 2023
@@ -1,50 +1,98 @@
-# $NetBSD: driver.mk,v 1.4 2019/09/24 19:29:41 maya Exp $
+# $NetBSD: driver.mk,v 1.5 2023/07/16 22:20:54 rjs Exp $
# stuff both dri and gallium drivers need.
# util
.PATH: ${X11SRCDIR.Mesa}/src/util
.PATH: ${X11SRCDIR.Mesa}/../src/util
+.PATH: ${X11SRCDIR.Mesa}/src/util/format
+.PATH: ${X11SRCDIR.Mesa}/../src/util/format
+.PATH: ${X11SRCDIR.Mesa}/src/util/perf
+.PATH: ${X11SRCDIR.Mesa}/../src/util/perf
SRCS.util= \
- hash_table.c \
+ anon_file.c \
build_id.c \
+ compress.c \
crc32.c \
+ dag.c \
disk_cache.c \
+ disk_cache_os.c \
+ double.c \
+ format_srgb.c \
+ fossilize_db.c \
+ hash_table.c \
fast_idiv_by_const.c \
half_float.c \
- format_srgb.c \
+ memstream.c \
mesa-sha1.c \
+ os_file.c \
+ os_memory_fd.c \
os_time.c \
ralloc.c \
UTILdebug.c \
+ UTILlog.c \
rand_xor.c \
rb_tree.c \
register_allocate.c \
rgtc.c \
set.c \
slab.c \
+ softfloat.c \
string_buffer.c \
strtod.c \
u_atomic.c \
u_cpu_detect.c \
+ u_debug.c \
+ u_hash_table.c \
+ u_idalloc.c \
u_math.c \
+ u_mm.c \
+ u_qsort.cpp \
u_queue.c \
+ u_printf.cpp \
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
+CPPFLAGS.format_srgb.c+= -I${X11SRCDIR.Mesa}/src/util
+CPPFLAGS.u_hash_table.c+= -I${X11SRCDIR.Mesa}/src/gallium/auxiliary
BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/debug.c UTILdebug.c
+BUILDSYMLINKS+= ${X11SRCDIR.Mesa}/src/util/log.c UTILlog.c
+
+SRCS.format= \
+ u_format.c \
+ u_format_bptc.c \
+ u_format_etc.c \
+ u_format_fxt1.c \
+ u_format_latc.c \
+ u_format_other.c \
+ u_format_rgtc.c \
+ u_format_s3tc.c \
+ u_format_unpack_neon.c \
+ u_format_yuv.c \
+ u_format_zs.c \
+ u_format_table.c
+
+.for _f in ${SRCS.format}
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/util/format
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/../src/util/format
+CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/../src
+.endfor
+
+SRCS.perf= \
+ u_trace.c
+
+CPPFLAGS.u_trace.c+= -I${X11SRCDIR.Mesa}/src/util/perf
+CPPFLAGS.u_trace.c+= -I${X11SRCDIR.Mesa}/src/gallium/auxiliary
-SRCS+= ${SRCS.util}
+SRCS+= ${SRCS.util} ${SRCS.format} ${SRCS.perf}
# also need to pull in libdricommon.la libmegadriver_stub.la
.PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.6 src/external/mit/xorg/lib/libglsl.mk:1.7
--- src/external/mit/xorg/lib/libglsl.mk:1.6 Tue Sep 24 19:29:41 2019
+++ src/external/mit/xorg/lib/libglsl.mk Sun Jul 16 22:20:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: libglsl.mk,v 1.6 2019/09/24 19:29:41 maya Exp $
+# $NetBSD: libglsl.mk,v 1.7 2023/07/16 22:20:54 rjs Exp $
LIBGLSL_GENERATED_CXX_FILES = \
glsl_lexer.cpp \
@@ -15,7 +15,8 @@ CPPFLAGS+= -I${X11SRCDIR.Mesa}/src/compi
-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
+ -I${X11SRCDIR.Mesa}/src/compiler/spirv \
+
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: rjs Date: Sun Jul 16 22:20:54 UTC 2023 Modified Files: src/external/mit/xorg/lib: driver.mk libglsl.mk libloader.mk libmesa.mk src/external/mit/xorg/lib/dri: Makefile src/external/mit/xorg/lib/gallium: Makefile src/external/mit/xorg/lib/libEGL: Makefile src/external/mit/xorg/lib/libGL: Makefile mesa-ver.mk src/external/mit/xorg/lib/libgbm: Makefile src/external/mit/xorg/lib/libglapi: Makefile Log Message: Make most of MesaLib build. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/driver.mk cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libglsl.mk \ src/external/mit/xorg/lib/libloader.mk cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libmesa.mk cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/dri/Makefile cvs rdiff -u -r1.49 -r1.50 src/external/mit/xorg/lib/gallium/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libEGL/Makefile cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/libGL/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL/mesa-ver.mk cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libgbm/Makefile cvs rdiff -u -r1.9 -r1.10 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.
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: rjs
Date: Sat Jul 15 21:24:47 UTC 2023
Modified Files:
src/external/mit/xorg/lib: Makefile 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
src/external/mit/xorg/lib/libgbm.old: Makefile
src/external/mit/xorg/lib/libglapi.old: Makefile
Log Message:
Fixup more references to "old" components.
ok mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libmesa.old.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri.old/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/gallium.old/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libgbm.old/Makefile
cvs rdiff -u -r1.2 -r1.3 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/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.57 src/external/mit/xorg/lib/Makefile:1.58
--- src/external/mit/xorg/lib/Makefile:1.57 Thu Jul 14 07:41:49 2022
+++ src/external/mit/xorg/lib/Makefile Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2022/07/14 07:41:49 mrg Exp $
+# $NetBSD: Makefile,v 1.58 2023/07/15 21:24:46 rjs Exp $
# build libraries for xorg
@@ -58,7 +58,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
SUBDIR+=libgbm${OLD_SUFFIX}
.if ${HAVE_XORG_GLAMOR} != "no"
# libEGL depends upon libgbm
-SUBDIR+=.WAIT libEGL
+SUBDIR+=.WAIT libEGL${OLD_SUFFIX}
.endif
.include
Index: src/external/mit/xorg/lib/libmesa.old.mk
diff -u src/external/mit/xorg/lib/libmesa.old.mk:1.2 src/external/mit/xorg/lib/libmesa.old.mk:1.3
--- src/external/mit/xorg/lib/libmesa.old.mk:1.2 Sun Jul 11 20:53:35 2021
+++ src/external/mit/xorg/lib/libmesa.old.mk Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.old.mk,v 1.2 2021/07/11 20:53:35 mrg Exp $
+# $NetBSD: libmesa.old.mk,v 1.3 2023/07/15 21:24:46 rjs Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -550,4 +550,4 @@ CPPFLAGS+= \
CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp -fcommon
-.include "libGL/mesa-ver.mk"
+.include "libGL.old/mesa-ver.mk"
Index: src/external/mit/xorg/lib/dri.old/Makefile
diff -u src/external/mit/xorg/lib/dri.old/Makefile:1.6 src/external/mit/xorg/lib/dri.old/Makefile:1.7
--- src/external/mit/xorg/lib/dri.old/Makefile:1.6 Sun Jul 2 23:56:12 2023
+++ src/external/mit/xorg/lib/dri.old/Makefile Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/07/02 23:56:12 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2023/07/15 21:24:46 rjs Exp $
# Link the mesa_dri_drivers mega driver.
@@ -449,8 +449,8 @@ LIBDPLIBS+= drm_intel ${.CURDIR}/../lib
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
MESA_SRC_MODULES= main math math_xform vbo tnl swrast ss common asm_c program asm_s
-.include "../libmesa.old.mk"
-.include "../libglsl.old.mk"
+.include "../libmesa${OLD_SUFFIX}.mk"
+.include "../libglsl${OLD_SUFFIX}.mk"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SRCS+= streaming-load-memcpy.c
@@ -460,7 +460,7 @@ CPPFLAGS.isl_tiled_memcpy_sse41.c+= -mss
CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wno-error=atomic-alignment :}
-.include "../driver.mk"
+.include "../driver${OLD_SUFFIX}.mk"
.for _d in ${DRIVERS}
SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
@@ -474,7 +474,7 @@ SYMLINKS+= mesa_dri_drivers.so.${SHLIB_M
PKGCONFIG= dri
PKGDIST.dri= ${X11SRCDIR.Mesa}/../src/pkgconfig
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
+.include "${.CURDIR}/../libGL${OLD_SUFFIX}/mesa-ver.mk"
PKGCONFIG_VERSION.dri= ${MESA_VER}
# XXX remove these from bsd.x11.mk
Index: src/external/mit/xorg/lib/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.5 src/external/mit/xorg/lib/gallium.old/Makefile:1.6
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.5 Tue Feb 7 06:19:03 2023
+++ src/external/mit/xorg/lib/gallium.old/Makefile Sat Jul 15 21:24:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/02/07 06:19:03 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/07/15 21:24:46 rjs Exp $
# Transparent struct/union broken
NOLINT=yes
@@ -1133,7 +1133,7 @@ CPPFLAGS+= ${CPPFLAGS.${XORG_MACHINE_ARC
CPPFLAGS.r600_pipe_common.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
CPPFLAGS.si_get.c+= -DMESA_LLVM_VERSION_STRING=\"${LLVM_VERSION}\"
-.include "../driver.mk"
+.include "../driver${OLD_SUFFIX}.mk"
.PATH: ${X11SRCDIR.Mesa}/src/gallium/targets/dri
Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u src/external/mit/xorg/lib/libGL.old/Makefile:1.4 src/external/mit/xorg/lib/libGL.old/Makefile:1.5
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: rjs Date: Sat Jul 15 21:24:47 UTC 2023 Modified Files: src/external/mit/xorg/lib: Makefile 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 src/external/mit/xorg/lib/libgbm.old: Makefile src/external/mit/xorg/lib/libglapi.old: Makefile Log Message: Fixup more references to "old" components. ok mrg@. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/external/mit/xorg/lib/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libmesa.old.mk cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri.old/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/gallium.old/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libGL.old/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libgbm.old/Makefile cvs rdiff -u -r1.2 -r1.3 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.
CVS commit: src/external/mit/xorg/lib/dri.old
Module Name:src Committed By: rillig Date: Sun Jul 2 23:56:12 UTC 2023 Modified Files: src/external/mit/xorg/lib/dri.old: Makefile Log Message: dri.old: disable lint again To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri.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/dri.old/Makefile diff -u src/external/mit/xorg/lib/dri.old/Makefile:1.5 src/external/mit/xorg/lib/dri.old/Makefile:1.6 --- src/external/mit/xorg/lib/dri.old/Makefile:1.5 Sat Jul 1 15:16:46 2023 +++ src/external/mit/xorg/lib/dri.old/Makefile Sun Jul 2 23:56:12 2023 @@ -1,7 +1,15 @@ -# $NetBSD: Makefile,v 1.5 2023/07/01 15:16:46 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2023/07/02 23:56:12 rillig Exp $ # Link the mesa_dri_drivers mega driver. +# Uses 'assert(cond)' in a comma expression, leading to a syntax error because +# in lint mode, 'assert(cond)' expands to an empty string, and '(, expr)' is +# not an expression. +NOLINT= + +LINTFLAGS+= -X 213 # void function '%s' cannot return value +LINTFLAGS+= -Ac23 # allow C23, for empty initializer braces + # When build_id.c expands the macro invocation 'ElfW(Nhdr)', the result is # 'Elf64 /* MD native binary size */ _Nhdr'. The comment prevents the two # identifiers from being concatenated.
CVS commit: src/external/mit/xorg/lib/dri.old
Module Name:src Committed By: rillig Date: Sun Jul 2 23:56:12 UTC 2023 Modified Files: src/external/mit/xorg/lib/dri.old: Makefile Log Message: dri.old: disable lint again To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri.old/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/dri.old
Module Name:src Committed By: rillig Date: Sat Jul 1 15:16:46 UTC 2023 Modified Files: src/external/mit/xorg/lib/dri.old: Makefile Log Message: dri.old: only disable lint for a single file To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri.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/dri.old/Makefile diff -u src/external/mit/xorg/lib/dri.old/Makefile:1.4 src/external/mit/xorg/lib/dri.old/Makefile:1.5 --- src/external/mit/xorg/lib/dri.old/Makefile:1.4 Thu Sep 29 18:58:04 2022 +++ src/external/mit/xorg/lib/dri.old/Makefile Sat Jul 1 15:16:46 2023 @@ -1,9 +1,12 @@ -# $NetBSD: Makefile,v 1.4 2022/09/29 18:58:04 rjs Exp $ +# $NetBSD: Makefile,v 1.5 2023/07/01 15:16:46 rillig Exp $ # Link the mesa_dri_drivers mega driver. -# XXX: anonymous structs inside anonymous unions don't work. -NOLINT=yes +# When build_id.c expands the macro invocation 'ElfW(Nhdr)', the result is +# 'Elf64 /* MD native binary size */ _Nhdr'. The comment prevents the two +# identifiers from being concatenated. +build_id.ln: + touch $@ .include
CVS commit: src/external/mit/xorg/lib/dri.old
Module Name:src Committed By: rillig Date: Sat Jul 1 15:16:46 UTC 2023 Modified Files: src/external/mit/xorg/lib/dri.old: Makefile Log Message: dri.old: only disable lint for a single file To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri.old/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/bin/xcalc
Module Name:src Committed By: mrg Date: Mon Jun 19 07:40:59 UTC 2023 Modified Files: src/external/mit/xorg/bin/xcalc: Makefile Log Message: use xorg-pkg-ver.mk to get PACKAGE_STRING defined. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xcalc/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/bin/xcalc
Module Name:src
Committed By: mrg
Date: Mon Jun 19 07:40:59 UTC 2023
Modified Files:
src/external/mit/xorg/bin/xcalc: Makefile
Log Message:
use xorg-pkg-ver.mk to get PACKAGE_STRING defined.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xcalc/Makefile
Please note 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/xcalc/Makefile
diff -u src/external/mit/xorg/bin/xcalc/Makefile:1.5 src/external/mit/xorg/bin/xcalc/Makefile:1.6
--- src/external/mit/xorg/bin/xcalc/Makefile:1.5 Mon Jul 8 20:37:33 2019
+++ src/external/mit/xorg/bin/xcalc/Makefile Mon Jun 19 07:40:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/07/08 20:37:33 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/19 07:40:59 mrg Exp $
.include
@@ -16,5 +16,7 @@ CPPFLAGS+= -DHAVE_STRLCPY -D_CONST_X_STR
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
CVS commit: src/external/mit/xorg/lib/libXt
Module Name:src
Committed By: mrg
Date: Mon Jun 19 07:21:17 UTC 2023
Modified Files:
src/external/mit/xorg/lib/libXt: Makefile
Log Message:
transform XFILESEARCHPATHDEFAULT in the pkg-config file.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXt/Makefile
Please note 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/libXt/Makefile
diff -u src/external/mit/xorg/lib/libXt/Makefile:1.7 src/external/mit/xorg/lib/libXt/Makefile:1.8
--- src/external/mit/xorg/lib/libXt/Makefile:1.7 Thu Jul 11 05:44:07 2019
+++ src/external/mit/xorg/lib/libXt/Makefile Mon Jun 19 07:21:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/07/11 05:44:07 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/19 07:21:17 mrg Exp $
.include
@@ -32,7 +32,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -DUSE_POLL -DUSE_SNPRINTF -DLIBXT -I.
CPPFLAGS+= -DHAVE_ASPRINTF -D_CONST_X_STRING
-CPPFLAGS.Intrinsic.c= -DXFILESEARCHPATHDEFAULT=\"${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S\"
+XFILESEARCHPATHDEFAULT=${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S
+CPPFLAGS.Intrinsic.c= -DXFILESEARCHPATHDEFAULT=\"${XFILESEARCHPATHDEFAULT}\"
CPPFLAGS.Error.c= -DERRORDB=\"${X11LIBDIR}/XtErrorDB\" \
-DXTERROR_PREFIX=\"\" -DXTWARNING_PREFIX=\"\"
CPPFLAGS.TMkey.c= -DXKB
@@ -306,5 +307,8 @@ PKGDIST= ${LIB}
CWARNFLAGS.clang+= -Wno-tautological-compare
+PKGCONFIG_SED_FLAGS+= \
+ -e "s,@XFILESEARCHPATHDEFAULT@,${XFILESEARCHPATHDEFAULT},"
+
.include
.include
CVS commit: src/external/mit/xorg/lib/libXt
Module Name:src Committed By: mrg Date: Mon Jun 19 07:21:17 UTC 2023 Modified Files: src/external/mit/xorg/lib/libXt: Makefile Log Message: transform XFILESEARCHPATHDEFAULT in the pkg-config file. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXt/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/xkeyboard-config
Module Name:src Committed By: mrg Date: Thu Mar 23 06:23:14 UTC 2023 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 Log Message: updates for xkeyboard-config 2.38. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.18 -r1.19 \ 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.17 -r1.18 \ 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.12 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.13 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.12 Fri Feb 10 13:22:58 2023 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Thu Mar 23 06:23:13 2023 @@ -1,5 +1,5 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.37" "X Version 11" +.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.38" "X Version 11" .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION @@ -13,7 +13,7 @@ settings in the xorg.conf(5). .SH XKB DATA FILES LOAD PATHS xkeyboard-config provides the XKB data files installed in -@xkb_base@. User-specific data files may be elsewhere but it depends on +/usr/X11R7/share/X11/xkb. User-specific data files may be elsewhere but it depends on the tool whether those files are loaded. For example, the libxkbcommon library will by default load XKB data files from the user's home directory. See the libxkbcommon documentation for details. @@ -22,7 +22,7 @@ See the libxkbcommon documentation for d The "custom" layout is a layout that is listed as available to tools reading the data files but is not actually provided by xkeyboard-config. -A user may save a layout specification in the @xkb_base@/symbols/custom file +A user may save a layout specification in the /usr/X11R7/share/X11/xkb/symbols/custom file and that layout will be available to most tools interacting with the xkeyboard-config data files. This is primarily aimed at systems running X where additional lookup paths cannot easily be added. @@ -246,6 +246,7 @@ us(alt-intl) English (US, alt. intl.) us(colemak) English (Colemak) us(colemak_dh) English (Colemak-DH) us(colemak_dh_iso) English (Colemak-DH ISO) +us(colemak_dh_ortho) English (Colemak-DH Ortholinear) us(dvorak) English (Dvorak) us(dvorak-intl) English (Dvorak, intl., with dead keys) us(dvorak-alt-intl) English (Dvorak, alt. intl.) @@ -338,6 +339,7 @@ in(ben_gitanjali) Bangla (India, Gitanja in(ben_inscript) Bangla (India, Baishakhi InScript) in(eeyek) Manipuri (Eeyek) in(guj) Gujarati +in(guj-kagapa) Gujarati (KaGaPa, phonetic) in(guru) Punjabi (Gurmukhi) in(jhelum) Punjabi (Gurmukhi Jhelum) in(kan) Kannada @@ -684,7 +686,8 @@ lv Latvian lv(apostrophe) Latvian (apostrophe) lv(tilde) Latvian (tilde) lv(fkey) Latvian (F) -lv(modern) Latvian (modern) +lv(modern) Latvian (Modern Latin) +lv(modern-cyr) Latvian (Modern Cyrillic) lv(ergonomic) Latvian (ergonomic, ŪGJRMV) lv(adapted) Latvian (adapted) @@ -1135,6 +1138,7 @@ ctrl:aa_ctrl At the bottom left ctrl:rctrl_ralt Right Ctrl as Right Alt ctrl:menu_rctrl Menu as Right Ctrl ctrl:swap_lalt_lctl Swap Left Alt with Left Ctrl +ctrl:swap_ralt_rctl Swap Right Alt with Right Ctrl ctrl:swap_lwin_lctl Swap Left Win with Left Ctrl ctrl:swap_rwin_rctl Swap Right Win with Right Ctrl ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Left Alt @@ -1317,6 +1321,8 @@ numpad:microsoft Num Lock on: digits; Sh numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead srvrkeys:none Special keys (Ctrl+Alt+) handled in a server apple:alupckeys Apple Aluminium emulates Pause, PrtSc, Scroll Lock +apple:jp_oadg109a Japanese Apple keyboards emulate OADG109A backslash +apple:jp_pc106 Japanese Apple keyboards emulate PC106 backslash shift:breaks_caps Shift cancels Caps Lock misc:typo Enable extra typographic characters misc:apl Enable APL overlay characters @@ -1475,23 +1481,23 @@ terminate:ctrl_alt_bksp Ctrl+Alt+Backspa .SH FILES -@xkb_base@/compat +/usr/X11R7/share/X11/xkb/compat -@xkb_base@/compiled +/usr/X11R7/share/X11/xkb/compiled -@xkb_base@/geometry +/usr/X11R7/share/X11/xkb/geometry -@xkb_base@/keycodes +/usr/X11R7/share/X11/xkb/keycodes -@xkb_base@/keymap +/usr/X11R7/share/X11/xkb/keymap -@xkb_base@/rules +/usr/X11R7/share/X11/xkb/rules
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Thu Mar 23 06:23:14 UTC 2023 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 Log Message: updates for xkeyboard-config 2.38. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.18 -r1.19 \ 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.17 -r1.18 \ 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.
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Mon Feb 27 00:34:11 UTC 2023
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
obsolete several xorg-server.old configurations and normalise some comments.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 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.108 src/external/mit/xorg/server/drivers/Makefile:1.109
--- src/external/mit/xorg/server/drivers/Makefile:1.108 Fri Jul 15 19:12:39 2022
+++ src/external/mit/xorg/server/drivers/Makefile Mon Feb 27 00:34:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2022/07/15 19:12:39 mrg Exp $
+# $NetBSD: Makefile,v 1.109 2023/02/27 00:34:11 mrg Exp $
.include
@@ -115,19 +115,17 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "amiga"
-# needs porting for xorg-server 21.1.3
-# xf86-video-s3
.if ${MACHINE} == "bebox"
SUBDIR+= \
xf86-video-cirrus \
xf86-video-mga \
xf86-video-s3virge
-.endif # ${MACHINE} == "bebox"
# needs porting for xorg-server 21.1.3
# xf86-video-s3
-# xf86-video-tga
-# xf86-video-trident
+
+.endif # ${MACHINE} == "bebox"
+
.if ${MACHINE} == "cats"
SUBDIR+= \
xf86-video-ast \
@@ -147,12 +145,17 @@ SUBDIR+= \
xf86-video-tseng \
xf86-video-vesa \
xf86-video-wsfb
+
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
+# xf86-video-tga
+# xf86-video-trident
+
# needs porting for xorg-server 1.18
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
- xf86-video-apm \
- xf86-video-ark \
- xf86-video-glint
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+# xf86-video-apm \
+# xf86-video-ark \
+# xf86-video-glint
+
.endif # ${MACHINE} == "cats"
.if ${MACHINE} == "dreamcast"
@@ -227,8 +230,6 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "mac68k"
-# needs porting for xorg-server 21.1.3
-# xf86-video-glint
.if ${MACHINE} == "macppc"
SUBDIR+= \
xf86-video-ati \
@@ -240,7 +241,11 @@ SUBDIR+= \
xf86-video-r128 \
xf86-video-tdfx \
xf86-video-wsfb
+
+# needs porting for xorg-server 21.1.3
+# xf86-video-glint
# xf86-video-imstt
+
.endif # ${MACHINE} == "macppc"
.if ${MACHINE} == "netwinder"
@@ -267,12 +272,14 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "ofppc"
-# needs porting for xorg-server 21.1.3
-# xf86-video-s3
.if ${MACHINE} == "prep"
SUBDIR+= \
xf86-video-cirrus \
xf86-video-mga
+
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
+
.endif # ${MACHINE} == "prep"
.if ${MACHINE} == "sgimips"
@@ -296,8 +303,6 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "shark"
-# needs porting for xorg-server 21.1.3
-# xf86-video-glint
.if ${MACHINE} == "sparc" || \
${MACHINE} == "sparc64"
SUBDIR+= \
@@ -309,13 +314,11 @@ SUBDIR+= \
xf86-video-suncg6 \
xf86-video-sunffb \
xf86-video-wsfb
-# xf86-video-ag10e \
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
- xf86-video-ag10e \
- xf86-video-sunleo
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+# needs porting for xorg-server 21.1.3
+# xf86-video-glint
+# xf86-video-ag10e \
+# xf86-video-sunleo
.if ${MACHINE} == "sparc"
SUBDIR+= \
@@ -323,11 +326,11 @@ SUBDIR+= \
xf86-video-suncg14 \
xf86-video-suntcx
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
- xf86-video-pnozz
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+# needs porting for xorg-server 21.1.3
+# xf86-video-pnozz
+
.endif # ${MACHINE} == "sparc"
+
.endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
.if ${MACHINE} == "pmax" || \
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: mrg Date: Mon Feb 27 00:34:11 UTC 2023 Modified Files: src/external/mit/xorg/server/drivers: Makefile Log Message: obsolete several xorg-server.old configurations and normalise some comments. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 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.
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-trident
Module Name:src Committed By: mrg Date: Sun Feb 26 20:19:05 UTC 2023 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile Log Message: updates for xf86-video-trident 1.4.0. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.9 --- src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.8 Tue Aug 16 06:24:03 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Sun Feb 26 20:19:05 2023 @@ -1,17 +1,18 @@ -# $NetBSD: Makefile,v 1.8 2016/08/16 06:24:03 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2023/02/26 20:19:05 mrg Exp $ DRIVER= xf86-video-trident DRIVER_NAME= trident_drv -SRCS= blade_accel.c blade_accel_exa.c image_accel.c -SRCS+= trident_accel.c trident_bank.c trident_dac.c -SRCS+= trident_dga.c trident_driver.c tridenthelper.c -SRCS+= trident_i2c.c trident_shadow.c -SRCS+= trident_tv.c trident_video.c tvga_dac.c xp_accel.c -SRCS+= xp4_accel.c xp4_accel_exa.c +SRCS= blade_exa.c blade_xaa.c image_xaa.c +SRCS+= tgui_xaa.c trident_bank.c trident_dac.c +SRCS+= trident_dga.c trident_driver.c +SRCS+= trident_i2c.c trident_pll.c trident_shadow.c +SRCS+= trident_tv.c trident_video.c tvga_dac.c +SRCS+= xp_xaa.c xp4_exa.c xp4_xaa.c + MAN= trident.4 -COPTS.trident_driver.c= -Wno-error # XXX xf86dgastr.h +#COPTS.trident_driver.c= -Wno-error # XXX xf86dgastr.h CWARNFLAGS.clang+= -Wno-return-type -Wno-empty-body
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-trident
Module Name:src Committed By: mrg Date: Sun Feb 26 20:19:05 UTC 2023 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile Log Message: updates for xf86-video-trident 1.4.0. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Fri Feb 24 17:08:31 UTC 2023
Modified Files:
src/external/mit/xorg/lib/freetype: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
arrange for ftoption.h to define FT_CONFIG_OPTION_USE_BROTLI but not for tools
guard the definition in ftoption.h with #ifndef TOOL_FCCACHE, and build the
tools portions with this defined if not already set.
this fixes building pkgsrc blender with native x11.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/tools/mkfontscale/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.23 src/external/mit/xorg/lib/freetype/Makefile:1.24
--- src/external/mit/xorg/lib/freetype/Makefile:1.23 Tue Nov 16 09:25:51 2021
+++ src/external/mit/xorg/lib/freetype/Makefile Fri Feb 24 17:08:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/11/16 09:25:51 nia Exp $
+# $NetBSD: Makefile,v 1.24 2023/02/24 17:08:31 mrg Exp $
USE_FORT?= yes # data-driven bugs?
@@ -103,6 +103,9 @@ LIBDPLIBS= \
z ${.CURDIR}/../../../../../lib/libz \
bz2 ${.CURDIR}/../../../../../lib/libbz2
+.include "../brotli/brotli.mk"
+CPPFLAGS+= -I${X11SRCDIR.brotli}/c/include
+
PKGCONFIG= freetype2
PKGDIST.freetype2= ${.CURDIR}
PKGCONFIG_VERSION.freetype2= 23:0:17
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.21 src/external/mit/xorg/tools/fc-cache/Makefile:1.22
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.21 Thu Jan 19 17:07:38 2023
+++ src/external/mit/xorg/tools/fc-cache/Makefile Fri Feb 24 17:08:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2023/01/19 17:07:38 martin Exp $
+# $NetBSD: Makefile,v 1.22 2023/02/24 17:08:31 mrg Exp $
.include
@@ -122,7 +122,6 @@ HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREE
-I${FONTCONFIG}/../include
HOST_CPPFLAGS+= -DXML_POOR_ENTROPY
-
HOST_CPPFLAGS+= -DTOOL_FCCACHE
LDADD= -lz
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.16 src/external/mit/xorg/tools/mkfontscale/Makefile:1.17
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.16 Fri Sep 9 19:15:20 2022
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Fri Feb 24 17:08:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/09/09 19:15:20 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2023/02/24 17:08:31 mrg Exp $
.include
@@ -94,5 +94,7 @@ HOST_CPPFLAGS+= -I${FREETYPE}/include -I
-I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
+HOST_CPPFLAGS+= -DTOOL_FCCACHE
+
.include
.include
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Fri Feb 24 17:08:31 UTC 2023 Modified Files: src/external/mit/xorg/lib/freetype: Makefile src/external/mit/xorg/tools/fc-cache: Makefile src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: arrange for ftoption.h to define FT_CONFIG_OPTION_USE_BROTLI but not for tools guard the definition in ftoption.h with #ifndef TOOL_FCCACHE, and build the tools portions with this defined if not already set. this fixes building pkgsrc blender with native x11. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/freetype/Makefile cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/tools/fc-cache/Makefile cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: nros Date: Fri Feb 10 13:22:58 UTC 2023 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man xkeyboard-config.pc.in Log Message: Fix xkb_base in the pkg-config file and mapage for xkeyboard-config The xkbdata files are installed in /usr/X11R7/lib/X11/xkb not /usr/X11R7/share/X11/xkb. The wrong directory causes build failures in pkgsrc packages that use the xkb_base variable. Also base the datadir on the vars from bsd.x11.mk. Also use @xkb_base@ instead of /usr/X11R7/share/lib/X11/xkb in the manpage to show the right xkbdata directory. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.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/lib/xkeyboard-config/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.11 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.12 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.11 Mon Oct 17 07:40:23 2022 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Fri Feb 10 13:22:58 2023 @@ -13,7 +13,7 @@ settings in the xorg.conf(5). .SH XKB DATA FILES LOAD PATHS xkeyboard-config provides the XKB data files installed in -/usr/X11R7/share/X11/xkb. User-specific data files may be elsewhere but it depends on +@xkb_base@. User-specific data files may be elsewhere but it depends on the tool whether those files are loaded. For example, the libxkbcommon library will by default load XKB data files from the user's home directory. See the libxkbcommon documentation for details. @@ -22,7 +22,7 @@ See the libxkbcommon documentation for d The "custom" layout is a layout that is listed as available to tools reading the data files but is not actually provided by xkeyboard-config. -A user may save a layout specification in the /usr/X11R7/share/X11/xkb/symbols/custom file +A user may save a layout specification in the @xkb_base@/symbols/custom file and that layout will be available to most tools interacting with the xkeyboard-config data files. This is primarily aimed at systems running X where additional lookup paths cannot easily be added. @@ -1475,23 +1475,23 @@ terminate:ctrl_alt_bksp Ctrl+Alt+Backspa .SH FILES -/usr/X11R7/share/X11/xkb/compat +@xkb_base@/compat -/usr/X11R7/share/X11/xkb/compiled +@xkb_base@/compiled -/usr/X11R7/share/X11/xkb/geometry +@xkb_base@/geometry -/usr/X11R7/share/X11/xkb/keycodes +@xkb_base@/keycodes -/usr/X11R7/share/X11/xkb/keymap +@xkb_base@/keymap -/usr/X11R7/share/X11/xkb/rules +@xkb_base@/rules -/usr/X11R7/share/X11/xkb/semantics +@xkb_base@/semantics -/usr/X11R7/share/X11/xkb/symbols +@xkb_base@/symbols -/usr/X11R7/share/X11/xkb/types +@xkb_base@/types .SH SEE ALSO setxkbmap(1) Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in:1.1 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in:1.2 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in:1.1 Tue Oct 18 07:36:38 2022 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in Fri Feb 10 13:22:58 2023 @@ -1,6 +1,7 @@ - -datadir=/usr/X11R7/share -xkb_base=/usr/X11R7/share/X11/xkb +prefix=@prefix@ +datarootdir=@datarootdir@ +datadir=@datadir@ +xkb_base=@xkb_base@ Name: XKeyboardConfig Description: X Keyboard configuration data
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: nros Date: Fri Feb 10 13:22:58 UTC 2023 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man xkeyboard-config.pc.in Log Message: Fix xkb_base in the pkg-config file and mapage for xkeyboard-config The xkbdata files are installed in /usr/X11R7/lib/X11/xkb not /usr/X11R7/share/X11/xkb. The wrong directory causes build failures in pkgsrc packages that use the xkb_base variable. Also base the datadir on the vars from bsd.x11.mk. Also use @xkb_base@ instead of /usr/X11R7/share/lib/X11/xkb in the manpage to show the right xkbdata directory. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in 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
Module Name:src
Committed By: mrg
Date: Tue Feb 7 06:19:03 UTC 2023
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/gallium.old: Makefile
Log Message:
apply -g1 to the gallium sources as well. saves another couple of 100MB.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/gallium.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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.48 src/external/mit/xorg/lib/gallium/Makefile:1.49
--- src/external/mit/xorg/lib/gallium/Makefile:1.48 Sun Jul 11 20:52:06 2021
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Feb 7 06:19:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2021/07/11 20:52:06 mrg Exp $
+# $NetBSD: Makefile,v 1.49 2023/02/07 06:19:03 mrg Exp $
# Link the gallium mega driver.
@@ -28,6 +28,12 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
CFLAGS+= -pthread
LDFLAGS+= -pthread
+# Reduce debugging for these extremely large objects.
+.if ${MKDEBUG:Uno} != "no"
+CXXFLAGS+= -g1
+CFLAGS+= -g1
+.endif
+
GALLIUM_SUBDIRS= \
auxiliary \
auxiliary/cso_cache \
Index: src/external/mit/xorg/lib/gallium.old/Makefile
diff -u src/external/mit/xorg/lib/gallium.old/Makefile:1.4 src/external/mit/xorg/lib/gallium.old/Makefile:1.5
--- src/external/mit/xorg/lib/gallium.old/Makefile:1.4 Thu Sep 29 18:58:04 2022
+++ src/external/mit/xorg/lib/gallium.old/Makefile Tue Feb 7 06:19:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/09/29 18:58:04 rjs Exp $
+# $NetBSD: Makefile,v 1.5 2023/02/07 06:19:03 mrg Exp $
# Transparent struct/union broken
NOLINT=yes
@@ -31,6 +31,12 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
CFLAGS+= -pthread
LDFLAGS+= -pthread
+# Reduce debugging for these extremely large objects.
+.if ${MKDEBUG:Uno} != "no"
+CXXFLAGS+= -g1
+CFLAGS+= -g1
+.endif
+
GALLIUM_SUBDIRS= \
auxiliary \
auxiliary/cso_cache \
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: mrg Date: Tue Feb 7 06:19:03 UTC 2023 Modified Files: src/external/mit/xorg/lib/gallium: Makefile src/external/mit/xorg/lib/gallium.old: Makefile Log Message: apply -g1 to the gallium sources as well. saves another couple of 100MB. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/external/mit/xorg/lib/gallium/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/gallium.old/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/brotli
Module Name:src
Committed By: mrg
Date: Sun Jan 29 07:54:11 UTC 2023
Added Files:
src/external/mit/xorg/lib/brotli: brotli-rename.mk brotli.mk
Log Message:
build framework for embedded brotli.
need to figure out a way to handle tools build vs installed build
before we can enable it in freetype itself.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/brotli/brotli-rename.mk \
src/external/mit/xorg/lib/brotli/brotli.mk
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/brotli/brotli-rename.mk
diff -u /dev/null src/external/mit/xorg/lib/brotli/brotli-rename.mk:1.1
--- /dev/null Sun Jan 29 07:54:11 2023
+++ src/external/mit/xorg/lib/brotli/brotli-rename.mk Sun Jan 29 07:54:11 2023
@@ -0,0 +1,41 @@
+# $NetBSD: brotli-rename.mk,v 1.1 2023/01/29 07:54:11 mrg Exp $
+
+#
+# functions exported by freetype's private brotli copy are renamed to have
+# a "nbft_" prefix.
+#
+
+RENAME_FUNCS= \
+ BrotliBuildCodeLengthsHuffmanTable \
+ BrotliBuildHuffmanTable \
+ BrotliBuildSimpleHuffmanTable \
+ BrotliDecoderCreateInstance \
+ BrotliDecoderDecompress \
+ BrotliDecoderDecompressStream \
+ BrotliDecoderDestroyInstance \
+ BrotliDecoderErrorString \
+ BrotliDecoderGetErrorCode \
+ BrotliDecoderHasMoreOutput \
+ BrotliDecoderHuffmanTreeGroupInit \
+ BrotliDecoderIsFinished \
+ BrotliDecoderIsUsed \
+ BrotliDecoderSetParameter \
+ BrotliDecoderStateCleanup \
+ BrotliDecoderStateCleanupAfterMetablock \
+ BrotliDecoderStateInit \
+ BrotliDecoderStateMetablockBegin \
+ BrotliDecoderTakeOutput \
+ BrotliDecoderVersion \
+ BrotliDefaultAllocFunc \
+ BrotliDefaultFreeFunc \
+ BrotliGetDictionary \
+ BrotliGetTransforms \
+ BrotliInitBitReader \
+ BrotliSafeReadBits32Slow \
+ BrotliSetDictionaryData \
+ BrotliTransformDictionaryWord \
+ BrotliWarmupBitReader \
+
+.for _f in ${RENAME_FUNCS}
+CPPFLAGS+= -D${_f}=nbft_${_f}
+.endfor
Index: src/external/mit/xorg/lib/brotli/brotli.mk
diff -u /dev/null src/external/mit/xorg/lib/brotli/brotli.mk:1.1
--- /dev/null Sun Jan 29 07:54:11 2023
+++ src/external/mit/xorg/lib/brotli/brotli.mk Sun Jan 29 07:54:11 2023
@@ -0,0 +1,24 @@
+# $NetBSD: brotli.mk,v 1.1 2023/01/29 07:54:11 mrg Exp $
+
+# makefile fragment to build brotlidec for freetype2
+
+.include "bsd.own.mk"
+
+BROTLI_SRCS= bit_reader.c decode.c huffman.c state.c
+BROTLI_SRCS+= constants.c context.c dictionary.c platform.c transform.c
+
+SRCS+= ${BROTLI_SRCS}
+
+.for _f in ${BROTLI_SRCS}
+CFLAGS.${_f}+= -fcommon
+CPPFLAGS+${_f}= -DBROTLIDEC_SHARED_COMPILATION \
+ -DBROTLI_HAVE_LOG2=1 \
+ -DBROTLI_SHARED_COMPILATION \
+ -DNDEBUG \
+ -I${X11SRCDIR.brotli}/c/include
+.endfor
+
+.include "brotli-rename.mk"
+
+.PATH: ${X11SRCDIR.brotli}/c/dec
+.PATH: ${X11SRCDIR.brotli}/c/common
CVS commit: src/external/mit/xorg/lib/brotli
Module Name:src Committed By: mrg Date: Sun Jan 29 07:54:11 UTC 2023 Added Files: src/external/mit/xorg/lib/brotli: brotli-rename.mk brotli.mk Log Message: build framework for embedded brotli. need to figure out a way to handle tools build vs installed build before we can enable it in freetype itself. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/brotli/brotli-rename.mk \ src/external/mit/xorg/lib/brotli/brotli.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server/hw
Module Name:src
Committed By: tsutsui
Date: Thu Jan 26 17:16:57 UTC 2023
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
Log Message:
Fix link errors now complained by new ld(1) from binutils 2.39.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.8 -r1.9 \
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/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.15 Thu Jan 26 17:09:46 2023
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Thu Jan 26 17:16:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/01/26 17:09:46 tsutsui Exp $
+# $NetBSD: Makefile,v 1.16 2023/01/26 17:16:57 tsutsui Exp $
.include
@@ -56,6 +56,8 @@ LDADD+= ${LDADD.dix} \
${LDADD.Xi} \
-lXfont2 \
-lpixman-1 \
+ -lXdmcp \
+ -lXau \
-lX11 \
-lz \
-lm
@@ -77,6 +79,8 @@ DPADD+= ${LDADD.dix} \
${DPADD.Xi} \
${LIBXFONT2} \
${LIBPIXMAN-1} \
+ ${LIBXDMCP} \
+ ${LIBXAU} \
${LIBX11} \
${LIBZ} \
${LIBM}
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.8 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.9
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.8 Fri Oct 28 09:43:59 2022
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Thu Jan 26 17:16:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.8 2022/10/28 09:43:59 wiz Exp $
+# $NetBSD: Makefile.Xsun,v 1.9 2023/01/26 17:16:57 tsutsui Exp $
.include
@@ -99,6 +99,8 @@ LDADD+= ${LDADD.dix} \
${LDADD.Xi} \
-lXfont2 \
-lpixman-1 \
+ -lXdmcp \
+ -lXau \
-lX11 \
-lz \
-lm
@@ -120,6 +122,8 @@ DPADD+= ${LDADD.dix} \
${DPADD.Xi} \
${LIBXFONT2} \
${LIBPIXMAN-1} \
+ ${LIBXDMCP} \
+ ${LIBXAU} \
${LIBX11} \
${LIBZ} \
${LIBM}
CVS commit: src/external/mit/xorg/server/xorg-server/hw
Module Name:src Committed By: tsutsui Date: Thu Jan 26 17:16:57 UTC 2023 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun Log Message: Fix link errors now complained by new ld(1) from binutils 2.39. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile cvs rdiff -u -r1.8 -r1.9 \ 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.
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Thu Jan 26 17:09:46 UTC 2023 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile Log Message: No need to link shared libXext here. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ 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.
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Thu Jan 26 17:09:46 UTC 2023
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
No need to link shared libXext here.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
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.14 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.14 Fri Oct 28 09:43:59 2022
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Thu Jan 26 17:09:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/10/28 09:43:59 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2023/01/26 17:09:46 tsutsui Exp $
.include
@@ -56,7 +56,6 @@ LDADD+= ${LDADD.dix} \
${LDADD.Xi} \
-lXfont2 \
-lpixman-1 \
- -lXext \
-lX11 \
-lz \
-lm
@@ -78,7 +77,6 @@ DPADD+= ${LDADD.dix} \
${DPADD.Xi} \
${LIBXFONT2} \
${LIBPIXMAN-1} \
- ${LIBXEXT} \
${LIBX11} \
${LIBZ} \
${LIBM}
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: christos
Date: Wed Jan 25 22:35:06 UTC 2023
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
fix clang build
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/lib/fontconfig/src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.28 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.29
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.28 Sun Jan 22 15:36:46 2023
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Wed Jan 25 17:35:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2023/01/22 20:36:46 christos Exp $
+# $NetBSD: Makefile,v 1.29 2023/01/25 22:35:06 christos Exp $
.include
@@ -291,8 +291,11 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
-I. \
-I${X11SRCDIR.${LIB}}
-CPPFLAGS.fccache.c+= -Wno-error=discarded-qualifiers
-CPPFLAGS.fccfg.c+= -Wno-error=discarded-qualifiers
+IGNORE_QUALIFIERS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+IGNORE_QUALIFIERS+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+
+CPPFLAGS.fccache.c+= ${IGNORE_QUALIFIERS}
+CPPFLAGS.fccfg.c+= ${IGNORE_QUALIFIERS}
.if ${MACHINE_ARCH:Mvax}
COPTS.fccache.c+= -O0
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src Committed By: christos Date: Wed Jan 25 22:35:06 UTC 2023 Modified Files: src/external/mit/xorg/lib/fontconfig/src: Makefile Log Message: fix clang build To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/lib/fontconfig/src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: christos
Date: Sun Jan 22 20:36:46 UTC 2023
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
Disable optimization on vax
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/fontconfig/src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.27 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.28
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.27 Sun Jan 22 09:35:10 2023
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Sun Jan 22 15:36:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2023/01/22 14:35:10 christos Exp $
+# $NetBSD: Makefile,v 1.28 2023/01/22 20:36:46 christos Exp $
.include
@@ -294,6 +294,11 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/free
CPPFLAGS.fccache.c+= -Wno-error=discarded-qualifiers
CPPFLAGS.fccfg.c+= -Wno-error=discarded-qualifiers
+.if ${MACHINE_ARCH:Mvax}
+COPTS.fccache.c+= -O0
+COPTS.fccfg.c+= -O0
+.endif
+
.include "Makefile.fcarch"
CLEANFILES+= fcarch.h
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src Committed By: christos Date: Sun Jan 22 20:36:46 UTC 2023 Modified Files: src/external/mit/xorg/lib/fontconfig/src: Makefile Log Message: Disable optimization on vax To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/fontconfig/src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src
Committed By: christos
Date: Sun Jan 22 14:35:10 UTC 2023
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
Log Message:
Disable MT for lint since we don't have stdatomic.h
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/fontconfig/src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.26 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.27
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.26 Thu Jan 19 01:29:10 2023
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Sun Jan 22 09:35:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/01/19 06:29:10 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2023/01/22 14:35:10 christos Exp $
.include
@@ -322,6 +322,8 @@ COPTS.fcpat.c+= ${${ACTIVE_CC} == "clang
COPTS.fcstr.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
.endif
+LINTFLAGS+=-DFC_NO_MT
+
LIBUUID_DIST= ${NETBSDSRCDIR}/external/bsd/libuuid_ul/lib/libuuid_ul
.include "${LIBUUID_DIST}/srcs.mk"
.include "${LIBUUID_DIST}/libuuid_ul-rename.mk"
CVS commit: src/external/mit/xorg/lib/fontconfig/src
Module Name:src Committed By: christos Date: Sun Jan 22 14:35:10 UTC 2023 Modified Files: src/external/mit/xorg/lib/fontconfig/src: Makefile Log Message: Disable MT for lint since we don't have stdatomic.h To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/fontconfig/src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/libXpm
Module Name:src Committed By: mrg Date: Fri Jan 20 10:20:06 UTC 2023 Modified Files: src/external/mit/xorg/lib/libXpm: xpm.mk Log Message: add $NetBSD$ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXpm/xpm.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/libXpm/xpm.mk diff -u src/external/mit/xorg/lib/libXpm/xpm.mk:1.1 src/external/mit/xorg/lib/libXpm/xpm.mk:1.2 --- src/external/mit/xorg/lib/libXpm/xpm.mk:1.1 Thu Jan 19 05:31:34 2023 +++ src/external/mit/xorg/lib/libXpm/xpm.mk Fri Jan 20 10:20:05 2023 @@ -1,3 +1,4 @@ +# $NetBSD: xpm.mk,v 1.2 2023/01/20 10:20:05 mrg Exp $ CPPFLAGS+= -DHAS_SNPRINTF CPPFLAGS+= -DXPM_PATH_COMPRESS=\"/usr/bin/compress\"
CVS commit: src/external/mit/xorg/lib/libXpm
Module Name:src Committed By: mrg Date: Fri Jan 20 10:20:06 UTC 2023 Modified Files: src/external/mit/xorg/lib/libXpm: xpm.mk Log Message: add $NetBSD$ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXpm/xpm.mk 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/tools/fc-cache
Module Name:src
Committed By: martin
Date: Thu Jan 19 17:07:38 UTC 2023
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
Pass -DALIGNOF_VOID_P with proper size to fix the tools build
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/tools/fc-cache/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.20 src/external/mit/xorg/tools/fc-cache/Makefile:1.21
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.20 Thu Jan 19 06:29:10 2023
+++ src/external/mit/xorg/tools/fc-cache/Makefile Thu Jan 19 17:07:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/01/19 06:29:10 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2023/01/19 17:07:38 martin Exp $
.include
@@ -89,7 +89,6 @@ SRCS.expat= xmlparse.c xmltok.c xmlrole.
SRCS= ${SRCS.fc-cache} ${SRCS.fontconfig} ${SRCS.freetype} ${SRCS.expat}
# XXX FONTCONFIG_PATH was arbitrarily chosen
-# XXX ALIGNOF_VOID_P=8 not valid for 32 bit, but probably ok?
HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DESTDIR}/etc/X11/fonts"' \
-DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' \
-DFC_TEMPLATEDIR='"${DESTDIR}${X11FONTDIR}"' \
@@ -97,7 +96,8 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
-DCONFIGDIR='"${DESTDIR}/etc/fonts/conf.d"' \
-DFC_GPERF_SIZE_T=unsigned \
-DFC_NO_MT=1 \
- -DALIGNOF_VOID_P=8 \
+ -DALIGNOF_VOID_P=${PTRSIZE} \
+ -DSIZEOF_VOID_P=${PTRSIZE} \
-DHAVE_FT_BITMAP_SIZE_Y_PPEM \
-DHAVE_FT_GET_BDF_PROPERTY \
-DHAVE_FT_GET_NEXT_CHAR \
@@ -131,4 +131,11 @@ LDADD= -lz
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include
+
+.if empty(X11FLAGS.SERVER:M-D_XSERVER64)
+PTRSIZE= 4
+.else
+PTRSIZE= 8
+.endif
+
.include
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src Committed By: martin Date: Thu Jan 19 17:07:38 UTC 2023 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile Log Message: Pass -DALIGNOF_VOID_P with proper size to fix the tools build To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/tools/fc-cache/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
Module Name:src
Committed By: mrg
Date: Thu Jan 19 05:31:35 UTC 2023
Modified Files:
src/external/mit/xorg/bin/cxpm: Makefile
src/external/mit/xorg/bin/sxpm: Makefile
src/external/mit/xorg/lib/libXpm: Makefile
Added Files:
src/external/mit/xorg/lib/libXpm: xpm.mk
Log Message:
updates for libXpm 3.5.15.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/cxpm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/sxpm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXpm/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXpm/xpm.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/bin/cxpm/Makefile
diff -u src/external/mit/xorg/bin/cxpm/Makefile:1.2 src/external/mit/xorg/bin/cxpm/Makefile:1.3
--- src/external/mit/xorg/bin/cxpm/Makefile:1.2 Fri May 31 01:41:08 2013
+++ src/external/mit/xorg/bin/cxpm/Makefile Thu Jan 19 05:31:34 2023
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 01:41:08 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/01/19 05:31:34 mrg Exp $
.include
PROG= cxpm
CPPFLAGS+= -I${X11SRCDIR.Xpm}/src
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
LDADD+= -lXpm -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
@@ -13,5 +12,7 @@ DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LI
.PATH: ${X11SRCDIR.Xpm}/${PROG}
.PATH: ${X11SRCDIR.Xpm}/man
+.include "${NETBSDSRCDIR}/external/mit/xorg/lib/libXpm/xpm.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/sxpm/Makefile
diff -u src/external/mit/xorg/bin/sxpm/Makefile:1.2 src/external/mit/xorg/bin/sxpm/Makefile:1.3
--- src/external/mit/xorg/bin/sxpm/Makefile:1.2 Fri May 31 01:41:56 2013
+++ src/external/mit/xorg/bin/sxpm/Makefile Thu Jan 19 05:31:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 01:41:56 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2023/01/19 05:31:34 mrg Exp $
.include
@@ -13,5 +13,7 @@ DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LI
.PATH: ${X11SRCDIR.Xpm}/${PROG}
.PATH: ${X11SRCDIR.Xpm}/man
+.include "${NETBSDSRCDIR}/external/mit/xorg/lib/libXpm/xpm.mk"
+
.include
.include
Index: src/external/mit/xorg/lib/libXpm/Makefile
diff -u src/external/mit/xorg/lib/libXpm/Makefile:1.3 src/external/mit/xorg/lib/libXpm/Makefile:1.4
--- src/external/mit/xorg/lib/libXpm/Makefile:1.3 Tue Nov 16 09:25:52 2021
+++ src/external/mit/xorg/lib/libXpm/Makefile Thu Jan 19 05:31:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/11/16 09:25:52 nia Exp $
+# $NetBSD: Makefile,v 1.4 2023/01/19 05:31:34 mrg Exp $
USE_FORT?= yes # data-driven bugs?
@@ -17,14 +17,58 @@ SRCS= Attrib.c CrBufFrI.c CrBufFrP.c CrD
INCS= xpm.h
INCSDIR=${X11INCDIR}/X11
-CPPFLAGS+=-DHAS_SNPRINTF
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-
LIBDPLIBS=\
Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
PKGDIST= ${LIB}
+.include "xpm.mk"
+
+.if 0 # not yet
+MAN= \
+ XpmAttributesSize.3 \
+ XpmCreateBuffer.3 \
+ XpmCreateBufferFromImage.3 \
+ XpmCreateBufferFromPixmap.3 \
+ XpmCreateBufferFromXpmImage.3 \
+ XpmCreateData.3 \
+ XpmCreateDataFromImage.3 \
+ XpmCreateDataFromPixmap.3 \
+ XpmCreateDataFromXpmImage.3 \
+ XpmCreateImage.3 \
+ XpmCreateImageFromBuffer.3 \
+ XpmCreateImageFromData.3 \
+ XpmCreateImageFromXpmImage.3 \
+ XpmCreatePixmap.3 \
+ XpmCreatePixmapFromBuffer.3 \
+ XpmCreatePixmapFromData.3 \
+ XpmCreatePixmapFromXpmImage.3 \
+ XpmCreateXpmImage.3 \
+ XpmCreateXpmImageFromBuffer.3 \
+ XpmCreateXpmImageFromData.3 \
+ XpmCreateXpmImageFromImage.3 \
+ XpmCreateXpmImageFromPixmap.3 \
+ XpmFree.3 \
+ XpmFreeAttributes.3 \
+ XpmFreeExtensions.3 \
+ XpmFreeXpmImage.3 \
+ XpmFreeXpmInfo.3 \
+ XpmGetErrorString.3 \
+ XpmLibraryVersion.3 \
+ XpmMisc.3 \
+ XpmRead.3 \
+ XpmReadFileToBuffer.3 \
+ XpmReadFileToData.3 \
+ XpmReadFileToImage.3 \
+ XpmReadFileToPixmap.3 \
+ XpmReadFileToXpmImage.3 \
+ XpmWrite.3 \
+ XpmWriteFileFromBuffer.3 \
+ XpmWriteFileFromImage.3 \
+ XpmWriteFileFromPixmap.3 \
+ XpmWriteFileFromXpmImage.3
+.endif
+
.include
.include
Added files:
Index: src/external/mit/xorg/lib/libXpm/xpm.mk
diff -u /dev/null src/external/mit/xorg/lib/libXpm/xpm.mk:1.1
--- /dev/null Thu Jan 19 05:31:35 2023
+++ src/external/mit/xorg/lib/libXpm/xpm.mk Thu Jan 19 05:31:34 2023
@@ -0,0 +1,6 @@
+
+CPPFLAGS+= -DHAS_SNPRINTF
+CPPFLAGS+= -DXPM_PATH_COMPRESS=\"/usr/bin/compress\"
+CPPFLAGS+= -DXPM_PATH_GZIP=\"/usr/bin/gzip\"
+CPPFLAGS+= -DXPM_PATH_UNCOMPRESS=\"/usr/bin/uncompress\"
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Thu Jan 19 05:31:35 UTC 2023 Modified Files: src/external/mit/xorg/bin/cxpm: Makefile src/external/mit/xorg/bin/sxpm: Makefile src/external/mit/xorg/lib/libXpm: Makefile Added Files: src/external/mit/xorg/lib/libXpm: xpm.mk Log Message: updates for libXpm 3.5.15. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/cxpm/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/sxpm/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXpm/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXpm/xpm.mk 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/bin/xhost
Module Name:src
Committed By: mrg
Date: Sun Jan 8 12:00:21 UTC 2023
Modified Files:
src/external/mit/xorg/bin/xhost: Makefile
Log Message:
also link -lintl.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xhost/Makefile
Please note 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/xhost/Makefile
diff -u src/external/mit/xorg/bin/xhost/Makefile:1.5 src/external/mit/xorg/bin/xhost/Makefile:1.6
--- src/external/mit/xorg/bin/xhost/Makefile:1.5 Sun Jan 8 11:20:28 2023
+++ src/external/mit/xorg/bin/xhost/Makefile Sun Jan 8 12:00:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/01/08 11:20:28 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/08 12:00:21 mrg Exp $
.include
@@ -12,8 +12,8 @@ CPPFLAGS+=-DUSE_GETTEXT -DLOCALEDIR=\"${
CPPFLAGS+= -DIPv6
.endif
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11 -lintl
+DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBINTL}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xhost
Module Name:src Committed By: mrg Date: Sun Jan 8 12:00:21 UTC 2023 Modified Files: src/external/mit/xorg/bin/xhost: Makefile Log Message: also link -lintl. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xhost/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/bin/xhost
Module Name:src
Committed By: mrg
Date: Sun Jan 8 11:20:28 UTC 2023
Modified Files:
src/external/mit/xorg/bin/xhost: Makefile
Log Message:
enable gettext support
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xhost/Makefile
Please note 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/xhost/Makefile
diff -u src/external/mit/xorg/bin/xhost/Makefile:1.4 src/external/mit/xorg/bin/xhost/Makefile:1.5
--- src/external/mit/xorg/bin/xhost/Makefile:1.4 Sun Mar 3 09:19:02 2019
+++ src/external/mit/xorg/bin/xhost/Makefile Sun Jan 8 11:20:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/03/03 09:19:02 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/01/08 11:20:28 mrg Exp $
.include
@@ -6,6 +6,7 @@ PROG= xhost
CPPFLAGS+=${X11FLAGS.CONNECTION} -DBSD44SOCKETS
CPPFLAGS+=-DHAVE_INET_ATON
+CPPFLAGS+=-DUSE_GETTEXT -DLOCALEDIR=\"${LOCALEDIR}\"
.if (${USE_INET6} != "no")
CPPFLAGS+= -DIPv6
CVS commit: src/external/mit/xorg/bin/xhost
Module Name:src Committed By: mrg Date: Sun Jan 8 11:20:28 UTC 2023 Modified Files: src/external/mit/xorg/bin/xhost: Makefile Log Message: enable gettext support To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xhost/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/bin/xfd
Module Name:src
Committed By: mrg
Date: Sun Jan 8 09:56:11 UTC 2023
Modified Files:
src/external/mit/xorg/bin/xfd: Makefile
Log Message:
set -D_CONST_X_STRING for new xfd.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xfd/Makefile
Please note 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/xfd/Makefile
diff -u src/external/mit/xorg/bin/xfd/Makefile:1.4 src/external/mit/xorg/bin/xfd/Makefile:1.5
--- src/external/mit/xorg/bin/xfd/Makefile:1.4 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/xfd/Makefile Sun Jan 8 09:56:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/01/08 09:56:11 mrg Exp $
.include
@@ -7,6 +7,7 @@ SRCS= xfd.c grid.c
CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
+CPPFLAGS+= -D_CONST_X_STRING
APPDEFS=Xfd
CVS commit: src/external/mit/xorg/bin/xfd
Module Name:src Committed By: mrg Date: Sun Jan 8 09:56:11 UTC 2023 Modified Files: src/external/mit/xorg/bin/xfd: Makefile Log Message: set -D_CONST_X_STRING for new xfd. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xfd/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/bin/lndir
Module Name:src
Committed By: mrg
Date: Sun Jan 8 09:55:38 UTC 2023
Modified Files:
src/external/mit/xorg/bin/lndir: Makefile
Log Message:
set -DHAVE_STRLCPY -DHAVE_STRLCAT for new lndir.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/lndir/Makefile
Please note 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/lndir/Makefile
diff -u src/external/mit/xorg/bin/lndir/Makefile:1.1 src/external/mit/xorg/bin/lndir/Makefile:1.2
--- src/external/mit/xorg/bin/lndir/Makefile:1.1 Sun Nov 21 02:43:31 2010
+++ src/external/mit/xorg/bin/lndir/Makefile Sun Jan 8 09:55:38 2023
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2010/11/21 02:43:31 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2023/01/08 09:55:38 mrg Exp $
.include
PROG= lndir
+CPPFLAGS+= -DHAVE_STRLCPY -DHAVE_STRLCAT
+
.PATH: ${X11SRCDIR.${PROG}}
.include
CVS commit: src/external/mit/xorg/bin/lndir
Module Name:src Committed By: mrg Date: Sun Jan 8 09:55:38 UTC 2023 Modified Files: src/external/mit/xorg/bin/lndir: Makefile Log Message: set -DHAVE_STRLCPY -DHAVE_STRLCAT for new lndir. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/lndir/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/libSM
Module Name:src
Committed By: mrg
Date: Sun Jan 8 09:10:58 UTC 2023
Modified Files:
src/external/mit/xorg/lib/libSM: Makefile
Log Message:
handle .pc updates. prepare to enable uuid support.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libSM/Makefile
Please note 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/libSM/Makefile
diff -u src/external/mit/xorg/lib/libSM/Makefile:1.4 src/external/mit/xorg/lib/libSM/Makefile:1.5
--- src/external/mit/xorg/lib/libSM/Makefile:1.4 Thu Jan 3 23:39:47 2019
+++ src/external/mit/xorg/lib/libSM/Makefile Sun Jan 8 09:10:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/01/03 23:39:47 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/01/08 09:10:58 mrg Exp $
.include
@@ -13,6 +13,8 @@ INCS= SM.h SMlib.h SMproto.h
INCSDIR=${X11INCDIR}/X11/SM
CPPFLAGS+= ${X11FLAGS.THREADLIB}
+# XXX not yet; libuuid_ul is not yet ready.
+#CPPFLAGS+= -DHAVE_LIBUUID
CONN_DEFINES= ${X11FLAGS.CONNECTION} -DICE_t
@@ -30,6 +32,7 @@ COPTS.sm_client.c= -Wno-error
COPTS.sm_manager.c= -Wno-error
PKGDIST= ${LIB}
+PKGCONFIG_SED_FLAGS= -e "s,@UUID_PC@,," -e "s,@UUID_LIB_PRIVATE@,,"
.include
.include
CVS commit: src/external/mit/xorg/lib/libSM
Module Name:src Committed By: mrg Date: Sun Jan 8 09:10:58 UTC 2023 Modified Files: src/external/mit/xorg/lib/libSM: Makefile Log Message: handle .pc updates. prepare to enable uuid support. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libSM/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/libICE
Module Name:src
Committed By: mrg
Date: Sun Jan 8 06:04:44 UTC 2023
Modified Files:
src/external/mit/xorg/lib/libICE: Makefile
Log Message:
handle @LIBBSD_LIBS@ in the new .pc file.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libICE/Makefile
Please note 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/libICE/Makefile
diff -u src/external/mit/xorg/lib/libICE/Makefile:1.6 src/external/mit/xorg/lib/libICE/Makefile:1.7
--- src/external/mit/xorg/lib/libICE/Makefile:1.6 Fri Mar 3 20:48:02 2017
+++ src/external/mit/xorg/lib/libICE/Makefile Sun Jan 8 06:04:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/03/03 20:48:02 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/01/08 06:04:43 mrg Exp $
.include
@@ -21,6 +21,7 @@ CPPFLAGS+= -DHAVE_ASPRINTF -DHAVE_ARC4RA
CPPFLAGS+= $(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES)
PKGDIST= ${LIB}
+PKGCONFIG_SED_FLAGS= -e "s,@LIBBSD_LIBS@,,"
CWARNFLAGS.clang+= -Wno-string-plus-int
CVS commit: src/external/mit/xorg/lib/libICE
Module Name:src Committed By: mrg Date: Sun Jan 8 06:04:44 UTC 2023 Modified Files: src/external/mit/xorg/lib/libICE: Makefile Log Message: handle @LIBBSD_LIBS@ in the new .pc file. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libICE/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/bin/xeyes
Module Name:src
Committed By: christos
Date: Sun Dec 25 23:05:58 UTC 2022
Modified Files:
src/external/mit/xorg/bin/xeyes: Makefile
Log Message:
Need -lxcb for xcb_create_pixmap
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/external/mit/xorg/bin/xeyes/Makefile:1.5
--- src/external/mit/xorg/bin/xeyes/Makefile:1.4 Mon Aug 23 18:14:31 2021
+++ src/external/mit/xorg/bin/xeyes/Makefile Sun Dec 25 18:05:58 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/08/23 22:14:31 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2022/12/25 23:05:58 christos Exp $
.include
@@ -8,9 +8,10 @@ PROG= xeyes
SRCS= xeyes.c Eyes.c transform.c
LDADD+= -lXi -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11 -lm \
- -lxcb-xfixes -lxcb-damage -lxcb-present -lX11-xcb
+ -lxcb-xfixes -lxcb-damage -lxcb-present -lX11-xcb -lxcb
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM} \
- ${LIBXCB_XFIXES} ${LIBXCB_DAMAGE} ${LIBXCB_PRESENT} ${LIBX11_XCB}
+ ${LIBXCB_XFIXES} ${LIBXCB_DAMAGE} ${LIBXCB_PRESENT} ${LIBX11_XCB} \
+ ${LIBXCB}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xeyes
Module Name:src Committed By: christos Date: Sun Dec 25 23:05:58 UTC 2022 Modified Files: src/external/mit/xorg/bin/xeyes: Makefile Log Message: Need -lxcb for xcb_create_pixmap To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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.
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Sat Dec 17 09:46:21 UTC 2022 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Makefile.cflags Log Message: handle pixman revert. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/external/mit/xorg/lib/pixman/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/pixman/Makefile.cflags 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/pixman
Module Name:src
Committed By: mrg
Date: Sat Dec 17 09:46:21 UTC 2022
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile Makefile.cflags
Log Message:
handle pixman revert.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/pixman/Makefile.cflags
Please note 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.41 src/external/mit/xorg/lib/pixman/Makefile:1.42
--- src/external/mit/xorg/lib/pixman/Makefile:1.41 Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/Makefile Sat Dec 17 09:46:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2022/11/13 09:36:37 mrg Exp $
+# $NetBSD: Makefile,v 1.42 2022/12/17 09:46:21 mrg Exp $
NOLINT= 1 # defined
@@ -88,12 +88,13 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f
.endif
.if !empty(MACHINE_ARCH:Maarch64*)
+# XXX not yet; new pixman bad on arm64.
# ARM64 NEON
-SRCS+= pixman-arm-neon.c \
- pixman-arma64-neon-asm.S \
- pixman-arma64-neon-asm-bilinear.S
-CPPFLAGS+= -DUSE_ARM_A64_NEON
-
+#SRCS+= pixman-arm-neon.c \
+# pixman-arma64-neon-asm.S \
+# pixman-arma64-neon-asm-bilinear.S
+#CPPFLAGS+= -DUSE_ARM_A64_NEON
+#
# XXX: not sure if needed?
#AFLAGS+= ${${ACTIVE_CC} == "clang" :? -fno-integrated-as :}
.endif
Index: src/external/mit/xorg/lib/pixman/Makefile.cflags
diff -u src/external/mit/xorg/lib/pixman/Makefile.cflags:1.1 src/external/mit/xorg/lib/pixman/Makefile.cflags:1.2
--- src/external/mit/xorg/lib/pixman/Makefile.cflags:1.1 Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/Makefile.cflags Sat Dec 17 09:46:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cflags,v 1.1 2022/11/13 09:36:37 mrg Exp $
+# $NetBSD: Makefile.cflags,v 1.2 2022/12/17 09:46:21 mrg Exp $
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
. if ${MACHINE_ARCH} == "i386"
@@ -18,7 +18,7 @@ CPPFLAGS+= -DUSE_ARM_NEON
.endif
.if !empty(MACHINE_ARCH:Maarch64*)
-CPPFLAGS+= -DUSE_ARM_A64_NEON
+#CPPFLAGS+= -DUSE_ARM_A64_NEON
.endif
.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
CVS commit: src/external/mit/xorg/lib/pixman/test
Module Name:src
Committed By: mrg
Date: Sun Nov 13 21:57:12 UTC 2022
Modified Files:
src/external/mit/xorg/lib/pixman/test: Makefile
Log Message:
add a 'check' target to run the tests (needs to be on the same arch as host.)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/pixman/test/Makefile
Please note 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/test/Makefile
diff -u src/external/mit/xorg/lib/pixman/test/Makefile:1.1 src/external/mit/xorg/lib/pixman/test/Makefile:1.2
--- src/external/mit/xorg/lib/pixman/test/Makefile:1.1 Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/test/Makefile Sun Nov 13 21:57:12 2022
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2022/11/13 09:36:37 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2022/11/13 21:57:12 mrg Exp $
NOINSTALL=1
NOMAN=1
@@ -56,5 +56,12 @@ LDADD+= -lpixman-1
.PATH: ${X11SRCDIR.pixman}/test
+check:
+.for test in ${PROGS}
+ echo -n "Starting ${test}: "; date
+ ./${test} && echo Passed: ${test}
+.endfor
+ echo -n "Done: "; date
+
.include
.include
CVS commit: src/external/mit/xorg/lib/pixman/test
Module Name:src Committed By: mrg Date: Sun Nov 13 21:57:12 UTC 2022 Modified Files: src/external/mit/xorg/lib/pixman/test: Makefile Log Message: add a 'check' target to run the tests (needs to be on the same arch as host.) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/pixman/test/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/pixman
Module Name:src
Committed By: mrg
Date: Sun Nov 13 09:36:37 UTC 2022
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Added Files:
src/external/mit/xorg/lib/pixman: Makefile.cflags
src/external/mit/xorg/lib/pixman/test: Makefile
Log Message:
add build infrastructure to build the pixman tests
not built or installed by default.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/pixman/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/pixman/Makefile.cflags
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/pixman/test/Makefile
Please note 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.40 src/external/mit/xorg/lib/pixman/Makefile:1.41
--- src/external/mit/xorg/lib/pixman/Makefile:1.40 Sat Nov 12 07:43:33 2022
+++ src/external/mit/xorg/lib/pixman/Makefile Sun Nov 13 09:36:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2022/11/12 07:43:33 mrg Exp $
+# $NetBSD: Makefile,v 1.41 2022/11/13 09:36:37 mrg Exp $
NOLINT= 1 # defined
@@ -54,20 +54,20 @@ COPTS.pixman-mmx.c= -mmmx -fvisibility=h
. if defined(HAVE_LLVM)
COPTS.pixman-mmx.c+= -Wno-error=attributes
. endif
-CPPFLAGS+= -DUSE_X86_MMX
+#CPPFLAGS+= -DUSE_X86_MMX
MKDEPFLAGS+= -mmmx
. endif
SRCS+= pixman-sse2.c pixman-ssse3.c
COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
COPTS.pixman-ssse3.c= -msse3 -mssse3 -fvisibility=hidden
-CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3
+#CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3
MKDEPFLAGS+= -msse2 -msse3 -mssse3 -fvisibility=hidden
.endif
.if ${MACHINE_ARCH} == "powerpc"
SRCS+= pixman-vmx.c
COPTS.pixman-vmx.c= -maltivec
-CPPFLAGS+= -DUSE_VMX
+#CPPFLAGS+= -DUSE_VMX
MKDEPFLAGS+= -maltivec
.endif
@@ -76,21 +76,18 @@ MKDEPFLAGS+= -maltivec
SRCS+= pixman-arm-simd.c \
pixman-arm-simd-asm.S \
pixman-arm-simd-asm-scaled.S
-CPPFLAGS+= -DUSE_ARM_SIMD
# ARM NEON
SRCS+= pixman-arm-neon.c \
pixman-arm-neon-asm.S \
pixman-arm-neon-asm-bilinear.S
-CPPFLAGS+= -DUSE_ARM_NEON
AFLAGS+= ${${ACTIVE_CC} == "clang" :? -fno-integrated-as :}
# ARM iwMMX
#SRCS+= pixman-mmx.c
#COPTS.pixman-mmx.c= -mcpu=iwmmxt
-#CPPFLAGS+= -DUSE_ARM_IWMMXT
.endif
-.if !empty(MACHINE_ARCH:Maarch64*) && 0
+.if !empty(MACHINE_ARCH:Maarch64*)
# ARM64 NEON
SRCS+= pixman-arm-neon.c \
pixman-arma64-neon-asm.S \
@@ -104,7 +101,7 @@ CPPFLAGS+= -DUSE_ARM_A64_NEON
.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
# Loongson MMI
SRCS+= pixman-mmx.c
-CPPFLAGS+= -DUSE_LOONGSON_MMI
+#CPPFLAGS+= -DUSE_LOONGSON_MMI
# SIMD instructions use floatpoint registers so we need to enable their use
COPTS.pixman-mmx.c= -march=loongson2f -mhard-float -Wa,-mhard-float
.endif
@@ -114,14 +111,11 @@ COPTS.pixman-mmx.c= -march=loongson2f -m
COPTS.pixman-fast-path.c+= -O1
.endif
+.include "Makefile.cflags"
+
INCS= pixman.h pixman-version.h
INCSDIR=${X11INCDIR}/pixman-1
-CPPFLAGS+= -DHAVE_CONFIG_H \
- -I${X11SRCDIR.pixman}/../include \
- -I${X11SRCDIR.pixman}/../combine \
- -I${X11SRCDIR.pixman}/pixman
-
# With pixman 0.28.3, HAVE_PTHREAD_SETSPECIFIC is much faster than TLS
CPPFLAGS+= -DHAVE_PTHREAD_SETSPECIFIC
#CPPFLAGS+= -DTLS=__thread
Added files:
Index: src/external/mit/xorg/lib/pixman/Makefile.cflags
diff -u /dev/null src/external/mit/xorg/lib/pixman/Makefile.cflags:1.1
--- /dev/null Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/Makefile.cflags Sun Nov 13 09:36:37 2022
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile.cflags,v 1.1 2022/11/13 09:36:37 mrg Exp $
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+. if ${MACHINE_ARCH} == "i386"
+CPPFLAGS+= -DUSE_X86_MMX
+. endif
+CPPFLAGS+= -DUSE_SSE2 -DUSE_SSSE3
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+CPPFLAGS+= -DUSE_VMX
+.endif
+
+.if !empty(MACHINE_ARCH:Mearm*)
+CPPFLAGS+= -DUSE_ARM_SIMD
+CPPFLAGS+= -DUSE_ARM_NEON
+#CPPFLAGS+= -DUSE_ARM_IWMMXT
+.endif
+
+.if !empty(MACHINE_ARCH:Maarch64*)
+CPPFLAGS+= -DUSE_ARM_A64_NEON
+.endif
+
+.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
+CPPFLAGS+= -DUSE_LOONGSON_MMI
+.endif
+
+CPPFLAGS+= -DHAVE_CONFIG_H \
+ -I${X11SRCDIR.pixman}/../include \
+ -I${X11SRCDIR.pixman}/../combine \
+ -I${X11SRCDIR.pixman}/pixman
Index: src/external/mit/xorg/lib/pixman/test/Makefile
diff -u /dev/null src/external/mit/xorg/lib/pixman/test/Makefile:1.1
--- /dev/null Sun Nov 13 09:36:37 2022
+++ src/external/mit/xorg/lib/pixman/test/Makefile Sun Nov 13 09:36:37 2022
@@ -0,0 +1,60 @@
+
+# $NetBSD: Makefile,v 1.1 2022/11/13 09:36:37 mrg Exp $
+
+NOINSTALL=1
+NOMAN=1
+
+.include
+
+PROGS= \
+ oob-test \
+ infinite-loop \
+ trap-crasher \
+ fence-image-self-test \
+ region-translate-test \
+ fetch-test \
+ a1-trap-test \
+ prng-test \
+ radial-invalid \
+ pdf-op-test \
+ region-test \
+ combiner-test \
+
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Sun Nov 13 09:36:37 UTC 2022 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Added Files: src/external/mit/xorg/lib/pixman: Makefile.cflags src/external/mit/xorg/lib/pixman/test: Makefile Log Message: add build infrastructure to build the pixman tests not built or installed by default. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/pixman/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/pixman/Makefile.cflags cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/pixman/test/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/bin/xlogo
Module Name:src
Committed By: mrg
Date: Sun Nov 13 05:26:07 UTC 2022
Modified Files:
src/external/mit/xorg/bin/xlogo: Makefile
Log Message:
add -D_CONST_X_STRING, like new upstream
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xlogo/Makefile
Please note 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/xlogo/Makefile
diff -u src/external/mit/xorg/bin/xlogo/Makefile:1.4 src/external/mit/xorg/bin/xlogo/Makefile:1.5
--- src/external/mit/xorg/bin/xlogo/Makefile:1.4 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/xlogo/Makefile Sun Nov 13 05:26:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2022/11/13 05:26:07 mrg Exp $
.include
@@ -7,6 +7,7 @@ SRCS= xlogo.c Logo.c RenderLogo.c
CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
+CPPFLAGS+= -D_CONST_X_STRING
APPDEFS=XLogo XLogo-color
CVS commit: src/external/mit/xorg/bin/xlogo
Module Name:src Committed By: mrg Date: Sun Nov 13 05:26:07 UTC 2022 Modified Files: src/external/mit/xorg/bin/xlogo: Makefile Log Message: add -D_CONST_X_STRING, like new upstream To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xlogo/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/pixman
Module Name:src
Committed By: mrg
Date: Sat Nov 12 07:43:33 UTC 2022
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
disable arm64 NEON for now. my X server exits for unknown reasons..
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 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.39 src/external/mit/xorg/lib/pixman/Makefile:1.40
--- src/external/mit/xorg/lib/pixman/Makefile:1.39 Sat Nov 12 04:00:57 2022
+++ src/external/mit/xorg/lib/pixman/Makefile Sat Nov 12 07:43:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/11/12 04:00:57 mrg Exp $
+# $NetBSD: Makefile,v 1.40 2022/11/12 07:43:33 mrg Exp $
NOLINT= 1 # defined
@@ -90,7 +90,7 @@ AFLAGS+= ${${ACTIVE_CC} == "clang" :? -f
#CPPFLAGS+= -DUSE_ARM_IWMMXT
.endif
-.if !empty(MACHINE_ARCH:Maarch64*)
+.if !empty(MACHINE_ARCH:Maarch64*) && 0
# ARM64 NEON
SRCS+= pixman-arm-neon.c \
pixman-arma64-neon-asm.S \
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src Committed By: mrg Date: Sat Nov 12 07:43:33 UTC 2022 Modified Files: src/external/mit/xorg/lib/pixman: Makefile Log Message: disable arm64 NEON for now. my X server exits for unknown reasons.. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 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.
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Sat Oct 29 21:06:15 UTC 2022
Modified Files:
src/external/mit/xorg/lib/libXext: Makefile
src/external/mit/xorg/lib/libXmu: Makefile
src/external/mit/xorg/lib/libXpresent: Makefile
src/external/mit/xorg/lib/libxkbfile: Makefile
Log Message:
updates for new libXext, libXmu, libXpresent and libxkbfile.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXext/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXmu/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXpresent/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libxkbfile/Makefile
Please note 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/libXext/Makefile
diff -u src/external/mit/xorg/lib/libXext/Makefile:1.10 src/external/mit/xorg/lib/libXext/Makefile:1.11
--- src/external/mit/xorg/lib/libXext/Makefile:1.10 Mon Feb 21 02:13:47 2022
+++ src/external/mit/xorg/lib/libXext/Makefile Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/02/21 02:13:47 uwe Exp $
+# $NetBSD: Makefile,v 1.11 2022/10/29 21:06:15 mrg Exp $
.include
@@ -25,7 +25,7 @@ SRCS= DPMS.c \
globals.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
-CPPFLAGS+= -DHAVE__XEATDATAWORDS
+CPPFLAGS+= -DHAVE__XEATDATAWORDS -DHAVE_REALLOCARRAY
LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic
Index: src/external/mit/xorg/lib/libXmu/Makefile
diff -u src/external/mit/xorg/lib/libXmu/Makefile:1.3 src/external/mit/xorg/lib/libXmu/Makefile:1.4
--- src/external/mit/xorg/lib/libXmu/Makefile:1.3 Sun Nov 21 06:01:50 2010
+++ src/external/mit/xorg/lib/libXmu/Makefile Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/11/21 06:01:50 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2022/10/29 21:06:15 mrg Exp $
.include
@@ -24,7 +24,8 @@ INCS= Atoms.h CharSet.h CloseHook.h Conv
INCSDIR=${X11INCDIR}/X11/Xmu
CPPFLAGS+= ${X11FLAGS.THREADLIB}
-CPPFLAGS+= -DHAS_SNPRINTF
+CPPFLAGS+= -DHAS_SNPRINTF -DHAVE_REALLOCARRAY -DHAVE_UNAME
+CPPFLAGS+= -D_CONST_X_STRING
CPPFLAGS+= -DXTSTRINGDEFINES #XTODO is this correct?
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xmu
Index: src/external/mit/xorg/lib/libXpresent/Makefile
diff -u src/external/mit/xorg/lib/libXpresent/Makefile:1.1 src/external/mit/xorg/lib/libXpresent/Makefile:1.2
--- src/external/mit/xorg/lib/libXpresent/Makefile:1.1 Thu Jul 23 05:46:39 2015
+++ src/external/mit/xorg/lib/libXpresent/Makefile Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/07/23 05:46:39 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2022/10/29 21:06:15 mrg Exp $
.include
@@ -23,7 +23,15 @@ INCSDIR=${X11INCDIR}/X11/extensions
PKGDIST= ${LIB}
-MAN= Xpresent.3
+MAN= Xpresent.3 \
+ XPresentFreeInput.3 \
+ XPresentNotifyMSC.3 \
+ XPresentPixmap.3 \
+ XPresentQueryCapabilities.3 \
+ XPresentQueryExtension.3 \
+ XPresentQueryVersion.3 \
+ XPresentSelectInput.3 \
+ XPresentVersion.3
.include
.include
Index: src/external/mit/xorg/lib/libxkbfile/Makefile
diff -u src/external/mit/xorg/lib/libxkbfile/Makefile:1.5 src/external/mit/xorg/lib/libxkbfile/Makefile:1.6
--- src/external/mit/xorg/lib/libxkbfile/Makefile:1.5 Sun Oct 13 07:28:09 2019
+++ src/external/mit/xorg/lib/libxkbfile/Makefile Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2022/10/29 21:06:15 mrg Exp $
.include
@@ -11,6 +11,7 @@ SRCS= cout.c maprules.c srvmisc.c xkbato
xkmread.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
+CPPFLAGS+= -DHAVE_UNLOCKED_STDIO -DHAVE_STRNDUP -DHAVE_STRCASECMP
INCS= XKBbells.h XKBconfig.h XKBfile.h XKBrules.h XKM.h XKMformat.h
INCSDIR=${X11INCDIR}/X11/extensions
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: mrg Date: Sat Oct 29 21:06:15 UTC 2022 Modified Files: src/external/mit/xorg/lib/libXext: Makefile src/external/mit/xorg/lib/libXmu: Makefile src/external/mit/xorg/lib/libXpresent: Makefile src/external/mit/xorg/lib/libxkbfile: Makefile Log Message: updates for new libXext, libXmu, libXpresent and libxkbfile. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXext/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXmu/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXpresent/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libxkbfile/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/xkeyboard-config/rules
Module Name:src
Committed By: mrg
Date: Tue Oct 18 08:18:36 UTC 2022
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile
Log Message:
keep changed-how-generated files in the ${FILES} list.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
Please note 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/rules/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.8 src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.9
--- src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.8 Tue Oct 18 07:41:29 2022
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile Tue Oct 18 08:18:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/10/18 07:41:29 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2022/10/18 08:18:36 mrg Exp $
#
# When upgrading, re-assemble the files base, base.lst, evdev and
# evdev.lst by running ./configure && make in the dist directory,
@@ -18,6 +18,7 @@
XKBNAME= rules
GENFILES= base.extras.xml base.xml
FILES= README base base.lst evdev evdev.lst xfree98 xkb.dtd
+FILES+= evdev.extras.xml evdev.xml
FILES+= ${GENFILES}
CLEAN+= ${GENFILES}
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src
Committed By: mrg
Date: Tue Oct 18 08:18:36 UTC 2022
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile
Log Message:
keep changed-how-generated files in the ${FILES} list.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/lib/xkeyboard-config/rules/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/xkeyboard-config/rules
Module Name:src
Committed By: mrg
Date: Tue Oct 18 07:41:30 UTC 2022
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile
Log Message:
add a note about a hack for the pkgconfig file.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
Please note 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/rules/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.7 src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.8
--- src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.7 Mon Oct 17 18:51:35 2022
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile Tue Oct 18 07:41:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/10/17 18:51:35 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2022/10/18 07:41:29 mrg Exp $
#
# When upgrading, re-assemble the files base, base.lst, evdev and
# evdev.lst by running ./configure && make in the dist directory,
@@ -8,6 +8,10 @@
# % env PKG_CONFIG_PATH=/usr/X11R7/lib/pkgconfig meson compile -C build
# % cp build/xkeyboard-config.7 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
# % cp build/rules/{base,evdev}{,.lst} src/external/mit/xorg/lib/xkeyboard-config/rules
+#
+# XXX and for now, this one too:
+#
+# % cp build/meson-private/xkeyboard-config.pc src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in
.include
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src Committed By: mrg Date: Tue Oct 18 07:41:30 UTC 2022 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile Log Message: add a note about a hack for the pkgconfig file. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/lib/xkeyboard-config/rules/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/xkeyboard-config
Module Name:src Committed By: mrg Date: Tue Oct 18 07:36:38 UTC 2022 Added Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.pc.in Log Message: hack: add generated file as .pc.in to fix the build To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in 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/xkeyboard-config/xkeyboard-config.pc.in diff -u /dev/null src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in:1.1 --- /dev/null Tue Oct 18 07:36:38 2022 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in Tue Oct 18 07:36:38 2022 @@ -0,0 +1,7 @@ + +datadir=/usr/X11R7/share +xkb_base=/usr/X11R7/share/X11/xkb + +Name: XKeyboardConfig +Description: X Keyboard configuration data +Version: 2.37
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Tue Oct 18 07:36:38 UTC 2022 Added Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.pc.in Log Message: hack: add generated file as .pc.in to fix the build To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.pc.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
