[src/trunk]: src/external/mit/xorg/server/xorg-server build glamoregl module ...

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

details:   https://anonhg.NetBSD.org/src/rev/a5691a11e0d4
branches:  trunk
changeset: 368612:a5691a11e0d4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jul 21 22:51:23 2022 +0000

description:
build glamoregl module with all the glamor objects, not as part of
the base list of libraries.  noted by rjs.

should fix PR#56934.

diffstat:

 external/mit/xorg/server/xorg-server/Makefile                       |   6 +-
 external/mit/xorg/server/xorg-server/Makefile.Xserver               |   3 +-
 external/mit/xorg/server/xorg-server/glamor/Makefile                |  64 ----------
 external/mit/xorg/server/xorg-server/glamor/Makefile.glamor         |  61 +++++++++
 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile       |  11 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile |   9 +-
 6 files changed, 68 insertions(+), 86 deletions(-)

diffs (226 lines):

diff -r 2df733e7f4ed -r a5691a11e0d4 external/mit/xorg/server/xorg-server/Makefile
--- a/external/mit/xorg/server/xorg-server/Makefile     Thu Jul 21 18:12:24 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile     Thu Jul 21 22:51:23 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2021/08/19 11:03:04 mrg Exp $
+#      $NetBSD: Makefile,v 1.31 2022/07/21 22:51:23 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,10 +11,6 @@
 SUBDIR+=       Xi xkb xkbstubs dbe record xfixes
 SUBDIR+=       damageext composite config dri3 .WAIT
 
-.if ${HAVE_XORG_GLAMOR} != "no"
-SUBDIR+=       glamor
-.endif
-
 # And finally, build the servers.
 SUBDIR+=       .WAIT hw
 
diff -r 2df733e7f4ed -r a5691a11e0d4 external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver     Thu Jul 21 18:12:24 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver     Thu Jul 21 22:51:23 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xserver,v 1.24 2022/07/15 04:18:54 mrg Exp $
+#      $NetBSD: Makefile.Xserver,v 1.25 2022/07/21 22:51:23 mrg Exp $
 
 .for _SL in \
        mi \
@@ -7,7 +7,6 @@
        xfixes \
        Xext \
        dbe \
-       glamor \
        present \
        pseudoramiX \
        record \
diff -r 2df733e7f4ed -r a5691a11e0d4 external/mit/xorg/server/xorg-server/glamor/Makefile
--- a/external/mit/xorg/server/xorg-server/glamor/Makefile      Thu Jul 21 18:12:24 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-#      $NetBSD: Makefile,v 1.4 2021/08/11 23:02:39 maya Exp $
-
-.include "../Makefile.serverlib"
-.include "../Makefile.servermod"
-
-LIB=   glamor
-
-.PATH: ${X11SRCDIR.xorg-server}/${LIB}
-SRCS= \
-       glamor.c \
-       glamor_copy.c \
-       glamor_core.c \
-       glamor_dash.c \
-       glamor_font.c \
-       glamor_glx.c \
-       glamor_composite_glyphs.c \
-       glamor_image.c \
-       glamor_lines.c \
-       glamor_segs.c \
-       glamor_render.c \
-       glamor_gradient.c \
-       glamor_prepare.c \
-       glamor_program.c \
-       glamor_rects.c \
-       glamor_spans.c \
-       glamor_text.c \
-       glamor_transfer.c \
-       glamor_transform.c \
-       glamor_trapezoid.c \
-       glamor_triangles.c \
-       glamor_addtraps.c \
-       glamor_glyphblt.c \
-       glamor_points.c \
-       glamor_pixmap.c \
-       glamor_largepixmap.c \
-       glamor_picture.c \
-       glamor_vbo.c \
-       glamor_window.c \
-       glamor_fbo.c \
-       glamor_compositerects.c \
-       glamor_utils.c \
-       glamor_sync.c
-SRCS+= \
-       glamor_xv.c
-.if ${HAVE_XORG_GLAMOR} == "no"
-SRCS+= \
-       glamor_egl_stubs.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}
-
-COPTS+=                ${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :}
-
-.include <bsd.x11.mk>
-.include <bsd.lib.mk>
diff -r 2df733e7f4ed -r a5691a11e0d4 external/mit/xorg/server/xorg-server/glamor/Makefile.glamor
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server/glamor/Makefile.glamor       Thu Jul 21 22:51:23 2022 +0000
@@ -0,0 +1,61 @@
+#      $NetBSD: Makefile.glamor,v 1.1 2022/07/21 22:51:23 mrg Exp $
+
+.ifndef XORG_SERVER_GLAMOR_MAKEFILE_GLAMOR
+XORG_SERVER_GLAMOR_MAKEFILE_GLAMOR=1
+
+.PATH: ${X11SRCDIR.xorg-server}/glamor
+SRCS+= \
+       glamor.c \
+       glamor_copy.c \
+       glamor_core.c \
+       glamor_dash.c \
+       glamor_font.c \
+       glamor_glx.c \
+       glamor_composite_glyphs.c \
+       glamor_image.c \
+       glamor_lines.c \
+       glamor_segs.c \
+       glamor_render.c \
+       glamor_gradient.c \
+       glamor_prepare.c \
+       glamor_program.c \
+       glamor_rects.c \
+       glamor_spans.c \
+       glamor_text.c \
+       glamor_transfer.c \
+       glamor_transform.c \
+       glamor_trapezoid.c \
+       glamor_triangles.c \
+       glamor_addtraps.c \
+       glamor_glyphblt.c \
+       glamor_points.c \
+       glamor_pixmap.c \
+       glamor_largepixmap.c \
+       glamor_picture.c \
+       glamor_vbo.c \
+       glamor_window.c \
+       glamor_fbo.c \
+       glamor_compositerects.c \
+       glamor_utils.c \
+       glamor_sync.c
+SRCS+= \
+       glamor_xv.c
+.if ${HAVE_XORG_GLAMOR} == "no"
+SRCS+= \
+       glamor_egl_stubs.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}
+
+COPTS+=                ${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :}
+
+.endif # XORG_SERVER_GLAMOR_MAKEFILE_GLAMOR
diff -r 2df733e7f4ed -r a5691a11e0d4 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Thu Jul 21 18:12:24 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Thu Jul 21 22:51:23 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2022/07/15 04:18:55 mrg Exp $
+#      $NetBSD: Makefile,v 1.23 2022/07/21 22:51:23 mrg Exp $
 
 USE_FORT?=     yes # network server *and* setuid
 
@@ -35,9 +35,6 @@
 LDADD+=        ${LDADD.fb}
 LDADD+=        ${LDADD.config}
 LDADD+=        ${LDADD.dbe}
-.if ${HAVE_XORG_GLAMOR} != "no"  
-LDADD+=        ${LDADD.glamor} -lgbm
-.endif
 LDADD+=        ${LDADD.record}
 LDADD+=        ${LDADD.hw/xfree86/loader}
 LDADD+=        ${LDADD.hw/xfree86/common}
@@ -132,12 +129,6 @@
        ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
        ${LIBGL} ${LIBXV} ${LIBXSHMFENCE} ${LIBXCVT}
 
-.if ${HAVE_XORG_GLAMOR} != "no"  
-DPADD+= \
-       ${DPADD.glamor} \
-       ${LIBEPOXY}
-.endif
-
 LDADD+=        -lcrypto
 DPADD+=        ${LIBCRYPTO}
 
diff -r 2df733e7f4ed -r a5691a11e0d4 external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile       Thu Jul 21 18:12:24 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile       Thu Jul 21 22:51:23 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2021/07/14 06:34:33 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2022/07/21 22:51:23 mrg Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules
 
@@ -7,11 +7,10 @@
 
 LIB=   glamoregl
 
-.PATH: ${X11SRCDIR.xorg-server}/glamor
 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/glamor_egl
-SRCS=  glamor_egl.c \
-       glamor_eglmodule.c \
-       glamor_xf86_xv.c
+SRCS=  glamor_xf86_xv.c
+
+.include "../../../glamor/Makefile.glamor"
 
 CPPFLAGS+=     \
        -I${X11SRCDIR.xorg-server}/hw/xfree86/common \