head 1.3; access; symbols netbsd-11-0-RC6:1.1.6.2 netbsd-11-0-RC5:1.1.6.2 netbsd-11-0-RC4:1.1.6.2 netbsd-11-0-RC3:1.1.6.2 netbsd-11-0-RC2:1.1.6.2 netbsd-11-0-RC1:1.1.6.2 perseant-exfatfs-base-20250801:1.1 netbsd-11:1.1.0.6 netbsd-11-base:1.1 netbsd-10-1-RELEASE:1.1 perseant-exfatfs-base-20240630:1.1 perseant-exfatfs:1.1.0.4 perseant-exfatfs-base:1.1 netbsd-10-0-RELEASE:1.1 netbsd-10-0-RC6:1.1 netbsd-10-0-RC5:1.1 netbsd-10-0-RC4:1.1 netbsd-10-0-RC3:1.1 netbsd-10-0-RC2:1.1 netbsd-10-0-RC1:1.1 netbsd-10:1.1.0.2 netbsd-10-base:1.1; locks; strict; comment @# @; 1.3 date 2025.12.09.05.51.46; author mrg; state Exp; branches; next 1.2; commitid uqVvGDcgl9AFdHlG; 1.2 date 2025.11.12.08.41.38; author mrg; state Exp; branches; next 1.1; commitid nz72gaVk97KM1fiG; 1.1 date 2022.07.21.22.51.23; author mrg; state Exp; branches 1.1.6.1; next ; commitid uLcaMQRq0yEjCOMD; 1.1.6.1 date 2025.11.20.19.09.05; author martin; state Exp; branches; next 1.1.6.2; commitid ecVBm2Ks79j8fkjG; 1.1.6.2 date 2025.12.10.16.41.28; author martin; state Exp; branches; next ; commitid xtdyg7aoCPeDMSlG; desc @@ 1.3 log @update for xorg-server 21.2.21. @ text @# $NetBSD: Makefile.glamor,v 1.2 2025/11/12 08:41:38 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 @ 1.2 log @updates for xorg-server 21.1.20. @ text @d1 1 a1 1 # $NetBSD: Makefile.glamor,v 1.1 2022/07/21 22:51:23 mrg Exp $ a42 2 SRCS+= \ glamor_glx_provider.c d49 1 a49 2 glamor_eglmodule.c \ glamor_glx_provider.c @ 1.1 log @build glamoregl module with all the glamor objects, not as part of the base list of libraries. noted by rjs. should fix PR#56934. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2021/08/11 23:02:39 maya Exp $ d43 2 d51 2 a52 1 glamor_eglmodule.c @ 1.1.6.1 log @Pull up following revision(s) (requested by mrg in ticket #91): share/mk/bsd.x11.mk: revision 1.163 external/mit/xorg/server/xorg-server/glamor/Makefile.glamor: revision 1.2 external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile: revision 1.4 note xorg-server update updates for xorg-server 21.1.20. @ text @d1 1 a1 1 # $NetBSD: Makefile.glamor,v 1.1 2022/07/21 22:51:23 mrg Exp $ a42 2 SRCS+= \ glamor_glx_provider.c d49 1 a49 2 glamor_eglmodule.c \ glamor_glx_provider.c @ 1.1.6.2 log @Pull up following revision(s) (requested by mrg in ticket #116): external/mit/xorg/bin/xkbcomp/Makefile: revision 1.13 share/mk/bsd.x11.mk: revision 1.164 external/mit/xorg/server/xorg-server/glamor/Makefile.glamor: revision 1.3 external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile: revision 1.5 update for xorg-server 21.2.21. update for xkbcomp 1.5.0. @ text @d1 1 a1 1 # $NetBSD: Makefile.glamor,v 1.1.6.1 2025/11/20 19:09:05 martin Exp $ d43 2 d51 2 a52 1 glamor_eglmodule.c @