On 8/6/19 2:39 PM, Richard Purdie wrote: > Fix a header overlap/redefinition issue with glibc 2.30. > > Signed-off-by: Richard Purdie <[email protected]> > --- > .../gstreamer1.0-plugins-good/headerfix.patch | 43 +++++++++++++++++++ > .../gstreamer1.0-plugins-good_1.16.0.bb | 1 + > 2 files changed, 44 insertions(+) > create mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch > > 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 00000000000..34d25a0a49e > --- /dev/null > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch > @@ -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. > +
this fix is good. > +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.0.bb > index ad831ed25ce..5751467db13 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 = " \ > > 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"
pEpkey.asc
Description: application/pgp-keys
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
