pkgsrc-Changes archive

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

CVS commit: pkgsrc/cad/kicad



Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Dec  9 21:20:52 UTC 2024

Modified Files:
        pkgsrc/cad/kicad: options.mk

Log Message:
kicad: add a wayland option, default on

If you have EGL available, kicad tries to build with Wayland support. However,
without the wayland bl3 include, the build fails.

Add an explicit option for enabling / disabling Wayland instead. From
Robert Whitlock in PR pkg/58339.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/cad/kicad/options.mk

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

Modified files:

Index: pkgsrc/cad/kicad/options.mk
diff -u pkgsrc/cad/kicad/options.mk:1.3 pkgsrc/cad/kicad/options.mk:1.4
--- pkgsrc/cad/kicad/options.mk:1.3     Wed Nov 20 01:29:49 2024
+++ pkgsrc/cad/kicad/options.mk Mon Dec  9 21:20:52 2024
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2024/11/20 01:29:49 mef Exp $
+# $NetBSD: options.mk,v 1.4 2024/12/09 21:20:52 bsiegert Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kicad
-PKG_SUPPORTED_OPTIONS= ng-spice
-PKG_SUGGESTED_OPTIONS= ng-spice
+PKG_SUPPORTED_OPTIONS= ng-spice wayland
+PKG_SUGGESTED_OPTIONS= ng-spice wayland
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,3 +12,18 @@ CMAKE_CONFIGURE_ARGS+=               -DKICAD_SPICE=ON
 .else
 CMAKE_CONFIGURE_ARGS+=         -DKICAD_SPICE=OFF
 .endif
+
+.if !empty(PKG_OPTIONS:Mwayland)
+.  include "../../devel/wayland/buildlink3.mk"
+CMAKE_ARGS+=   -DKICAD_WAYLAND=ON
+# This conditional matches the conditional in Makefile
+# so that it's effectively a test for whether
+# KICAD_USE_EGL is enabled.
+.  if empty(MESALIB_SUPPORTS_EGL:Myes)
+PKG_FAIL_REASON+= "Kicad requires the KICAD_USE_EGL CMake option when using the "
+PKG_FAIL_REASON+= "KICAD_WAYLAND CMake option. See the cmake_dependent_option() "
+PKG_FAIL_REASON+= "for KICAD_WAYLAND in CMakeLists.txt."
+.  endif
+.else
+CMAKE_ARGS+=   -DKICAD_WAYLAND=OFF
+.endif



Home | Main Index | Thread Index | Old Index