summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch37
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch43
-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 @@
1From aadfa5f20f53601785e417fe3fcbe6d574880988 Mon Sep 17 00:00:00 2001
2From: Philippe Normand <philn@igalia.com>
3Date: Tue, 23 Apr 2019 10:10:01 +0100
4Subject: [PATCH] scaletempo: Advertise interleaved layout in caps templates
5
6Scaletempo doesn't support non-interleaved layout. Not explicitely stating this
7would trigger critical warnings and a caps negotiation failure when scaletempo
8is used as playbin audio-filter.
9
10Patch suggested by George Kiagiadakis <george.kiagiadakis@collabora.com>.
11
12Fixes #591
13Upstream-Status: Backport [merged, on track for 1.16.1.]
14---
15 gst/audiofx/gstscaletempo.c | 6 +++---
16 1 file changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/gst/audiofx/gstscaletempo.c b/gst/audiofx/gstscaletempo.c
19index 3a719719a..83ee8fe24 100644
20--- a/gst/audiofx/gstscaletempo.c
21+++ b/gst/audiofx/gstscaletempo.c
22@@ -93,9 +93,9 @@ enum
23
24 #define SUPPORTED_CAPS \
25 GST_STATIC_CAPS ( \
26- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) "; " \
27- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) "; " \
28- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) \
29+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) ", layout=(string)interleaved; " \
30+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) ", layout=(string)interleaved; " \
31+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) ", layout=(string)interleaved" \
32 )
33
34 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
35--
362.20.1
37
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 @@
1Things break with overlapping defines between glib and gstreamer with glibc 2.30.
2
3Discussion in the link below, basically internal __ prefixed variables
4shouldn't be redefined.
5
6Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/635]
7RP 2019/8/6
8
9Index: gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h
10===================================================================
11--- gst-plugins-good-1.16.0.orig/sys/v4l2/ext/types-compat.h
12+++ gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h
13@@ -24,29 +24,6 @@
14 #ifndef __TYPES_COMPAT_H__
15 #define __TYPES_COMPAT_H__
16
17-/* From linux/types.h */
18-#ifndef __bitwise__
19-# ifdef __CHECKER__
20-# define __bitwise__ __attribute__((bitwise))
21-# else
22-# define __bitwise__
23-# endif
24-#endif
25-
26-#ifndef __bitwise
27-# ifdef __CHECK_ENDIAN__
28-# define __bitwise __bitwise__
29-# else
30-# define __bitwise
31-# endif
32-#endif
33-
34-#define __u64 guint64
35-#define __u32 guint32
36-#define __u16 guint16
37-#define __u8 guint8
38-#define __s64 gint64
39-#define __s32 gint32
40-#define __le32 guint32 __bitwise
41+#include <linux/types.h>
42
43 #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
2 2
3SRC_URI = " \ 3SRC_URI = " \
4 http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ 4 http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
5 file://0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch \
6 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ 5 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
7 file://headerfix.patch \
8 " 6 "
9 7
10SRC_URI[md5sum] = "d1a7b442994d9522418de4af4330e034" 8SRC_URI[md5sum] = "515987ee763256840a11bd8ea098f2bf"
11SRC_URI[sha256sum] = "654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd" 9SRC_URI[sha256sum] = "9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f"
12 10
13S = "${WORKDIR}/gst-plugins-good-${PV}" 11S = "${WORKDIR}/gst-plugins-good-${PV}"
14 12
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 22:34:22 +0000