Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f1203fe74be79c71c16a647b24558ad5fdbe985c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (f1203fe74be79c71c16a647b24558ad5fdbe985c)
  • Date: Tue, 21 Mar 2023 19:08:14 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

windowmanagers/hyprland/BUILD | 39
++++++++++++++++++++++++++++++++++++++
windowmanagers/hyprland/DEPENDS | 29 ++++++++++++++++++++++++++--
windowmanagers/hyprland/DETAILS | 5 ++++
windowmanagers/hyprland/HISTORY | 4 +++
windowmanagers/hyprland/PREPARE | 1
windowmanagers/hyprland/PRE_BUILD | 9 ++++++--
6 files changed, 83 insertions(+), 4 deletions(-)

New commits:
commit f1203fe74be79c71c16a647b24558ad5fdbe985c
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

windowmanagers/hyprland: the ability for builtin wlroots is back

diff --git a/windowmanagers/hyprland/BUILD b/windowmanagers/hyprland/BUILD
new file mode 100755
index 0000000..5ac5f4d
--- /dev/null
+++ b/windowmanagers/hyprland/BUILD
@@ -0,0 +1,39 @@
+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/DEPENDS b/windowmanagers/hyprland/DEPENDS
index 1d3bcd6..4d8977f 100755
--- a/windowmanagers/hyprland/DEPENDS
+++ b/windowmanagers/hyprland/DEPENDS
@@ -11,7 +11,25 @@ depends cairo &&
depends pixman &&
depends OPENGL &&
depends seatd &&
-depends -sub "SCM HYPRLAND" wlroots 'use_system_wlroots=enabled' &&
+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 &&
+
+ 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
+fi &&

optional_depends xwayland \
'xwayland=enabled' \
@@ -19,7 +37,14 @@ optional_depends xwayland \
'Enable x11 application support?' &&

if is_depends_enabled $SPELL xwayland; then
- depends libxcb
+ depends libxcb &&
+
+ if [[ "${SYSWLROOTS}" == "n" ]]; then
+ depends xcb-util-renderutil &&
+ depends xcb-util-wm &&
+
+ optional_depends xcb-util-errors '' '' 'Improved error reporting?'
+ fi
fi &&

optional_depends systemd \
diff --git a/windowmanagers/hyprland/DETAILS b/windowmanagers/hyprland/DETAILS
index 0e67cfd..65dc527 100755
--- a/windowmanagers/hyprland/DETAILS
+++ b/windowmanagers/hyprland/DETAILS
@@ -11,6 +11,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/Hyprland-${VERSION}beta"
SOURCE3="udis86-scm.tar.xz"
SOURCE3_URL[0]="git_http://github.com/canihavesomecoffee/udis86:udis86-scm";
SOURCE3_IGNORE="volatile"
+if [[ "${SYSWLROOTS}" == "n" ]]; then
+ SOURCE4="${SPELL}-wlroots-scm.tar.xz"
+
SOURCE4_URL[0]="git_http://gitlab.freedesktop.org/wlroots/wlroots.git:${SPELL}-wlroots-scm:5ae17de23f5fd9bb252a698f3771c840280e2c05";
+ SOURCE4_IGNORE="volatile"
+fi
WEB_SITE=http://www.hyprland.org/
ENTERED=20230123
LICENSE[0]=BSD
diff --git a/windowmanagers/hyprland/HISTORY b/windowmanagers/hyprland/HISTORY
index a36029e..24814dd 100644
--- a/windowmanagers/hyprland/HISTORY
+++ b/windowmanagers/hyprland/HISTORY
@@ -1,3 +1,7 @@
+2023-03-21 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PRE_BUILD, PREPARE: the ability for
builtin wlroots
+ is back
+
2023-03-20 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.23.0, added hyprland-protocols and udis86 as
subprojects
to download
diff --git a/windowmanagers/hyprland/PREPARE b/windowmanagers/hyprland/PREPARE
new file mode 100755
index 0000000..1807e2d
--- /dev/null
+++ b/windowmanagers/hyprland/PREPARE
@@ -0,0 +1 @@
+config_query SYSWLROOTS "Use system wlroots?" n
diff --git a/windowmanagers/hyprland/PRE_BUILD
b/windowmanagers/hyprland/PRE_BUILD
index c4e74d4..7d0cfc0 100755
--- a/windowmanagers/hyprland/PRE_BUILD
+++ b/windowmanagers/hyprland/PRE_BUILD
@@ -5,6 +5,11 @@ apply_patch_dir patches &&
cd "${SOURCE_DIRECTORY}/subprojects" &&
unpack_file 2 &&
unpack_file 3 &&
-rm -rf "${SPELL}-protocols" "udis86" &&
+rm -rf "${SPELL}-protocols" "udis86" "wlroots" &&
mv "${SPELL}-protocols-scm" "./${SPELL}-protocols" &&
-mv udis86-scm ./udis86
+mv udis86-scm ./udis86 &&
+
+if [[ "${SYSWLROOTS}" == "n" ]]; then
+ unpack_file 4 &&
+ mv "${SPELL}-wlroots-scm" "./wlroots"
+fi



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f1203fe74be79c71c16a647b24558ad5fdbe985c), Pavel Vinogradov, 03/21/2023

Archive powered by MHonArc 2.6.24.

Top of Page