From: Ross Burton Date: Fri, 17 Jun 2016 17:53:20 +0000 (+0100) Subject: gst-player: upgrade to latest HEAD X-Git-Tag: uninative-1.3~541 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=646c366c2566bd8dd6f73681cea9f5b021589a56;p=openembedded-core.git 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 @@ SUMMARY = "GStreamer playback helper library and examples" LICENSE = "LGPL-2.0+" -LIC_FILES_CHKSUM = "file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5=03aeca9d8295f811817909075a15ff65" +LIC_FILES_CHKSUM = "file://gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9" -DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+3" +DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3" SRC_URI = "git://github.com/sdroege/gst-player.git \ - file://filechooser.patch \ - file://Fix-pause-play.patch \ - file://Add-error-signal-emission-for-missing-plugins.patch \ + file://filechooser.patch;apply=0 \ + file://Fix-pause-play.patch;apply=0 \ + file://Add-error-signal-emission-for-missing-plugins.patch;apply=0 \ file://gst-player.desktop" -SRCREV = "5386c5b984d40ef5434673ed62204e69aaf52645" +SRCREV = "ea90e63c1064503f9ba5d59aa4ca604f13ca5def" S = "${WORKDIR}/git" -inherit autotools gtk-doc lib_package pkgconfig distro_features_check gobject-introspection +inherit autotools pkgconfig distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" @@ -22,17 +22,14 @@ do_configure_prepend() { touch ${S}/ChangeLog } -EXTRA_OECONF += "ac_cv_path_VALGRIND=no ac_cv_path_GDB=no" - do_install_append() { install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop } -FILES_${PN}-bin += "${datadir}/applications/*.desktop" - -RDEPENDS_${PN}-bin = "gstreamer1.0-plugins-base-playback" -RRECOMMENDS_${PN}-bin = "gstreamer1.0-plugins-base-meta \ - gstreamer1.0-plugins-good-meta \ - gstreamer1.0-plugins-bad-meta \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" +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_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" +RPROVIDES_${PN} += "${PN}-bin"