CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Aug 19 08:16:22 UTC 2020

Modified Files:
        pkgsrc/graphics/wld: Makefile
        pkgsrc/x11/modular-xorg-xwayland: Makefile
        pkgsrc/x11/qt5-qtwayland: Makefile

Log Message:
Skip building only-useful-with-Wayland packages on unsupported systems


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/wld/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/modular-xorg-xwayland/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/qt5-qtwayland/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/wld/Makefile
diff -u pkgsrc/graphics/wld/Makefile:1.5 pkgsrc/graphics/wld/Makefile:1.6
--- pkgsrc/graphics/wld/Makefile:1.5    Mon Aug 17 20:17:33 2020
+++ pkgsrc/graphics/wld/Makefile        Wed Aug 19 08:16:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/08/17 20:17:33 leot Exp $
+# $NetBSD: Makefile,v 1.6 2020/08/19 08:16:21 nia Exp $
 
 DISTNAME=      wld-0.0.0.20200220
 PKGREVISION=   2
@@ -29,6 +29,12 @@ MAKE_FLAGS+= DRM_DRIVERS=${WLD_DRIVERS:Q
 
 PKGCONFIG_OVERRIDE+=   wld.pc.in
 
+.include "../../devel/wayland/platform.mk"
+
+.if empty(PLATFORM_SUPPORTS_WAYLAND:M[Yy][Ee][Ss])
+PKG_SKIP_REASON+=      "Platform does not support Wayland"
+.endif
+
 .include "../../devel/wayland/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.83

Index: pkgsrc/x11/modular-xorg-xwayland/Makefile
diff -u pkgsrc/x11/modular-xorg-xwayland/Makefile:1.8 pkgsrc/x11/modular-xorg-xwayland/Makefile:1.9
--- pkgsrc/x11/modular-xorg-xwayland/Makefile:1.8       Fri Jul 31 16:50:57 2020
+++ pkgsrc/x11/modular-xorg-xwayland/Makefile   Wed Aug 19 08:16:21 2020
@@ -1,9 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2020/07/31 16:50:57 maya Exp $
+# $NetBSD: Makefile,v 1.9 2020/08/19 08:16:21 nia Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-xorg-xwayland-${XORG_VERSION}
 PKGREVISION=   2
 
+.include "../../devel/wayland/platform.mk"
+
+.if empty(PLATFORM_SUPPORTS_WAYLAND:M[Yy][Ee][Ss])
+PKG_SKIP_REASON+=      "Platform does not support Wayland"
+.endif
+
 DISTINFO_FILE=         ${.CURDIR}/../../x11/modular-xorg-server/distinfo
 PATCHDIR=              ${.CURDIR}/../../x11/modular-xorg-server/patches
 

Index: pkgsrc/x11/qt5-qtwayland/Makefile
diff -u pkgsrc/x11/qt5-qtwayland/Makefile:1.11 pkgsrc/x11/qt5-qtwayland/Makefile:1.12
--- pkgsrc/x11/qt5-qtwayland/Makefile:1.11      Mon Aug 17 20:20:34 2020
+++ pkgsrc/x11/qt5-qtwayland/Makefile   Wed Aug 19 08:16:21 2020
@@ -1,10 +1,16 @@
-# $NetBSD: Makefile,v 1.11 2020/08/17 20:20:34 leot Exp $
+# $NetBSD: Makefile,v 1.12 2020/08/19 08:16:21 nia Exp $
 
 DISTNAME=      qtwayland-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtwayland-${QTVERSION}
 PKGREVISION=   1
 COMMENT=       Qt5 module for Wayland support
 
+.include "../../devel/wayland/platform.mk"
+
+.if empty(PLATFORM_SUPPORTS_WAYLAND:M[Yy][Ee][Ss])
+PKG_SKIP_REASON+=      "Platform does not support Wayland"
+.endif
+
 BUILD_TARGET=          sub-src
 INSTALL_ENV+=          INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=    lib/pkgconfig