Wed May 1 09:06:54 2024 UTC (26d)
qt6-qtbase: Adjust logic for PLIST.egldevice.

Avoids errors on systems that do not have the file in question, which will be
the majority of bulk build hosts.


(jperkin)
diff -r1.29 -r1.30 pkgsrc/x11/qt6-qtbase/Makefile
cvs diff -r1.29 -r1.30 pkgsrc/x11/qt6-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt6-qtbase/Makefile 2024/04/27 11:49:40 1.29
+++ pkgsrc/x11/qt6-qtbase/Makefile 2024/05/01 09:06:54 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2024/04/27 11:49:40 adam Exp $ 1# $NetBSD: Makefile,v 1.30 2024/05/01 09:06:54 jperkin Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt6-qtbase-${QTVERSION} 4PKGNAME= qt6-qtbase-${QTVERSION}
5COMMENT= C++ X GUI toolkit 5COMMENT= C++ X GUI toolkit
6CATEGORIES= x11 6CATEGORIES= x11
7 7
8LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3 8LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
9 9
10.include "Makefile.common" 10.include "Makefile.common"
11 11
12HAS_CONFIGURE= yes 12HAS_CONFIGURE= yes
13CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 13CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
14CONFIGURE_ARGS+= -I "${PREFIX}/include" 14CONFIGURE_ARGS+= -I "${PREFIX}/include"
@@ -235,29 +235,31 @@ PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Xm @@ -235,29 +235,31 @@ PKGCONFIG_OVERRIDE+= lib/pkgconfig/Qt6Xm
235.include "../../lang/python/application.mk" 235.include "../../lang/python/application.mk"
236.include "../../math/double-conversion/buildlink3.mk" 236.include "../../math/double-conversion/buildlink3.mk"
237.include "../../security/libb2/buildlink3.mk" 237.include "../../security/libb2/buildlink3.mk"
238.include "../../security/openssl/buildlink3.mk" 238.include "../../security/openssl/buildlink3.mk"
239.include "../../textproc/icu/buildlink3.mk" 239.include "../../textproc/icu/buildlink3.mk"
240.include "../../textproc/md4c/buildlink3.mk" 240.include "../../textproc/md4c/buildlink3.mk"
241.include "../../www/libproxy/buildlink3.mk" 241.include "../../www/libproxy/buildlink3.mk"
242.if ${OPSYS} != "Darwin" 242.if ${OPSYS} != "Darwin"
243PLIST.x11= yes 243PLIST.x11= yes
244.include "../../fonts/fontconfig/buildlink3.mk" 244.include "../../fonts/fontconfig/buildlink3.mk"
245.include "../../graphics/glu/buildlink3.mk" 245.include "../../graphics/glu/buildlink3.mk"
246. if !empty(MESALIB_SUPPORTS_EGL:Myes) 246. if !empty(MESALIB_SUPPORTS_EGL:Myes)
247PLIST.egl= yes 247PLIST.egl= yes
 248. if exists(${X11BASE}/include/EGL/eglext.h)
248EGL_EXT_FILE= cat ${X11BASE}/include/EGL/eglext.h 249EGL_EXT_FILE= cat ${X11BASE}/include/EGL/eglext.h
249. if exists(${X11BASE}/include/EGL/eglext.h) && !empty(EGL_EXT_FILE:sh:MEGL_DRM_MASTER_FD_EXT) 250. if !empty(EGL_EXT_FILE:sh:MEGL_DRM_MASTER_FD_EXT)
250PLIST.egldevice= yes 251PLIST.egldevice= yes
 252. endif
251. endif 253. endif
252. endif 254. endif
253BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.11 255BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.11
254.include "../../x11/libxcb/buildlink3.mk" 256.include "../../x11/libxcb/buildlink3.mk"
255.include "../../x11/xcb-util/buildlink3.mk" 257.include "../../x11/xcb-util/buildlink3.mk"
256.include "../../x11/xcb-util-cursor/buildlink3.mk" 258.include "../../x11/xcb-util-cursor/buildlink3.mk"
257.include "../../x11/xcb-util-image/buildlink3.mk" 259.include "../../x11/xcb-util-image/buildlink3.mk"
258.include "../../x11/xcb-util-keysyms/buildlink3.mk" 260.include "../../x11/xcb-util-keysyms/buildlink3.mk"
259.include "../../x11/xcb-util-renderutil/buildlink3.mk" 261.include "../../x11/xcb-util-renderutil/buildlink3.mk"
260.include "../../x11/xcb-util-wm/buildlink3.mk" 262.include "../../x11/xcb-util-wm/buildlink3.mk"
261.include "../../x11/libSM/buildlink3.mk" 263.include "../../x11/libSM/buildlink3.mk"
262.include "../../x11/libX11/buildlink3.mk" 264.include "../../x11/libX11/buildlink3.mk"
263.include "../../x11/libXext/buildlink3.mk" 265.include "../../x11/libXext/buildlink3.mk"