diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2018-01-04 15:12:36 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-05 12:02:37 +0000 |
commit | 6bcad1498937262df22077fbfc52c48e7a423459 (patch) | |
tree | e19fcd77453261b80c8c46b042b1ed74bdb817de /meta/recipes-multimedia | |
parent | 651a82f26b6143af49ecf3e54671159fe15efe99 (diff) | |
download | poky-6bcad1498937262df22077fbfc52c48e7a423459.tar.gz |
gst-player: Upgrade, rename to gst-examples
Switch to using current repository, switch to meson (following
upstream), rename the recipe like upstream.
Add a patch to install the player binaries.
(From OE-Core rev: ac695195077dd12e41f6104e5cc77ec2cf03af11)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch | 39 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop (renamed from meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop) | 0 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-examples_git.bb (renamed from meta/recipes-multimedia/gstreamer/gst-player_git.bb) | 18 |
3 files changed, 47 insertions, 10 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 new file mode 100644 index 0000000000..0338bad1c0 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 755f6dab07565aca7b6aefacad8be65de364ff75 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Thu, 17 Aug 2017 11:07:02 +0300 | ||
4 | Subject: [PATCH] Make player examples installable | ||
5 | |||
6 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
7 | Upstream-Status: Denied [Upstream considers these code examples, for now a least] | ||
8 | |||
9 | https://bugzilla.gnome.org/show_bug.cgi?id=777827 | ||
10 | --- | ||
11 | playback/player/gst-play/meson.build | 1 + | ||
12 | playback/player/gtk/meson.build | 1 + | ||
13 | 2 files changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/playback/player/gst-play/meson.build b/playback/player/gst-play/meson.build | ||
16 | index 719b55b..a56fe13 100644 | ||
17 | --- a/playback/player/gst-play/meson.build | ||
18 | +++ b/playback/player/gst-play/meson.build | ||
19 | @@ -8,5 +8,6 @@ executable('gst-play', | ||
20 | ['gst-play.c', | ||
21 | 'gst-play-kb.c', | ||
22 | 'gst-play-kb.h'], | ||
23 | + install: true, | ||
24 | dependencies : [gst_dep, gstplayer_dep, m_dep]) | ||
25 | |||
26 | diff --git a/playback/player/gtk/meson.build b/playback/player/gtk/meson.build | ||
27 | index 08aae4f..671a65d 100644 | ||
28 | --- a/playback/player/gtk/meson.build | ||
29 | +++ b/playback/player/gtk/meson.build | ||
30 | @@ -18,5 +18,6 @@ executable('gtk-play', | ||
31 | gtk_play_resources, | ||
32 | 'gtk-video-renderer.h', | ||
33 | 'gtk-video-renderer.c'], | ||
34 | + install: true, | ||
35 | dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep]) | ||
36 | |||
37 | -- | ||
38 | 2.13.3 | ||
39 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop b/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop index 7ddd456a1e..7ddd456a1e 100644 --- a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop +++ b/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop | |||
diff --git a/meta/recipes-multimedia/gstreamer/gst-player_git.bb b/meta/recipes-multimedia/gstreamer/gst-examples_git.bb index ee11e2ba10..8891328b07 100644 --- a/meta/recipes-multimedia/gstreamer/gst-player_git.bb +++ b/meta/recipes-multimedia/gstreamer/gst-examples_git.bb | |||
@@ -1,25 +1,23 @@ | |||
1 | SUMMARY = "GStreamer playback helper library and examples" | 1 | SUMMARY = "GStreamer examples (including gtk-play, gst-play)" |
2 | LICENSE = "LGPL-2.0+" | 2 | LICENSE = "LGPL-2.0+" |
3 | LIC_FILES_CHKSUM = "file://gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" | 3 | LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" |
4 | 4 | ||
5 | DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 glib-2.0-native" | 5 | DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 glib-2.0-native" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/sdroege/gst-player.git \ | 7 | SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-examples \ |
8 | file://0001-Make-player-examples-installable.patch \ | ||
8 | file://gst-player.desktop" | 9 | file://gst-player.desktop" |
9 | 10 | ||
10 | SRCREV = "ee3c226c82767a089743e4e06058743e67f73cdb" | 11 | SRCREV = "e88c04ff34cf56984e62a524a0bcc16ab51b282d" |
11 | PV = "0.0.1+git${SRCPV}" | 12 | PV = "0.0.1+git${SRCPV}" |
12 | UPSTREAM_CHECK_COMMITS = "1" | 13 | UPSTREAM_CHECK_COMMITS = "1" |
13 | 14 | ||
14 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
15 | 16 | ||
16 | inherit autotools pkgconfig distro_features_check | 17 | inherit meson pkgconfig distro_features_check |
17 | 18 | ||
18 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
19 | 19 | ||
20 | do_configure_prepend() { | 20 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
21 | touch ${S}/ChangeLog | ||
22 | } | ||
23 | 21 | ||
24 | do_install_append() { | 22 | do_install_append() { |
25 | install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop | 23 | install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop |
@@ -31,4 +29,4 @@ RRECOMMENDS_${PN} = "gstreamer1.0-plugins-base-meta \ | |||
31 | gstreamer1.0-plugins-bad-meta \ | 29 | gstreamer1.0-plugins-bad-meta \ |
32 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ | 30 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ |
33 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" | 31 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" |
34 | RPROVIDES_${PN} += "${PN}-bin" | 32 | RPROVIDES_${PN} += "gst-player gst-player-bin" |