New commits:
commit 3e4ea89fbb85bdcc98ca69e912c39a5a0928bad9
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
windowmanagers/hyprland: version 0.23.0
diff --git a/windowmanagers/hyprland/BUILD b/windowmanagers/hyprland/BUILD
deleted file mode 100755
index e35d56c..0000000
--- a/windowmanagers/hyprland/BUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-if is_depends_enabled $SPELL wlroots; then
- default_build
-else
- local PREFIX=${PREFIX:-/usr}
- local MESON_BUILD_TYPE="${MESON_BUILD_TYPE:-release}" &&
-
- local MESON_BUILD &&
- local MESON_OPTS &&
- local BUILDER &&
- local BUILDER_OPTS="-j ${MAKE_NJOBS} -C builddir/" &&
-
- if [[ $(get_spell_provider ${SPELL} MESON-BUILD) == muon ]]; then
- MESON_BUILD="muon setup" &&
-
- OPTS="prefix=${INSTALL_ROOT}${PREFIX} buildtype=${MESON_BUILD_TYPE}
default_library=static libdir=lib ${OPTS}"
- else
- MESON_BUILD="meson setup"
- MESON_OPTS="--prefix ${INSTALL_ROOT}${PREFIX} --buildtype
${MESON_BUILD_TYPE} --default-library static --libdir lib"
- fi &&
-
- if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL}
NINJA-BUILD); then
- BUILDER="muon samu"
- elif [[ $(get_spell_provider ${SPELL} NINJA-BUILD) == samurai ]]; then
- BUILDER="samu"
- else
- BUILDER="ninja"
- fi &&
-
- for MO in $OPTS; do
- MESON_OPTS+=" -D${MO}"
- done &&
-
- cd "${SOURCE_DIRECTORY}" &&
-
- ${MESON_BUILD} ${MESON_OPTS} builddir/ &&
-
- ${BUILDER} ${BUILDER_OPTS}
-fi
diff --git a/windowmanagers/hyprland/DEPENDS b/windowmanagers/hyprland/DEPENDS
index d7beda3..17c4650 100755
--- a/windowmanagers/hyprland/DEPENDS
+++ b/windowmanagers/hyprland/DEPENDS
@@ -11,26 +11,7 @@ depends cairo &&
depends pixman &&
depends OPENGL &&
depends seatd &&
-
-optional_depends -sub "SCM HYPRLAND" wlroots \
- 'use_system_wlroots=enabled' \
- 'use_system_wlroots=disabled' \
- 'Use system wlroots? (Recommended)' &&
-
-# If no system wlroots, we need to depend on wlroots' deps
-# so wlroots subproject will build
-if ! is_depends_enabled $SPELL wlroots; then
- depends python3 &&
- depends DEVICE-MANAGER &&
- depends xcb-util-errors &&
- depends libdrm &&
- depends hwdata &&
- optional_depends vulkan-headers '' '' 'Build Vulkan renderer?' &&
- if is_depends_enabled $SPELL vulkan-headers; then
- depends vulkan-loader &&
- depends glslang
- fi
-fi &&
+depends -sub "SCM" wlroots 'use_system_wlroots=enabled' &&
- if get_option('xwayland').enabled() and not have_xwlr
- error('Cannot enable Xwayland in Hyprland: wlroots has been built
without Xwayland support')
- endif
- have_xwayland = xcb_dep.found() and have_xwlr
-
- if not have_xwayland
--add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
-+ add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
- endif
-
- if get_option('buildtype') == 'debug'
+ cmake = import('cmake')
diff --git a/meson_options.txt b/meson_options.txt
index d34c617..adf708f 100644
--- a/meson_options.txt
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3e4ea89fbb85bdcc98ca69e912c39a5a0928bad9),
Pavel Vinogradov, 03/20/2023