Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/libepoxy libepoxy: Only require egl on...



details:   https://anonhg.NetBSD.org/src/rev/761d47d0009d
branches:  trunk
changeset: 956777:761d47d0009d
user:      nia <nia%NetBSD.org@localhost>
date:      Sat Nov 07 18:12:16 2020 +0000

description:
libepoxy: Only require egl on ports with egl support.

Reported by martin.

diffstat:

 external/mit/xorg/lib/libepoxy/Makefile |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 0f150496d0f7 -r 761d47d0009d external/mit/xorg/lib/libepoxy/Makefile
--- a/external/mit/xorg/lib/libepoxy/Makefile   Sat Nov 07 17:46:56 2020 +0000
+++ b/external/mit/xorg/lib/libepoxy/Makefile   Sat Nov 07 18:12:16 2020 +0000
@@ -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 @@
        -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>



Home | Main Index | Thread Index | Old Index