Module Name: src
Committed By: mrg
Date: Thu Jul 21 22:51:23 UTC 2022
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile Makefile.Xserver
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl:
Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/glamor: Makefile.glamor
Removed Files:
src/external/mit/xorg/server/xorg-server/glamor: Makefile
Log Message:
build glamoregl module with all the glamor objects, not as part of
the base list of libraries. noted by rjs.
should fix PR#56934.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/mit/xorg/server/xorg-server/Makefile
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.4 -r0 \
src/external/mit/xorg/server/xorg-server/glamor/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/glamor/Makefile.glamor
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/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/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.30 src/external/mit/xorg/server/xorg-server/Makefile:1.31
--- src/external/mit/xorg/server/xorg-server/Makefile:1.30 Thu Aug 19 11:03:04 2021
+++ src/external/mit/xorg/server/xorg-server/Makefile Thu Jul 21 22:51:23 2022
@@ -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+= present pseudoramiX
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
Index: src/external/mit/xorg/server/xorg-server/Makefile.Xserver
diff -u src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.24 src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.25
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver:1.24 Fri Jul 15 04:18:54 2022
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver Thu Jul 21 22:51:23 2022
@@ -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 \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.22 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.23
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.22 Fri Jul 15 04:18:55 2022
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Thu Jul 21 22:51:23 2022
@@ -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.dix}
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 @@ DPADD+= \
${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
${LIBGL} ${LIBXV} ${LIBXSHMFENCE} ${LIBXCVT}
-.if ${HAVE_XORG_GLAMOR} != "no"
-DPADD+= \
- ${DPADD.glamor} \
- ${LIBEPOXY}
-.endif
-
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.2 Wed Jul 14 06:34:33 2021
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile Thu Jul 21 22:51:23 2022
@@ -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 @@ XMODULEDIR= ${X11USRLIBDIR}/modules
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 \
Added files:
Index: src/external/mit/xorg/server/xorg-server/glamor/Makefile.glamor
diff -u /dev/null src/external/mit/xorg/server/xorg-server/glamor/Makefile.glamor:1.1
--- /dev/null Thu Jul 21 22:51:23 2022
+++ src/external/mit/xorg/server/xorg-server/glamor/Makefile.glamor Thu Jul 21 22:51:23 2022
@@ -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
