[src/trunk]: src/external/mit/xorg/server/xorg-server Fix glamor - don't use ...

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

details:   https://anonhg.NetBSD.org/src/rev/18d43846b2e6
branches:  trunk
changeset: 1022888:18d43846b2e6
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Aug 11 23:02:39 2021 +0000

description:
Fix glamor - don't use stub functions
${LDADD.gbm} seems to be empty - use -lgbm directly (couldn't find a better
fix)

diffstat:

 external/mit/xorg/server/xorg-server/glamor/Makefile          |  12 ++++++++--
 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile |   4 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r edf3f0693881 -r 18d43846b2e6 external/mit/xorg/server/xorg-server/glamor/Makefile
--- a/external/mit/xorg/server/xorg-server/glamor/Makefile      Wed Aug 11 20:48:16 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/glamor/Makefile      Wed Aug 11 23:02:39 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2016/09/02 03:58:59 jakllsch Exp $
+#      $NetBSD: Makefile,v 1.4 2021/08/11 23:02:39 maya Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -42,13 +42,19 @@
        glamor_sync.c
 SRCS+= \
        glamor_xv.c
+.if ${HAVE_XORG_GLAMOR} == "no"
 SRCS+= \
        glamor_egl_stubs.c
-SRCS.EGL= \
-       glamor_egl.c
+.else
+SRCS+= \
+       glamor_egl.c \
+       glamor_eglmodule.c
+.endif
 
 CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/xorg \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
+               -I${DESTDIR}${X11INCDIR}/libdrm \
+               -I${X11SRCDIR.xorg-server}/glamor \
                -I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=      ${X11FLAGS.DIX}
 
diff -r edf3f0693881 -r 18d43846b2e6 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Wed Aug 11 20:48:16 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Wed Aug 11 23:02:39 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2020/09/13 23:01:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.19 2021/08/11 23:02:39 maya Exp $
 
 .include <bsd.own.mk>
 
@@ -33,7 +33,7 @@
 LDADD+=        ${LDADD.config}
 LDADD+=        ${LDADD.dbe}
 .if ${HAVE_XORG_GLAMOR} != "no"  
-LDADD+=        ${LDADD.glamor} ${LDADD.gbm}
+LDADD+=        ${LDADD.glamor} -lgbm
 .endif
 LDADD+=        ${LDADD.record}
 LDADD+=        ${LDADD.hw/xfree86/loader}