Remove patch that downgraded gbm_bo_create_with_modifiers. Meanwhile gbm_bo_create_with_modifiers2 should be save to use?
Fix to work with manpages class Signed-off-by: Markus Volk <[email protected]> --- ...screencast-Fix-build-with-older-mesa.patch | 53 ------------------- ...7.0.bb => xdg-desktop-portal-wlr_0.8.1.bb} | 9 ++-- 2 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch rename meta-multimedia/recipes-support/xdg-desktop-portal-wlr/{xdg-desktop-portal-wlr_0.7.0.bb => xdg-desktop-portal-wlr_0.8.1.bb} (74%) diff --git a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch deleted file mode 100644 index ff4fcc292a..0000000000 --- a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch +++ /dev/null @@ -1,53 +0,0 @@ -From ef60a76e2a21b7649632dcf71d125039604a56b5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 18 Jun 2023 10:42:19 -0700 -Subject: [PATCH] screencast: Fix build with older mesa - -gbm_bo_create_with_modifiers2() is quite new and there are still distros -that ship 21.2 and older. e.g. powerVR mesa implementation - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - src/screencast/pipewire_screencast.c | 8 ++++++-- - src/screencast/screencast_common.c | 4 ++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/screencast/pipewire_screencast.c b/src/screencast/pipewire_screencast.c -index 0611fd5..7d66810 100644 ---- a/src/screencast/pipewire_screencast.c -+++ b/src/screencast/pipewire_screencast.c -@@ -234,9 +234,13 @@ static void pwr_handle_stream_param_changed(void *data, uint32_t id, - uint32_t n_params; - struct spa_pod_builder *builder[2] = {&b[0].b, &b[1].b}; - -- struct gbm_bo *bo = gbm_bo_create_with_modifiers2(cast->ctx->gbm, -+ struct gbm_bo *bo = gbm_bo_create_with_modifiers(cast->ctx->gbm, - cast->screencopy_frame_info[cast->buffer_type].width, cast->screencopy_frame_info[cast->buffer_type].height, -- cast->screencopy_frame_info[cast->buffer_type].format, modifiers, n_modifiers, flags); -+ cast->screencopy_frame_info[cast->buffer_type].format, modifiers, n_modifiers); -+ if(!bo) -+ bo = gbm_bo_create(cast->ctx->gbm, -+ cast->screencopy_frame_info[cast->buffer_type].width, cast->screencopy_frame_info[cast->buffer_type].height, -+ cast->screencopy_frame_info[cast->buffer_type].format, GBM_BO_USE_RENDERING); - if (bo) { - modifier = gbm_bo_get_modifier(bo); - gbm_bo_destroy(bo); -diff --git a/src/screencast/screencast_common.c b/src/screencast/screencast_common.c -index d6d13db..2e4fc18 100644 ---- a/src/screencast/screencast_common.c -+++ b/src/screencast/screencast_common.c -@@ -143,8 +143,8 @@ struct xdpw_buffer *xdpw_buffer_create(struct xdpw_screencast_instance *cast, - uint32_t flags = GBM_BO_USE_RENDERING; - if (cast->pwr_format.modifier != DRM_FORMAT_MOD_INVALID) { - uint64_t *modifiers = (uint64_t*)&cast->pwr_format.modifier; -- buffer->bo = gbm_bo_create_with_modifiers2(cast->ctx->gbm, frame_info->width, frame_info->height, -- frame_info->format, modifiers, 1, flags); -+ buffer->bo = gbm_bo_create_with_modifiers(cast->ctx->gbm, frame_info->width, frame_info->height, -+ frame_info->format, modifiers, 1); - } else { - if (cast->ctx->state->config->screencast_conf.force_mod_linear) { - flags |= GBM_BO_USE_LINEAR; --- -2.41.0 - diff --git a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.8.1.bb similarity index 74% rename from meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb rename to meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.8.1.bb index c3056c9e86..3deeb1078d 100644 --- a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb +++ b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.8.1.bb @@ -13,18 +13,17 @@ DEPENDS = " \ virtual/libgbm \ " -inherit meson pkgconfig features_check +inherit meson pkgconfig features_check manpages REQUIRED_DISTRO_FEATURES = "opengl wayland" -SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;branch=master \ - file://0001-screencast-Fix-build-with-older-mesa.patch" +SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;branch=master" PV .= "+git" -SRCREV = "d9ada849aeca6137915de2df69beaef4e272cc1d" +SRCREV = "256eb4a9f6ecffd64289d6501d036c2094b47db6" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'basu', d)}" -PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" +PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsd-bus-provider=libsystemd,-Dsystemd=disabled" PACKAGECONFIG[basu] = "-Dsd-bus-provider=basu,,basu" -- 2.52.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#123527): https://lists.openembedded.org/g/openembedded-devel/message/123527 Mute This Topic: https://lists.openembedded.org/mt/117294478/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
