sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (ee32f8f96bedf4ec114eb114edce04c55910718e)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (ee32f8f96bedf4ec114eb114edce04c55910718e)
- Date: Wed, 7 Aug 2024 23:23:02 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
ChangeLog | 4 +++
windowmanagers/hyprland/DEPENDS | 7 +-----
windowmanagers/hyprland/DETAILS | 8 +------
windowmanagers/hyprland/HISTORY | 6 +++++
windowmanagers/hyprland/PRE_BUILD | 7 +-----
wm-addons/aquamarine/CONFIGURE | 1
wm-addons/aquamarine/DEPENDS | 19 +++++++++++++++++
wm-addons/aquamarine/DETAILS | 26
++++++++++++++++++++++++
wm-addons/aquamarine/HISTORY | 4 +++
wm-addons/aquamarine/PREPARE | 2 +
wm-addons/aquamarine/PRE_BUILD | 4 +++
wm-addons/aquamarine/patches/no-OpenGL-GL.patch | 12 +++++++++++
wm-addons/hyprutils/DETAILS | 4 +--
wm-addons/hyprutils/HISTORY | 3 ++
14 files changed, 89 insertions(+), 18 deletions(-)
New commits:
commit ee32f8f96bedf4ec114eb114edce04c55910718e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
windowmanagers/hyprland: version 0.42.0
commit 47615c3a3918f917a88550432dfc9c092964ca2e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
wm-addons/hyprutils: version 0.2.1
commit 508e6b78f8eab6f61d792b333c4dd1b16e0fc3cd
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
wm-addons/aquamarine: new spell, a very light linux rendering backend
library
diff --git a/ChangeLog b/ChangeLog
index e8f7578..1fafa7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2024-08-07 Pavel Vinogradov <public AT sourcemage.org>
+ * wm-addons/aquamarine: new spell, a very light linux rendering
backend
+ library
+
2024-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* GO_FUNCTIONS: added
* ipp-usb goipp gotags: added to openprinting
diff --git a/windowmanagers/hyprland/DEPENDS b/windowmanagers/hyprland/DEPENDS
index b6a8e37..f90d3ba 100755
--- a/windowmanagers/hyprland/DEPENDS
+++ b/windowmanagers/hyprland/DEPENDS
@@ -1,10 +1,12 @@
. "${GRIMOIRE}/MESON_DEPENDS" &&
+depends aquamarine &&
depends PKG-CONFIG &&
depends jq &&
depends git &&
depends wayland &&
depends wayland-protocols &&
depends libglvnd &&
+depends libxcursor &&
depends libxkbcommon &&
depends libinput &&
depends cairo &&
@@ -17,11 +19,6 @@ depends hyprutils &&
depends hyprwayland-scanner &&
depends util-linux &&
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' &&
diff --git a/windowmanagers/hyprland/DETAILS b/windowmanagers/hyprland/DETAILS
index 5468eae..4c52e9b 100755
--- a/windowmanagers/hyprland/DETAILS
+++ b/windowmanagers/hyprland/DETAILS
@@ -1,7 +1,7 @@
. "$GRIMOIRE/MESON_FUNCTIONS"
SPELL=hyprland
- VERSION=0.41.2
-
SOURCE_HASH=sha512:ef8adb75a8f0cb21e084a37fcc971cefb5065550fae4039449610efdadc3059deb84e4e45d54d2d0525828086300dd7619d76aaad7d4df610e1ee86d9393f6f9
+ VERSION=0.42.0
+
SOURCE_HASH=sha512:695d2f6ffc43e9e0620154c32e52a451492e3d093fe08d671273a56af219d38f7d061402997b6da53c95c15ab68caaa652fc8964bfaefd248f48ae62989ae544
PROTOCOLS_COMMIT=e06482e0e611130cd1929f75e8c1cf679e57d161
UDIS86_COMMIT=5336633af70f3917760a6d441ff02d93477b0c86
SOURCE2_HASH=sha512:e21519d5897219b8837aab0077f5c4aa928c92e73a0304ad7549ca8ec823de461c4322747a077266a749f6a105233388dbbdf952c6cbd095b7ae80666d70339b
@@ -14,10 +14,6 @@ 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";
- WLROOTS_COMMIT="422207dbcf0949e28042403edab539159282885e"
-
SOURCE4_HASH="sha512:81ba7cb22ba12429a0b7a88a397aa673a4370a2ea40e6a8ac1ec7cc4e1c94bf5c90a240d2429a1e6a0bac5edb66f078afc061d917c58f17f60be4bc543d57697"
- 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 cd15e64..22b325a 100644
--- a/windowmanagers/hyprland/HISTORY
+++ b/windowmanagers/hyprland/HISTORY
@@ -1,3 +1,9 @@
+2024-08-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.42.0, removed wlroots-hyprland sources and URLs
+ * DEPENDS: now needs aquamarine, dropped dependencies needed for
+ wlroots-hyprland, added libxcursor
+ * PRE_BUILD: removed wlroots-hyprland related code
+
2024-06-25 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.41.2
diff --git a/windowmanagers/hyprland/PRE_BUILD
b/windowmanagers/hyprland/PRE_BUILD
index a78bd76..c656769 100755
--- a/windowmanagers/hyprland/PRE_BUILD
+++ b/windowmanagers/hyprland/PRE_BUILD
@@ -2,9 +2,6 @@ default_pre_build &&
cd "${SOURCE_DIRECTORY}/subprojects" &&
unpack_file 2 &&
unpack_file 3 &&
-rm -rf "${SPELL}-protocols" "udis86" "wlroots-${SPELL}" &&
+rm -rf "${SPELL}-protocols" "udis86" &&
mv "${SOURCE2%.tar.gz}" "./${SPELL}-protocols" &&
-mv "${SOURCE3%.tar.gz}" "./udis86" &&
-
-unpack_file 4 &&
-mv "${SOURCE4%.tar.gz}" "./wlroots-${SPELL}"
+mv "${SOURCE3%.tar.gz}" "./udis86"
diff --git a/wm-addons/aquamarine/CONFIGURE b/wm-addons/aquamarine/CONFIGURE
new file mode 100755
index 0000000..90942b1
--- /dev/null
+++ b/wm-addons/aquamarine/CONFIGURE
@@ -0,0 +1 @@
+. "${GRIMOIRE}/CMAKE_CONFIGURE"
diff --git a/wm-addons/aquamarine/DEPENDS b/wm-addons/aquamarine/DEPENDS
new file mode 100755
index 0000000..401b659
--- /dev/null
+++ b/wm-addons/aquamarine/DEPENDS
@@ -0,0 +1,19 @@
+. "${GRIMOIRE}/CMAKE_DEPENDS" &&
+
+if [[ "${AQUAMARINE_BRANCH}" == "scm" ]]; then
+ depends git
+fi &&
+
+depends DEVICE-MANAGER &&
+depends hyprutils &&
+depends hyprwayland-scanner &&
+depends hwdata &&
+depends libdrm &&
+depends libinput &&
+depends libdisplay-info &&
+depends OPENGL &&
+depends pixman &&
+depends PKG-CONFIG &&
+depends seatd &&
+depends wayland &&
+depends wayland-protocols
diff --git a/wm-addons/aquamarine/DETAILS b/wm-addons/aquamarine/DETAILS
new file mode 100755
index 0000000..260a934
--- /dev/null
+++ b/wm-addons/aquamarine/DETAILS
@@ -0,0 +1,26 @@
+. "${GRIMOIRE}/FUNCTIONS"
+. "${GRIMOIRE}/CMAKE_FUNCTIONS"
+ SPELL="aquamarine"
+if [[ "${AQUAMARINE_BRANCH}" == "scm" ]]; then
+ VERSION="$(get_scm_version)"
+ SOURCE="${SPELL}-scm.tar.xz"
+ FORCE_DOWNLOAD="on"
+ SOURCE_URL[0]="git_http://github.com/hyprwm/${SPELL}:${SPELL}-scm:main";
+ SOURCE_IGNORE="volatile"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
+else
+ VERSION="0.3.0"
+
SOURCE_HASH="sha512:3d33d9fbc2a98265f101f5660146d789f224e12605d306c2ad238a1bdb3fda3f0b177a64cc023217aa92d5b36c8024487ad703133cbc354ff87b009e5a04d77f"
+ 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";
+# Watch: https://github.com/hyprwm/aquamarine/tags tags/v([0-9.]+)[.]tar
+fi
+ WEB_SITE="https://github.com/hyprwm/aquamarine";
+ ENTERED="20240807"
+ LICENSE[0]="BSD"
+ KEYWORDS="rendering backend library"
+ SHORT="very light linux rendering backend library"
+cat << EOF
+Aquamarine is a very light linux rendering backend library.
+EOF
diff --git a/wm-addons/aquamarine/HISTORY b/wm-addons/aquamarine/HISTORY
new file mode 100644
index 0000000..95020f7
--- /dev/null
+++ b/wm-addons/aquamarine/HISTORY
@@ -0,0 +1,4 @@
+2024-08-07 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFIGURE, DEPENDS, DETAILS, PREPARE, PRE_BUILD,
patches/no-OpenGL-GL.patch:
+ created a spell, version 0.3.0
+
diff --git a/wm-addons/aquamarine/PREPARE b/wm-addons/aquamarine/PREPARE
new file mode 100755
index 0000000..e38d86f
--- /dev/null
+++ b/wm-addons/aquamarine/PREPARE
@@ -0,0 +1,2 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+prepare_select_branch stable scm
diff --git a/wm-addons/aquamarine/PRE_BUILD b/wm-addons/aquamarine/PRE_BUILD
new file mode 100755
index 0000000..f80ee7d
--- /dev/null
+++ b/wm-addons/aquamarine/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/wm-addons/aquamarine/patches/no-OpenGL-GL.patch
b/wm-addons/aquamarine/patches/no-OpenGL-GL.patch
new file mode 100644
index 0000000..2e03948
--- /dev/null
+++ b/wm-addons/aquamarine/patches/no-OpenGL-GL.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,7 +60,7 @@ target_include_directories(
+ PRIVATE "./src" "./src/include" "./protocols" "${CMAKE_BINARY_DIR}")
+ set_target_properties(aquamarine PROPERTIES VERSION ${AQUAMARINE_VERSION}
+ SOVERSION 2)
+-target_link_libraries(aquamarine OpenGL::EGL OpenGL::GL PkgConfig::deps)
++target_link_libraries(aquamarine OpenGL::EGL PkgConfig::deps)
+
+ check_include_file("sys/timerfd.h" HAS_TIMERFD)
+ pkg_check_modules(epoll IMPORTED_TARGET epoll-shim)
diff --git a/wm-addons/hyprutils/DETAILS b/wm-addons/hyprutils/DETAILS
index 31646b9..699f885 100755
--- a/wm-addons/hyprutils/DETAILS
+++ b/wm-addons/hyprutils/DETAILS
@@ -9,8 +9,8 @@ if [[ "${HYPRUTILS_BRANCH}" == "scm" ]]; then
SOURCE_IGNORE="volatile"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
else
- VERSION="0.1.5"
-
SOURCE_HASH="sha512:c7ca50507871aacdb9054a308d03bfd666df817f1020a6c8df00cd88d3368ffcda629eb5b3952a4fece4b191f8cf739d8f837b3baf59bc8582c310063b60037a"
+ VERSION="0.2.1"
+
SOURCE_HASH="sha512:168b7cf204d9b6b56df3404da52956e38ab56a55a441cf71c531efdad3112724c8df1deda2ea7fadb8ac9b2243dc9933612d4c23cd361d3dc5123485a5a5976a"
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/hyprutils/HISTORY b/wm-addons/hyprutils/HISTORY
index ac5c13d..202157f 100644
--- a/wm-addons/hyprutils/HISTORY
+++ b/wm-addons/hyprutils/HISTORY
@@ -1,3 +1,6 @@
+2024-08-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.2.1
+
2024-06-25 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.1.5
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (ee32f8f96bedf4ec114eb114edce04c55910718e), Pavel Vinogradov, 08/07/2024
Archive powered by MHonArc 2.6.24.