Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

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

 windowmanagers/hyprland/BUILD                                 |   38 
----------
 windowmanagers/hyprland/DEPENDS                               |   21 -----
 windowmanagers/hyprland/DETAILS                               |   10 ++
 windowmanagers/hyprland/HISTORY                               |   10 ++
 windowmanagers/hyprland/INSTALL                               |   16 ----
 windowmanagers/hyprland/PRE_BUILD                             |   13 +--
 windowmanagers/hyprland/patches/hyprland-system-wlroots.patch |   16 ----
 7 files changed, 27 insertions(+), 97 deletions(-)

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' &&
 
 optional_depends xwayland                            \
                  'xwayland=enabled'                  \
diff --git a/windowmanagers/hyprland/DETAILS b/windowmanagers/hyprland/DETAILS
index a8a15cf..0e67cfd 100755
--- a/windowmanagers/hyprland/DETAILS
+++ b/windowmanagers/hyprland/DETAILS
@@ -1,10 +1,16 @@
 . "$GRIMOIRE/MESON_FUNCTIONS"
            SPELL=hyprland
-         VERSION=0.22.0
+         VERSION=0.23.0
+     
SOURCE_HASH=sha256:a866dc48d2c7fad6f9a57e890430a8c234ea9f8fcada6c6eafb95eaadadb1ab0
           SOURCE=Hyprland-${VERSION}beta.tar.gz
    
SOURCE_URL[0]=https://github.com/hyprwm/${SPELL}/archive/v${VERSION}beta.tar.gz
-     
SOURCE_HASH=sha256:dd721975b15126a8165226d5ab2cbb88c5bd48dd768b6ee123149451af2fb0c1
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/Hyprland-${VERSION}beta"
+         SOURCE2="${SPELL}-protocols-scm.tar.xz"
+  
SOURCE2_URL[0]="git_http://github.com/hyprwm/${SPELL}-protocols:${SPELL}-protocols-scm:main";
+  SOURCE2_IGNORE="volatile"
+         SOURCE3="udis86-scm.tar.xz"
+  SOURCE3_URL[0]="git_http://github.com/canihavesomecoffee/udis86:udis86-scm";
+  SOURCE3_IGNORE="volatile"
         WEB_SITE=http://www.hyprland.org/
          ENTERED=20230123
       LICENSE[0]=BSD
diff --git a/windowmanagers/hyprland/HISTORY b/windowmanagers/hyprland/HISTORY
index e88481d..50158fa 100644
--- a/windowmanagers/hyprland/HISTORY
+++ b/windowmanagers/hyprland/HISTORY
@@ -1,3 +1,13 @@
+2023-03-20 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 0.23.0, added hyprland-protocols and udis86 as 
subprojects
+         to download
+       * BUILD, INSTALL: removed, not needed anymore
+       * DEPENDS: wlroots scm branch is required now, removed extra 
dependencies
+         for builtin wlroots
+       * PRE_BUILD: removed git cloning of hyprland-protocols and wlroots,
+         unpacking and renaming subprojects directories is refactored as well
+       * patches/hyprland-system-wlroots.patch: updated
+
 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)
diff --git a/windowmanagers/hyprland/INSTALL b/windowmanagers/hyprland/INSTALL
deleted file mode 100755
index dff3c37..0000000
--- a/windowmanagers/hyprland/INSTALL
+++ /dev/null
@@ -1,16 +0,0 @@
-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 5e7f917..c4e74d4 100755
--- a/windowmanagers/hyprland/PRE_BUILD
+++ b/windowmanagers/hyprland/PRE_BUILD
@@ -3,11 +3,8 @@ cd "${SOURCE_DIRECTORY}" &&
 apply_patch_dir patches &&
 
 cd "${SOURCE_DIRECTORY}/subprojects" &&
-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 &&
-  cd "${SOURCE_DIRECTORY}/subprojects/wlroots/" &&
-  git checkout 677a3f2f8847ed2de49dd60868f9d9487a546f58
-fi
+unpack_file 2 &&
+unpack_file 3 &&
+rm -rf "${SPELL}-protocols" "udis86" &&
+mv "${SPELL}-protocols-scm" "./${SPELL}-protocols" &&
+mv udis86-scm ./udis86
diff --git a/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch 
b/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
index 63bfbd1..c855975 100644
--- a/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
+++ b/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
@@ -1,8 +1,8 @@
 diff --git a/meson.build b/meson.build
-index 9435333..21afe36 100644
+index f380255..0b43fc2 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -37,17 +37,28 @@ add_project_arguments(
+@@ -39,8 +39,19 @@ add_project_arguments(
    ],
    language: 'cpp')
  
@@ -23,17 +23,7 @@ index 9435333..21afe36 100644
 +
  xcb_dep = dependency('xcb', required: get_option('xwayland'))
  
- 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