diff options
author | Carlos Rafael Giani <crg7475@mailbox.org> | 2019-10-22 16:59:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-04 13:31:27 +0000 |
commit | 46dcf91b5ff6dc495cb9550a539eb7aa16d6170b (patch) | |
tree | bebfc48cb2256468e4e5397a35cc7e6112e8441b /meta | |
parent | 298fae4f6c8b76d53b303723208be79db40c54cf (diff) | |
download | openembedded-core-contrib-46dcf91b5ff6dc495cb9550a539eb7aa16d6170b.tar.gz |
gstreamer1.0-plugins-good: upgrade to version 1.16.1
* 0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch
* headerfix.patch
Removed since these changes are already included in 1.16.1
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch | 37 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch | 43 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bb) | 6 |
3 files changed, 2 insertions, 84 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch deleted file mode 100644 index caa080c8e7..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aadfa5f20f53601785e417fe3fcbe6d574880988 Mon Sep 17 00:00:00 2001 -From: Philippe Normand <philn@igalia.com> -Date: Tue, 23 Apr 2019 10:10:01 +0100 -Subject: [PATCH] scaletempo: Advertise interleaved layout in caps templates - -Scaletempo doesn't support non-interleaved layout. Not explicitely stating this -would trigger critical warnings and a caps negotiation failure when scaletempo -is used as playbin audio-filter. - -Patch suggested by George Kiagiadakis <george.kiagiadakis@collabora.com>. - -Fixes #591 -Upstream-Status: Backport [merged, on track for 1.16.1.] ---- - gst/audiofx/gstscaletempo.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gst/audiofx/gstscaletempo.c b/gst/audiofx/gstscaletempo.c -index 3a719719a..83ee8fe24 100644 ---- a/gst/audiofx/gstscaletempo.c -+++ b/gst/audiofx/gstscaletempo.c -@@ -93,9 +93,9 @@ enum - - #define SUPPORTED_CAPS \ - GST_STATIC_CAPS ( \ -- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) "; " \ -- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) "; " \ -- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) \ -+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) ", layout=(string)interleaved; " \ -+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) ", layout=(string)interleaved; " \ -+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) ", layout=(string)interleaved" \ - ) - - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", --- -2.20.1 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch deleted file mode 100644 index 34d25a0a49..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch +++ /dev/null @@ -1,43 +0,0 @@ -Things break with overlapping defines between glib and gstreamer with glibc 2.30. - -Discussion in the link below, basically internal __ prefixed variables -shouldn't be redefined. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/635] -RP 2019/8/6 - -Index: gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h -=================================================================== ---- gst-plugins-good-1.16.0.orig/sys/v4l2/ext/types-compat.h -+++ gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h -@@ -24,29 +24,6 @@ - #ifndef __TYPES_COMPAT_H__ - #define __TYPES_COMPAT_H__ - --/* From linux/types.h */ --#ifndef __bitwise__ --# ifdef __CHECKER__ --# define __bitwise__ __attribute__((bitwise)) --# else --# define __bitwise__ --# endif --#endif -- --#ifndef __bitwise --# ifdef __CHECK_ENDIAN__ --# define __bitwise __bitwise__ --# else --# define __bitwise --# endif --#endif -- --#define __u64 guint64 --#define __u32 guint32 --#define __u16 guint16 --#define __u8 guint8 --#define __s64 gint64 --#define __s32 gint32 --#define __le32 guint32 __bitwise -+#include <linux/types.h> - - #endif /* __TYPES_COMPAT_H__ */ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb index 5751467db1..21d2b2bb7f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb @@ -2,13 +2,11 @@ require gstreamer1.0-plugins.inc SRC_URI = " \ http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ - file://0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://headerfix.patch \ " -SRC_URI[md5sum] = "d1a7b442994d9522418de4af4330e034" -SRC_URI[sha256sum] = "654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd" +SRC_URI[md5sum] = "515987ee763256840a11bd8ea098f2bf" +SRC_URI[sha256sum] = "9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f" S = "${WORKDIR}/gst-plugins-good-${PV}" |