diff options
author | Ross Burton <ross.burton@intel.com> | 2016-06-17 18:53:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-27 14:08:43 +0100 |
commit | 13eb4a832b533f84001fca8be960ad1e58fc823f (patch) | |
tree | 6bccf2d9a0b3f6c7a15b007b40d5c8cc4c532661 | |
parent | c6d50b272936b61b98a056ea2e1de5d0f4ef53ce (diff) | |
download | poky-13eb4a832b533f84001fca8be960ad1e58fc823f.tar.gz |
gst-player: upgrade to latest HEAD
Update to the latest revision now that we have gst-plugins-bad 1.8.x which has
integrated the GstPlayer object. This upstream is now just the user interface,
so remove all redundant items from the packaging and package the binaries in PN
instead of PN-bin.
(From OE-Core rev: 646c366c2566bd8dd6f73681cea9f5b021589a56)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-player_git.bb | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-player_git.bb b/meta/recipes-multimedia/gstreamer/gst-player_git.bb index 6d39c2de2d..b09244b2ee 100644 --- a/meta/recipes-multimedia/gstreamer/gst-player_git.bb +++ b/meta/recipes-multimedia/gstreamer/gst-player_git.bb | |||
@@ -1,20 +1,20 @@ | |||
1 | SUMMARY = "GStreamer playback helper library and examples" | 1 | SUMMARY = "GStreamer playback helper library and examples" |
2 | LICENSE = "LGPL-2.0+" | 2 | LICENSE = "LGPL-2.0+" |
3 | LIC_FILES_CHKSUM = "file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5=03aeca9d8295f811817909075a15ff65" | 3 | LIC_FILES_CHKSUM = "file://gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" |
4 | 4 | ||
5 | DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+3" | 5 | DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/sdroege/gst-player.git \ | 7 | SRC_URI = "git://github.com/sdroege/gst-player.git \ |
8 | file://filechooser.patch \ | 8 | file://filechooser.patch;apply=0 \ |
9 | file://Fix-pause-play.patch \ | 9 | file://Fix-pause-play.patch;apply=0 \ |
10 | file://Add-error-signal-emission-for-missing-plugins.patch \ | 10 | file://Add-error-signal-emission-for-missing-plugins.patch;apply=0 \ |
11 | file://gst-player.desktop" | 11 | file://gst-player.desktop" |
12 | 12 | ||
13 | SRCREV = "5386c5b984d40ef5434673ed62204e69aaf52645" | 13 | SRCREV = "ea90e63c1064503f9ba5d59aa4ca604f13ca5def" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | inherit autotools gtk-doc lib_package pkgconfig distro_features_check gobject-introspection | 17 | inherit autotools pkgconfig distro_features_check |
18 | 18 | ||
19 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 19 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
20 | 20 | ||
@@ -22,17 +22,14 @@ do_configure_prepend() { | |||
22 | touch ${S}/ChangeLog | 22 | touch ${S}/ChangeLog |
23 | } | 23 | } |
24 | 24 | ||
25 | EXTRA_OECONF += "ac_cv_path_VALGRIND=no ac_cv_path_GDB=no" | ||
26 | |||
27 | do_install_append() { | 25 | do_install_append() { |
28 | install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop | 26 | install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop |
29 | } | 27 | } |
30 | 28 | ||
31 | FILES_${PN}-bin += "${datadir}/applications/*.desktop" | 29 | RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback" |
32 | 30 | RRECOMMENDS_${PN} = "gstreamer1.0-plugins-base-meta \ | |
33 | RDEPENDS_${PN}-bin = "gstreamer1.0-plugins-base-playback" | 31 | gstreamer1.0-plugins-good-meta \ |
34 | RRECOMMENDS_${PN}-bin = "gstreamer1.0-plugins-base-meta \ | 32 | gstreamer1.0-plugins-bad-meta \ |
35 | gstreamer1.0-plugins-good-meta \ | 33 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ |
36 | gstreamer1.0-plugins-bad-meta \ | 34 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" |
37 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ | 35 | RPROVIDES_${PN} += "${PN}-bin" |
38 | ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" | ||