31 Commits

Author SHA1 Message Date
25850e9720 Merge pull request 'squeekboard: set correct rust target' (#17) from gyorgysarvari/meta-wayland:scarthgap into scarthgap
Reviewed-on: https://codeberg.org/flk/meta-wayland/pulls/17
2025-06-26 15:35:55 +02:00
97b69bf921 squeekboard: set correct rust target
$HOST_SYS Rust target is not recognized by Rust provided by oe-core and
meta-lts-mixins layers, the correct one should be $RUST_HOST_SYS.

Fixes the following compilation error:

  error: Error loading target specification: Could not find specification
         for target "aarch64-poky-linux". Run `rustc --print target-list`
         for a list of built-in targets

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
2025-06-26 13:20:27 +02:00
cacc737e24 python3: move python link to its own python3-as-python package
the FILES is overriden in the python anonymous function for dynamic packages
(python3-core)

causing the following error:

```log
ERROR: python3-3.12.8-r0 do_package: QA Issue: python3: Files/directories were installed but not shipped in any package:
  /usr/bin/python
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
python3: 1 installed and not shipped files. [installed-vs-shipped]
ERROR: python3-3.12.8-r0 do_package: Fatal QA errors were found, failing task.
```

it is safer to make a new package split and add a RRECOMMENDS to python-core
on it

fixes:
https://codeberg.org/flk/meta-wayland/issues/14

Signed-off-by: Ludovic Jozeau <ludovic.jozeau@scle.fr>
2025-04-24 05:11:22 +02:00
43e8c701b7 python3: move python link to python3-core package
fixes:
https://codeberg.org/flk/meta-wayland/issues/13
2025-04-22 14:50:19 +02:00
6ff79b3423 waybar: create ${D}${systemd_user_unitdir}
This should fix:
https://codeberg.org/flk/meta-wayland/issues/8
2025-02-15 15:06:46 +01:00
34994e171f libdbusmenu: update SRC_URI 2024-12-10 18:58:25 +01:00
104508c0bb recipes-extended/libdbusmenu: add libxslt-native dependencies
This dependency will provide xsltproc tool needed at compile time

Signed-off-by: Dylan Laduranty <dylan.laduranty@mesotic.com>
2024-07-11 18:04:00 +02:00
776605767f nwg-shell-config: update 2024-05-07 23:36:20 +02:00
bc0c5fba4d nwg-panel: update 2024-05-07 23:36:20 +02:00
d97f446d4c nwg-menu: update 2024-05-07 23:36:20 +02:00
ed68fa152c nwg-drawer: fix go build 2024-05-07 23:36:20 +02:00
e9653b3a0d nwg-dock-hyprland: update 2024-05-07 23:36:20 +02:00
49e7dfe426 nwg-dock: update 2024-05-07 23:36:20 +02:00
6ac82432c3 nwg-bar: update 2024-05-07 23:36:20 +02:00
ab3af140f8 azote: update 2024-05-07 23:36:20 +02:00
34b4457a73 nwg-look: dont link shared
If using module mode we cant link shared

This fixes:
| link: duplicated definition of symbol github.com/gotk3/gotk3/glib.(*Object).Unref-fm.(*Object).Unref.func1, from github.com/gotk3/gotk3/gtk and github.com/gotk3/gotk3/gdk
2024-05-05 19:43:47 +02:00
e96711817f Add recipe for sdbus-c++-1
We still need it. At least hyprland has not yet been ported to sdbus-c++-2
2024-05-02 20:00:21 +02:00
280159e855 playerctl: add missing glib-2.0 dependency 2024-04-30 09:16:36 +02:00
0bba89ca28 hypridle: update 2024-04-19 18:36:21 +02:00
a60828deac yambar: update 2024-04-17 19:21:57 +02:00
748b283f86 fuzzel: update 2024-04-17 19:21:41 +02:00
90e4fcea4b fnott: update 2024-04-17 19:21:17 +02:00
b2e51c2511 foot: update 2024-04-17 19:09:23 +02:00
66b21e8d2d wlroots-0.17: update 2024-04-14 19:00:57 +02:00
d0ed62eafc gamescope: roll back to stable 2024-04-14 18:59:32 +02:00
9c2470a7f9 foot: update 2024-04-11 06:37:40 +02:00
0265face9c fcft: update 2024-04-11 06:37:34 +02:00
c0f1053fd7 hyprlock: update 2024-04-10 16:16:56 +02:00
282a7fa099 hyprcursor: update 2024-04-10 15:53:43 +02:00
0911232acc hyprcursors: update 2024-04-07 20:04:20 +02:00
5b4b4b9a3d hyprland: add recipe for 0.38
update to 0.38.1
2024-04-07 20:04:13 +02:00
33 changed files with 281 additions and 155 deletions

View File

@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "wayland"
BBFILE_PATTERN_wayland = "^${LAYERDIR}/" BBFILE_PATTERN_wayland = "^${LAYERDIR}/"
BBFILE_PRIORITY_wayland = "5" BBFILE_PRIORITY_wayland = "5"
LAYERSERIES_COMPAT_wayland = "scarthgap styhead" LAYERSERIES_COMPAT_wayland = "scarthgap"
LAYERDEPENDS_wayland = " \ LAYERDEPENDS_wayland = " \
core \ core \

View File

@ -2,5 +2,7 @@ do_install:append:class-target() {
ln -sf ${bindir}/python3 ${D}${bindir}/python ln -sf ${bindir}/python3 ${D}${bindir}/python
} }
FILES:${PN}:class-target += "${bindir}/python" PACKAGES:prepend:class-target = "${PN}-as-python "
FILES:${PN}-as-python = "${bindir}/python"
RRECOMMENDS:${PN}-core:append:class-target = " ${PN}-as-python"

View File

@ -13,6 +13,6 @@ RDEPENDS:${PN} = "python-i3ipc"
inherit setuptools3 inherit setuptools3
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "1.9.2" PV = "1.8"
SRCREV = "d31aad311cd9280517e429eb397915fb4ff21a40" SRCREV = "31207c0ca44ed846763dc6df55316ee7a7d047a8"

View File

@ -4,15 +4,15 @@ HOMEPAGE = "https://fontawesome.com/"
SECTION = "base/fonts" SECTION = "base/fonts"
LICENSE = "CC-BY-4.0 & OFL-1.1" LICENSE = "CC-BY-4.0 & OFL-1.1"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9b9d97c72a232b7715f2aed4bf4a4d45" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4186e0f8172f263065437f80932efbe1"
SRC_URI = " \ SRC_URI = " \
git://github.com/FortAwesome/Font-Awesome.git;protocol=https;branch=6.x \ git://github.com/FortAwesome/Font-Awesome.git;protocol=https;branch=6.x \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "6.5.2" PV = "6.4.0"
SRCREV = "c0f460dca7f7688761120415ff3c9cf7f73119be" SRCREV = "0698449d50f2b95517562295a59d414afc68b369"
do_install () { do_install () {

View File

@ -3,14 +3,13 @@ HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
LICENSE = "LGPL-3.0-only" LICENSE = "LGPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
SRC_URI = "git://github.com/AyatanaIndicators/libdbusmenu.git;protocol=https;branch=master" SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=master"
DEPENDS = "glib-2.0 json-glib dbus intltool-native" DEPENDS = "glib-2.0 json-glib dbus intltool-native libxslt-native"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "16.0.4" PV = "16.0.4"
SRCREV = "4d03141aea4e2ad0f04ab73cf1d4f4bcc4a19f6c" SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
EXTRA_OECONF += "--disable-dumper --disable-gtk --disable-gtk-doc" EXTRA_OECONF += "--disable-dumper --disable-gtk --disable-gtk-doc"
CFLAGS += "-Wno-error" CFLAGS += "-Wno-error"

View File

@ -3,13 +3,14 @@ HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
LICENSE = "LGPL-3.0-only" LICENSE = "LGPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-native" 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"
RDEPENDS:${PN} = "libdbusmenu-glib" RDEPENDS:${PN} = "libdbusmenu-glib"
SRC_URI = "git://github.com/AyatanaIndicators/libdbusmenu.git;protocol=https;branch=master"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "16.0.4" PV = "16.0.4"
SRCREV = "4d03141aea4e2ad0f04ab73cf1d4f4bcc4a19f6c" SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
EXTRA_OECONF += "--disable-dumper --disable-gtk-doc" EXTRA_OECONF += "--disable-dumper --disable-gtk-doc"

View File

@ -13,7 +13,5 @@ SRCREV = "92b031749c0fe84ef5cdf895067b84a829920e25"
inherit meson pkgconfig inherit meson pkgconfig
PACKAGECONFIG ?= ""
PACKAGECONFIG[test] = ",,edid-decode-native"
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"

View File

@ -1,39 +0,0 @@
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

View File

@ -3,10 +3,7 @@ HOMEPAGE = "https://gitlab.freedesktop.org/emersion/libliftoff"
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=706cd9899438a9385250ab6773c1fa53" LIC_FILES_CHKSUM = "file://LICENSE;md5=706cd9899438a9385250ab6773c1fa53"
SRC_URI = " \ SRC_URI = "git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=v0.4;protocol=https"
git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=v0.4;protocol=https \
file://29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e.patch \
"
DEPENDS = "libdrm" DEPENDS = "libdrm"

View File

@ -0,0 +1,21 @@
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
}

View File

@ -17,8 +17,8 @@ RDEPENDS:${PN} = "\
inherit setuptools3 inherit setuptools3
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "0.3.18" PV = "0.3.16"
SRCREV = "7d605472029f7b7f07766465329b739a6f2adf7b" SRCREV = "f785c41bdb2e979efee516b6da2d83f2a3296672"
do_install:append() { do_install:append() {
install -d ${D}${datadir}/pixmaps ${D}${datadir}/applications install -d ${D}${datadir}/pixmaps ${D}${datadir}/applications

View File

@ -15,8 +15,8 @@ SRC_URI = " \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
PV = "0.10.3" PV = "0.10.0"
SRCREV = "e627879b1656ec7352e6382f80ee16d90b377aaf" SRCREV = "cc084f5f86776b3b5b9708a99bed49b991eb48af"
DEPENDS += " \ DEPENDS += " \
date \ date \
@ -70,6 +70,7 @@ PACKAGECONFIG ?= " \
" "
do_install:append() { do_install:append() {
install -d ${D}${systemd_user_unitdir}
install -m 0644 ${WORKDIR}/waybar.service ${D}${systemd_user_unitdir} install -m 0644 ${WORKDIR}/waybar.service ${D}${systemd_user_unitdir}
} }

View File

@ -1,18 +0,0 @@
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 = ""

View File

@ -1,2 +1,2 @@
SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main" SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main"
SRCREV = "fd133914bf1921db2a26627698f914478f6a9471" SRCREV = "4334510363a8420f17d88505d13405d5126eabf0"

View File

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b5b6bed06dd8ed68f00c26d0b4cede89"
SRC_URI = "git://github.com/hyprwm/hyprlang.git;protocol=https;branch=main" SRC_URI = "git://github.com/hyprwm/hyprlang.git;protocol=https;branch=main"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRCREV = "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706" SRCREV = "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2"
PV = "0.5.1" PV = "0.5.0"
inherit cmake inherit cmake

View File

@ -5,8 +5,8 @@ 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"
PV = "0.7.0" PV = "0.6.0"
SRCREV = "03cd362f494d6771b4f524f4fafbc28bade00c8e" SRCREV = "1013a80608891f120184aa7c1a7cfde04bfc96fb"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
DEPENDS += " \ DEPENDS += " \

View File

@ -21,7 +21,7 @@ DEPENDS = " \
wayland \ wayland \
wayland-native \ wayland-native \
wayland-protocols \ wayland-protocols \
virtual/libgles3 \ wlroots \
" "
RDEPENDS:${PN} = "wl-clipboard" RDEPENDS:${PN} = "wl-clipboard"

View File

@ -1,17 +0,0 @@
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 = "1270ebaa539e56d61b708c24b072b09cbbd3a828"
PV = "0.3.4"
inherit cmake pkgconfig
BBCLASSEXTEND = "native"

View File

@ -136,7 +136,7 @@ S = "${WORKDIR}/git"
inherit cargo meson rust pkgconfig inherit cargo meson rust pkgconfig
EXTRA_OEMESON = "\ EXTRA_OEMESON = "\
-Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \ -Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
-Dtests=false \ -Dtests=false \
-Ddepdatadir=${datadir} \ -Ddepdatadir=${datadir} \
-Donline=true \ -Donline=true \

View File

@ -260,7 +260,7 @@ S = "${WORKDIR}/git"
inherit cargo meson rust pkgconfig inherit cargo meson rust pkgconfig
EXTRA_OEMESON = "\ EXTRA_OEMESON = "\
-Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \ -Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
-Dtests=false \ -Dtests=false \
-Ddepdatadir=${datadir} \ -Ddepdatadir=${datadir} \
-Donline=false \ -Donline=false \

View File

@ -10,18 +10,18 @@ manually add it to CXXFLAGS
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/meson.build b/src/meson.build diff --git a/src/meson.build b/src/meson.build
index 7f7e793..c61077f 100644 index d3dec0d..da0affe 100644
--- a/src/meson.build --- a/src/meson.build
+++ b/src/meson.build +++ b/src/meson.build
@@ -20,7 +20,7 @@ cap_dep = dependency('libcap', required: get_option('rt_cap')) @@ -18,7 +18,7 @@ cap_dep = dependency('libcap', required: false)
epoll_dep = dependency('epoll-shim', required: false) epoll_dep = dependency('epoll-shim', required: false)
glm_dep = dependency('glm') glm_dep = dependency('glm')
sdl_dep = dependency('SDL2', required: get_option('sdl2_backend')) sdl_dep = dependency('SDL2')
-stb_dep = dependency('stb') -stb_dep = dependency('stb')
+stb_dep = dependency('stb', required: false) +stb_dep = dependency('stb', required: false)
avif_dep = dependency('libavif', version: '>=1.0.0', required: get_option('avif_screenshots'))
wlroots_dep = dependency( wlroots_dep = dependency(
'wlroots',
-- --
2.43.0 2.43.0

View File

@ -11,18 +11,18 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 04bd472..345a2a7 100644 index 7af6884..e67146a 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -67,7 +67,7 @@ add_project_arguments( @@ -62,7 +62,7 @@ endif
add_project_arguments(
if hwdata_dep.found() '-DHAVE_PIPEWIRE=@0@'.format(pipewire_dep.found().to_int()),
add_project_arguments( '-DHAVE_OPENVR=@0@'.format(openvr_dep.found().to_int()),
- '-DHWDATA_PNP_IDS="@0@"'.format(hwdata_dep.get_variable('pkgdatadir') / 'pnp.ids'), - '-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'), + '-DHWDATA_PNP_IDS="@0@"'.format(hwdata_dep.get_variable('datadir') / 'hwdata' / 'pnp.ids'),
language: 'cpp', language: 'cpp',
) )
else
-- --
2.43.0 2.43.0

View File

@ -10,10 +10,11 @@ DEPENDS += " \
glm \ glm \
glslang-native \ glslang-native \
hwdata \ hwdata \
libei \
libdecor \
libdisplay-info \ libdisplay-info \
libinput \ libinput \
libliftoff \
libsdl2 \
libdrm \
libx11\ libx11\
libxcomposite \ libxcomposite \
libxcursor \ libxcursor \
@ -36,23 +37,20 @@ RDEPENDS:${PN} = "xwayland hwdata"
CXXFLAGS:append = " -I${STAGING_INCDIR}/stb" CXXFLAGS:append = " -I${STAGING_INCDIR}/stb"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pipewire', d)} rt_cap avif_screenshots openvr input_emulation drm_backend sdl2_backend" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl pipewire', d)} openvr"
PACKAGECONFIG[benchmark] = "-Dbenchmark=enabled,-Dbenchmark=disabled"
PACKAGECONFIG[input_emulation] = "-Dinput_emulation=enabled,-Dinput_emulation=disabled,libei"
PACKAGECONFIG[openvr] = "-Denable_openvr_support=true,-Denable_openvr_support=false" PACKAGECONFIG[openvr] = "-Denable_openvr_support=true,-Denable_openvr_support=false"
PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire" PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
PACKAGECONFIG[avif_screenshots] = "-Davif_screenshots=enabled,-Davif_screenshots=disabled,libavif" PACKAGECONFIG[opengl] = ",,mesa-glut"
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.6;protocol=https \ SRC_URI = " \
file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \ gitsm://github.com/ValveSoftware/gamescope.git;branch=jupiter-3.5;protocol=https \
file://0001-meson.build-dont-leak-buildpath.patch \ file://0001-meson.build-dont-leak-buildpath.patch \
file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
" "
SRCREV = "97a2e038105e43fc7b4c78585eefc639ad95319f"
PV = "3.14.15" SRCREV = "c59b09dbc0c100f604ae603c5f0026c42c62d49c"
PV = "3.13.16.9"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

View File

@ -0,0 +1,52 @@
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}"

View File

@ -0,0 +1,60 @@
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'),

View File

@ -12,19 +12,17 @@ DEPENDS += " \
hyprcursor \ hyprcursor \
hyprlang \ hyprlang \
jq-native \ jq-native \
hwdata-native \
libdisplay-info \
libliftoff \
libdrm \ libdrm \
libinput \ libinput \
libxkbcommon \ libxkbcommon \
pango \ pango \
pixman \ pixman \
seatd \
tomlplusplus \ tomlplusplus \
udis86 \
virtual/egl \ virtual/egl \
wayland \ wayland \
wayland-native \ wayland-native \
wlroots \
" "
RRECOMMENDS:${PN} ?= " \ RRECOMMENDS:${PN} ?= " \
@ -36,7 +34,10 @@ RRECOMMENDS:${PN} ?= " \
hyprland-contrib \ hyprland-contrib \
" "
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b" SRC_URI = " \
gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b \
file://meson-build.patch \
"
SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91" SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

View File

@ -0,0 +1,71 @@
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'),

View File

@ -12,21 +12,17 @@ DEPENDS += " \
hyprcursor \ hyprcursor \
hyprlang \ hyprlang \
jq-native \ jq-native \
hwdata-native \
libdisplay-info \
libliftoff \
libdrm \ libdrm \
libinput \ libinput \
libxkbcommon \ libxkbcommon \
pango \ pango \
pixman \ pixman \
seatd \
tomlplusplus \ tomlplusplus \
util-linux-libuuid \ udis86 \
virtual/egl \ virtual/egl \
wayland \ wayland \
wayland-native \ wayland-native \
hyprwayland-scanner-native \ wlroots \
" "
RRECOMMENDS:${PN} ?= " \ RRECOMMENDS:${PN} ?= " \
@ -38,10 +34,13 @@ RRECOMMENDS:${PN} ?= " \
hyprland-contrib \ hyprland-contrib \
" "
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main" SRC_URI = " \
gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
file://meson-build.patch \
"
SRCREV = "cba1ade848feac44b2eda677503900639581c3f4" SRCREV = "3875679755014997776e091ff8903acfb311dd2f"
PV = "0.40" PV = "0.38.0"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit meson pkgconfig features_check inherit meson pkgconfig features_check

View File

@ -14,9 +14,9 @@ DEPENDS += " \
gtk+3 \ gtk+3 \
" "
SRC_URI = "git://github.com/labwc/labwc-tweaks-gtk.git;protocol=https;branch=master" SRC_URI = "git://github.com/labwc/labwc-tweaks.git;protocol=https;branch=master"
SRCREV = "67adbedd610a1b44e7ba667ae72a5c9b07105119" SRCREV = "1604f64cc62e4800ee04a6e1c323a48ee8140d83"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit meson pkgconfig features_check inherit meson pkgconfig features_check

View File

@ -28,14 +28,14 @@ RRECOMMENDS:${PN} ?= " \
slurp \ slurp \
wl-clipboard \ wl-clipboard \
labwc-menu-generator \ labwc-menu-generator \
labwc-tweaks-gtk \ labwc-tweaks \
swaybg \ swaybg \
" "
SRC_URI = "git://github.com/labwc/labwc.git;protocol=https;branch=master" SRC_URI = "git://github.com/labwc/labwc.git;protocol=https;branch=master"
SRCREV = "b41af54a1bd7d9270d19de4c9a2b77d882cf3ede" SRCREV = "59014e507175971e84af2b846b6b3a2c232cce7f"
PV = "0.7.2" PV = "0.7.1"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit meson pkgconfig features_check gettext inherit meson pkgconfig features_check gettext

View File

@ -39,7 +39,7 @@ RRECOMMENDS:${PN} ?= " \
SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=master" SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=master"
SRCREV = "dcdb72757a5ec591c692df5e96c57c51758dbd8f" SRCREV = "2b08e79061db583d0ffe46114c48f958a0d3e6ed"
PV = "1.10-dev" PV = "1.10-dev"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

View File

@ -39,8 +39,8 @@ PACKAGECONFIG ?= " \
" "
SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=0.17;protocol=https" SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=0.17;protocol=https"
SRCREV = "bc73e507abd1e8319353a8601f1f8ebfe17307ee" SRCREV = "6dce6ae2ed92544b9758b194618e21f4c97f1d6b"
PV = "0.17.3" PV = "0.17.2"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

View File

@ -39,7 +39,7 @@ PACKAGECONFIG ?= " \
" "
SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https" SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https"
SRCREV = "56ebfde540da9631548773baba87beb716660322" SRCREV = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"
PV = "0.18.0-dev" PV = "0.18.0-dev"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"