gstreamer: Add fix for glibc 2.30

Fix a header overlap/redefinition issue with glibc 2.30.

(From OE-Core rev: 11422465e187b096d06c0eaf0a66dbac5b9e8710)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2019-08-06 22:38:42 +01:00
parent 88c6be81a5
commit e93572cda7
2 changed files with 44 additions and 0 deletions

View File

@@ -0,0 +1,43 @@
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__ */

View File

@@ -4,6 +4,7 @@ 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"