diff mbox series

[RFC,11/12] gst-examples: 1.18.5 -> 1.20.0

Message ID 20220126102814.4173943-12-ch@denx.de
State New
Headers show
Series Update to gstreamer 1.20 for kirkstone | expand

Commit Message

Claudius Heine Jan. 26, 2022, 10:28 a.m. UTC 
Signed-off-by: Claudius Heine <ch@denx.de>
---
 ...001-Make-player-examples-installable.patch | 22 +++++++++----------
 ...mples_1.18.5.bb => gst-examples_1.20.0.bb} | 11 +++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gst-examples_1.18.5.bb => gst-examples_1.20.0.bb} (82%)
diff mbox series

Patch

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..96baab2415 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
@@ -9,29 +9,29 @@  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 8ec021d..977cc5c 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',
       '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
+diff --git a/subprojects/gst-examples/playback/player/gtk/meson.build b/subprojects/gst-examples/playback/player/gtk/meson.build
 index f7a7419..6281130 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
 @@ -13,5 +13,6 @@ if gtk_dep.found()
          gtk_play_resources,
         '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])
++      install: true,
+       dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplay_dep, gtk_dep, x11_dep])
  endif
diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.20.0.bb
similarity index 82%
rename from meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb
rename to meta/recipes-multimedia/gstreamer/gst-examples_1.20.0.bb
index a720bb73ff..ef1b457882 100644
--- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.20.0.bb
@@ -7,14 +7,13 @@  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 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 \
-           "
+require gstreamer1.0-source.inc
 
-SRCREV = "fe9a365dc0f1ff632abcfe3322ac5527a2cf30a0"
+S = "${SRC_BASE}/subprojects/gst-examples"
 
-S = "${WORKDIR}/git"
+SRC_URI += "file://0001-Make-player-examples-installable.patch;patchdir=${SRC_BASE} \
+            file://gst-player.desktop \
+            "
 
 inherit meson pkgconfig features_check