From 044948b4cb8b03d4fcdc7074d147809c8462c8aa Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Tue, 19 Dec 2023 19:48:07 +0100 Subject: [PATCH] phoc: update --- .../phoc/0001-meson.build-dont-build-subprojects.patch | 7 +++---- recipes-wlroots/phoc/phoc_git.bb | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/recipes-wlroots/phoc/phoc/0001-meson.build-dont-build-subprojects.patch b/recipes-wlroots/phoc/phoc/0001-meson.build-dont-build-subprojects.patch index b88db5e..be53485 100644 --- a/recipes-wlroots/phoc/phoc/0001-meson.build-dont-build-subprojects.patch +++ b/recipes-wlroots/phoc/phoc/0001-meson.build-dont-build-subprojects.patch @@ -29,16 +29,15 @@ index 77b8971..e5b0908 100644 embed_wlroots = get_option('embed-wlroots') -@@ -66,7 +60,7 @@ endif +@@ -70,7 +64,7 @@ endif if not embed_wlroots.disabled() and wlroots_proj.found() wlroots = wlroots_proj.get_variable('wlroots') else -- wlroots = dependency('wlroots', version: '>= 0.16.0') -+ wlroots = dependency('wlroots', version: '>= 0.16.2') +- wlroots = dependency('wlroots', version: ['>= 0.17.0-dev', '< 0.18.0']) ++ wlroots = dependency('wlroots', version: ['>= 0.17.0', '< 0.18.0']) endif wlroots_has_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true' - -- 2.41.0 diff --git a/recipes-wlroots/phoc/phoc_git.bb b/recipes-wlroots/phoc/phoc_git.bb index 00c4c1e..fb76998 100644 --- a/recipes-wlroots/phoc/phoc_git.bb +++ b/recipes-wlroots/phoc/phoc_git.bb @@ -20,7 +20,7 @@ DEPENDS += " \ wayland \ wayland-native \ wayland-protocols \ - wlroots-0.16 \ + wlroots-0.17 \ " RDEPENDS:${PN} = "mutter" @@ -31,8 +31,8 @@ SRC_URI = " \ " S = "${WORKDIR}/git" -PV = "0.32.0" -SRCREV = "7c5840f6f14853ad362b52799650966f7a8c864a" +PV = "0.34.0-beta1" +SRCREV = "a6796290d8dd4d2de4a4265a87de86597a52b538" inherit features_check gsettings meson pkgconfig