CVS commit: [netbsd-9] src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src
Committed By: martin
Date: Mon Nov 27 19:50:37 UTC 2023
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard [netbsd-9]:
Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1766):
external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile: revision
1.23 (via patch)
xf86-input-keyboard: add build glue to enable USE_WSKBD_GETMAP.
To generate a diff of this commit:
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16.2.1 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16.2.2
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16.2.1 Tue Jun 1 10:36:32 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Mon Nov 27 19:50:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16.2.1 2021/06/01 10:36:32 martin Exp $
+# $NetBSD: Makefile,v 1.16.2.2 2023/11/27 19:50:37 martin Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -16,6 +16,7 @@ CPPFLAGS+= -DPCVT_SUPPORT
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
${MACHINE} == "shark" || ${MACHINE} == "vax" || \
+${MACHINE} == "ews4800mips" || ${MACHINE} == "newsmips" || \
${MACHINE} == "evbarm" || ${MACHINE} == "mac68k"
CPPFLAGS+= -DDEFAULT_TO_WSKBD
.endif
@@ -24,6 +25,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: [netbsd-9] src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src Committed By: martin Date: Mon Nov 27 19:50:37 UTC 2023 Modified Files: src/external/mit/xorg/server/drivers/xf86-input-keyboard [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1766): external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile: revision 1.23 (via patch) xf86-input-keyboard: add build glue to enable USE_WSKBD_GETMAP. To generate a diff of this commit: cvs rdiff -u -r1.16.2.1 -r1.16.2.2 \ 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: [netbsd-9] src/external/mit/xorg
Module Name:src Committed By: martin Date: Mon Jan 23 13:43:07 UTC 2023 Modified Files: src/external/mit/xorg/bin/cxpm [netbsd-9]: Makefile src/external/mit/xorg/bin/sxpm [netbsd-9]: Makefile src/external/mit/xorg/lib/libXpm [netbsd-9]: Makefile Added Files: src/external/mit/xorg/lib/libXpm [netbsd-9]: xpm.mk Log Message: Apply patch, requested by mrg in ticket #1577: Adjust for upstream patches for the followign CVEs: CVE-2022-46285, CVE-2022-44617, CVE-2022-4883, CVE-2020-14363, CVE-2022-46340, CVE-2022-46341, CVE-2022-46342 CVE-2022-46343, CVE-2022-46344, CVE-2022-46283, CVE-2021-4008, CVE-2021-4009, CVE-2021-4010, CVE-2021-4011 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.30.1 src/external/mit/xorg/bin/cxpm/Makefile cvs rdiff -u -r1.2 -r1.2.30.1 src/external/mit/xorg/bin/sxpm/Makefile cvs rdiff -u -r1.2 -r1.2.66.1 src/external/mit/xorg/lib/libXpm/Makefile cvs rdiff -u -r0 -r1.2.4.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: [netbsd-9] src/external/mit/xorg
Module Name:src
Committed By: martin
Date: Mon Jan 23 13:43:07 UTC 2023
Modified Files:
src/external/mit/xorg/bin/cxpm [netbsd-9]: Makefile
src/external/mit/xorg/bin/sxpm [netbsd-9]: Makefile
src/external/mit/xorg/lib/libXpm [netbsd-9]: Makefile
Added Files:
src/external/mit/xorg/lib/libXpm [netbsd-9]: xpm.mk
Log Message:
Apply patch, requested by mrg in ticket #1577:
Adjust for upstream patches for the followign CVEs:
CVE-2022-46285, CVE-2022-44617, CVE-2022-4883, CVE-2020-14363,
CVE-2022-46340, CVE-2022-46341, CVE-2022-46342 CVE-2022-46343,
CVE-2022-46344, CVE-2022-46283, CVE-2021-4008, CVE-2021-4009,
CVE-2021-4010, CVE-2021-4011
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.30.1 src/external/mit/xorg/bin/cxpm/Makefile
cvs rdiff -u -r1.2 -r1.2.30.1 src/external/mit/xorg/bin/sxpm/Makefile
cvs rdiff -u -r1.2 -r1.2.66.1 src/external/mit/xorg/lib/libXpm/Makefile
cvs rdiff -u -r0 -r1.2.4.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/bin/cxpm/Makefile
diff -u src/external/mit/xorg/bin/cxpm/Makefile:1.2 src/external/mit/xorg/bin/cxpm/Makefile:1.2.30.1
--- src/external/mit/xorg/bin/cxpm/Makefile:1.2 Fri May 31 01:41:08 2013
+++ src/external/mit/xorg/bin/cxpm/Makefile Mon Jan 23 13:43:07 2023
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 01:41:08 mrg Exp $
+# $NetBSD: Makefile,v 1.2.30.1 2023/01/23 13:43:07 martin 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.2.30.1
--- src/external/mit/xorg/bin/sxpm/Makefile:1.2 Fri May 31 01:41:56 2013
+++ src/external/mit/xorg/bin/sxpm/Makefile Mon Jan 23 13:43:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 01:41:56 mrg Exp $
+# $NetBSD: Makefile,v 1.2.30.1 2023/01/23 13:43:07 martin 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.2 src/external/mit/xorg/lib/libXpm/Makefile:1.2.66.1
--- src/external/mit/xorg/lib/libXpm/Makefile:1.2 Sat Sep 13 04:32:30 2008
+++ src/external/mit/xorg/lib/libXpm/Makefile Mon Jan 23 13:43:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $
+# $NetBSD: Makefile,v 1.2.66.1 2023/01/23 13:43:07 martin Exp $
.include
@@ -15,14 +15,13 @@ 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"
+
.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.2.4.2
--- /dev/null Mon Jan 23 13:43:07 2023
+++ src/external/mit/xorg/lib/libXpm/xpm.mk Mon Jan 23 13:43:07 2023
@@ -0,0 +1,7 @@
+# $NetBSD: xpm.mk,v 1.2.4.2 2023/01/23 13:43:07 martin Exp $
+
+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: [netbsd-9] src/external/mit/xorg/server/drivers/xf86-video-wsfb
Module Name:src
Committed By: martin
Date: Tue Aug 30 15:37:27 UTC 2022
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-wsfb [netbsd-9]:
Makefile
Log Message:
Pull up following revision(s) (requested by rin in ticket #1511):
external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile: revision 1.6
wsfb: Disable broken DGA support:
- dga(1) crashes X server since pScrn->AdjustFrame is NULL.
- If nop is provided as pScrn->AdjustFrame, dga(1) crashes X server *AND*
kernel. This is because DGA uses physical address of framebuffer via
/dev/mem (oops!), but we provide only mmap(2)'ed virtual address.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 \
src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.5.2.1
--- src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile:1.5 Fri Aug 3 02:26:00 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile Tue Aug 30 15:37:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/08/03 02:26:00 kamil Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2022/08/30 15:37:27 martin Exp $
DRIVER= xf86-video-wsfb
DRIVER_NAME= wsfb_drv
@@ -11,3 +11,11 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
CWARNFLAGS.clang+= -Wno-format
.include "../Makefile.xf86-driver"
+
+# XXX
+# DGA support for this driver is broken:
+# - dga(1) crashes X server since pScrn->AdjustFrame is NULL.
+# - If nop is provided as pScrn->AdjustFrame, dga(1) crashes X server *AND*
+# kernel. This is because DGA uses physical address of framebuffer via
+# /dev/mem (oops!), but we provide only mmap(2)'ed virtual address.
+CPPFLAGS+= -UXFreeXDGA
CVS commit: [netbsd-9] src/external/mit/xorg/server/drivers/xf86-video-wsfb
Module Name:src Committed By: martin Date: Tue Aug 30 15:37:27 UTC 2022 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-wsfb [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by rin in ticket #1511): external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile: revision 1.6 wsfb: Disable broken DGA support: - dga(1) crashes X server since pScrn->AdjustFrame is NULL. - If nop is provided as pScrn->AdjustFrame, dga(1) crashes X server *AND* kernel. This is because DGA uses physical address of framebuffer via /dev/mem (oops!), but we provide only mmap(2)'ed virtual address. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.2.1 \ src/external/mit/xorg/server/drivers/xf86-video-wsfb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: martin
Date: Mon Aug 29 16:20:45 UTC 2022
Modified Files:
src/external/mit/xorg/bin/xdm [netbsd-9]: Makefile Makefile.xdm
Log Message:
Pull up following revision(s) (requested by nia in ticket #1510):
external/mit/xorg/bin/xdm/Makefile.xdm: revision 1.11
external/mit/xorg/bin/xdm/Makefile: revision 1.18
external/mit/xorg/bin/xdm/Makefile: revision 1.19
fix the man page generation, noted by uwe@
xdm: Include "sbin" directories (and games) in DEF_USER_PATH.
Upstream's configure.ac picks a DEF_USER_PATH on a per-OS basis.
Most of these include the "sbin" directories, with NetBSD being the
(only?) exception.
However, this is inconsistent with the way a typical login shell is
initialized (when using the default skeleton files). To avoid user
confusion, harmonize DEF_USER_PATH with our other defaults and with
other OSes.
PR xsrc/54851
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.10 -r1.10.2.1 src/external/mit/xorg/bin/xdm/Makefile.xdm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.17 src/external/mit/xorg/bin/xdm/Makefile:1.17.2.1
--- src/external/mit/xorg/bin/xdm/Makefile:1.17 Wed Mar 6 12:40:23 2019
+++ src/external/mit/xorg/bin/xdm/Makefile Mon Aug 29 16:20:45 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/03/06 12:40:23 nakayama Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2022/08/29 16:20:45 martin Exp $
.include
@@ -13,6 +13,9 @@ SRCS+= Login.c greet.c verify.c
CPPFLAGS+= -DSTATIC_GREETER_LIB
.endif
+DEF_USER_PATH= /sbin:/usr/sbin:/bin:/usr/bin:/usr/games:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin:${X11BINDIR}
+DEF_SYSTEM_PATH=/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}
+
CPPFLAGS+= -DRETSIGTYPE=void
CPPFLAGS.auth.c+= -DBSD44SOCKETS
CPPFLAGS.socket.c+= -DBSD44SOCKETS
@@ -22,8 +25,8 @@ CPPFLAGS.resource.c+= \
-DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \
-DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \
-DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \
- -DDEF_USER_PATH=\"/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR}\" \
- -DDEF_SYSTEM_PATH=\"/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}\" \
+ -DDEF_USER_PATH=\"${DEF_USER_PATH}\" \
+ -DDEF_SYSTEM_PATH=\"${DEF_SYSTEM_PATH}\" \
-DDEF_SYSTEM_SHELL=\"/bin/sh\" \
-DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \
-DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \
@@ -52,14 +55,17 @@ CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${
.include "../../xorg-pkg-ver.mk"
X11EXTRAMANDEFS+= \
- -e 's,ARC4_RANDOM,1,' \
- -e 's,BINDIR,$(X11BINDIR),' \
- -e 's,CHOOSERPATH,$(XDMCHOOSERPATH),' \
- -e 's,DGREETERLIBPATH,$(XDMGREETERLIB),' \
- -e 's,XDMDIR,$(XDMDIR),' \
- -e 's,XDMXAUTHDIR,$(XDMVARDIR),' \
- -e 's,XDMLOGDIR,$(XDMLOGDIR),' \
- -e 's,XDMPIDDIR,$(XDMPIDDIR),'
+ -e 's,CHOOSERPATH,${XDMCHOOSERPATH},' \
+ -e 's,XDMLOGDIR,${XDMLOGDIR},' \
+ -e 's,XDMDIR,${XDMDIR},' \
+ -e 's,BINDIR,${X11BINDIR},' \
+ -e 's,XDMPIDDIR,${XDMPIDDIR},' \
+ -e 's,XDMXAUTHDIR,${XDMVARDIR},' \
+ -e 's,DEF_USER_PATH,${DEF_USER_PATH},' \
+ -e 's,DEF_SYSTEM_PATH,${DEF_SYSTEM_PATH},' \
+ -e 's,DEF_GREETER_LIB,${XDMGREETERLIB},' \
+ -e 's,DEV_RANDOM,${DEV_RANDOM},' \
+ -e 's,ARC4_RANDOM,1,'
.include
.include
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.10 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.10.2.1
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.10 Wed Mar 6 12:40:23 2019
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Mon Aug 29 16:20:45 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.10 2019/03/06 12:40:23 nakayama Exp $
+# $NetBSD: Makefile.xdm,v 1.10.2.1 2022/08/29 16:20:45 martin Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -6,12 +6,13 @@ XDMCHOOSERPATH= ${X11ROOTDIR}/libexec/ch
XDMGREETERLIB= ${X11ROOTDIR}/lib/libXdmGreet.so
XDMLOGDIR= /var/log
XDMPIDDIR= /var/run
+DEV_RANDOM= /dev/urandom
CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${XDMDIR}\" \
-DHASXDMAUTH ${X11FLAGS.CONNECTION} \
-DBSD44SOCKETS \
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
- -DDEV_RANDOM=\"dev/urandom\" \
+ -DDEV_RANDOM=\"${DEV_RANDOM}\" \
-DXPM -DUSE_XFT \
-DHAVE_GETIFADDRS \
-DHAVE_MKSTEMP \
CVS commit: [netbsd-9] src/external/mit/xorg/bin/xdm
Module Name:src Committed By: martin Date: Mon Aug 29 16:20:45 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm [netbsd-9]: Makefile Makefile.xdm Log Message: Pull up following revision(s) (requested by nia in ticket #1510): external/mit/xorg/bin/xdm/Makefile.xdm: revision 1.11 external/mit/xorg/bin/xdm/Makefile: revision 1.18 external/mit/xorg/bin/xdm/Makefile: revision 1.19 fix the man page generation, noted by uwe@ xdm: Include "sbin" directories (and games) in DEF_USER_PATH. Upstream's configure.ac picks a DEF_USER_PATH on a per-OS basis. Most of these include the "sbin" directories, with NetBSD being the (only?) exception. However, this is inconsistent with the way a typical login shell is initialized (when using the default skeleton files). To avoid user confusion, harmonize DEF_USER_PATH with our other defaults and with other OSes. PR xsrc/54851 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.2.1 src/external/mit/xorg/bin/xdm/Makefile cvs rdiff -u -r1.10 -r1.10.2.1 src/external/mit/xorg/bin/xdm/Makefile.xdm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/external/mit/xorg/lib/libdrm
Module Name:src
Committed By: martin
Date: Mon Aug 12 17:23:20 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libdrm [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by maya in ticket #46):
external/mit/xorg/lib/libdrm/Makefile: revision 1.17
We need to link against libm for real, not just in spirit.
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 src/external/mit/xorg/lib/libdrm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.16 src/external/mit/xorg/lib/libdrm/Makefile:1.16.2.1
--- src/external/mit/xorg/lib/libdrm/Makefile:1.16 Sun Sep 9 01:53:23 2018
+++ src/external/mit/xorg/lib/libdrm/Makefile Mon Aug 12 17:23:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/09/09 01:53:23 riastradh Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2019/08/12 17:23:20 martin Exp $
.include
@@ -23,7 +23,7 @@ COPTS.xf86drm.c+= ${${ACTIVE_CC} == "cla
CWARNFLAGS.clang+= -Wno-conversion -Wno-tautological-compare
LIBDPLIBS= m ${.CURDIR}/../../../../../lib/libm
-LIBDPLIBS= pci ${.CURDIR}/../../../../../lib/libpci
+LIBDPLIBS+= pci ${.CURDIR}/../../../../../lib/libpci
.if 0
MAN= drm.7 \
CVS commit: [netbsd-9] src/external/mit/xorg/lib/libdrm
Module Name:src Committed By: martin Date: Mon Aug 12 17:23:20 UTC 2019 Modified Files: src/external/mit/xorg/lib/libdrm [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #46): external/mit/xorg/lib/libdrm/Makefile: revision 1.17 We need to link against libm for real, not just in spirit. XXX pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.2.1 src/external/mit/xorg/lib/libdrm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
