From 65128b26479631cd6109602624725aa7840c7e4a Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 19 Feb 2016 18:53:16 -0800 Subject: gstreamer1.0-plugins-ugly_git: update 1.7.1 -> 1.7.2 Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-plugins-ugly_git.bb | 23 +++++++++++++++++++--- 1 file 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 = " \ git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \ " -PV = "1.7.1+git${SRCPV}" +PV = "1.7.2+git${SRCPV}" + UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))" -SRCREV_base = "c9c37983babad909d01c1c4c417d42a0cf252c1d" -SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65" +SRCREV_base = "8bdb68edbc605e21314b608e7a39bdbaab7302b8" +SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0" SRCREV_FORMAT = "base" S = "${WORKDIR}/git" +# The mpg123 plugin was added prior to the 1.7.2 release +# https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=43bd45ba991ef3247957ca37cdcb52f4b8c0acb1 +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" + do_configure_prepend() { ${S}/autogen.sh --noconfigure } + +# In 1.7.2, the mpg123 plugin was moved from -bad to -ugly +# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=08d8aefcdaaf89ecb6dd53ec1e4f95cd42d01664 +# https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=43bd45ba991ef3247957ca37cdcb52f4b8c0acb1 + +PACKAGESPLITFUNCS_append = " handle_mpg123_rename " + +python handle_mpg123_rename () { + d.setVar('RPROVIDES_gstreamer1.0-plugins-ugly-mpg123', 'gstreamer1.0-plugins-bad-mpg123') + d.setVar('RREPLACES_gstreamer1.0-plugins-ugly-mpg123', 'gstreamer1.0-plugins-bad-mpg123') + d.setVar('RCONFLICTS_gstreamer1.0-plugins-ugly-mpg123', 'gstreamer1.0-plugins-bad-mpg123') +} -- cgit 1.2.3-korg