Module Name: src
Committed By: nia
Date: Thu May 9 06:34:51 UTC 2024
Modified Files:
src/external/mit/xorg/bin/xdpyinfo: Makefile
src/external/mit/xorg/bin/xset: Makefile
src/share/mk: bsd.x11.mk
Log Message:
stop using and linking against libXxf86misc
support for this extension was removed from xorg in 2008,
our xorg-server and our xorg-server.old can't use it.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xdpyinfo/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xset/Makefile
cvs rdiff -u -r1.154 -r1.155 src/share/mk/bsd.x11.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/xdpyinfo/Makefile
diff -u src/external/mit/xorg/bin/xdpyinfo/Makefile:1.7 src/external/mit/xorg/bin/xdpyinfo/Makefile:1.8
--- src/external/mit/xorg/bin/xdpyinfo/Makefile:1.7 Sun Jul 19 19:49:18 2015
+++ src/external/mit/xorg/bin/xdpyinfo/Makefile Thu May 9 06:34:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/19 19:49:18 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2024/05/09 06:34:50 nia Exp $
.include <bsd.own.mk>
@@ -9,10 +9,10 @@ PROG= xdpyinfo
CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
LDADD+= -lXtst -lXi -lXrender -lXinerama -lXcomposite \
- -lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11 \
+ -lXxf86vm -lXxf86dga -lXext -lX11 \
-lxcb -lX11-xcb
DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} ${LIBXCOMPOSITE} \
- ${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXXF86MISC} ${LIBXEXT} ${LIBX11} \
+ ${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXEXT} ${LIBX11} \
${LIBXCB} ${LIBX11XCB}
.PATH: ${X11SRCDIR.${PROG}}
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.7 src/external/mit/xorg/bin/xset/Makefile:1.8
--- src/external/mit/xorg/bin/xset/Makefile:1.7 Sun Mar 11 08:46:31 2018
+++ src/external/mit/xorg/bin/xset/Makefile Thu May 9 06:34:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/03/11 08:46:31 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2024/05/09 06:34:51 nia Exp $
.include <bsd.own.mk>
@@ -6,8 +6,8 @@ PROG= xset
CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB -DHAVE_USLEEP
-LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC}
+LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
+DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE}
DPADD+= ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.154 src/share/mk/bsd.x11.mk:1.155
--- src/share/mk/bsd.x11.mk:1.154 Mon Apr 29 22:09:10 2024
+++ src/share/mk/bsd.x11.mk Thu May 9 06:34:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.154 2024/04/29 22:09:10 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.155 2024/05/09 06:34:51 nia Exp $
.include <bsd.init.mk>
@@ -31,7 +31,7 @@ X11FLAGS.CONNECTION+= -DIPv6
# EXT_DEFINES
X11FLAGS.BASE_EXTENSION= -DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC \
-DXRECORD -DMITSHM -DBIGREQS -DXF86VIDMODE \
- -DXF86MISC -DDPMSExtension -DEVI \
+ -DDPMSExtension -DEVI \
-DSCREENSAVER -DXV -DXVMC -DGLXEXT \
-DRES
