Module Name: src
Committed By: mrg
Date: Thu Jul 14 07:41:50 UTC 2022
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/bin/cvt: Makefile
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/libxcvt: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils: Makefile
Log Message:
build and install libxcvt, and it's cvt(1).
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.235 -r1.236 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/cvt/Makefile
cvs rdiff -u -r1.56 -r1.57 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcvt/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.98 src/distrib/sets/lists/xbase/shl.mi:1.99
--- src/distrib/sets/lists/xbase/shl.mi:1.98 Mon Jul 11 19:35:41 2022
+++ src/distrib/sets/lists/xbase/shl.mi Thu Jul 14 07:41:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.98 2022/07/11 19:35:41 mrg Exp $
+# $NetBSD: shl.mi,v 1.99 2022/07/14 07:41:49 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -305,6 +305,9 @@
./usr/X11R7/lib/libxcb.so xbase-libxcb-lib xorg,compatx11file
./usr/X11R7/lib/libxcb.so.2 xbase-libxcb-lib xorg,compatx11file
./usr/X11R7/lib/libxcb.so.2.0 xbase-libxcb-lib xorg,compatx11file
+./usr/X11R7/lib/libxcvt.so xbase-libxcvt-lib xorg,compatx11file
+./usr/X11R7/lib/libxcvt.so.0 xbase-libxcvt-lib xorg,compatx11file
+./usr/X11R7/lib/libxcvt.so.0.0 xbase-libxcvt-lib xorg,compatx11file
./usr/X11R7/lib/libxkbfile.so xbase-libxkbfile-lib xorg,compatx11file
./usr/X11R7/lib/libxkbfile.so.2 xbase-libxkbfile-lib xorg,compatx11file
./usr/X11R7/lib/libxkbfile.so.2.0 xbase-libxkbfile-lib xorg,compatx11file
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.235 src/distrib/sets/lists/xcomp/mi:1.236
--- src/distrib/sets/lists/xcomp/mi:1.235 Tue Jul 12 02:44:43 2022
+++ src/distrib/sets/lists/xcomp/mi Thu Jul 14 07:41:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.235 2022/07/12 02:44:43 mrg Exp $
+# $NetBSD: mi,v 1.236 2022/07/14 07:41:49 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -698,6 +698,8 @@
./usr/X11R7/include/freetype2/ttunpat.h xcomp-obsolete obsolete
./usr/X11R7/include/ft2build.h xcomp-obsolete obsolete
./usr/X11R7/include/gbm.h xcomp-MesaLib-include xorg
+./usr/X11R7/include/libxcvt/libxcvt.h xcomp-libxcvt-include xorg
+./usr/X11R7/include/libxcvt/libxcvt_mode.h xcomp-libxcvt-include xorg
./usr/X11R7/include/libdrm/amdgpu.h xcomp-libdrm-include xorg
./usr/X11R7/include/libdrm/amdgpu_drm.h xcomp-libdrm-include xorg
./usr/X11R7/include/libdrm/drm.h xcomp-libdrm-include xorg
@@ -1312,6 +1314,8 @@
./usr/X11R7/lib/libxcb-xvmc_p.a xcomp-libxcb-lib profile,xorg,compatx11file
./usr/X11R7/lib/libxcb.a xcomp-libxcb-lib xorg,compatx11file
./usr/X11R7/lib/libxcb_p.a xcomp-libxcb-lib profile,xorg,compatx11file
+./usr/X11R7/lib/libxcvt.a xcomp-libxcvt-lib xorg,compatx11file
+./usr/X11R7/lib/libxcvt_p.a xcomp-libxcvt-lib profile,xorg,compatx11file
./usr/X11R7/lib/libxkbfile.a xcomp-libxkbfile-lib xorg,compatx11file
./usr/X11R7/lib/libxkbfile_p.a xcomp-libxkbfile-lib profile,xorg,compatx11file
./usr/X11R7/lib/libxkbui.a xcomp-libxkbui-lib xorg,compatx11file
@@ -1345,6 +1349,7 @@
./usr/X11R7/lib/pkgconfig/inputproto.pc xcomp-xorgproto-lib xorg
./usr/X11R7/lib/pkgconfig/kbproto.pc xcomp-xorgproto-lib xorg
./usr/X11R7/lib/pkgconfig/lbxutil.pc xcomp-obsolete obsolete
+./usr/X11R7/lib/pkgconfig/libxcvt.pc xcomp-libxcvt-lib xorg
./usr/X11R7/lib/pkgconfig/libdrm.pc xcomp-libdrm-lib xorg
./usr/X11R7/lib/pkgconfig/libdrm_radeon.pc xcomp-libdrm_radeon-lib xorg
./usr/X11R7/lib/pkgconfig/libfs.pc xcomp-libFS-lib xorg
@@ -5937,6 +5942,7 @@
./usr/libdata/lint/llib-lgbm.ln xcomp-libgbm-lintlib lint,xorg
./usr/libdata/lint/llib-lglut.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-llbxutil.ln xcomp-obsolete obsolete,xorg
+./usr/libdata/lint/llib-lxcvt.ln xcomp-libxcvt-lintlib lint,xorg
./usr/libdata/lint/llib-llisp.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-lmp.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-lpciaccess.ln xcomp-libpciaccess-lintlib lint,xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.56 src/distrib/sets/lists/xcomp/shl.mi:1.57
--- src/distrib/sets/lists/xcomp/shl.mi:1.56 Wed Oct 28 08:10:09 2020
+++ src/distrib/sets/lists/xcomp/shl.mi Thu Jul 14 07:41:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.56 2020/10/28 08:10:09 nia Exp $
+# $NetBSD: shl.mi,v 1.57 2022/07/14 07:41:49 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -63,6 +63,7 @@
./usr/X11R7/lib/libglapi_pic.a xcomp-libglapi-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libglut_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/liblbxutil_pic.a xcomp-obsolete obsolete
+./usr/X11R7/lib/libxcvt_pic.a xcomp-libxcvt-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/liblisp_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/libmp_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/libpciaccess_pic.a xcomp-libpciaccess-lib xorg,picinstall,compatx11file
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.42 src/distrib/sets/lists/xdebug/mi:1.43
--- src/distrib/sets/lists/xdebug/mi:1.42 Sat Jan 9 02:40:44 2021
+++ src/distrib/sets/lists/xdebug/mi Thu Jul 14 07:41:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.42 2021/01/09 02:40:44 uki Exp $
+# $NetBSD: mi,v 1.43 2022/07/14 07:41:49 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R7/lib base-x11-root xorg,debuglib,compatx11dir
./usr/X11R7/lib/libEGL_g.a xdebug-libEGL-debuglib xorg,debuglib,compatx11file,xorg_glamor
@@ -63,6 +63,7 @@
./usr/X11R7/lib/liblbxutil_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/liblisp_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/libmp_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/libxcvt_g.a xdebug-libxcvt-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libpciaccess_g.a xdebug-libpciaccess-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libpixman-1_g.a xdebug-pixman-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libpthread-stubs_g.a xdebug-libpthread-stubs-debuglib xorg,debuglib,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.64 src/distrib/sets/lists/xdebug/shl.mi:1.65
--- src/distrib/sets/lists/xdebug/shl.mi:1.64 Mon Jul 11 19:35:42 2022
+++ src/distrib/sets/lists/xdebug/shl.mi Thu Jul 14 07:41:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.64 2022/07/11 19:35:42 mrg Exp $
+# $NetBSD: shl.mi,v 1.65 2022/07/14 07:41:49 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete obsolete
@@ -102,6 +102,7 @@
./usr/libdata/debug/usr/X11R7/lib/libxcb-xv.so.0.1.debug xdebug-libxcb-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxcb-xvmc.so.0.1.debug xdebug-libxcb-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxcb.so.2.0.debug xdebug-libxcb-debug xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libxcvt.so.0.0.debug xdebug-libxcvt-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug xdebug-libxkbfile-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug xdebug-libxkbui-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug xdebug-libxshmfence-debug xorg,debug,compatx11file
Index: src/external/mit/xorg/bin/cvt/Makefile
diff -u src/external/mit/xorg/bin/cvt/Makefile:1.1 src/external/mit/xorg/bin/cvt/Makefile:1.2
--- src/external/mit/xorg/bin/cvt/Makefile:1.1 Thu Jul 14 03:48:34 2022
+++ src/external/mit/xorg/bin/cvt/Makefile Thu Jul 14 07:41:49 2022
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2022/07/14 03:48:34 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2022/07/14 07:41:49 mrg Exp $
.include <bsd.own.mk>
PROG= cvt
SRCS= cvt.c
-LDADD+= -llxcvt
-DPADD+= ${LIBXCVT}
+LDADD+= -lxcvt -lm
+DPADD+= ${LIBXCVT} ${LIBM}
.PATH: ${X11SRCDIR.xcvt}/cvt
.PATH: ${X11SRCDIR.xcvt}/man
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.56 src/external/mit/xorg/lib/Makefile:1.57
--- src/external/mit/xorg/lib/Makefile:1.56 Sun Jul 11 20:52:06 2021
+++ src/external/mit/xorg/lib/Makefile Thu Jul 14 07:41:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2021/07/11 20:52:06 mrg Exp $
+# $NetBSD: Makefile,v 1.57 2022/07/14 07:41:49 mrg Exp $
# build libraries for xorg
@@ -7,7 +7,8 @@
.include "mesa-which.mk"
SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_SUFFIX} \
- libXau libXdmcp libdrm libpciaccess libpthread-stubs libxshmfence .WAIT
+ libXau libXdmcp libdrm libpciaccess libpthread-stubs \
+ libxcvt libxshmfence .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=libdrm_intel
.endif
Index: src/external/mit/xorg/lib/libxcvt/Makefile
diff -u src/external/mit/xorg/lib/libxcvt/Makefile:1.1 src/external/mit/xorg/lib/libxcvt/Makefile:1.2
--- src/external/mit/xorg/lib/libxcvt/Makefile:1.1 Thu Jul 14 03:48:34 2022
+++ src/external/mit/xorg/lib/libxcvt/Makefile Thu Jul 14 07:41:50 2022
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2022/07/14 03:48:34 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2022/07/14 07:41:50 mrg Exp $
.include <bsd.own.mk>
LIB= xcvt
-.PATH: ${X11SRCDIR.${LIB}}/lib
-.PATH: ${X11SRCDIR.${LIB}}/include/libxcvt
SRCS= libxcvt.c
@@ -17,3 +15,6 @@ PKGCONFIG= libxcvt
.include <bsd.x11.mk>
.include <bsd.lib.mk>
+
+.PATH: ${X11SRCDIR.${LIB}}/lib
+.PATH: ${X11SRCDIR.${LIB}}/include/libxcvt
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.17 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.17 Mon Nov 21 09:14:12 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Thu Jul 14 07:41:50 2022
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.17 2016/11/21 09:14:12 snj Exp $
+# $NetBSD: Makefile,v 1.18 2022/07/14 07:41:50 mrg Exp $
-SUBDIR= cvt gtf
+SUBDIR= gtf
.include <bsd.subdir.mk>
