* [PR PATCH] New package: hyprland-0.34.0
@ 2024-01-31 18:36 zen0bit
2024-01-31 18:37 ` [PR PATCH] [Updated] " zen0bit
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: zen0bit @ 2024-01-31 18:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 650 bytes --]
There is a new pull request by zen0bit against master on the void-packages repository
https://github.com/oSoWoSo/VUR hyprland
https://github.com/void-linux/void-packages/pull/48461
New package: hyprland-0.34.0
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **NO**
#### Local build testing
- I built this PR locally for my native architecture, x64 glibc
A patch file from https://github.com/void-linux/void-packages/pull/48461.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hyprland-48461.patch --]
[-- Type: text/x-diff, Size: 21994 bytes --]
From 6a8fb6f525c110791f76f4e27d6663ec8958347d Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:40:55 +0100
Subject: [PATCH 01/10] New package: tomlplusplus-3.4.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
common/shlibs | 1 +
srcpkgs/tomlplusplus/template | 16 ++++++++++++++++
2 files changed, 17 insertions(+)
create mode 100644 srcpkgs/tomlplusplus/template
diff --git a/common/shlibs b/common/shlibs
index 71f172740e5c6..d9ed3d70f1202 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4272,3 +4272,4 @@ libsqsh.so.1 libsqsh-1.3.0_1
libunicode.so.0.4 libunicode-0.4.0_1
libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
+libtomlplusplus.so.3 tomlplusplus-3.4.0_1
diff --git a/srcpkgs/tomlplusplus/template b/srcpkgs/tomlplusplus/template
new file mode 100644
index 0000000000000..de29c97769a7f
--- /dev/null
+++ b/srcpkgs/tomlplusplus/template
@@ -0,0 +1,16 @@
+# Template file for 'tomlplusplus'
+pkgname=tomlplusplus
+version=3.4.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config cmake"
+short_desc="Header-only TOML config file parser and serializer for C++17"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="MIT"
+homepage="https://marzer.github.io/tomlplusplus/"
+distfiles="https://github.com/marzer/${pkgname}/archive/refs/tags/v${version}.tar.gz"
+checksum=8517f65938a4faae9ccf8ebb36631a38c1cadfb5efa85d9a72e15b9e97d25155
+
+post_install() {
+ vlicense LICENSE
+}
From d86b29fea0c6be8079024abe3eb6bd21a24ad927 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:41:26 +0100
Subject: [PATCH 02/10] New package: sdbus-cpp-1.4.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
common/shlibs | 1 +
srcpkgs/sdbus-cpp/patches/sysd.patch | 74 ++++++++++++++++++++++++++++
srcpkgs/sdbus-cpp/template | 15 ++++++
3 files changed, 90 insertions(+)
create mode 100644 srcpkgs/sdbus-cpp/patches/sysd.patch
create mode 100644 srcpkgs/sdbus-cpp/template
diff --git a/common/shlibs b/common/shlibs
index d9ed3d70f1202..f4eb18462148a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4273,3 +4273,4 @@ libunicode.so.0.4 libunicode-0.4.0_1
libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
libtomlplusplus.so.3 tomlplusplus-3.4.0_1
+libsdbus-c++.so.1 sdbus-cpp-1.4.0_1
diff --git a/srcpkgs/sdbus-cpp/patches/sysd.patch b/srcpkgs/sdbus-cpp/patches/sysd.patch
new file mode 100644
index 0000000000000..94f97cd6599fc
--- /dev/null
+++ b/srcpkgs/sdbus-cpp/patches/sysd.patch
@@ -0,0 +1,74 @@
+diff -upr b/CMakeLists.txt a/CMakeLists.txt
+--- b/CMakeLists.txt 2023-10-10 18:26:21.000000000 +0100
++++ a/CMakeLists.txt 2024-01-30 00:15:54.286326912 +0000
+@@ -12,7 +12,8 @@ include(GNUInstallDirs) # Installation d
+ # PERFORMING CHECKS & PREPARING THE DEPENDENCIES
+ #-------------------------------
+
+-set(LIBSYSTEMD "systemd")
++set(LIBSYSTEMD_IMPL "systemd")
++set(LIBSYSTEMD_LIB "libsystemd")
+
+ option(BUILD_LIBSYSTEMD "Build libsystemd static library and incorporate it into libsdbus-c++" OFF)
+
+@@ -23,13 +24,15 @@ if(NOT BUILD_LIBSYSTEMD)
+ message(WARNING "libsystemd not found, checking for libelogind instead")
+ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=236)
+ if(TARGET PkgConfig::Systemd)
+- set(LIBSYSTEMD "elogind")
++ set(LIBSYSTEMD_IMPL "elogind")
++ set(LIBSYSTEMD_LIB "libelogind")
+ string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION})
+ list(GET VERSION_LIST 0 Systemd_VERSION)
+ else()
+ message(WARNING "libelogind not found, checking for basu instead")
+ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu)
+- set(LIBSYSTEMD "basu")
++ set(LIBSYSTEMD_IMPL "basu")
++ set(LIBSYSTEMD_LIB "basu")
+ # https://git.sr.ht/~emersion/basu/commit/d4d185d29a26
+ set(Systemd_VERSION "240")
+ endif()
+@@ -125,8 +128,8 @@ add_library(sdbus-c++-objlib OBJECT ${SD
+ target_compile_definitions(sdbus-c++-objlib PRIVATE
+ BUILD_LIB=1
+ LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
+- SDBUS_${LIBSYSTEMD}
+- SDBUS_HEADER=<${LIBSYSTEMD}/sd-bus.h>)
++ SDBUS_${LIBSYSTEMD_IMPL}
++ SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
+ target_include_directories(sdbus-c++-objlib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
+ if(BUILD_SHARED_LIBS)
+@@ -236,6 +239,7 @@ if(BUILD_SHARED_LIBS AND (BUILD_LIBSYSTE
+ else()
+ set(PKGCONFIG_REQS "")
+ endif()
++set(PKGCONFIG_DEPS ${LIBSYSTEMD_LIB})
+ configure_file(pkgconfig/sdbus-c++.pc.in pkgconfig/sdbus-c++.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/sdbus-c++.pc
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev)
+diff -upr b/pkgconfig/sdbus-c++.pc.in a/pkgconfig/sdbus-c++.pc.in
+--- b/pkgconfig/sdbus-c++.pc.in 2023-10-10 18:26:21.000000000 +0100
++++ a/pkgconfig/sdbus-c++.pc.in 2024-01-30 00:16:40.114327313 +0000
+@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDI
+
+ Name: @PROJECT_NAME@
+ Description: C++ library on top of sd-bus, a systemd D-Bus library
+-Requires@PKGCONFIG_REQS@: @LIBSYSTEMD@
++Requires@PKGCONFIG_REQS@: @PKGCONFIG_DEPS@
+ Version: @SDBUSCPP_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+ Cflags: -I${includedir}
+diff -upr b/tests/CMakeLists.txt a/tests/CMakeLists.txt
+--- b/tests/CMakeLists.txt 2023-10-10 18:26:21.000000000 +0100
++++ a/tests/CMakeLists.txt 2024-01-30 00:16:58.895327477 +0000
+@@ -106,7 +106,7 @@ include_directories(${CMAKE_CURRENT_SOUR
+ add_executable(sdbus-c++-unit-tests ${UNITTESTS_SRCS})
+ target_compile_definitions(sdbus-c++-unit-tests PRIVATE
+ LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
+- SDBUS_HEADER=<${LIBSYSTEMD}/sd-bus.h>)
++ SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
+ target_link_libraries(sdbus-c++-unit-tests sdbus-c++-objlib GTest::gmock)
+
+ add_executable(sdbus-c++-integration-tests ${INTEGRATIONTESTS_SRCS})
diff --git a/srcpkgs/sdbus-cpp/template b/srcpkgs/sdbus-cpp/template
new file mode 100644
index 0000000000000..c56e1049a924e
--- /dev/null
+++ b/srcpkgs/sdbus-cpp/template
@@ -0,0 +1,15 @@
+# Template file for 'sdbus-cpp'
+pkgname=sdbus-cpp
+version=1.4.0
+revision=1
+build_style=cmake
+hostmakedepends="cmake meson ninja pkg-config git m4 rsync gperf"
+makedepends="libmount-devel libcap-devel libelogind elogind-devel elogind"
+depends="libmount libcap libelogind elogind-devel elogind"
+short_desc="High-level C++ D-Bus library providing powerful API in modern C++"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="LGPL-2.1-only"
+homepage="https://github.com/Kistler-Group/sdbus-cpp"
+changelog="https://github.com/Kistler-Group/${pkgname}/releases"
+distfiles="https://github.com/Kistler-Group/${pkgname}/archive/refs/tags/v${version}.tar.gz"
+checksum=ca7405c7f0f9ae3023dcfa37bc68974c4b8a1c9ea2909b970e0aedc3e8657ee6
From b082f984c72970c05b8cfa1e08fd63b866a5ac30 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 12:43:35 +0100
Subject: [PATCH 03/10] libdrm: update to 2.4.119
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/libdrm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 5c7578cef7450..ffbd8bcab7195 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
# Template file for 'libdrm'
pkgname=libdrm
-version=2.4.115
+version=2.4.119
revision=1
build_style=meson
configure_args="-Dudev=true -Dvalgrind=disabled -Dinstall-test-programs=true"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://dri.freedesktop.org/"
distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz"
-checksum=fd8b7c6e4e40d13c32ab67ace2cb6c71e08c9ca53124ff33ccadd74f604117e3
+checksum=6e798976e175f1f6e83706681644d0ce0527855b95a471479875ae3c1ef9870a
case "$XBPS_TARGET_MACHINE" in
aarch64*) configure_args+=" -Dvc4=enabled";;
From 9ba52abc27d8e69f332f64899a3cd2a0dca36130 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:41:51 +0100
Subject: [PATCH 04/10] New package: libliftoff-0.4.1
Signed-off-by: zenobit <zenobit@disroot.org>
---
common/shlibs | 1 +
srcpkgs/libliftoff/template | 31 +++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/libliftoff/template
diff --git a/common/shlibs b/common/shlibs
index f4eb18462148a..685e21019e311 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4274,3 +4274,4 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
libtomlplusplus.so.3 tomlplusplus-3.4.0_1
libsdbus-c++.so.1 sdbus-cpp-1.4.0_1
+libliftoff.so.0 libliftoff-0.4.1_1
diff --git a/srcpkgs/libliftoff/template b/srcpkgs/libliftoff/template
new file mode 100644
index 0000000000000..8484cc27278dc
--- /dev/null
+++ b/srcpkgs/libliftoff/template
@@ -0,0 +1,31 @@
+# Template file for 'libliftoff'
+pkgname=libliftoff
+version=0.4.1
+revision=1
+build_style=meson
+hostmakedepends="cmake ninja pkg-config"
+makedepends="libdrm-devel"
+depends="libdrm"
+short_desc="Lightweight KMS plane library"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/emersion/libliftoff"
+distfiles="https://gitlab.freedesktop.org/emersion/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=44ec5cfdd0df040d1023d4d6a48b23c31f21ce61ee2347da9e1ca244fe24dd1c
+
+do_build() {
+ cd ${wrksrc}
+ meson setup --prefix=/usr build/
+ ninja -C build
+}
+
+do_install() {
+ cd ${wrksrc}
+ meson install --destdir=$DESTDIR -C build
+ vmkdir usr/share/doc/${pkgname}
+ vinstall README.md 644 usr/share/doc/${pkgname}
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 730438c88f38a590917bf750c22b6daf18fc4962 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:43:13 +0100
Subject: [PATCH 05/10] New package: hyprlang-0.2.1
Signed-off-by: zenobit <zenobit@disroot.org>
---
common/shlibs | 1 +
srcpkgs/hyprlang/template | 13 +++++++++++++
2 files changed, 14 insertions(+)
create mode 100644 srcpkgs/hyprlang/template
diff --git a/common/shlibs b/common/shlibs
index 685e21019e311..bac63b4326d36 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4275,3 +4275,4 @@ libunicode_loader.so.0.4 libunicode-0.4.0_1
libtomlplusplus.so.3 tomlplusplus-3.4.0_1
libsdbus-c++.so.1 sdbus-cpp-1.4.0_1
libliftoff.so.0 libliftoff-0.4.1_1
+libhyprlang.so hyprlang-0.2.1_1
diff --git a/srcpkgs/hyprlang/template b/srcpkgs/hyprlang/template
new file mode 100644
index 0000000000000..26d798cfa161b
--- /dev/null
+++ b/srcpkgs/hyprlang/template
@@ -0,0 +1,13 @@
+# Template file for 'hyprlang'
+pkgname=hyprlang
+version=0.2.1
+revision=1
+build_style=cmake
+hostmakedepends="cmake pkg-config"
+short_desc="Official implementation library for the hypr config language"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="GPL-3.0-only"
+homepage="https://hyprland.org/hyprlang/index.html"
+changelog="https://github.com/hyprwm/${pkgname}/releases"
+distfiles="https://github.com/hyprwm/hyprlang/archive/refs/tags/v${version}.tar.gz"
+checksum=e41b265f09c1e84e03f052f584fcc086fe48ec5057191ef35917ce79e7dc4190
From 7d34baf8bcff5208819df57f670e4288512d96ca Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:43:40 +0100
Subject: [PATCH 06/10] New package: hyprland-protocols-0.2
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/hyprland-protocols/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/hyprland-protocols/template
diff --git a/srcpkgs/hyprland-protocols/template b/srcpkgs/hyprland-protocols/template
new file mode 100644
index 0000000000000..b1ed9fcaf5fee
--- /dev/null
+++ b/srcpkgs/hyprland-protocols/template
@@ -0,0 +1,17 @@
+# Template file for 'hyprland-protocols'
+pkgname=hyprland-protocols
+version=0.2
+revision=1
+build_style=meson
+hostmakedepends="wayland-devel"
+makedepends="wayland-devel"
+short_desc="Wayland protocol extensions for Hyprland"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="https://github.com/hyprwm/hyprland-protocols"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=106cb189d0fbe4ec0ee11a12a17238172f4c4cd1b2b26db904df144e5c7a05f0
+
+post_install() {
+ vlicense LICENSE
+}
From 0b5c70270987ab064692b3a3933cc6b2aac98c1a Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:42:55 +0100
Subject: [PATCH 07/10] New package: hyprpaper-0.6.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/hyprpaper/template | 43 ++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 srcpkgs/hyprpaper/template
diff --git a/srcpkgs/hyprpaper/template b/srcpkgs/hyprpaper/template
new file mode 100644
index 0000000000000..0de8e6ad26a0a
--- /dev/null
+++ b/srcpkgs/hyprpaper/template
@@ -0,0 +1,43 @@
+# Template file for 'hyprpaper'
+pkgname=hyprpaper
+version=0.6.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config wayland-devel"
+makedepends="
+ pango-devel
+ cairo-devel
+ libjpeg-turbo-devel
+ wayland-devel
+ wayland-protocols
+ wlroots-devel
+ hyprland-protocols
+ hyprlang
+ libwebp-devel
+ file-devel
+"
+short_desc="Wallpaper utility for wlroots compositors with IPC controls"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="https://github.com/hyprwm/hyprpaper"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=71d8294ffbcbaae628c4eabdcb3b7fb1974d6bed7794b787bb77934d0a3f4538
+
+do_build() {
+ cmake \
+ --no-warn-unused-cli \
+ -G "Unix Makefiles" \
+ -D CMAKE_BUILD_TYPE=Release \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -B build
+ make protocols
+ make -C build all
+}
+
+do_install() {
+ vbin build/hyprpaper
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 0faab8f3c577a33250d4acd58f63f2ea61bfdd07 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:44:06 +0100
Subject: [PATCH 08/10] New package: hyprland-nvidia-0.34.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/hyprland-nvidia/patches/nvidia.patch | 37 ++++++++++++++++++++
srcpkgs/hyprland-nvidia/template | 12 +++++++
2 files changed, 49 insertions(+)
create mode 100644 srcpkgs/hyprland-nvidia/patches/nvidia.patch
create mode 100644 srcpkgs/hyprland-nvidia/template
diff --git a/srcpkgs/hyprland-nvidia/patches/nvidia.patch b/srcpkgs/hyprland-nvidia/patches/nvidia.patch
new file mode 100644
index 0000000000000..14f901ac1da50
--- /dev/null
+++ b/srcpkgs/hyprland-nvidia/patches/nvidia.patch
@@ -0,0 +1,37 @@
+--- a/subprojects/wlroots/render/gles2/renderer.c 2023-07-18 22:52:11.582880146 +0100
++++ b/subprojects/wlroots/render/gles2/renderer.c 2023-07-18 22:57:28.564061654 +0100
+@@ -176,7 +176,7 @@
+ assert(wlr_egl_is_current(renderer->egl));
+
+ push_gles2_debug(renderer);
+- glFlush();
++ glFinish();
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ pop_gles2_debug(renderer);
+
+--- a/subprojects/wlroots/types/output/render.c 2023-07-18 22:52:11.589880106 +0100
++++ b/subprojects/wlroots/types/output/render.c 2023-07-18 22:56:10.481509606 +0100
+@@ -240,22 +240,7 @@
+ }
+
+ uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
+- struct wlr_renderer *renderer = output->renderer;
+- assert(renderer != NULL);
+-
+- if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
+- return DRM_FORMAT_INVALID;
+- }
+-
+- if (!wlr_output_attach_render(output, NULL)) {
+- return false;
+- }
+-
+- uint32_t fmt = renderer->impl->preferred_read_format(renderer);
+-
+- output_clear_back_buffer(output);
+-
+- return fmt;
++ return DRM_FORMAT_XRGB8888;
+ }
+
+ struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output,
diff --git a/srcpkgs/hyprland-nvidia/template b/srcpkgs/hyprland-nvidia/template
new file mode 100644
index 0000000000000..d7a7b8d6f4d62
--- /dev/null
+++ b/srcpkgs/hyprland-nvidia/template
@@ -0,0 +1,12 @@
+# Template file for 'hyprland-nvidia'
+pkgname=hyprland-nvidia
+version=0.34.0
+revision=1
+build_style=meta
+depends="hyprland"
+short_desc="Dynamic tiling Wayland compositor that d... (transitional dummy package)"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="https://hyprland.org/"
+changelog="https://github.com/hyprwm/Hyprland/releases"
+
From 378ee34e1c0803f09bac1e841d64025a259fc742 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:44:53 +0100
Subject: [PATCH 09/10] New package: hyprland-0.34.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/hyprland/template | 111 ++++++++++++++++++++++++++++++++++++++
1 file changed, 111 insertions(+)
create mode 100644 srcpkgs/hyprland/template
diff --git a/srcpkgs/hyprland/template b/srcpkgs/hyprland/template
new file mode 100644
index 0000000000000..dd89133194b2a
--- /dev/null
+++ b/srcpkgs/hyprland/template
@@ -0,0 +1,111 @@
+# Template file for 'hyprland'
+pkgname=hyprland
+version=0.34.0
+revision=1
+build_style=cmake
+hostmakedepends="jq git pkg-config glslang hwids meson ninja autoconf mk-configure"
+makedepends="
+ cairo-devel
+ libdisplay-info-devel
+ libdrm-devel
+ libliftoff
+ pango-devel
+ tomlplusplus
+ wlroots-devel
+ xorg-server-xwayland
+"
+depends="
+ cairo
+ glslang
+ libdisplay-info
+ libinput
+ libliftoff
+ libxcb
+ libXfixes
+ libxkbcommon
+ libdrm>=2.4.118
+ pango
+ pixman
+ polkit
+ tomlplusplus
+ Vulkan-ValidationLayers
+ vulkan-loader
+ wayland>=1.22.0
+ wayland-protocols
+ xcb-proto
+ xcb-util
+ xcb-util-errors
+ xcb-util-keysyms
+ xcb-util-renderutil
+ xcb-util-wm
+ xorg-server-xwayland
+"
+short_desc="Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="https://hyprland.org/"
+changelog="https://github.com/hyprwm/Hyprland/releases"
+distfiles="https://github.com/hyprwm/Hyprland/releases/download/v${version}/source-v${version}.tar.gz"
+checksum=234500dc726ec6cd190d95d45cf6d04766064172e75c1351ee7c49ec3405497e
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" libexecinfo-devel"
+ depends+=" libexecinfo"
+fi
+
+do_build() {
+ # build hyprland
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ cmake --no-warn-unused-cli \
+ -DCMAKE_CXX_FLAGS="-lexecinfo" \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DNO_SYSTEMD:STRING=true \
+ -S . -B ./build -G Ninja
+ else
+ cmake --no-warn-unused-cli \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DNO_SYSTEMD:STRING=true \
+ -S . -B ./build -G Ninja
+ fi
+ cmake --build ./build --config Release --target all -j${XBPS_MAKEJOBS}
+ chmod -R 777 ./build
+}
+
+do_install() {
+ vlicense LICENSE
+
+ # binaries
+ vbin build/Hyprland
+ vbin build/hyprctl/hyprctl
+ vbin build/hyprpm/hyprpm
+
+ # assets
+ vmkdir usr/share/wayland-sessions
+ vmkdir usr/share/hyprland
+ vmkdir usr/share/xdg-desktop-portal
+ install -Dm0644 assets/*.png ${DESTDIR}/usr/share/hyprland
+ vinstall assets/header.svg 644 usr/share/hyprland
+ vinstall assets/hyprland-portals.conf 644 usr/share/xdg-desktop-portal
+ vinstall example/hyprland.desktop 644 usr/share/wayland-sessions
+ vinstall example/hyprland.conf 644 usr/share/hyprland
+ vman docs/Hyprland.1
+ vman docs/hyprctl.1
+
+ # wlroots
+ vinstall subprojects/wlroots/build/libwlroots.so.13032 644 usr/lib
+
+ # headers
+ vmkdir usr/include/hyprland
+ vmkdir usr/include/hyprland/protocols
+ vmkdir usr/include/hyprland/wlroots
+ vmkdir usr/share/pkgconfig
+ find src -name '*.h*' -exec install -Dm0644 {} ${DESTDIR}/usr/include/hyprland/{} \;
+ pushd subprojects/wlroots/include
+ find . -name '*.h*' -exec install -Dm0644 {} ${DESTDIR}/usr/include/hyprland/wlroots/{} \;
+ popd
+ pushd subprojects/wlroots/build/include
+ find . -name '*.h*' -exec install -Dm0644 {} ${DESTDIR}/usr/include/hyprland/wlroots/{} \;
+ popd
+ vinstall build/hyprland.pc 644 usr/share/pkgconfig
+ install -Dm0644 protocols/*-protocol.h ${DESTDIR}/usr/include/hyprland/protocols
+}
From 9d2d868a62aa635fe6a4ef216e9c4a6b22ff18de Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:42:31 +0100
Subject: [PATCH 10/10] New package: xdg-desktop-portal-hyprland
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/xdg-desktop-portal-hyprland/template | 41 ++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-hyprland/template
diff --git a/srcpkgs/xdg-desktop-portal-hyprland/template b/srcpkgs/xdg-desktop-portal-hyprland/template
new file mode 100644
index 0000000000000..a91968460c298
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-hyprland/template
@@ -0,0 +1,41 @@
+# Template file for 'xdg-desktop-portal-hyprland'
+pkgname=xdg-desktop-portal-hyprland
+version=1.3.1
+revision=1
+build_style=cmake
+hostmakedepends="
+ pkg-config
+ wayland-devel
+ scdoc
+ git
+"
+makedepends="
+ wayland-devel
+ wayland-protocols
+ hyprland-protocols
+ pipewire-devel
+ libgbm-devel
+ libdrm-devel
+ elogind-devel
+ qt6-base-devel
+ hyprlang
+ sdbus-cpp
+"
+depends="
+ xdg-desktop-portal
+ pipewire
+ qt6-base
+ qt6-wayland
+ hyprlang
+ sdbus-cpp
+"
+short_desc="Backend of xdg-desktop-portal for Hyprland"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="MIT"
+homepage="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=60b390f326b84cc52657b735e3d7ba8f03aa3363672100dba47580984491611f
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] New package: hyprland-0.34.0
2024-01-31 18:36 [PR PATCH] New package: hyprland-0.34.0 zen0bit
@ 2024-01-31 18:37 ` zen0bit
2024-01-31 18:37 ` classabbyamp
2024-01-31 18:37 ` [PR PATCH] [Closed]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: zen0bit @ 2024-01-31 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
There is an updated pull request by zen0bit against master on the void-packages repository
https://github.com/oSoWoSo/VUR hyprland
https://github.com/void-linux/void-packages/pull/48461
New package: hyprland-0.34.0
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **NO**
#### Local build testing
- I built this PR locally for my native architecture, x64 glibc
A patch file from https://github.com/void-linux/void-packages/pull/48461.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hyprland-48461.patch --]
[-- Type: text/x-diff, Size: 21994 bytes --]
From 946175c3a631fb19f25a77ade549b5ac3edbba19 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:40:55 +0100
Subject: [PATCH 01/10] New package: tomlplusplus-3.4.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
common/shlibs | 1 +
srcpkgs/tomlplusplus/template | 16 ++++++++++++++++
2 files changed, 17 insertions(+)
create mode 100644 srcpkgs/tomlplusplus/template
diff --git a/common/shlibs b/common/shlibs
index 71f172740e5c6..d9ed3d70f1202 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4272,3 +4272,4 @@ libsqsh.so.1 libsqsh-1.3.0_1
libunicode.so.0.4 libunicode-0.4.0_1
libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
+libtomlplusplus.so.3 tomlplusplus-3.4.0_1
diff --git a/srcpkgs/tomlplusplus/template b/srcpkgs/tomlplusplus/template
new file mode 100644
index 0000000000000..de29c97769a7f
--- /dev/null
+++ b/srcpkgs/tomlplusplus/template
@@ -0,0 +1,16 @@
+# Template file for 'tomlplusplus'
+pkgname=tomlplusplus
+version=3.4.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config cmake"
+short_desc="Header-only TOML config file parser and serializer for C++17"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="MIT"
+homepage="https://marzer.github.io/tomlplusplus/"
+distfiles="https://github.com/marzer/${pkgname}/archive/refs/tags/v${version}.tar.gz"
+checksum=8517f65938a4faae9ccf8ebb36631a38c1cadfb5efa85d9a72e15b9e97d25155
+
+post_install() {
+ vlicense LICENSE
+}
From fc0a88591a402210393d5e7048d8795d87f2415a Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:41:26 +0100
Subject: [PATCH 02/10] New package: sdbus-cpp-1.4.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
common/shlibs | 1 +
srcpkgs/sdbus-cpp/patches/sysd.patch | 74 ++++++++++++++++++++++++++++
srcpkgs/sdbus-cpp/template | 15 ++++++
3 files changed, 90 insertions(+)
create mode 100644 srcpkgs/sdbus-cpp/patches/sysd.patch
create mode 100644 srcpkgs/sdbus-cpp/template
diff --git a/common/shlibs b/common/shlibs
index d9ed3d70f1202..f4eb18462148a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4273,3 +4273,4 @@ libunicode.so.0.4 libunicode-0.4.0_1
libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
libtomlplusplus.so.3 tomlplusplus-3.4.0_1
+libsdbus-c++.so.1 sdbus-cpp-1.4.0_1
diff --git a/srcpkgs/sdbus-cpp/patches/sysd.patch b/srcpkgs/sdbus-cpp/patches/sysd.patch
new file mode 100644
index 0000000000000..94f97cd6599fc
--- /dev/null
+++ b/srcpkgs/sdbus-cpp/patches/sysd.patch
@@ -0,0 +1,74 @@
+diff -upr b/CMakeLists.txt a/CMakeLists.txt
+--- b/CMakeLists.txt 2023-10-10 18:26:21.000000000 +0100
++++ a/CMakeLists.txt 2024-01-30 00:15:54.286326912 +0000
+@@ -12,7 +12,8 @@ include(GNUInstallDirs) # Installation d
+ # PERFORMING CHECKS & PREPARING THE DEPENDENCIES
+ #-------------------------------
+
+-set(LIBSYSTEMD "systemd")
++set(LIBSYSTEMD_IMPL "systemd")
++set(LIBSYSTEMD_LIB "libsystemd")
+
+ option(BUILD_LIBSYSTEMD "Build libsystemd static library and incorporate it into libsdbus-c++" OFF)
+
+@@ -23,13 +24,15 @@ if(NOT BUILD_LIBSYSTEMD)
+ message(WARNING "libsystemd not found, checking for libelogind instead")
+ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=236)
+ if(TARGET PkgConfig::Systemd)
+- set(LIBSYSTEMD "elogind")
++ set(LIBSYSTEMD_IMPL "elogind")
++ set(LIBSYSTEMD_LIB "libelogind")
+ string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION})
+ list(GET VERSION_LIST 0 Systemd_VERSION)
+ else()
+ message(WARNING "libelogind not found, checking for basu instead")
+ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu)
+- set(LIBSYSTEMD "basu")
++ set(LIBSYSTEMD_IMPL "basu")
++ set(LIBSYSTEMD_LIB "basu")
+ # https://git.sr.ht/~emersion/basu/commit/d4d185d29a26
+ set(Systemd_VERSION "240")
+ endif()
+@@ -125,8 +128,8 @@ add_library(sdbus-c++-objlib OBJECT ${SD
+ target_compile_definitions(sdbus-c++-objlib PRIVATE
+ BUILD_LIB=1
+ LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
+- SDBUS_${LIBSYSTEMD}
+- SDBUS_HEADER=<${LIBSYSTEMD}/sd-bus.h>)
++ SDBUS_${LIBSYSTEMD_IMPL}
++ SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
+ target_include_directories(sdbus-c++-objlib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
+ if(BUILD_SHARED_LIBS)
+@@ -236,6 +239,7 @@ if(BUILD_SHARED_LIBS AND (BUILD_LIBSYSTE
+ else()
+ set(PKGCONFIG_REQS "")
+ endif()
++set(PKGCONFIG_DEPS ${LIBSYSTEMD_LIB})
+ configure_file(pkgconfig/sdbus-c++.pc.in pkgconfig/sdbus-c++.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/sdbus-c++.pc
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev)
+diff -upr b/pkgconfig/sdbus-c++.pc.in a/pkgconfig/sdbus-c++.pc.in
+--- b/pkgconfig/sdbus-c++.pc.in 2023-10-10 18:26:21.000000000 +0100
++++ a/pkgconfig/sdbus-c++.pc.in 2024-01-30 00:16:40.114327313 +0000
+@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDI
+
+ Name: @PROJECT_NAME@
+ Description: C++ library on top of sd-bus, a systemd D-Bus library
+-Requires@PKGCONFIG_REQS@: @LIBSYSTEMD@
++Requires@PKGCONFIG_REQS@: @PKGCONFIG_DEPS@
+ Version: @SDBUSCPP_VERSION@
+ Libs: -L${libdir} -l@PROJECT_NAME@
+ Cflags: -I${includedir}
+diff -upr b/tests/CMakeLists.txt a/tests/CMakeLists.txt
+--- b/tests/CMakeLists.txt 2023-10-10 18:26:21.000000000 +0100
++++ a/tests/CMakeLists.txt 2024-01-30 00:16:58.895327477 +0000
+@@ -106,7 +106,7 @@ include_directories(${CMAKE_CURRENT_SOUR
+ add_executable(sdbus-c++-unit-tests ${UNITTESTS_SRCS})
+ target_compile_definitions(sdbus-c++-unit-tests PRIVATE
+ LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
+- SDBUS_HEADER=<${LIBSYSTEMD}/sd-bus.h>)
++ SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
+ target_link_libraries(sdbus-c++-unit-tests sdbus-c++-objlib GTest::gmock)
+
+ add_executable(sdbus-c++-integration-tests ${INTEGRATIONTESTS_SRCS})
diff --git a/srcpkgs/sdbus-cpp/template b/srcpkgs/sdbus-cpp/template
new file mode 100644
index 0000000000000..c56e1049a924e
--- /dev/null
+++ b/srcpkgs/sdbus-cpp/template
@@ -0,0 +1,15 @@
+# Template file for 'sdbus-cpp'
+pkgname=sdbus-cpp
+version=1.4.0
+revision=1
+build_style=cmake
+hostmakedepends="cmake meson ninja pkg-config git m4 rsync gperf"
+makedepends="libmount-devel libcap-devel libelogind elogind-devel elogind"
+depends="libmount libcap libelogind elogind-devel elogind"
+short_desc="High-level C++ D-Bus library providing powerful API in modern C++"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="LGPL-2.1-only"
+homepage="https://github.com/Kistler-Group/sdbus-cpp"
+changelog="https://github.com/Kistler-Group/${pkgname}/releases"
+distfiles="https://github.com/Kistler-Group/${pkgname}/archive/refs/tags/v${version}.tar.gz"
+checksum=ca7405c7f0f9ae3023dcfa37bc68974c4b8a1c9ea2909b970e0aedc3e8657ee6
From 43f2ebd754fb60aa8b8eae9a08c7a4dac96ad423 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 12:43:35 +0100
Subject: [PATCH 03/10] libdrm: update to 2.4.119
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/libdrm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 5c7578cef7450..ffbd8bcab7195 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
# Template file for 'libdrm'
pkgname=libdrm
-version=2.4.115
+version=2.4.119
revision=1
build_style=meson
configure_args="-Dudev=true -Dvalgrind=disabled -Dinstall-test-programs=true"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://dri.freedesktop.org/"
distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz"
-checksum=fd8b7c6e4e40d13c32ab67ace2cb6c71e08c9ca53124ff33ccadd74f604117e3
+checksum=6e798976e175f1f6e83706681644d0ce0527855b95a471479875ae3c1ef9870a
case "$XBPS_TARGET_MACHINE" in
aarch64*) configure_args+=" -Dvc4=enabled";;
From 8db5c54308a2a3623017d424fc03de819663330e Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:41:51 +0100
Subject: [PATCH 04/10] New package: libliftoff-0.4.1
Signed-off-by: zenobit <zenobit@disroot.org>
---
common/shlibs | 1 +
srcpkgs/libliftoff/template | 31 +++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 srcpkgs/libliftoff/template
diff --git a/common/shlibs b/common/shlibs
index f4eb18462148a..685e21019e311 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4274,3 +4274,4 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
libtomlplusplus.so.3 tomlplusplus-3.4.0_1
libsdbus-c++.so.1 sdbus-cpp-1.4.0_1
+libliftoff.so.0 libliftoff-0.4.1_1
diff --git a/srcpkgs/libliftoff/template b/srcpkgs/libliftoff/template
new file mode 100644
index 0000000000000..8484cc27278dc
--- /dev/null
+++ b/srcpkgs/libliftoff/template
@@ -0,0 +1,31 @@
+# Template file for 'libliftoff'
+pkgname=libliftoff
+version=0.4.1
+revision=1
+build_style=meson
+hostmakedepends="cmake ninja pkg-config"
+makedepends="libdrm-devel"
+depends="libdrm"
+short_desc="Lightweight KMS plane library"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/emersion/libliftoff"
+distfiles="https://gitlab.freedesktop.org/emersion/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=44ec5cfdd0df040d1023d4d6a48b23c31f21ce61ee2347da9e1ca244fe24dd1c
+
+do_build() {
+ cd ${wrksrc}
+ meson setup --prefix=/usr build/
+ ninja -C build
+}
+
+do_install() {
+ cd ${wrksrc}
+ meson install --destdir=$DESTDIR -C build
+ vmkdir usr/share/doc/${pkgname}
+ vinstall README.md 644 usr/share/doc/${pkgname}
+}
+
+post_install() {
+ vlicense LICENSE
+}
From e5bbb7f68d2d457878ff15155049b58d4d7b8293 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:43:13 +0100
Subject: [PATCH 05/10] New package: hyprlang-0.2.1
Signed-off-by: zenobit <zenobit@disroot.org>
---
common/shlibs | 1 +
srcpkgs/hyprlang/template | 13 +++++++++++++
2 files changed, 14 insertions(+)
create mode 100644 srcpkgs/hyprlang/template
diff --git a/common/shlibs b/common/shlibs
index 685e21019e311..bac63b4326d36 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4275,3 +4275,4 @@ libunicode_loader.so.0.4 libunicode-0.4.0_1
libtomlplusplus.so.3 tomlplusplus-3.4.0_1
libsdbus-c++.so.1 sdbus-cpp-1.4.0_1
libliftoff.so.0 libliftoff-0.4.1_1
+libhyprlang.so hyprlang-0.2.1_1
diff --git a/srcpkgs/hyprlang/template b/srcpkgs/hyprlang/template
new file mode 100644
index 0000000000000..26d798cfa161b
--- /dev/null
+++ b/srcpkgs/hyprlang/template
@@ -0,0 +1,13 @@
+# Template file for 'hyprlang'
+pkgname=hyprlang
+version=0.2.1
+revision=1
+build_style=cmake
+hostmakedepends="cmake pkg-config"
+short_desc="Official implementation library for the hypr config language"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="GPL-3.0-only"
+homepage="https://hyprland.org/hyprlang/index.html"
+changelog="https://github.com/hyprwm/${pkgname}/releases"
+distfiles="https://github.com/hyprwm/hyprlang/archive/refs/tags/v${version}.tar.gz"
+checksum=e41b265f09c1e84e03f052f584fcc086fe48ec5057191ef35917ce79e7dc4190
From 953dfc5d35d2fc0c7860d8701ac8dceb3c5d8a73 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:43:40 +0100
Subject: [PATCH 06/10] New package: hyprland-protocols-0.2
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/hyprland-protocols/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/hyprland-protocols/template
diff --git a/srcpkgs/hyprland-protocols/template b/srcpkgs/hyprland-protocols/template
new file mode 100644
index 0000000000000..b1ed9fcaf5fee
--- /dev/null
+++ b/srcpkgs/hyprland-protocols/template
@@ -0,0 +1,17 @@
+# Template file for 'hyprland-protocols'
+pkgname=hyprland-protocols
+version=0.2
+revision=1
+build_style=meson
+hostmakedepends="wayland-devel"
+makedepends="wayland-devel"
+short_desc="Wayland protocol extensions for Hyprland"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="https://github.com/hyprwm/hyprland-protocols"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=106cb189d0fbe4ec0ee11a12a17238172f4c4cd1b2b26db904df144e5c7a05f0
+
+post_install() {
+ vlicense LICENSE
+}
From 2ab5f76b21831e9ab868ea3cff38619edea9f9dd Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:42:55 +0100
Subject: [PATCH 07/10] New package: hyprpaper-0.6.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/hyprpaper/template | 43 ++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 srcpkgs/hyprpaper/template
diff --git a/srcpkgs/hyprpaper/template b/srcpkgs/hyprpaper/template
new file mode 100644
index 0000000000000..0de8e6ad26a0a
--- /dev/null
+++ b/srcpkgs/hyprpaper/template
@@ -0,0 +1,43 @@
+# Template file for 'hyprpaper'
+pkgname=hyprpaper
+version=0.6.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config wayland-devel"
+makedepends="
+ pango-devel
+ cairo-devel
+ libjpeg-turbo-devel
+ wayland-devel
+ wayland-protocols
+ wlroots-devel
+ hyprland-protocols
+ hyprlang
+ libwebp-devel
+ file-devel
+"
+short_desc="Wallpaper utility for wlroots compositors with IPC controls"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="https://github.com/hyprwm/hyprpaper"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=71d8294ffbcbaae628c4eabdcb3b7fb1974d6bed7794b787bb77934d0a3f4538
+
+do_build() {
+ cmake \
+ --no-warn-unused-cli \
+ -G "Unix Makefiles" \
+ -D CMAKE_BUILD_TYPE=Release \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -B build
+ make protocols
+ make -C build all
+}
+
+do_install() {
+ vbin build/hyprpaper
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 04b49903d94a8eadc3b8b542d6f5bb02b663f493 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:44:06 +0100
Subject: [PATCH 08/10] New package: hyprland-nvidia-0.34.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/hyprland-nvidia/patches/nvidia.patch | 37 ++++++++++++++++++++
srcpkgs/hyprland-nvidia/template | 12 +++++++
2 files changed, 49 insertions(+)
create mode 100644 srcpkgs/hyprland-nvidia/patches/nvidia.patch
create mode 100644 srcpkgs/hyprland-nvidia/template
diff --git a/srcpkgs/hyprland-nvidia/patches/nvidia.patch b/srcpkgs/hyprland-nvidia/patches/nvidia.patch
new file mode 100644
index 0000000000000..14f901ac1da50
--- /dev/null
+++ b/srcpkgs/hyprland-nvidia/patches/nvidia.patch
@@ -0,0 +1,37 @@
+--- a/subprojects/wlroots/render/gles2/renderer.c 2023-07-18 22:52:11.582880146 +0100
++++ b/subprojects/wlroots/render/gles2/renderer.c 2023-07-18 22:57:28.564061654 +0100
+@@ -176,7 +176,7 @@
+ assert(wlr_egl_is_current(renderer->egl));
+
+ push_gles2_debug(renderer);
+- glFlush();
++ glFinish();
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ pop_gles2_debug(renderer);
+
+--- a/subprojects/wlroots/types/output/render.c 2023-07-18 22:52:11.589880106 +0100
++++ b/subprojects/wlroots/types/output/render.c 2023-07-18 22:56:10.481509606 +0100
+@@ -240,22 +240,7 @@
+ }
+
+ uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
+- struct wlr_renderer *renderer = output->renderer;
+- assert(renderer != NULL);
+-
+- if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
+- return DRM_FORMAT_INVALID;
+- }
+-
+- if (!wlr_output_attach_render(output, NULL)) {
+- return false;
+- }
+-
+- uint32_t fmt = renderer->impl->preferred_read_format(renderer);
+-
+- output_clear_back_buffer(output);
+-
+- return fmt;
++ return DRM_FORMAT_XRGB8888;
+ }
+
+ struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output,
diff --git a/srcpkgs/hyprland-nvidia/template b/srcpkgs/hyprland-nvidia/template
new file mode 100644
index 0000000000000..d7a7b8d6f4d62
--- /dev/null
+++ b/srcpkgs/hyprland-nvidia/template
@@ -0,0 +1,12 @@
+# Template file for 'hyprland-nvidia'
+pkgname=hyprland-nvidia
+version=0.34.0
+revision=1
+build_style=meta
+depends="hyprland"
+short_desc="Dynamic tiling Wayland compositor that d... (transitional dummy package)"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="https://hyprland.org/"
+changelog="https://github.com/hyprwm/Hyprland/releases"
+
From 3d6dd8d7652c2f24b58a1899448a56831fe94bcb Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:44:53 +0100
Subject: [PATCH 09/10] New package: hyprland-0.34.0
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/hyprland/template | 111 ++++++++++++++++++++++++++++++++++++++
1 file changed, 111 insertions(+)
create mode 100644 srcpkgs/hyprland/template
diff --git a/srcpkgs/hyprland/template b/srcpkgs/hyprland/template
new file mode 100644
index 0000000000000..dd89133194b2a
--- /dev/null
+++ b/srcpkgs/hyprland/template
@@ -0,0 +1,111 @@
+# Template file for 'hyprland'
+pkgname=hyprland
+version=0.34.0
+revision=1
+build_style=cmake
+hostmakedepends="jq git pkg-config glslang hwids meson ninja autoconf mk-configure"
+makedepends="
+ cairo-devel
+ libdisplay-info-devel
+ libdrm-devel
+ libliftoff
+ pango-devel
+ tomlplusplus
+ wlroots-devel
+ xorg-server-xwayland
+"
+depends="
+ cairo
+ glslang
+ libdisplay-info
+ libinput
+ libliftoff
+ libxcb
+ libXfixes
+ libxkbcommon
+ libdrm>=2.4.118
+ pango
+ pixman
+ polkit
+ tomlplusplus
+ Vulkan-ValidationLayers
+ vulkan-loader
+ wayland>=1.22.0
+ wayland-protocols
+ xcb-proto
+ xcb-util
+ xcb-util-errors
+ xcb-util-keysyms
+ xcb-util-renderutil
+ xcb-util-wm
+ xorg-server-xwayland
+"
+short_desc="Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="BSD-3-Clause"
+homepage="https://hyprland.org/"
+changelog="https://github.com/hyprwm/Hyprland/releases"
+distfiles="https://github.com/hyprwm/Hyprland/releases/download/v${version}/source-v${version}.tar.gz"
+checksum=234500dc726ec6cd190d95d45cf6d04766064172e75c1351ee7c49ec3405497e
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ makedepends+=" libexecinfo-devel"
+ depends+=" libexecinfo"
+fi
+
+do_build() {
+ # build hyprland
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ cmake --no-warn-unused-cli \
+ -DCMAKE_CXX_FLAGS="-lexecinfo" \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DNO_SYSTEMD:STRING=true \
+ -S . -B ./build -G Ninja
+ else
+ cmake --no-warn-unused-cli \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DNO_SYSTEMD:STRING=true \
+ -S . -B ./build -G Ninja
+ fi
+ cmake --build ./build --config Release --target all -j${XBPS_MAKEJOBS}
+ chmod -R 777 ./build
+}
+
+do_install() {
+ vlicense LICENSE
+
+ # binaries
+ vbin build/Hyprland
+ vbin build/hyprctl/hyprctl
+ vbin build/hyprpm/hyprpm
+
+ # assets
+ vmkdir usr/share/wayland-sessions
+ vmkdir usr/share/hyprland
+ vmkdir usr/share/xdg-desktop-portal
+ install -Dm0644 assets/*.png ${DESTDIR}/usr/share/hyprland
+ vinstall assets/header.svg 644 usr/share/hyprland
+ vinstall assets/hyprland-portals.conf 644 usr/share/xdg-desktop-portal
+ vinstall example/hyprland.desktop 644 usr/share/wayland-sessions
+ vinstall example/hyprland.conf 644 usr/share/hyprland
+ vman docs/Hyprland.1
+ vman docs/hyprctl.1
+
+ # wlroots
+ vinstall subprojects/wlroots/build/libwlroots.so.13032 644 usr/lib
+
+ # headers
+ vmkdir usr/include/hyprland
+ vmkdir usr/include/hyprland/protocols
+ vmkdir usr/include/hyprland/wlroots
+ vmkdir usr/share/pkgconfig
+ find src -name '*.h*' -exec install -Dm0644 {} ${DESTDIR}/usr/include/hyprland/{} \;
+ pushd subprojects/wlroots/include
+ find . -name '*.h*' -exec install -Dm0644 {} ${DESTDIR}/usr/include/hyprland/wlroots/{} \;
+ popd
+ pushd subprojects/wlroots/build/include
+ find . -name '*.h*' -exec install -Dm0644 {} ${DESTDIR}/usr/include/hyprland/wlroots/{} \;
+ popd
+ vinstall build/hyprland.pc 644 usr/share/pkgconfig
+ install -Dm0644 protocols/*-protocol.h ${DESTDIR}/usr/include/hyprland/protocols
+}
From d3ccf12a19c06d66ca949b392620af0748d4a1d4 Mon Sep 17 00:00:00 2001
From: zenobit <zenobit@disroot.org>
Date: Wed, 31 Jan 2024 11:42:31 +0100
Subject: [PATCH 10/10] New package: xdg-desktop-portal-hyprland
Signed-off-by: zenobit <zenobit@disroot.org>
---
srcpkgs/xdg-desktop-portal-hyprland/template | 41 ++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/xdg-desktop-portal-hyprland/template
diff --git a/srcpkgs/xdg-desktop-portal-hyprland/template b/srcpkgs/xdg-desktop-portal-hyprland/template
new file mode 100644
index 0000000000000..a91968460c298
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-hyprland/template
@@ -0,0 +1,41 @@
+# Template file for 'xdg-desktop-portal-hyprland'
+pkgname=xdg-desktop-portal-hyprland
+version=1.3.1
+revision=1
+build_style=cmake
+hostmakedepends="
+ pkg-config
+ wayland-devel
+ scdoc
+ git
+"
+makedepends="
+ wayland-devel
+ wayland-protocols
+ hyprland-protocols
+ pipewire-devel
+ libgbm-devel
+ libdrm-devel
+ elogind-devel
+ qt6-base-devel
+ hyprlang
+ sdbus-cpp
+"
+depends="
+ xdg-desktop-portal
+ pipewire
+ qt6-base
+ qt6-wayland
+ hyprlang
+ sdbus-cpp
+"
+short_desc="Backend of xdg-desktop-portal for Hyprland"
+maintainer="Makrennel <makrommel@protonmail.ch>"
+license="MIT"
+homepage="https://github.com/hyprwm/xdg-desktop-portal-hyprland"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=60b390f326b84cc52657b735e3d7ba8f03aa3363672100dba47580984491611f
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: New package: hyprland-0.34.0
2024-01-31 18:36 [PR PATCH] New package: hyprland-0.34.0 zen0bit
2024-01-31 18:37 ` [PR PATCH] [Updated] " zen0bit
@ 2024-01-31 18:37 ` classabbyamp
2024-01-31 18:37 ` [PR PATCH] [Closed]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2024-01-31 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48461#issuecomment-1919708503
Comment:
see previous discussion https://github.com/void-linux/void-packages/issues/37544
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: New package: hyprland-0.34.0
2024-01-31 18:36 [PR PATCH] New package: hyprland-0.34.0 zen0bit
2024-01-31 18:37 ` [PR PATCH] [Updated] " zen0bit
2024-01-31 18:37 ` classabbyamp
@ 2024-01-31 18:37 ` classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2024-01-31 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There's a closed pull request on the void-packages repository
New package: hyprland-0.34.0
https://github.com/void-linux/void-packages/pull/48461
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **NO**
#### Local build testing
- I built this PR locally for my native architecture, x64 glibc
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-31 18:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-31 18:36 [PR PATCH] New package: hyprland-0.34.0 zen0bit
2024-01-31 18:37 ` [PR PATCH] [Updated] " zen0bit
2024-01-31 18:37 ` classabbyamp
2024-01-31 18:37 ` [PR PATCH] [Closed]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).