Module Name: src Committed By: maya Date: Wed Aug 11 23:02:39 UTC 2021
Modified Files: src/external/mit/xorg/server/xorg-server/glamor: Makefile src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile Log Message: Fix glamor - don't use stub functions ${LDADD.gbm} seems to be empty - use -lgbm directly (couldn't find a better fix) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server/glamor/Makefile cvs rdiff -u -r1.18 -r1.19 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/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/glamor/Makefile diff -u src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.4 --- src/external/mit/xorg/server/xorg-server/glamor/Makefile:1.3 Fri Sep 2 03:58:59 2016 +++ src/external/mit/xorg/server/xorg-server/glamor/Makefile Wed Aug 11 23:02:39 2021 @@ -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 @@ SRCS= \ 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} 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.18 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.19 --- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.18 Sun Sep 13 23:01:02 2020 +++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Wed Aug 11 23:02:39 2021 @@ -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.dix} 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}