Module Name:    src
Committed By:   nia
Date:           Sat Nov  7 18:12:16 UTC 2020

Modified Files:
        src/external/mit/xorg/lib/libepoxy: Makefile

Log Message:
libepoxy: Only require egl on ports with egl support.

Reported by martin.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libepoxy/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/lib/libepoxy/Makefile
diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.8 src/external/mit/xorg/lib/libepoxy/Makefile:1.9
--- src/external/mit/xorg/lib/libepoxy/Makefile:1.8	Mon Nov  2 06:25:24 2020
+++ src/external/mit/xorg/lib/libepoxy/Makefile	Sat Nov  7 18:12:16 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2020/11/02 06:25:24 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2020/11/07 18:12:16 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -40,8 +40,15 @@ PKGCONFIG_SED_FLAGS= \
 	-e "s,@DLOPEN_LIBS@,," \
 	-e "s,@epoxy_has_glx@,1," \
 	-e "s,@epoxy_has_egl@,${EGL}," \
-	-e "s,@epoxy_has_wgl@,0," \
+	-e "s,@epoxy_has_wgl@,0,"
+
+.if ${HAVE_XORG_GLAMOR} != "no"
+PKGCONFIG_SED_FLAGS+= \
 	-e "s,@GL_REQS@, gl egl,"
+.else
+PKGCONFIG_SED_FLAGS+= \
+	-e "s,@GL_REQS@, gl,"
+.endif
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>

Reply via email to