hyprpaper: update

This commit is contained in:
Markus Volk 2024-08-17 08:44:31 +02:00
parent c66a2e487c
commit bcf4d7c591
2 changed files with 47 additions and 21 deletions

View File

@ -0,0 +1,40 @@
From 6c00eb848ce432183c79f34f2e487f6c00a1746a Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Sat, 17 Aug 2024 08:26:30 +0200
Subject: [PATCH] CMakeLists: require native hyprwayland-scanner
This would fix a cross-compile issue where hyprwayland-scanner is pulled in for
target but needs to run on host.
Patch-Status: Submitted [https://github.com/hyprwm/hyprpaper/pull/191]
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3b0f1e..4e48137 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED)
+find_package(hyprwayland-scanner 0.4.0 REQUIRED)
pkg_check_modules(
deps
@@ -58,8 +59,7 @@ pkg_check_modules(
libjpeg
libwebp
hyprlang>=0.2.0
- hyprutils>=0.2.0
- hyprwayland-scanner>=0.4.0)
+ hyprutils>=0.2.0)
file(GLOB_RECURSE SRCFILES "src/*.cpp")
--
2.45.2

View File

@ -3,10 +3,13 @@ HOMEPAGE = "https://hyprland.org/"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=936078e4e67b0e1e1bd1e862d4ffbc25"
SRC_URI = "git://github.com/hyprwm/hyprpaper.git;protocol=https;branch=main"
SRC_URI = " \
git://github.com/hyprwm/hyprpaper.git;protocol=https;branch=main \
file://0001-CMakeLists-require-native-hyprwayland-scanner.patch \
"
PV = "0.7.0"
SRCREV = "f4abf5902f3f0c51d2aab8a521f7c1b1b08afd64"
PV = "0.7.1"
SRCREV = "808d88e5745e775763109e26502e951043349d5f"
S = "${WORKDIR}/git"
DEPENDS += " \
@ -14,6 +17,7 @@ DEPENDS += " \
file \
fribidi \
hyprlang \
hyprwayland-scanner-native \
jpeg \
libglvnd \
libwebp \
@ -27,22 +31,4 @@ RDEPENDS:${PN} = "hyprlang"
REQUIRED_DISTRO_FEATURES = "wayland"
EXTRA_OEMAKE = " \
WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
WAYLAND_PROTOCOLS=${STAGING_DATADIR}/wayland-protocols \
"
do_configure:prepend() {
sed -i -e '$ainstall(TARGETS hyprpaper)' ${S}/CMakeLists.txt
}
do_compile:prepend() {
cd ${S} && oe_runmake protocols
}
do_install() {
install -d ${D}${bindir}
install -m0755 ${B}/hyprpaper ${D}${bindir}
}
inherit cmake pkgconfig features_check