summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-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.0.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch
new file mode 100644
index 0000000000..34d25a0a49
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch
@@ -0,0 +1,43 @@
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.0.bb
index ad831ed25c..5751467db1 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.0.bb
@@ -4,6 +4,7 @@ SRC_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 \ 5 file://0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch \
6 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ 6 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
7 file://headerfix.patch \
7 " 8 "
8 9
9SRC_URI[md5sum] = "d1a7b442994d9522418de4af4330e034" 10SRC_URI[md5sum] = "d1a7b442994d9522418de4af4330e034"