[src/trunk]: src/external/mit/xorg/server/xorg-server fix dri3 extension buil...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c1e7ab7ba1e3
branches:  trunk
changeset: 985322:c1e7ab7ba1e3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Aug 19 11:03:04 2021 +0000

description:
fix dri3 extension building and build it.

needed for amdgpu.

diffstat:

 external/mit/xorg/server/xorg-server/Makefile                 |   9 ++-------
 external/mit/xorg/server/xorg-server/dri3/Makefile            |   6 ++++--
 external/mit/xorg/server/xorg-server/hw/vfb/Makefile          |   4 +++-
 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile |  11 ++---------
 external/mit/xorg/server/xorg-server/hw/xnest/Makefile        |   4 +++-
 5 files changed, 14 insertions(+), 20 deletions(-)

diffs (133 lines):

diff -r 33548ca98450 -r c1e7ab7ba1e3 external/mit/xorg/server/xorg-server/Makefile
--- a/external/mit/xorg/server/xorg-server/Makefile     Thu Aug 19 10:18:13 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile     Thu Aug 19 11:03:04 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.29 2017/08/29 18:19:49 ryoon Exp $
+#      $NetBSD: Makefile,v 1.30 2021/08/19 11:03:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,12 +9,7 @@
 SUBDIR+=       dix fb mi Xext miext os randr render 
 SUBDIR+=       present pseudoramiX
 SUBDIR+=       Xi xkb xkbstubs dbe record xfixes
-SUBDIR+=       damageext composite config .WAIT
-
-# XXX
-.if ${HAVE_DRI3:Uno} != "no"
-SUBDIR+=       dri3
-.endif
+SUBDIR+=       damageext composite config dri3 .WAIT
 
 .if ${HAVE_XORG_GLAMOR} != "no"
 SUBDIR+=       glamor
diff -r 33548ca98450 -r c1e7ab7ba1e3 external/mit/xorg/server/xorg-server/dri3/Makefile
--- a/external/mit/xorg/server/xorg-server/dri3/Makefile        Thu Aug 19 10:18:13 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/dri3/Makefile        Thu Aug 19 11:03:04 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2016/08/14 00:03:58 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2021/08/19 11:03:04 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -12,7 +12,9 @@
 
 CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/xorg \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
-               -I${X11SRCDIR.xorg-server}/../include
+               -I${DESTDIR}${X11INCDIR}/libdrm \
+               -I${X11SRCDIR.xorg-server}/../include \
+               -I${X11SRCDIR.xorg-server}/Xext
 CPPFLAGS+=      ${X11FLAGS.DIX}
 
 .include <bsd.x11.mk>
diff -r 33548ca98450 -r c1e7ab7ba1e3 external/mit/xorg/server/xorg-server/hw/vfb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Thu Aug 19 10:18:13 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Thu Aug 19 11:03:04 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2020/09/13 23:01:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.21 2021/08/19 11:03:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -65,6 +65,7 @@
        ${LDADD.os} \
        ${LDADD.glx} \
        ${LDADD.present} \
+       ${LDADD.dri3} \
        -lXfont2 \
        -lfreetype \
        -lXau \
@@ -97,6 +98,7 @@
        ${DPADD.os} \
        ${DPADD.glx} \
        ${DPADD.present} \
+       ${DPADD.dri3} \
        ${LIBXFONT2} \
        ${LIBFREETYPE} \
        ${LIBXAU} \
diff -r 33548ca98450 -r c1e7ab7ba1e3 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Thu Aug 19 10:18:13 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Thu Aug 19 11:03:04 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2021/08/11 23:02:39 maya Exp $
+#      $NetBSD: Makefile,v 1.20 2021/08/19 11:03:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -63,10 +63,7 @@
 LDADD+=        ${LDADD.present}
 LDADD+=        ${LDADD.hw/xfree86/dri}
 LDADD+=        ${LDADD.hw/xfree86/dri2}
-# XXX
-.if ${HAVE_DRI3:Uno} != "no"
 LDADD+=        ${LDADD.dri3}
-.endif
 LDADD+=        ${LDADD.hw/xfree86/dixmods/fb}
 LDADD+=        -lpixman-1 -lXfont2 -lfreetype -lXau -lfontenc -lXdmcp
 LDADD+=        -lpciaccess -ldrm
@@ -117,6 +114,7 @@
        ${DPADD.present} \
        ${DPADD.hw/xfree86/dri} \
        ${DPADD.hw/xfree86/dri2} \
+       ${DPADD.dri3} \
        ${DPADD.hw/xfree86/dixmods/fb} \
        ${DPADD.hw/xfree86/fb} \
        ${DPADD.hw/xfree86/common} \
@@ -139,11 +137,6 @@
        ${LIBEPOXY}
 .endif
 
-# XXX
-.if ${HAVE_DRI3:Uno} != "no"
-DPADD+=        ${DPADD.dri3}
-.endif
-
 LDADD+=        -lcrypto
 DPADD+=        ${LIBCRYPTO}
 
diff -r 33548ca98450 -r c1e7ab7ba1e3 external/mit/xorg/server/xorg-server/hw/xnest/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xnest/Makefile    Thu Aug 19 10:18:13 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xnest/Makefile    Thu Aug 19 11:03:04 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.23 2020/08/05 15:48:09 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.24 2021/08/19 11:03:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -70,6 +70,7 @@
        ${LDADD.os} \
        ${LDADD.glx} \
        ${LDADD.present} \
+       ${LDADD.dri3} \
        -lXfont2 -lXext -lfontenc \
        -lpixman-1 -lX11 -lXau \
        -lXdmcp -lfreetype -lm
@@ -94,6 +95,7 @@
        ${DPADD.os} \
        ${DPADD.glx} \
        ${DPADD.present} \
+       ${DPADD.dri3} \
        ${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
        ${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
        ${LIBXDMCP} ${LIBFREETYPE} ${LIBM}