Devtool upgrade is failing on gst-examples, as devtool generated patches contain paths relative to the git root, but do_patch then tries to apply them on a subfolder when the recipe is built. As a consequence we always had to manually strip the paths in patches generated with devtool upgrade.
Use do_patch "striplevel" parameter instead: we can keep paths relative to the git root in patches, and both "devtool upgrade" and do_patch will be happy. Signed-off-by: Mathieu Dubois-Briand <[email protected]> --- .../0001-Make-player-examples-installable.patch | 16 ++++++++-------- ...amples-gtk-show-player-warnings-in-a-dialog-box.patch | 6 +++--- meta/recipes-multimedia/gstreamer/gst-examples_1.28.7.bb | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch b/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch index caf2e02980bc..72fe5a26aaed 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch +++ b/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch @@ -8,14 +8,14 @@ Upstream-Status: Denied [Upstream considers these code examples, for now a least https://bugzilla.gnome.org/show_bug.cgi?id=777827 --- - playback/player/gst-play/meson.build | 1 + - playback/player/gtk/meson.build | 1 + + subprojects/gst-examples/playback/player/gst-play/meson.build | 1 + + subprojects/gst-examples/playback/player/gtk/meson.build | 1 + 2 files changed, 2 insertions(+) -diff --git a/playback/player/gst-play/meson.build b/playback/player/gst-play/meson.build +diff --git a/subprojects/gst-examples/playback/player/gst-play/meson.build b/subprojects/gst-examples/playback/player/gst-play/meson.build index 5e80ca8dd4a8..129e5bdcbe3d 100644 ---- a/playback/player/gst-play/meson.build -+++ b/playback/player/gst-play/meson.build +--- a/subprojects/gst-examples/playback/player/gst-play/meson.build ++++ b/subprojects/gst-examples/playback/player/gst-play/meson.build @@ -2,5 +2,6 @@ executable('gst-play', ['gst-play.c', 'gst-play-kb.c', @@ -23,10 +23,10 @@ index 5e80ca8dd4a8..129e5bdcbe3d 100644 + install: true, dependencies : [gst_dep, dependency('gstreamer-play-1.0'), m_dep]) -diff --git a/playback/player/gtk/meson.build b/playback/player/gtk/meson.build +diff --git a/subprojects/gst-examples/playback/player/gtk/meson.build b/subprojects/gst-examples/playback/player/gtk/meson.build index 6892f152544f..20d7505877c2 100644 ---- a/playback/player/gtk/meson.build -+++ b/playback/player/gtk/meson.build +--- a/subprojects/gst-examples/playback/player/gtk/meson.build ++++ b/subprojects/gst-examples/playback/player/gtk/meson.build @@ -21,5 +21,6 @@ if gtk_dep.found() 'gtk-video-renderer.h', 'gtk-video-renderer.c'], diff --git a/meta/recipes-multimedia/gstreamer/gst-examples/0002-examples-gtk-show-player-warnings-in-a-dialog-box.patch b/meta/recipes-multimedia/gstreamer/gst-examples/0002-examples-gtk-show-player-warnings-in-a-dialog-box.patch index cb9b815488ec..6c02d8d71fee 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples/0002-examples-gtk-show-player-warnings-in-a-dialog-box.patch +++ b/meta/recipes-multimedia/gstreamer/gst-examples/0002-examples-gtk-show-player-warnings-in-a-dialog-box.patch @@ -12,10 +12,10 @@ Signed-off-by: Mathieu Dubois-Briand <[email protected]> .../playback/player/gtk/gtk-play.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) -diff --git a/playback/player/gtk/gtk-play.c b/playback/player/gtk/gtk-play.c +diff --git a/subprojects/gst-examples/playback/player/gtk/gtk-play.c b/subprojects/gst-examples/playback/player/gtk/gtk-play.c index fb83f6be29c5..2310c716f2e9 100644 ---- a/playback/player/gtk/gtk-play.c -+++ b/playback/player/gtk/gtk-play.c +--- a/subprojects/gst-examples/playback/player/gtk/gtk-play.c ++++ b/subprojects/gst-examples/playback/player/gtk/gtk-play.c @@ -88,6 +88,7 @@ typedef struct gboolean loop; gboolean fullscreen; diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.28.7.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.28.7.bb index 627bc9013710..9a4c73f092f6 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples_1.28.7.bb +++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.28.7.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20 DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 json-glib glib-2.0-native" SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;branch=1.28;tag=${PV} \ - file://0001-Make-player-examples-installable.patch \ - file://0002-examples-gtk-show-player-warnings-in-a-dialog-box.patch \ + file://0001-Make-player-examples-installable.patch;striplevel=3 \ + file://0002-examples-gtk-show-player-warnings-in-a-dialog-box.patch;striplevel=3 \ file://gst-player.desktop \ " --- base-commit: 9ed2651231082b51ab75379219e034b7dec8c06e change-id: 20260909-mathieu-gst-examples-striplevel-01db445ff063 Best regards, -- Mathieu Dubois-Briand <[email protected]>
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#245454): https://lists.openembedded.org/g/openembedded-core/message/245454 Mute This Topic: https://lists.openembedded.org/mt/121159216/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
