summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-19 18:53:16 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-22 20:42:47 +0000
commit9d83a3e5ed11ad4a4d09f77ef3619c3d7d3c82e9 (patch)
tree90cfd2032bf2db9b1b0f572dc8177372e6c7415f
parent6456a6fe2149a1e28b4e253097d1159472a8ca9a (diff)
downloadpoky-9d83a3e5ed11ad4a4d09f77ef3619c3d7d3c82e9.tar.gz
gstreamer1.0-plugins-ugly_git: update 1.7.1 -> 1.7.2
(From OE-Core rev: 65128b26479631cd6109602624725aa7840c7e4a) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb23
1 files changed, 20 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb
index ccf6ece8b3..69afe4cfb3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb
@@ -10,15 +10,32 @@ SRC_URI = " \
10 git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \ 10 git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
11" 11"
12 12
13PV = "1.7.1+git${SRCPV}" 13PV = "1.7.2+git${SRCPV}"
14
14UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" 15UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
15 16
16SRCREV_base = "c9c37983babad909d01c1c4c417d42a0cf252c1d" 17SRCREV_base = "8bdb68edbc605e21314b608e7a39bdbaab7302b8"
17SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65" 18SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0"
18SRCREV_FORMAT = "base" 19SRCREV_FORMAT = "base"
19 20
20S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
21 22
23# The mpg123 plugin was added prior to the 1.7.2 release
24# https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=43bd45ba991ef3247957ca37cdcb52f4b8c0acb1
25PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
26
22do_configure_prepend() { 27do_configure_prepend() {
23 ${S}/autogen.sh --noconfigure 28 ${S}/autogen.sh --noconfigure
24} 29}
30
31# In 1.7.2, the mpg123 plugin was moved from -bad to -ugly
32# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=08d8aefcdaaf89ecb6dd53ec1e4f95cd42d01664
33# https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=43bd45ba991ef3247957ca37cdcb52f4b8c0acb1
34
35PACKAGESPLITFUNCS_append = " handle_mpg123_rename "
36
37python handle_mpg123_rename () {
38 d.setVar('RPROVIDES_gstreamer1.0-plugins-ugly-mpg123', 'gstreamer1.0-plugins-bad-mpg123')
39 d.setVar('RREPLACES_gstreamer1.0-plugins-ugly-mpg123', 'gstreamer1.0-plugins-bad-mpg123')
40 d.setVar('RCONFLICTS_gstreamer1.0-plugins-ugly-mpg123', 'gstreamer1.0-plugins-bad-mpg123')
41}