mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2025-07-29 20:20:33 +02:00
Compare commits
39 Commits
scarthgap
...
8854ac9daf
Author | SHA1 | Date | |
---|---|---|---|
8854ac9daf | |||
ea8d494f6c | |||
d7778a0666 | |||
1b1ffb7011 | |||
6db0e2c455 | |||
0cb0d2679a | |||
8facdea432 | |||
8c2ba34cd8 | |||
15e9f6be67 | |||
e9668eb1ad | |||
6ba384d13c | |||
0f8286ad14 | |||
7bbf30b8ae | |||
7ec5ad8ecf | |||
c4273bef08 | |||
f66aa06877 | |||
6f24b2b0c4 | |||
adbbcb8b3d | |||
62317d5643 | |||
799a848c5e | |||
9d5c0ae90f | |||
8d73d44880 | |||
4e675238de | |||
c65424edce | |||
7ba60e097d | |||
6a0ed0f3cd | |||
7820e7dc1d | |||
b941423a34 | |||
428604848e | |||
727d1dd3cf | |||
c4baf81b61 | |||
89e776f788 | |||
f8b1f7aace | |||
b508e211a0 | |||
e0402132c8 | |||
df2ef3f690 | |||
0cc685fb0f | |||
4127159e77 | |||
d300da1c43 |
@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "wayland"
|
||||
BBFILE_PATTERN_wayland = "^${LAYERDIR}/"
|
||||
BBFILE_PRIORITY_wayland = "5"
|
||||
|
||||
LAYERSERIES_COMPAT_wayland = "scarthgap"
|
||||
LAYERSERIES_COMPAT_wayland = "scarthgap styhead"
|
||||
|
||||
LAYERDEPENDS_wayland = " \
|
||||
core \
|
||||
|
@ -15,7 +15,7 @@ DEPENDS = " \
|
||||
hyprlang \
|
||||
libdrm \
|
||||
pipewire \
|
||||
sdbus-c++-1 \
|
||||
sdbus-c++ \
|
||||
virtual/libgbm \
|
||||
"
|
||||
|
||||
|
@ -1,6 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
./sdbus-c++-unit-tests 2>&1 && echo "PASS: sdbus-c++-unit-tests" || echo "FAIL: sdbus-c++-unit-tests"
|
||||
|
||||
./sdbus-c++-integration-tests 2>&1 && echo "PASS: sdbus-c++-integration-tests" || echo "FAIL: sdbus-c++-integration-tests"
|
@ -1,51 +0,0 @@
|
||||
SUMMARY = "sdbus-c++"
|
||||
DESCRIPTION = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API in modern C++"
|
||||
|
||||
SECTION = "libs"
|
||||
|
||||
LICENSE = "LGPL-2.1-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742"
|
||||
|
||||
inherit cmake pkgconfig systemd ptest
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-external-libsystemd', 'with-builtin-libsystemd', d)} \
|
||||
${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}"
|
||||
PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu"
|
||||
PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd"
|
||||
PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DTESTS_INSTALL_PATH=${PTEST_PATH},-DBUILD_TESTS=OFF,googletest gmock"
|
||||
|
||||
DEPENDS += "expat"
|
||||
|
||||
PV .= "+git"
|
||||
SRCREV = "7450515d0bc632b871d0d3f549ddb24783dd008f"
|
||||
SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \
|
||||
file://run-ptest"
|
||||
|
||||
EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \
|
||||
-DBUILD_DOC=ON \
|
||||
-DBUILD_DOXYGEN_DOC=OFF"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
# Link libatomic on architectures without 64bit atomics fixes
|
||||
# libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8'
|
||||
LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
|
||||
LDFLAGS:append:powerpc = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
|
||||
LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
|
||||
|
||||
do_install:append() {
|
||||
if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then
|
||||
rm -rf ${D}${sysconfdir}/dbus-1
|
||||
fi
|
||||
}
|
||||
|
||||
do_install_ptest() {
|
||||
DESTDIR='${D}' cmake_runcmake_build --target tests/install
|
||||
}
|
||||
|
||||
FILES:${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/"
|
||||
FILES:${PN}-dev += "${bindir}/sdbus-c++-xml2cpp"
|
||||
|
||||
RDEPENDS:${PN}-ptest += "dbus"
|
||||
# It adds -isystem which is spurious, no idea where it gets it from
|
||||
CCACHE_DISABLE = "1"
|
@ -2,7 +2,5 @@ do_install:append:class-target() {
|
||||
ln -sf ${bindir}/python3 ${D}${bindir}/python
|
||||
}
|
||||
|
||||
PACKAGES:prepend:class-target = "${PN}-as-python "
|
||||
FILES:${PN}-as-python = "${bindir}/python"
|
||||
RRECOMMENDS:${PN}-core:append:class-target = " ${PN}-as-python"
|
||||
FILES:${PN}:class-target += "${bindir}/python"
|
||||
|
||||
|
@ -4,15 +4,15 @@ HOMEPAGE = "https://fontawesome.com/"
|
||||
SECTION = "base/fonts"
|
||||
|
||||
LICENSE = "CC-BY-4.0 & OFL-1.1"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4186e0f8172f263065437f80932efbe1"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9b9d97c72a232b7715f2aed4bf4a4d45"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/FortAwesome/Font-Awesome.git;protocol=https;branch=6.x \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "6.4.0"
|
||||
SRCREV = "0698449d50f2b95517562295a59d414afc68b369"
|
||||
PV = "6.5.2"
|
||||
SRCREV = "c0f460dca7f7688761120415ff3c9cf7f73119be"
|
||||
|
||||
|
||||
do_install () {
|
||||
|
@ -3,13 +3,14 @@ HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
|
||||
LICENSE = "LGPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
|
||||
|
||||
SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=master"
|
||||
SRC_URI = "git://github.com/AyatanaIndicators/libdbusmenu.git;protocol=https;branch=master"
|
||||
|
||||
DEPENDS = "glib-2.0 json-glib dbus intltool-native libxslt-native"
|
||||
DEPENDS = "glib-2.0 json-glib dbus intltool-native"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "16.0.4"
|
||||
SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
|
||||
SRCREV = "4d03141aea4e2ad0f04ab73cf1d4f4bcc4a19f6c"
|
||||
|
||||
EXTRA_OECONF += "--disable-dumper --disable-gtk --disable-gtk-doc"
|
||||
|
||||
CFLAGS += "-Wno-error"
|
||||
|
@ -3,14 +3,13 @@ HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
|
||||
LICENSE = "LGPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
|
||||
|
||||
SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=master"
|
||||
|
||||
DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-native libxslt-native"
|
||||
DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-native"
|
||||
RDEPENDS:${PN} = "libdbusmenu-glib"
|
||||
|
||||
SRC_URI = "git://github.com/AyatanaIndicators/libdbusmenu.git;protocol=https;branch=master"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "16.0.4"
|
||||
SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
|
||||
SRCREV = "4d03141aea4e2ad0f04ab73cf1d4f4bcc4a19f6c"
|
||||
|
||||
EXTRA_OECONF += "--disable-dumper --disable-gtk-doc"
|
||||
|
||||
|
@ -13,5 +13,7 @@ SRCREV = "92b031749c0fe84ef5cdf895067b84a829920e25"
|
||||
|
||||
inherit meson pkgconfig
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
PACKAGECONFIG ?= ""
|
||||
PACKAGECONFIG[test] = ",,edid-decode-native"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
@ -0,0 +1,39 @@
|
||||
From 29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Thu, 21 Dec 2023 20:15:29 +0000
|
||||
Subject: [PATCH] layer.c: fix build against upcoming `gcc-14`
|
||||
(`-Werror=calloc-transposed-args`)
|
||||
|
||||
`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
|
||||
detected minor infelicity in `calloc()` API usage in `libliftoff`:
|
||||
|
||||
../layer.c: In function 'liftoff_layer_create':
|
||||
../layer.c:20:48: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in t
|
||||
ument [-Werror=calloc-transposed-args]
|
||||
20 | layer->candidate_planes = calloc(sizeof(layer->candidate_planes[0]),
|
||||
| ^
|
||||
../layer.c:20:48: note: earlier argument should specify number of elements, later size of each element
|
||||
---
|
||||
layer.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/emersion/libliftoff/-/commit/29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e]
|
||||
|
||||
diff --git a/layer.c b/layer.c
|
||||
index 73a8186..6510ea7 100644
|
||||
--- a/layer.c
|
||||
+++ b/layer.c
|
||||
@@ -17,8 +17,8 @@ liftoff_layer_create(struct liftoff_output *output)
|
||||
return NULL;
|
||||
}
|
||||
layer->output = output;
|
||||
- layer->candidate_planes = calloc(sizeof(layer->candidate_planes[0]),
|
||||
- output->device->planes_cap);
|
||||
+ layer->candidate_planes = calloc(output->device->planes_cap,
|
||||
+ sizeof(layer->candidate_planes[0]));
|
||||
if (layer->candidate_planes == NULL) {
|
||||
liftoff_log_errno(LIFTOFF_ERROR, "calloc");
|
||||
free(layer);
|
||||
--
|
||||
GitLab
|
||||
|
@ -3,7 +3,10 @@ HOMEPAGE = "https://gitlab.freedesktop.org/emersion/libliftoff"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=706cd9899438a9385250ab6773c1fa53"
|
||||
|
||||
SRC_URI = "git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=v0.4;protocol=https"
|
||||
SRC_URI = " \
|
||||
git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=v0.4;protocol=https \
|
||||
file://29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e.patch \
|
||||
"
|
||||
|
||||
DEPENDS = "libdrm"
|
||||
|
||||
|
@ -1,21 +0,0 @@
|
||||
SUMMARY = "Udis86 is a disassembler for the x86 and x86-64 class of instruction set architectures"
|
||||
HOMEPAGE = "https://github.com/vmt/udis86"
|
||||
SECTION = "libs"
|
||||
LICENSE = "BSD-2-Clause"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=ab079829a9e47b6d81dab3bf5da3f638"
|
||||
|
||||
SRC_URI = "git://github.com/canihavesomecoffee/udis86.git;protocol=https;branch=master"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.7.2"
|
||||
SRCREV = "5336633af70f3917760a6d441ff02d93477b0c86"
|
||||
|
||||
inherit autotools-brokensep pkgconfig python3native
|
||||
|
||||
EXTRA_OECONF += "--enable-shared"
|
||||
|
||||
do_configure:prepend() {
|
||||
cd ${S} && ./autogen.sh
|
||||
}
|
||||
|
||||
|
@ -25,8 +25,8 @@ RDEPENDS:${PN} = " \
|
||||
inherit setuptools3
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.12.7"
|
||||
SRCREV = "73a3cf3cbf3ea059e605c6f5f8f5c25a8e734170"
|
||||
PV = "1.12.5"
|
||||
SRCREV = "d68a0813820ddaf2beccf56d52e8906d17eea016"
|
||||
|
||||
do_configure:prepend() {
|
||||
[ -d ${S}/dist ] && mv ${S}/dist ${S}/distrib
|
||||
|
@ -19,6 +19,7 @@ SRCREV = "86f75d0856193c1ba1505f6afbc1b73d34c7093a"
|
||||
inherit go go-mod pkgconfig
|
||||
|
||||
GO_INSTALL = "${GO_IMPORT}"
|
||||
GO_LINKSHARED = ""
|
||||
|
||||
do_compile[network] = "1"
|
||||
|
||||
PRIVATE_LIBS:${PN}:append = " libstd.so"
|
||||
|
@ -12,13 +12,12 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-dock-hyprland.git"
|
||||
|
||||
SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
|
||||
|
||||
PV = "0.1.8"
|
||||
SRCREV = "08f399f4baf580274249e42d46e2d788dc28d6a8"
|
||||
PV = "0.1.7"
|
||||
SRCREV = "47f41c936b1549cee4a6345cdaa345e880b31a48"
|
||||
|
||||
inherit go go-mod pkgconfig
|
||||
|
||||
GO_INSTALL = "${GO_IMPORT}"
|
||||
GO_LINKSHARED = ""
|
||||
|
||||
do_install:append() {
|
||||
# remove precompiled x86 binaries
|
||||
@ -30,3 +29,5 @@ do_install:append() {
|
||||
}
|
||||
|
||||
do_compile[network] = "1"
|
||||
|
||||
PRIVATE_LIBS:${PN}:append = " libstd.so"
|
||||
|
@ -18,7 +18,6 @@ SRCREV = "6fdd055eaff282298ea5496d203514b5f99314a0"
|
||||
inherit go go-mod pkgconfig
|
||||
|
||||
GO_INSTALL = "${GO_IMPORT}"
|
||||
GO_LINKSHARED = ""
|
||||
|
||||
do_install:append() {
|
||||
# remove precompiled x86 binaries
|
||||
@ -27,3 +26,5 @@ do_install:append() {
|
||||
}
|
||||
|
||||
do_compile[network] = "1"
|
||||
|
||||
PRIVATE_LIBS:${PN}:append = " libstd.so"
|
||||
|
@ -19,7 +19,6 @@ SRCREV = "0cd48d1631eecb3043ee2c1fed9dfa25ca855375"
|
||||
inherit go go-mod pkgconfig
|
||||
|
||||
GO_INSTALL = "${GO_IMPORT}"
|
||||
GO_LINKSHARED = ""
|
||||
|
||||
do_install:append() {
|
||||
# remove precompiled x86 binary
|
||||
@ -28,3 +27,5 @@ do_install:append() {
|
||||
}
|
||||
|
||||
do_compile[network] = "1"
|
||||
|
||||
PRIVATE_LIBS:${PN}:append = " libstd.so"
|
||||
|
@ -15,8 +15,6 @@ inherit go go-mod pkgconfig gtk-icon-cache
|
||||
|
||||
GO_INSTALL = "${GO_IMPORT}"
|
||||
|
||||
GO_LINKSHARED = ""
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${datadir}/nwg-look/langs ${D}${datadir}/applications ${D}${datadir}/pixmaps
|
||||
install -m 0644 ${S}/src/${GO_IMPORT}/stuff/main.glade ${D}${datadir}/nwg-look
|
||||
@ -29,3 +27,4 @@ FILES:${PN} += "${datadir}"
|
||||
|
||||
do_compile[network] = "1"
|
||||
|
||||
PRIVATE_LIBS:${PN}:append = " libstd.so"
|
||||
|
@ -24,7 +24,6 @@ SRCREV = "fd8b92ad1ad0c0c7a23fc7a0be942ca0cbe7f7e0"
|
||||
inherit go go-mod pkgconfig
|
||||
|
||||
GO_INSTALL = "${GO_IMPORT}"
|
||||
GO_LINKSHARED = ""
|
||||
|
||||
do_install:append() {
|
||||
# remove precompiled x86 binary
|
||||
|
@ -20,6 +20,6 @@ RDEPENDS:${PN} = "\
|
||||
inherit setuptools3
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.9.31"
|
||||
SRCREV = "dffae7319c59ae55c515fafb150a0f10be21f3cf"
|
||||
PV = "0.9.26"
|
||||
SRCREV = "6a2e3d4ebaf22dd7490cb6f4ba2fb011048f8c63"
|
||||
|
||||
|
@ -17,6 +17,6 @@ RDEPENDS:${PN} = "\
|
||||
inherit setuptools3
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "0.5.37"
|
||||
SRCREV = "0137ed8f8c999eb72b4dd3db996d25a241e161a8"
|
||||
PV = "0.5.31"
|
||||
SRCREV = "1399f85cafd6a1746359009020bd17daa5b51419"
|
||||
|
||||
|
@ -70,7 +70,6 @@ PACKAGECONFIG ?= " \
|
||||
"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${systemd_user_unitdir}
|
||||
install -m 0644 ${WORKDIR}/waybar.service ${D}${systemd_user_unitdir}
|
||||
}
|
||||
|
||||
|
@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
|
||||
|
||||
SRC_URI = "git://github.com/hyprwm/hypridle.git;protocol=https;branch=main"
|
||||
|
||||
DEPENDS = "wayland wayland-native wayland-protocols hyprlang sdbus-c++-1"
|
||||
DEPENDS = "wayland wayland-native wayland-protocols hyprlang sdbus-c++"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRCREV = "7cff4581a3753154fc5b41f39a098fad49b777b1"
|
||||
|
18
recipes-support/hyprland/hyprland-expo.bb
Normal file
18
recipes-support/hyprland/hyprland-expo.bb
Normal file
@ -0,0 +1,18 @@
|
||||
SUMMARY = "A plugin to add expo (overlay) for workspaces."
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://../LICENSE;md5=e6458723c467506fd0c4aea3be2bcf8a"
|
||||
|
||||
require hyprland-plugins.inc
|
||||
|
||||
DEPENDS = " \
|
||||
pixman \
|
||||
libdrm \
|
||||
hyprland \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git/hyprexpo"
|
||||
|
||||
inherit meson pkgconfig
|
||||
|
||||
FILES:${PN} += "${libdir}/libhyprexpo.so"
|
||||
FILES:${PN}-dev = ""
|
@ -1,2 +1,2 @@
|
||||
SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main"
|
||||
SRCREV = "4334510363a8420f17d88505d13405d5126eabf0"
|
||||
SRCREV = "9971fec974a9d94a2a1b1d68d5ada5fc59fec053"
|
||||
|
@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b5b6bed06dd8ed68f00c26d0b4cede89"
|
||||
SRC_URI = "git://github.com/hyprwm/hyprlang.git;protocol=https;branch=main"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRCREV = "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2"
|
||||
PV = "0.5.0"
|
||||
SRCREV = "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706"
|
||||
PV = "0.5.1"
|
||||
|
||||
inherit cmake
|
||||
|
17
recipes-support/hyprland/hyprwayland-scanner_git.bb
Normal file
17
recipes-support/hyprland/hyprwayland-scanner_git.bb
Normal file
@ -0,0 +1,17 @@
|
||||
SUMMARY = "A Hyprland implementation of wayland-scanner, in and for C++."
|
||||
HOMEPAGE = "https://github.com/hyprwm/hyprwayland-scanner"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
|
||||
|
||||
SRC_URI = "git://github.com/hyprwm/hyprwayland-scanner.git;protocol=https;branch=main"
|
||||
|
||||
DEPENDS = "pugixml"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRCREV = "126dad854f22fe30e6b82cd21808e76903d90ac5"
|
||||
PV = "0.3.2"
|
||||
|
||||
inherit cmake pkgconfig
|
||||
|
||||
BBCLASSEXTEND = "native"
|
@ -136,7 +136,7 @@ S = "${WORKDIR}/git"
|
||||
inherit cargo meson rust pkgconfig
|
||||
|
||||
EXTRA_OEMESON = "\
|
||||
-Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
|
||||
-Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \
|
||||
-Dtests=false \
|
||||
-Ddepdatadir=${datadir} \
|
||||
-Donline=true \
|
||||
|
@ -260,7 +260,7 @@ S = "${WORKDIR}/git"
|
||||
inherit cargo meson rust pkgconfig
|
||||
|
||||
EXTRA_OEMESON = "\
|
||||
-Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
|
||||
-Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \
|
||||
-Dtests=false \
|
||||
-Ddepdatadir=${datadir} \
|
||||
-Donline=false \
|
||||
|
@ -10,18 +10,18 @@ manually add it to CXXFLAGS
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index d3dec0d..da0affe 100644
|
||||
index 7f7e793..c61077f 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -18,7 +18,7 @@ cap_dep = dependency('libcap', required: false)
|
||||
@@ -20,7 +20,7 @@ cap_dep = dependency('libcap', required: get_option('rt_cap'))
|
||||
epoll_dep = dependency('epoll-shim', required: false)
|
||||
glm_dep = dependency('glm')
|
||||
sdl_dep = dependency('SDL2')
|
||||
sdl_dep = dependency('SDL2', required: get_option('sdl2_backend'))
|
||||
-stb_dep = dependency('stb')
|
||||
+stb_dep = dependency('stb', required: false)
|
||||
avif_dep = dependency('libavif', version: '>=1.0.0', required: get_option('avif_screenshots'))
|
||||
|
||||
wlroots_dep = dependency(
|
||||
'wlroots',
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
@ -11,18 +11,18 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 7af6884..e67146a 100644
|
||||
index 04bd472..345a2a7 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -62,7 +62,7 @@ endif
|
||||
add_project_arguments(
|
||||
'-DHAVE_PIPEWIRE=@0@'.format(pipewire_dep.found().to_int()),
|
||||
'-DHAVE_OPENVR=@0@'.format(openvr_dep.found().to_int()),
|
||||
@@ -67,7 +67,7 @@ add_project_arguments(
|
||||
|
||||
if hwdata_dep.found()
|
||||
add_project_arguments(
|
||||
- '-DHWDATA_PNP_IDS="@0@"'.format(hwdata_dep.get_variable('pkgdatadir') / 'pnp.ids'),
|
||||
+ '-DHWDATA_PNP_IDS="@0@"'.format(hwdata_dep.get_variable('datadir') / 'hwdata' / 'pnp.ids'),
|
||||
language: 'cpp',
|
||||
)
|
||||
|
||||
)
|
||||
else
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
@ -10,11 +10,10 @@ DEPENDS += " \
|
||||
glm \
|
||||
glslang-native \
|
||||
hwdata \
|
||||
libei \
|
||||
libdecor \
|
||||
libdisplay-info \
|
||||
libinput \
|
||||
libliftoff \
|
||||
libsdl2 \
|
||||
libdrm \
|
||||
libx11\
|
||||
libxcomposite \
|
||||
libxcursor \
|
||||
@ -37,20 +36,22 @@ RDEPENDS:${PN} = "xwayland hwdata"
|
||||
|
||||
CXXFLAGS:append = " -I${STAGING_INCDIR}/stb"
|
||||
|
||||
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl pipewire', d)} openvr"
|
||||
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl pipewire', d)} rt_cap avif_screenshots openvr sdl2_backend drm_backend"
|
||||
PACKAGECONFIG[openvr] = "-Denable_openvr_support=true,-Denable_openvr_support=false"
|
||||
PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
|
||||
PACKAGECONFIG[opengl] = ",,mesa-glut"
|
||||
PACKAGECONFIG[avif_screenshots] = "-Davif_screenshots=enabled,-Davif_screenshots=disabled,libavif"
|
||||
PACKAGECONFIG[rt_cap] = "-Drt_cap=enabled,-Drt_cap=disabled,libcap"
|
||||
PACKAGECONFIG[sdl2_backend] = "-Dsdl2_backend=enabled,-Dsdl2_backend=disabled,libsdl2"
|
||||
PACKAGECONFIG[drm_backend] = "-Ddrm_backend=enabled,-Ddrm_backend=disabled,libdrm"
|
||||
|
||||
|
||||
SRC_URI = " \
|
||||
gitsm://github.com/ValveSoftware/gamescope.git;branch=jupiter-3.5;protocol=https \
|
||||
file://0001-meson.build-dont-leak-buildpath.patch \
|
||||
SRC_URI = " \
|
||||
gitsm://github.com/ValveSoftware/gamescope.git;branch=jupiter-3.6;protocol=https \
|
||||
file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
|
||||
file://0001-meson.build-dont-leak-buildpath.patch \
|
||||
"
|
||||
|
||||
SRCREV = "c59b09dbc0c100f604ae603c5f0026c42c62d49c"
|
||||
PV = "3.13.16.9"
|
||||
SRCREV = "f6cd671cb4ee139f470fc55b580cc6ff3a50384b"
|
||||
PV = "3.14.6"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
@ -1,52 +0,0 @@
|
||||
|
||||
SUMMARY = "A Wayland WM"
|
||||
HOMEPAGE = "https://hyprland.org/"
|
||||
SECTION = "graphics"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=a08367f3a4cd5301ba8b88eded36b8fd"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "wayland opengl"
|
||||
|
||||
DEPENDS += " \
|
||||
virtual/egl \
|
||||
cairo \
|
||||
wayland \
|
||||
wayland-native \
|
||||
jq-native \
|
||||
pango \
|
||||
pixman \
|
||||
libdrm \
|
||||
libxkbcommon \
|
||||
libinput \
|
||||
udis86 \
|
||||
wlroots-0.17 \
|
||||
"
|
||||
|
||||
RRECOMMENDS:${PN} ?= " \
|
||||
foot \
|
||||
jq \
|
||||
grim \
|
||||
slurp \
|
||||
wl-clipboard \
|
||||
hyprland-contrib \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
|
||||
file://meson-build.patch \
|
||||
"
|
||||
|
||||
SRCREV = "9afdd61adeaf413afbe853dbc5fdf6853c8bde21"
|
||||
PV = "0.32.3"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit meson pkgconfig features_check
|
||||
|
||||
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)}"
|
||||
|
||||
PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled"
|
||||
PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland"
|
||||
PACKAGECONFIG[legacy_renderer] = "-Dlegacy_renderer=enabled,-Dlegacy_renderer=disabled"
|
||||
|
||||
FILES:${PN} += "${datadir}"
|
@ -1,60 +0,0 @@
|
||||
From 19e0c04a57bfb3677caf1ac8c22527b066666a95 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Volk <f_l_k@t-online.de>
|
||||
Date: Sun, 23 Jul 2023 10:19:54 +0200
|
||||
Subject: [PATCH] hyprland: update
|
||||
|
||||
---
|
||||
meson.build | 17 +----------------
|
||||
src/meson.build | 6 +++---
|
||||
2 files changed, 4 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 1d2c7f9f..c5ef4e67 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
|
||||
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
||||
endif
|
||||
|
||||
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
|
||||
-have_xwlr = wlroots.get_variable('features').get('xwayland')
|
||||
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
||||
-
|
||||
-cmake = import('cmake')
|
||||
-udis = cmake.subproject('udis86')
|
||||
-udis86 = udis.dependency('libudis86')
|
||||
-
|
||||
-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
|
||||
+if get_option('xwayland').disabled()
|
||||
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
||||
endif
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 0af864b9..38723b8c 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -9,16 +9,16 @@ executable('Hyprland', src,
|
||||
server_protos,
|
||||
dependency('wayland-server'),
|
||||
dependency('wayland-client'),
|
||||
- wlroots.get_variable('wlroots'),
|
||||
+ dependency('wlroots'),
|
||||
dependency('cairo'),
|
||||
dependency('libdrm'),
|
||||
dependency('egl'),
|
||||
dependency('xkbcommon'),
|
||||
dependency('libinput'),
|
||||
- xcb_dep,
|
||||
+ dependency('xcb', required: get_option('xwayland')),
|
||||
backtrace_dep,
|
||||
systemd_dep,
|
||||
- udis86,
|
||||
+ dependency('udis86'),
|
||||
|
||||
dependency('pixman-1'),
|
||||
dependency('gl', 'opengl'),
|
@ -12,17 +12,19 @@ DEPENDS += " \
|
||||
hyprcursor \
|
||||
hyprlang \
|
||||
jq-native \
|
||||
hwdata-native \
|
||||
libdisplay-info \
|
||||
libliftoff \
|
||||
libdrm \
|
||||
libinput \
|
||||
libxkbcommon \
|
||||
pango \
|
||||
pixman \
|
||||
seatd \
|
||||
tomlplusplus \
|
||||
udis86 \
|
||||
virtual/egl \
|
||||
wayland \
|
||||
wayland-native \
|
||||
wlroots \
|
||||
"
|
||||
|
||||
RRECOMMENDS:${PN} ?= " \
|
||||
@ -34,10 +36,7 @@ RRECOMMENDS:${PN} ?= " \
|
||||
hyprland-contrib \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b \
|
||||
file://meson-build.patch \
|
||||
"
|
||||
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b"
|
||||
|
||||
SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91"
|
||||
S = "${WORKDIR}/git"
|
||||
|
@ -1,71 +0,0 @@
|
||||
From 596cf2f2e1cbe68ce5673711d84cbfd576d40db1 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Volk <f_l_k@t-online.de>
|
||||
Date: Sun, 23 Jul 2023 10:19:54 +0200
|
||||
Subject: [PATCH] hyprland: update
|
||||
|
||||
---
|
||||
meson.build | 17 +----------------
|
||||
src/meson.build | 6 +++---
|
||||
2 files changed, 4 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 81d6e403..04503a3c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
|
||||
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
||||
endif
|
||||
|
||||
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
|
||||
-have_xwlr = wlroots.get_variable('features').get('xwayland')
|
||||
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
||||
-
|
||||
-cmake = import('cmake')
|
||||
-udis = cmake.subproject('udis86')
|
||||
-udis86 = udis.dependency('libudis86')
|
||||
-
|
||||
-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
|
||||
+if get_option('xwayland').disabled()
|
||||
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
||||
endif
|
||||
|
||||
@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
|
||||
add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
|
||||
endif
|
||||
|
||||
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
|
||||
-
|
||||
globber = run_command('find', 'src', '-name', '*.h*', check: true)
|
||||
headers = globber.stdout().strip().split('\n')
|
||||
foreach file : headers
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 59771fcf..a77349c4 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -9,7 +9,7 @@ executable('Hyprland', src,
|
||||
server_protos,
|
||||
dependency('wayland-server'),
|
||||
dependency('wayland-client'),
|
||||
- wlroots.get_variable('wlroots'),
|
||||
+ dependency('wlroots'),
|
||||
dependency('cairo'),
|
||||
dependency('hyprcursor'),
|
||||
dependency('hyprlang', version: '>= 0.3.2'),
|
||||
@@ -17,10 +17,10 @@ executable('Hyprland', src,
|
||||
dependency('egl'),
|
||||
dependency('xkbcommon'),
|
||||
dependency('libinput'),
|
||||
- xcb_dep,
|
||||
+ dependency('xcb', required: get_option('xwayland')),
|
||||
backtrace_dep,
|
||||
systemd_dep,
|
||||
- udis86,
|
||||
+ dependency('udis86'),
|
||||
|
||||
dependency('pixman-1'),
|
||||
dependency('gl', 'opengl'),
|
@ -12,17 +12,20 @@ DEPENDS += " \
|
||||
hyprcursor \
|
||||
hyprlang \
|
||||
jq-native \
|
||||
hwdata-native \
|
||||
libdisplay-info \
|
||||
libliftoff \
|
||||
libdrm \
|
||||
libinput \
|
||||
libxkbcommon \
|
||||
pango \
|
||||
pixman \
|
||||
seatd \
|
||||
tomlplusplus \
|
||||
udis86 \
|
||||
virtual/egl \
|
||||
wayland \
|
||||
wayland-native \
|
||||
wlroots \
|
||||
hyprwayland-scanner-native \
|
||||
"
|
||||
|
||||
RRECOMMENDS:${PN} ?= " \
|
||||
@ -34,13 +37,10 @@ RRECOMMENDS:${PN} ?= " \
|
||||
hyprland-contrib \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
|
||||
file://meson-build.patch \
|
||||
"
|
||||
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
|
||||
|
||||
SRCREV = "3875679755014997776e091ff8903acfb311dd2f"
|
||||
PV = "0.38.0"
|
||||
SRCREV = "d86eec332fb3843d24b1f79ecc36f792b5d04773"
|
||||
PV = "0.40-dev"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit meson pkgconfig features_check
|
||||
|
@ -39,7 +39,7 @@ RRECOMMENDS:${PN} ?= " \
|
||||
|
||||
SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=master"
|
||||
|
||||
SRCREV = "2b08e79061db583d0ffe46114c48f958a0d3e6ed"
|
||||
SRCREV = "087226d997c15f4df30542778854999c632642a3"
|
||||
PV = "1.10-dev"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
@ -39,7 +39,7 @@ PACKAGECONFIG ?= " \
|
||||
"
|
||||
|
||||
SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https"
|
||||
SRCREV = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"
|
||||
SRCREV = "b1b34cd6653d51f3bf8e331e6ae7b39290ae820e"
|
||||
PV = "0.18.0-dev"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
Reference in New Issue
Block a user