Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Conner Clere (e766885abeaace439cc7485fcf75734be00a036c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Conner Clere (e766885abeaace439cc7485fcf75734be00a036c)
  • Date: Fri, 10 Mar 2023 03:33:40 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

windowmanagers/hyprland/BUILD | 38
++++++++++++++++++++++++++++++++++++++
windowmanagers/hyprland/DEPENDS | 4 +---
windowmanagers/hyprland/HISTORY | 8 ++++++++
windowmanagers/hyprland/INSTALL | 16 ++++++++++++++++
windowmanagers/hyprland/PRE_BUILD | 5 +++--
5 files changed, 66 insertions(+), 5 deletions(-)

New commits:
commit e766885abeaace439cc7485fcf75734be00a036c
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

hyprland: fix build/install when not using system wlroots

diff --git a/windowmanagers/hyprland/BUILD b/windowmanagers/hyprland/BUILD
new file mode 100755
index 0000000..e35d56c
--- /dev/null
+++ b/windowmanagers/hyprland/BUILD
@@ -0,0 +1,38 @@
+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 d05b68d..d7beda3 100755
--- a/windowmanagers/hyprland/DEPENDS
+++ b/windowmanagers/hyprland/DEPENDS
@@ -11,10 +11,8 @@ depends cairo &&
depends pixman &&
depends OPENGL &&
depends seatd &&
-depends -sub "SCM HYPRLAND" wlroots &&

-# Needs -sub SCM
-optional_depends wlroots \
+optional_depends -sub "SCM HYPRLAND" wlroots \
'use_system_wlroots=enabled' \
'use_system_wlroots=disabled' \
'Use system wlroots? (Recommended)' &&
diff --git a/windowmanagers/hyprland/HISTORY b/windowmanagers/hyprland/HISTORY
index 41b5b9c..e88481d 100644
--- a/windowmanagers/hyprland/HISTORY
+++ b/windowmanagers/hyprland/HISTORY
@@ -1,3 +1,11 @@
+2023-03-09 Conner Clere <xenanthropy AT sourcemage.org>
+ * BUILD: added, modified meson_build; change to `--shared-library
static`
+ (only applies if system wlroots not used)
+ * INSTALL: added, modified meson_install; add `--tags runtime,man`
+ * PRE_BUILD: update wlroots git clone to checkout appropriate wlroots
commit
+ * DEPENDS: fix wlroots dep, remove hard dep line and add sub_depends
to
+ wlroots optional_depends
+
2023-03-08 Conner Clere <xenanthropy AT sourcemage.org>
* DETAILS: version 0.22.0
* DEPENDS: change wlroots dep to -sub SCM HYPRLAND
diff --git a/windowmanagers/hyprland/INSTALL b/windowmanagers/hyprland/INSTALL
new file mode 100755
index 0000000..dff3c37
--- /dev/null
+++ b/windowmanagers/hyprland/INSTALL
@@ -0,0 +1,16 @@
+local MESON_INSTALL &&
+local MESON_OPTS &&
+
+if [[ $(get_spell_provider ${SPELL} MESON-BUILD) == muon ]]; then
+ MESON_INSTALL="muon"
+
+ MESON_OPTS="-C builddir/ install"
+else
+ MESON_INSTALL="meson"
+
+ MESON_OPTS="install -C builddir/ --no-rebuild --tags runtime,man"
+fi &&
+
+cd "${SOURCE_DIRECTORY}" &&
+
+DESTDIR="${INSTALL_ROOT}/" ${MESON_INSTALL} ${MESON_OPTS}
diff --git a/windowmanagers/hyprland/PRE_BUILD
b/windowmanagers/hyprland/PRE_BUILD
index a8d652e..5e7f917 100755
--- a/windowmanagers/hyprland/PRE_BUILD
+++ b/windowmanagers/hyprland/PRE_BUILD
@@ -7,6 +7,7 @@ git clone https://github.com/hyprwm/hyprland-protocols.git
./hyprland-protocols

# Clones wlroots repo if you aren't using system wlroots
if ! is_depends_enabled $SPELL wlroots; then
- git clone https://gitlab.freedesktop.org/wlroots/wlroots.git ./wlroots
+ git clone https://gitlab.freedesktop.org/wlroots/wlroots.git ./wlroots &&
+ cd "${SOURCE_DIRECTORY}/subprojects/wlroots/" &&
+ git checkout 677a3f2f8847ed2de49dd60868f9d9487a546f58
fi
-



  • [SM-Commit] GIT changes to master grimoire by Conner Clere (e766885abeaace439cc7485fcf75734be00a036c), Conner Clere, 03/09/2023

Archive powered by MHonArc 2.6.24.

Top of Page