Module Name: src
Committed By: tsutsui
Date: Sat Aug 21 15:57:00 UTC 2021
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 erorrs on ancient monolithic Xservers after DRI3 was enabled.
https://mail-index.netbsd.org/source-changes/2021/08/19/msg131652.html
> fix dri3 extension building and build it.
>
> needed for amdgpu.
XXX: I wonder if each Xorg server extension can be enabled/disabled
per ${MACHINE} basis rather than in MI include/dix-config.h header.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.5 -r1.6 \
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.11 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.11 Mon Mar 22 14:11:02 2021
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Sat Aug 21 15:57:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/03/22 14:11:02 tsutsui Exp $
+# $NetBSD: Makefile,v 1.12 2021/08/21 15:57:00 tsutsui Exp $
.include <bsd.own.mk>
@@ -52,6 +52,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.damageext} \
${LDADD.miext/damage} \
${LDADD.miext/sync} \
+ ${LDADD.dri3} \
${LDADD.Xi} \
-lXfont2 \
-lpixman-1 \
@@ -73,6 +74,7 @@ DPADD+= ${LDADD.dix} \
${DPADD.damageext} \
${DPADD.miext/damage} \
${DPADD.miext/sync} \
+ ${DPADD.dri3} \
${DPADD.Xi} \
${LIBXFONT2} \
${LIBPIXMAN-1} \
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.5 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.6
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.5 Wed Aug 5 15:48:09 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Sat Aug 21 15:57:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.5 2020/08/05 15:48:09 tsutsui Exp $
+# $NetBSD: Makefile.Xsun,v 1.6 2021/08/21 15:57:00 tsutsui Exp $
.include <bsd.own.mk>
@@ -94,6 +94,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.damageext} \
${LDADD.miext/damage} \
${LDADD.miext/sync} \
+ ${LDADD.dri3} \
${LDADD.Xi} \
-lXfont2 \
-lpixman-1 \
@@ -114,6 +115,7 @@ DPADD+= ${LDADD.dix} \
${DPADD.damageext} \
${DPADD.miext/damage} \
${DPADD.miext/sync} \
+ ${DPADD.dri3} \
${DPADD.Xi} \
${LIBXFONT2} \
${LIBPIXMAN-1} \
