sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (a5104746fb55139e43f5dbdd3317320b963c2c4e)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (a5104746fb55139e43f5dbdd3317320b963c2c4e)
- Date: Tue, 30 Apr 2024 03:21:08 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
windowmanagers/hyprland/BUILD | 39 --------
windowmanagers/hyprland/CONFIGURE | 4
windowmanagers/hyprland/DEPENDS | 38 ++------
windowmanagers/hyprland/DETAILS | 14 +-
windowmanagers/hyprland/HISTORY | 5 +
windowmanagers/hyprland/PREPARE | 1
windowmanagers/hyprland/PRE_BUILD | 11 --
windowmanagers/hyprland/patches/hyprland-system-wlroots.patch | 47
----------
wm-addons/hyprcursor/DEPENDS | 3
wm-addons/hyprcursor/DETAILS | 4
wm-addons/hyprcursor/HISTORY | 5 +
wm-addons/hyprcursor/PRE_BUILD | 4
wm-addons/hyprcursor/patches/tomlplusplus.patch | 13 ++
13 files changed, 57 insertions(+), 131 deletions(-)
New commits:
commit a5104746fb55139e43f5dbdd3317320b963c2c4e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
windowmanagers/hyprland: version 0.39.1
commit 31d1a34c0408ceae1c7c65b398f8bc5e3560c001
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
wm-addons/hyprcursor: version 0.1.8
diff --git a/windowmanagers/hyprland/BUILD b/windowmanagers/hyprland/BUILD
deleted file mode 100755
index 5ac5f4d..0000000
--- a/windowmanagers/hyprland/BUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-if [[ "${SYSWLROOTS}" == "y" ]]; then
- default_build
-else
- OPTS+=" use_system_wlroots=disabled" &&
- 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/CONFIGURE
b/windowmanagers/hyprland/CONFIGURE
index 9f48d22..da8d28e 100755
--- a/windowmanagers/hyprland/CONFIGURE
+++ b/windowmanagers/hyprland/CONFIGURE
@@ -1 +1,3 @@
-. "${GRIMOIRE}/MESON_CONFIGURE"
+. "${GRIMOIRE}/MESON_CONFIGURE" &&
+
+persistent_remove SYSWLROOTS
diff --git a/windowmanagers/hyprland/DEPENDS b/windowmanagers/hyprland/DEPENDS
index 1166076..cc348a7 100755
--- a/windowmanagers/hyprland/DEPENDS
+++ b/windowmanagers/hyprland/DEPENDS
@@ -13,24 +13,19 @@ depends OPENGL &&
depends seatd &&
depends tomlplusplus &&
depends hyprcursor &&
-if [[ "${SYSWLROOTS}" == "y" ]]; then
- depends -sub "SCM HYPRLAND" wlroots 'use_system_wlroots=enabled'
-else
- depends DEVICE-MANAGER &&
- optional_depends hwdata '' '' 'Enable DRM backend?' &&
-
- if is_depends_enabled "${SPELL}" "hwdata"; then
- depends libdisplay-info &&
- depends libliftoff
- fi &&
+depends DEVICE-MANAGER &&
+optional_depends hwdata '' '' 'Enable DRM backend?' &&
+if is_depends_enabled "${SPELL}" "hwdata"; then
+ depends libdisplay-info &&
+ depends libliftoff
+fi &&
- optional_depends libxcb '' '' 'enable X11 backend' &&
+optional_depends libxcb '' '' 'enable X11 backend' &&
- optional_depends vulkan-headers '' '' 'build Vulkan renderer' &&
- if is_depends_enabled $SPELL vulkan-headers;then
- depends vulkan-loader &&
- depends glslang
- fi
+optional_depends vulkan-headers '' '' 'build Vulkan renderer' &&
+if is_depends_enabled $SPELL vulkan-headers;then
+ depends vulkan-loader &&
+ depends glslang
fi &&
optional_depends xwayland \
@@ -40,17 +35,12 @@ optional_depends xwayland \
if is_depends_enabled $SPELL xwayland; then
depends libxcb &&
-
- if [[ "${SYSWLROOTS}" == "n" ]]; then
- depends xcb-util-renderutil &&
- depends xcb-util-wm &&
-
- optional_depends xcb-util-errors '' '' 'Improved error reporting?'
- fi
+ depends xcb-util-renderutil &&
+ depends xcb-util-wm &&
+ optional_depends xcb-util-errors '' '' 'Improved error reporting?'
fi &&
optional_depends systemd \
'systemd=enabled' \
'systemd=disabled' \
'Enable systemd support?'
-
diff --git a/windowmanagers/hyprland/DETAILS b/windowmanagers/hyprland/DETAILS
index 22cc35f..cb9826a 100755
--- a/windowmanagers/hyprland/DETAILS
+++ b/windowmanagers/hyprland/DETAILS
@@ -1,7 +1,7 @@
. "$GRIMOIRE/MESON_FUNCTIONS"
SPELL=hyprland
- VERSION=0.38.1
-
SOURCE_HASH=sha512:a84c7c7e2b634032eb79d7c73efefaa99fb506f36eed7cea9dac09bfe53b46accef9145ae062b4a9fd3f8121d3abb52fe2465d176c950d498115da8ae111127e
+ VERSION=0.39.1
+
SOURCE_HASH=sha512:173dc2baea68e301fad13b1634779f859263abdba7ab60233791c6c8c8ed2def24afdfb51d3db1820646b391530f1f6aeca82d8cf6de1ef178810c11fbdef37b
PROTOCOLS_COMMIT=0c2ce70625cb30aef199cb388f99e19a61a6ce03
UDIS86_COMMIT=5336633af70f3917760a6d441ff02d93477b0c86
SOURCE2_HASH=sha512:1eafa6ee8f371f2811a155b9ad6af006f39d76ec61b7144d094f79c849c90d813c8d58e34e74066a8285653bf3909b181d015cf0b4a42c593784154edee1dcdb
@@ -14,12 +14,10 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/Hyprland-${VERSION}"
SOURCE2_URL[0]="https://github.com/hyprwm/${SPELL}-protocols/archive/$PROTOCOLS_COMMIT.tar.gz";
SOURCE3="udis86-${UDIS86_COMMIT}.tar.gz"
SOURCE3_URL[0]="https://github.com/canihavesomecoffee/udis86/archive/$UDIS86_COMMIT.tar.gz";
-if [[ "${SYSWLROOTS}" == "n" ]]; then
- WLROOTS_COMMIT="50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"
-
SOURCE4_HASH="sha512:ce09d175f12cf25021caf18c0eac56aad97d238b3e2c4bfcc071d12d1bb8a44ee5c3aceab72ce3002928ca3c2c833bb5992b4820b44e0d0985c343ae903d056e"
- SOURCE4="wlroots-${WLROOTS_COMMIT}.tar.gz"
-
SOURCE4_URL[0]="https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${WLROOTS_COMMIT}/${SOURCE4}.tar.gz";
-fi
+ WLROOTS_COMMIT="611a4f24cd2384378f6e500253983107c6656c64"
+
SOURCE4_HASH="sha512:157c94643bc630b1c97f05f620c2adb21f744cac16ed8c53ab377820ce8af2ec6b826197a41b6814a838b6e032b92a790f4214210831f8e91a6aff0346f54027"
+ SOURCE4="wlroots-hyprland-${WLROOTS_COMMIT}.tar.gz"
+
SOURCE4_URL[0]="https://github.com/hyprwm/wlroots-${SPELL}/archive/${WLROOTS_COMMIT}.tar.gz";
WEB_SITE=http://www.hyprland.org/
ENTERED=20230123
LICENSE[0]=BSD
diff --git a/windowmanagers/hyprland/HISTORY b/windowmanagers/hyprland/HISTORY
index dfebf19..868aa47 100644
--- a/windowmanagers/hyprland/HISTORY
+++ b/windowmanagers/hyprland/HISTORY
@@ -1,3 +1,8 @@
+2024-04-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.39.1, adapted for wlroots-hyprland
+ * CONFIGURE, DEPENDS, PRE_BUILD: adapted for wlroots-hyprland
+ * BUILD, PREPARE, patches/hyprland-system-wlroots.patch: removed, not
needed
+
2024-04-13 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.38.1
diff --git a/windowmanagers/hyprland/PREPARE b/windowmanagers/hyprland/PREPARE
deleted file mode 100755
index 1807e2d..0000000
--- a/windowmanagers/hyprland/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SYSWLROOTS "Use system wlroots?" n
diff --git a/windowmanagers/hyprland/PRE_BUILD
b/windowmanagers/hyprland/PRE_BUILD
index 3e6df54..a78bd76 100755
--- a/windowmanagers/hyprland/PRE_BUILD
+++ b/windowmanagers/hyprland/PRE_BUILD
@@ -1,15 +1,10 @@
default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-apply_patch_dir patches &&
-
cd "${SOURCE_DIRECTORY}/subprojects" &&
unpack_file 2 &&
unpack_file 3 &&
-rm -rf "${SPELL}-protocols" "udis86" "wlroots" &&
+rm -rf "${SPELL}-protocols" "udis86" "wlroots-${SPELL}" &&
mv "${SOURCE2%.tar.gz}" "./${SPELL}-protocols" &&
mv "${SOURCE3%.tar.gz}" "./udis86" &&
-if [[ "${SYSWLROOTS}" == "n" ]]; then
- unpack_file 4 &&
- mv "${SOURCE4%.tar.gz}" "./wlroots"
-fi
+unpack_file 4 &&
+mv "${SOURCE4%.tar.gz}" "./wlroots-${SPELL}"
diff --git a/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
b/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
deleted file mode 100644
index b61f633..0000000
--- a/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -urp a/meson.build b/meson.build
---- a/meson.build 2023-10-14 22:54:39.226371688 -0500
-+++ b/meson.build 2023-10-14 23:00:28.755390834 -0500
-@@ -39,8 +39,19 @@ add_project_arguments(
- ],
- language: 'cpp')
-
--wlroots = subproject('wlroots', default_options: ['examples=false',
'renderers=gles2'])
--have_xwlr = wlroots.get_variable('features').get('xwayland')
-+wlroots = dependency('wlroots', required: get_option('use_system_wlroots'))
-+use_system_wlroots = not get_option('use_system_wlroots').disabled() and
wlroots.found()
-+if not use_system_wlroots
-+ wlroots = subproject('wlroots', default_options :
['examples=false']).get_variable('wlroots')
-+endif
-+
-+have_xwlr = false
-+if use_system_wlroots
-+ have_xwlr = cpp_compiler.get_define('WLR_HAS_XWAYLAND', prefix:
'#include <wlr/config.h>', dependencies: wlroots) == '1'
-+else
-+ have_xwlr =
subproject('wlroots').get_variable('features').get('xwayland')
-+endif
-+
- xcb_dep = dependency('xcb', required: get_option('xwayland'))
-
- cmake = import('cmake')
-diff -urp a/meson_options.txt b/meson_options.txt
---- a/meson_options.txt 2023-10-14 22:52:56.346366052 -0500
-+++ b/meson_options.txt 2023-10-14 22:55:23.933374136 -0500
-@@ -1,3 +1,4 @@
-+option('use_system_wlroots', type: 'feature', value: 'auto', description:
'Use the system-wide installation of wlroots')
- option('xwayland', type: 'feature', value: 'auto', description: 'Enable
support for X11 applications')
- option('systemd', type: 'feature', value: 'auto', description: 'Enable
systemd integration')
- option('legacy_renderer', type: 'feature', value: 'disabled', description:
'Enable legacy renderer')
-diff -urp a/src/meson.build b/src/meson.build
---- a/src/meson.build 2023-10-14 22:54:39.231371688 -0500
-+++ b/src/meson.build 2023-10-14 22:55:36.874374845 -0500
-@@ -7,9 +7,9 @@ executable('Hyprland', src,
- cpp_pch: 'pch/pch.hpp',
- dependencies: [
- server_protos,
-+ wlroots,
- dependency('wayland-server'),
- dependency('wayland-client'),
-- wlroots.get_variable('wlroots'),
- dependency('cairo'),
- dependency('libdrm'),
- dependency('egl'),
diff --git a/wm-addons/hyprcursor/DEPENDS b/wm-addons/hyprcursor/DEPENDS
index 064fb22..3f9f348 100755
--- a/wm-addons/hyprcursor/DEPENDS
+++ b/wm-addons/hyprcursor/DEPENDS
@@ -7,4 +7,5 @@ fi &&
depends cairo &&
depends hyprlang &&
depends librsvg2 &&
-depends libzip
+depends libzip &&
+depends tomlplusplus
diff --git a/wm-addons/hyprcursor/DETAILS b/wm-addons/hyprcursor/DETAILS
index c3c4df1..665168c 100755
--- a/wm-addons/hyprcursor/DETAILS
+++ b/wm-addons/hyprcursor/DETAILS
@@ -9,8 +9,8 @@ if [[ "${HYPRCURSOR_BRANCH}" == "scm" ]]; then
SOURCE_IGNORE="volatile"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
else
- VERSION="0.1.5"
-
SOURCE_HASH="sha512:3092b6773a34fa1cab10f83fa48274d79a50cd373dfe8a89d0170a78767a66b5e0cbe57cd1b86bc4bb85371c23ac7425f59e61fb50723a895fef4e7f6039fdfc"
+ VERSION="0.1.8"
+
SOURCE_HASH="sha512:f03ead33b37d46f189ec16b6dcebf066a4f531e74a5a71c4aaae90cb09415fd3901793bcdf41d7ce7bd2b5a22856abda360ed63648a19f4aef40dc78ae96963e"
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
SOURCE_URL[0]="https://github.com/hyprwm/${SPELL}/archive/refs/tags/v${VERSION}.tar.gz";
diff --git a/wm-addons/hyprcursor/HISTORY b/wm-addons/hyprcursor/HISTORY
index 6f24589..250d3c0 100644
--- a/wm-addons/hyprcursor/HISTORY
+++ b/wm-addons/hyprcursor/HISTORY
@@ -1,3 +1,8 @@
+2024-04-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.1.8
+ * DEPENDS: added tomlplusplus
+ * PRE_BUILD, patches/tomlplusplus.patch: added to fix tomlplusplus
detection
+
2024-03-25 Pavel Vinogradov <public AT sourcemage.org>
* CONFIGURE, DEPENDS, DETAILS: created a spell, version 0.1.5
diff --git a/wm-addons/hyprcursor/PRE_BUILD b/wm-addons/hyprcursor/PRE_BUILD
new file mode 100755
index 0000000..f80ee7d
--- /dev/null
+++ b/wm-addons/hyprcursor/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/wm-addons/hyprcursor/patches/tomlplusplus.patch
b/wm-addons/hyprcursor/patches/tomlplusplus.patch
new file mode 100644
index 0000000..1aa4bfe
--- /dev/null
+++ b/wm-addons/hyprcursor/patches/tomlplusplus.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,8 @@ configure_file(hyprcursor.pc.in hyprcursor.pc @ONLY)
+ set(CMAKE_CXX_STANDARD 23)
+
+ find_package(PkgConfig REQUIRED)
+-pkg_check_modules(deps REQUIRED IMPORTED_TARGET hyprlang>=0.4.2 libzip
cairo librsvg-2.0 tomlplusplus)
++pkg_check_modules(deps REQUIRED IMPORTED_TARGET hyprlang>=0.4.2 libzip
cairo librsvg-2.0)
++find_package(tomlplusplus)
+
+ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+ message(STATUS "Configuring hyprcursor in Debug")
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (a5104746fb55139e43f5dbdd3317320b963c2c4e), Pavel Vinogradov, 04/29/2024
Archive powered by MHonArc 2.6.24.