From 231fa8898942fb13d56a51cd35396c8ef91453fb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 May 2025 13:39:30 +0100 Subject: gst-examples: Update 1.18.6 -> 1.26.1 Update to the version from the gstreamer monorepo, bringing it back into line with the other gstreamer revisions. Drop the libsoup-2.4 dependency which disables the webrtc code, we weren't building that anyway as it needs libnice enabled in gstreamer-plugins-bad. (From OE-Core rev: 446fadaa147be6656e37c612de772fa04607130f) Signed-off-by: Richard Purdie --- .../0001-Make-player-examples-installable.patch | 26 ++++++++-------- .../gstreamer/gst-examples_1.18.6.bb | 35 ---------------------- .../gstreamer/gst-examples_1.26.1.bb | 35 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb create mode 100644 meta/recipes-multimedia/gstreamer/gst-examples_1.26.1.bb (limited to 'meta/recipes-multimedia') 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 ab93c13244..828c87dc9a 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 @@ -13,25 +13,25 @@ https://bugzilla.gnome.org/show_bug.cgi?id=777827 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 -index 8ec021d..977cc5c 100644 ---- a/playback/player/gst-play/meson.build -+++ b/playback/player/gst-play/meson.build +Index: gst-examples/playback/player/gst-play/meson.build +=================================================================== +--- gst-examples.orig/playback/player/gst-play/meson.build ++++ gst-examples/playback/player/gst-play/meson.build @@ -2,5 +2,6 @@ executable('gst-play', ['gst-play.c', 'gst-play-kb.c', 'gst-play-kb.h'], + install: true, - dependencies : [gst_dep, gstplayer_dep, m_dep]) + dependencies : [gst_dep, dependency('gstreamer-play-1.0'), m_dep]) -diff --git a/playback/player/gtk/meson.build b/playback/player/gtk/meson.build -index f7a7419..6281130 100644 ---- a/playback/player/gtk/meson.build -+++ b/playback/player/gtk/meson.build -@@ -13,5 +13,6 @@ if gtk_dep.found() - gtk_play_resources, +Index: gst-examples/playback/player/gtk/meson.build +=================================================================== +--- gst-examples.orig/playback/player/gtk/meson.build ++++ gst-examples/playback/player/gtk/meson.build +@@ -20,5 +20,6 @@ if gtk_dep.found() 'gtk-video-renderer.h', 'gtk-video-renderer.c'], -+ install: true, - dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep]) + c_args : extra_c_args, ++ install: true, + dependencies : [gst_dep, gsttag_dep, gstplay_dep, gtk_dep, x11_dep]) endif diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb deleted file mode 100644 index 70b72fd7fb..0000000000 --- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "GStreamer examples (including gtk-play, gst-play)" -DESCRIPTION = "GStreamer example applications" -HOMEPAGE = "https://gitlab.freedesktop.org/gstreamer/gst-examples" -BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues" -LICENSE = "LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" - -DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 libsoup-2.4 json-glib glib-2.0-native" - -SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https;branch=1.18 \ - file://0001-Make-player-examples-installable.patch \ - file://gst-player.desktop \ - " - -SRCREV = "70e4fcf4fc8ae19641aa990de5f37d758cdfcea4" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig features_check - -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.(\d*[02468])+(\.\d+)+)" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -do_install:append() { - install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop -} - -RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback" -RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \ - gstreamer1.0-plugins-good-meta \ - gstreamer1.0-plugins-bad-meta \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" -RPROVIDES:${PN} += "gst-player gst-player-bin" diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.26.1.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.26.1.bb new file mode 100644 index 0000000000..59c7a4ade1 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.26.1.bb @@ -0,0 +1,35 @@ +SUMMARY = "GStreamer examples (including gtk-play, gst-play)" +DESCRIPTION = "GStreamer example applications" +HOMEPAGE = "https://gitlab.freedesktop.org/gstreamer/gst-examples" +BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" + +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.26 \ + file://0001-Make-player-examples-installable.patch \ + file://gst-player.desktop \ + " + +SRCREV = "7174e955ec066fb8d1fb683cc82713e0615826b6" + +S = "${WORKDIR}/git/subprojects/gst-examples" + +inherit meson pkgconfig features_check + +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.(\d*[02468])+(\.\d+)+)" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +do_install:append() { + install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop +} + +RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback" +RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \ + gstreamer1.0-plugins-good-meta \ + gstreamer1.0-plugins-bad-meta \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" +RPROVIDES:${PN} += "gst-player gst-player-bin" -- cgit v1.2.3-54-g00ecf