Skip to Content.
Sympa Menu

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

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 (32bf5664206217e0da1db09967350b0e251e66c4)
  • Date: Wed, 8 Mar 2023 17:43:46 +0000

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

wm-addons/wlroots/CONFIGURE | 5 +++-
wm-addons/wlroots/DEPENDS | 47
++++++++++++++++++++++++++++----------------
wm-addons/wlroots/HISTORY | 9 ++++++++
wm-addons/wlroots/PRE_BUILD | 6 +++++
4 files changed, 49 insertions(+), 18 deletions(-)

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

wlroots: rework dependencies, enable option for hyprland support

diff --git a/wm-addons/wlroots/CONFIGURE b/wm-addons/wlroots/CONFIGURE
index e1385873..ab7bcef 100755
--- a/wm-addons/wlroots/CONFIGURE
+++ b/wm-addons/wlroots/CONFIGURE
@@ -1,4 +1,7 @@
. "${GRIMOIRE}/MESON_CONFIGURE" &&

config_query_option WLROOTS_OPTS "Build examples?" \
- "n" "examples=true" "examples=false"
+ "n" "examples=true" "examples=false" &&
+if [[ $WLROOTS_BRANCH == "scm" ]]; then
+ config_query HYPRLAND "Checkout commit ID for hyprland?" n
+fi
diff --git a/wm-addons/wlroots/DEPENDS b/wm-addons/wlroots/DEPENDS
index 4d76db9..4996145 100755
--- a/wm-addons/wlroots/DEPENDS
+++ b/wm-addons/wlroots/DEPENDS
@@ -5,35 +5,48 @@ if [[ "${WLROOTS_BRANCH}" == "scm" ]]; then
depends git
fi &&

-depends python3 &&
-depends DEVICE-MANAGER &&
-#depends libinput &&
-depends libxkbcommon &&
-depends OPENGL &&
-depends pixman &&
-depends seatd &&
-depends wayland &&
+depends python3 &&
+depends libxkbcommon &&
+depends OPENGL &&
+depends pixman &&
+depends wayland &&
depends wayland-protocols &&
-depends xcb-util-errors &&

vdepends <<! &&
libdrm >= 2.4.109
!

-depends hwdata &&
+optional_depends seatd
\
+ 'session=enabled'
\
+ 'session=disabled'
\
+ 'Enable session support? (required for libinput or DRM backends)'
&&

-#optional_depends libcap \
-# 'libcap=enabled' \
-# 'libcap=disabled' \
-# 'to enable rootless session support' &&
+if is_depends_enabled $SPELL seatd; then
+ depends DEVICE-MANAGER &&
+ optional_depends libinput '' '' 'Enable input backend?' &&
+ optional_depends hwdata '' '' 'Enable DRM backend?' &&

+ if is_depends_enabled $SPELL hwdata; then
+ depends libdisplay-info &&
+ depends libliftoff
+ fi
+fi &&

-optional_depends libinput '' '' 'input backend' &&
optional_depends libxcb '' '' 'enable X11 backend' &&

+if is_depends_enabled $SPELL libxcb; then
+ depends xwayland &&
+ depends xcb-util-renderutil &&
+ depends xcb-util-wm &&
+
+ optional_depends xcb-util-errors \
+ 'xcb-errors=enabled' \
+ 'xcb-errors=disabled' \
+ 'Improved error reporting?'
+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 '' '' 'X11 support'
+fi
diff --git a/wm-addons/wlroots/HISTORY b/wm-addons/wlroots/HISTORY
index ef0f906..19de995 100644
--- a/wm-addons/wlroots/HISTORY
+++ b/wm-addons/wlroots/HISTORY
@@ -1,3 +1,12 @@
+2023-03-08 Conner Clere <xenanthropy AT sourcemage.org>
+ * CONFIGURE: add HYPRLAND config_query
+ * PRE_BUILD: added, if HYPRLAND=y then checkout
+ appropriate commit id to sync wlroots version with hyprland
+ * DEPENDS: reworked dependencies (seatd, DEVICE-MANAGER,
+ xcb-util-errors, hwdata optional) xwayland hard dep if
+ x11 backend enabled; new (possible) deps: xcb-util-renderutil,
+ xcb-util-wm, libdisplay-info, libliftoff
+
2023-03-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: https -> git_http for scm branch, dropped signature too
* DEPENDS: ' -> " for scm branch check
diff --git a/wm-addons/wlroots/PRE_BUILD b/wm-addons/wlroots/PRE_BUILD
new file mode 100755
index 0000000..29e2aae
--- /dev/null
+++ b/wm-addons/wlroots/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if [[ $HYPRLAND == 'y' ]]; then
+ git checkout 677a3f2f8847ed2de49dd60868f9d9487a546f58
+fi



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

Archive powered by MHonArc 2.6.24.

Top of Page