drop AVX cpu flag, make python3_7 default, drop gst patches they are not needed anymore, add compiler-rt-sanitizers-9.0.1 build fix: gentoo bug #708430

4 files changed, 11 insertions, 791 deletions

diff --git a/patches/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5-make-fix.patch b/patches/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5-make-fix.patch
deleted file mode 100644
index bcc07b1..0000000
--- a/patches/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5-make-fix.patch
+++ /dev/null
@@ -1,293 +0,0 @@
---- gst-plugins-bad-1.14.5.old/common/glib-gen.mak	2018-03-23 20:45:17.000000000 -0000
-+++ gst-plugins-bad-1.14.5/common/glib-gen.mak	2020-01-25 02:59:25.736661871 -0000
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
-diff -Naur gst-plugins-bad-1.14.5.old/common/gst-glib-gen.mak gst-plugins-bad-1.14.5/common/gst-glib-gen.mak
---- gst-plugins-bad-1.14.5.old/common/gst-glib-gen.mak	2018-03-23 20:45:17.000000000 -0000
-+++ gst-plugins-bad-1.14.5/common/gst-glib-gen.mak	2020-01-25 02:59:25.736661871 -0000
-@@ -1,14 +1,16 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
-diff -Naur gst-plugins-bad-1.14.5.old/ext/srt/Makefile.in gst-plugins-bad-1.14.5/ext/srt/Makefile.in
---- gst-plugins-bad-1.14.5.old/ext/srt/Makefile.in	2019-05-29 17:00:09.000000000 -0000
-+++ gst-plugins-bad-1.14.5/ext/srt/Makefile.in	2020-01-25 02:59:25.737661871 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -795,7 +797,7 @@
- 	gstsrtserversink.h \
- 	$(NULL)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
-diff -Naur gst-plugins-bad-1.14.5.old/ext/srtp/Makefile.in gst-plugins-bad-1.14.5/ext/srtp/Makefile.in
---- gst-plugins-bad-1.14.5.old/ext/srtp/Makefile.in	2019-05-29 17:00:09.000000000 -0000
-+++ gst-plugins-bad-1.14.5/ext/srtp/Makefile.in	2020-01-25 02:59:25.737661871 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- VPATH = @srcdir@
- am__is_gnu_make = { \
-@@ -775,7 +777,7 @@
- BUILT_SOURCES = gstsrtp-enumtypes.c gstsrtp-enumtypes.h
- nodist_libgstsrtp_la_SOURCES = $(BUILT_SOURCES)
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff -Naur gst-plugins-bad-1.14.5.old/ext/webrtc/Makefile.in gst-plugins-bad-1.14.5/ext/webrtc/Makefile.in
---- gst-plugins-bad-1.14.5.old/ext/webrtc/Makefile.in	2019-05-29 17:00:09.000000000 -0000
-+++ gst-plugins-bad-1.14.5/ext/webrtc/Makefile.in	2020-01-25 02:59:25.737661871 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -797,7 +799,7 @@
- 
- libgstwebrtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- libgstwebrtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
-diff -Naur gst-plugins-bad-1.14.5.old/gst-libs/gst/interfaces/Makefile.am gst-plugins-bad-1.14.5/gst-libs/gst/interfaces/Makefile.am
---- gst-plugins-bad-1.14.5.old/gst-libs/gst/interfaces/Makefile.am	2018-03-23 20:45:15.000000000 -0000
-+++ gst-plugins-bad-1.14.5/gst-libs/gst/interfaces/Makefile.am	2020-01-25 02:59:25.738661871 -0000
-@@ -5,13 +5,15 @@
- headers_photography = 		\
- 	photography.h
- 
-+H := \#
-+
- # variables used for enum/marshal generation
- glib_enum_headers=$(headers_photography)
- glib_enum_define=GST_PHOTOGRAPHY
- glib_gen_prefix=gst_photography
- glib_gen_basename=photography
- glib_gen_decl_banner=GST_PHOTOGRAPHY_API
--glib_gen_decl_include=\#include <gst/interfaces/photography-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/interfaces/photography-prelude.h>
- 
- built_sources = \
- 	photography-enumtypes.c
-diff -Naur gst-plugins-bad-1.14.5.old/gst-libs/gst/interfaces/Makefile.in gst-plugins-bad-1.14.5/gst-libs/gst/interfaces/Makefile.in
---- gst-plugins-bad-1.14.5.old/gst-libs/gst/interfaces/Makefile.in	2019-05-29 17:00:10.000000000 -0000
-+++ gst-plugins-bad-1.14.5/gst-libs/gst/interfaces/Makefile.in	2020-01-25 02:59:25.738661871 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -773,7 +775,7 @@
- glib_gen_prefix = gst_photography
- glib_gen_basename = photography
- glib_gen_decl_banner = GST_PHOTOGRAPHY_API
--glib_gen_decl_include = \#include <gst/interfaces/photography-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/interfaces/photography-prelude.h>
- built_sources = \
- 	photography-enumtypes.c
- 
-@@ -805,7 +807,7 @@
- 	$(built_headers)
- 
- CLEANFILES = $(BUILT_SOURCES)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff -Naur gst-plugins-bad-1.14.5.old/gst-libs/gst/mpegts/Makefile.am gst-plugins-bad-1.14.5/gst-libs/gst/mpegts/Makefile.am
---- gst-plugins-bad-1.14.5.old/gst-libs/gst/mpegts/Makefile.am	2018-03-23 20:45:15.000000000 -0000
-+++ gst-plugins-bad-1.14.5/gst-libs/gst/mpegts/Makefile.am	2020-01-25 02:59:25.738661871 -0000
-@@ -39,6 +39,8 @@
- 	$(GST_ALL_LDFLAGS) \
- 	$(GST_LT_LDFLAGS)
- 
-+H := \#
-+
- glib_enum_headers=gstmpegtssection.h	\
- 	gstmpegtsdescriptor.h		\
- 	gst-atsc-section.h		\
-@@ -50,7 +52,7 @@
- glib_gen_prefix=gst_mpegts
- glib_gen_basename=gstmpegts
- glib_gen_decl_banner=GST_MPEGTS_API
--glib_gen_decl_include=\#include <gst/mpegts/mpegts-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/mpegts/mpegts-prelude.h>
- 
- BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
- nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
-diff -Naur gst-plugins-bad-1.14.5.old/gst-libs/gst/mpegts/Makefile.in gst-plugins-bad-1.14.5/gst-libs/gst/mpegts/Makefile.in
---- gst-plugins-bad-1.14.5.old/gst-libs/gst/mpegts/Makefile.in	2019-05-29 17:00:10.000000000 -0000
-+++ gst-plugins-bad-1.14.5/gst-libs/gst/mpegts/Makefile.in	2020-01-25 02:59:25.739661871 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -821,7 +823,7 @@
- glib_gen_prefix = gst_mpegts
- glib_gen_basename = gstmpegts
- glib_gen_decl_banner = GST_MPEGTS_API
--glib_gen_decl_include = \#include <gst/mpegts/mpegts-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/mpegts/mpegts-prelude.h>
- BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h
- nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c
- CLEANFILES = $(BUILT_SOURCES) $(am__append_1)
-@@ -841,7 +843,7 @@
- @HAVE_INTROSPECTION_TRUE@gir_DATA = $(BUILT_GIRSOURCES)
- @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0/
- @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff -Naur gst-plugins-bad-1.14.5.old/gst-libs/gst/webrtc/Makefile.am gst-plugins-bad-1.14.5/gst-libs/gst/webrtc/Makefile.am
---- gst-plugins-bad-1.14.5.old/gst-libs/gst/webrtc/Makefile.am	2018-03-24 17:44:06.000000000 -0000
-+++ gst-plugins-bad-1.14.5/gst-libs/gst/webrtc/Makefile.am	2020-01-25 02:59:25.738661871 -0000
-@@ -1,11 +1,13 @@
- lib_LTLIBRARIES = libgstwebrtc-@GST_API_VERSION@.la
- 
-+H := \#
-+
- glib_enum_headers = dtlstransport.h icetransport.h rtptransceiver.h webrtc_fwd.h
- glib_enum_define = GST_WEBRTC
- glib_gen_prefix = gst_webrtc
- glib_gen_basename = webrtc
- glib_gen_decl_banner=GST_WEBRTC_API
--glib_gen_decl_include=\#include <gst/webrtc/webrtc_fwd.h>
-+glib_gen_decl_include=$(H)include <gst/webrtc/webrtc_fwd.h>
- 
- built_sources = webrtc-enumtypes.c
- built_headers = webrtc-enumtypes.h
-diff -Naur gst-plugins-bad-1.14.5.old/gst-libs/gst/webrtc/Makefile.in gst-plugins-bad-1.14.5/gst-libs/gst/webrtc/Makefile.in
---- gst-plugins-bad-1.14.5.old/gst-libs/gst/webrtc/Makefile.in	2019-05-29 17:00:11.000000000 -0000
-+++ gst-plugins-bad-1.14.5/gst-libs/gst/webrtc/Makefile.in	2020-01-25 02:59:25.739661871 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -761,7 +763,7 @@
- glib_gen_prefix = gst_webrtc
- glib_gen_basename = webrtc
- glib_gen_decl_banner = GST_WEBRTC_API
--glib_gen_decl_include = \#include <gst/webrtc/webrtc_fwd.h>
-+glib_gen_decl_include = $(H)include <gst/webrtc/webrtc_fwd.h>
- built_sources = webrtc-enumtypes.c
- built_headers = webrtc-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
-@@ -806,7 +808,7 @@
- 	$(GST_ALL_LDFLAGS) \
- 	$(GST_LT_LDFLAGS)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstWebRTC-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@include_HEADERS))
- @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, $(libgstwebrtc_@GST_API_VERSION@_la_SOURCES)) $(BUILT_SOURCES)
diff --git a/patches/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-make-fix.patch b/patches/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-make-fix.patch
deleted file mode 100644
index 010ccc2..0000000
--- a/patches/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-make-fix.patch
+++ /dev/null
@@ -1,441 +0,0 @@
---- gst-plugins-base-1.14.5.old/common/glib-gen.mak	2018-03-23 20:44:44.000000000 -0000
-+++ gst-plugins-base-1.14.5/common/glib-gen.mak	2020-01-25 02:40:57.375758050 -0000
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
-diff -Naur gst-plugins-base-1.14.5.old/common/gst-glib-gen.mak gst-plugins-base-1.14.5/common/gst-glib-gen.mak
---- gst-plugins-base-1.14.5.old/common/gst-glib-gen.mak	2018-03-23 20:44:44.000000000 -0000
-+++ gst-plugins-base-1.14.5/common/gst-glib-gen.mak	2020-01-25 02:40:57.376758050 -0000
-@@ -1,14 +1,16 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
-diff -Naur gst-plugins-base-1.14.5.old/gst/encoding/Makefile.in gst-plugins-base-1.14.5/gst/encoding/Makefile.in
---- gst-plugins-base-1.14.5.old/gst/encoding/Makefile.in	2019-05-29 16:33:24.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst/encoding/Makefile.in	2020-01-25 02:42:51.666748132 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- VPATH = @srcdir@
-@@ -638,7 +640,7 @@
- 	gstsmartencoder.h	\
- 	gststreamcombinerpad.h
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- all: all-am
- 
- .SUFFIXES:
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/app/Makefile.am gst-plugins-base-1.14.5/gst-libs/gst/app/Makefile.am
---- gst-plugins-base-1.14.5.old/gst-libs/gst/app/Makefile.am	2018-03-23 20:44:42.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/app/Makefile.am	2020-01-25 02:40:57.376758050 -0000
-@@ -1,10 +1,12 @@
- lib_LTLIBRARIES = libgstapp-@GST_API_VERSION@.la
- 
-+H := \#
-+
- glib_enum_define = GST_APP
- glib_gen_prefix = __gst_app
- glib_gen_basename = app
- glib_gen_decl_banner=GST_APP_API
--glib_gen_decl_include=\#include <gst/app/app-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/app/app-prelude.h>
- 
- glib_enum_headers = gstappsrc.h
- 
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/app/Makefile.in gst-plugins-base-1.14.5/gst-libs/gst/app/Makefile.in
---- gst-plugins-base-1.14.5.old/gst-libs/gst/app/Makefile.in	2019-05-29 16:33:22.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/app/Makefile.in	2020-01-25 02:42:51.667748132 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -618,12 +620,12 @@
- glib_gen_prefix = __gst_app
- glib_gen_basename = app
- glib_gen_decl_banner = GST_APP_API
--glib_gen_decl_include = \#include <gst/app/app-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/app/app-prelude.h>
- glib_enum_headers = gstappsrc.h
- built_sources = app-enumtypes.c
- built_headers = app-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c
- nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
- libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/audio/Makefile.am gst-plugins-base-1.14.5/gst-libs/gst/audio/Makefile.am
---- gst-plugins-base-1.14.5.old/gst-libs/gst/audio/Makefile.am	2018-03-23 20:44:42.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/audio/Makefile.am	2020-01-25 02:40:57.376758050 -0000
-@@ -2,6 +2,8 @@
- ORC_SOURCE=gstaudiopack
- include $(top_srcdir)/common/orc.mak
- 
-+H := \#
-+
- glib_enum_headers= 		\
- 	audio.h			\
- 	audio-format.h			\
-@@ -20,7 +22,7 @@
- glib_gen_prefix = gst_audio
- glib_gen_basename = audio
- glib_gen_decl_banner=GST_AUDIO_API
--glib_gen_decl_include=\#include <gst/audio/audio-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/audio/audio-prelude.h>
- 
- built_sources = audio-enumtypes.c
- built_headers = audio-enumtypes.h
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/audio/Makefile.in gst-plugins-base-1.14.5/gst-libs/gst/audio/Makefile.in
---- gst-plugins-base-1.14.5.old/gst-libs/gst/audio/Makefile.in	2019-05-29 16:33:23.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/audio/Makefile.in	2020-01-25 02:42:51.685748131 -0000
-@@ -39,12 +39,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -784,7 +786,7 @@
- glib_gen_prefix = gst_audio
- glib_gen_basename = audio
- glib_gen_decl_banner = GST_AUDIO_API
--glib_gen_decl_include = \#include <gst/audio/audio-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/audio/audio-prelude.h>
- built_sources = audio-enumtypes.c
- built_headers = audio-enumtypes.h
- lib_LTLIBRARIES = \
-@@ -895,7 +897,7 @@
- @HAVE_X86_TRUE@	$(GST_LIB_LDFLAGS) \
- @HAVE_X86_TRUE@	$(GST_ALL_LDFLAGS)
- 
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # Introspection
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/pbutils/Makefile.am gst-plugins-base-1.14.5/gst-libs/gst/pbutils/Makefile.am
---- gst-plugins-base-1.14.5.old/gst-libs/gst/pbutils/Makefile.am	2018-03-23 20:44:42.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/pbutils/Makefile.am	2020-01-25 02:40:57.377758050 -0000
-@@ -12,13 +12,15 @@
- 	gstdiscoverer.h \
- 	gstaudiovisualizer.h
- 
-+H := \#
-+
- # variables used for enum/marshal generation
- glib_enum_headers = $(headers_pbutils)
- glib_enum_define = PB_UTILS
- glib_gen_prefix = pbutils
- glib_gen_basename = pbutils
- glib_gen_decl_banner=GST_PBUTILS_API
--glib_gen_decl_include=\#include <gst/pbutils/pbutils-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/pbutils/pbutils-prelude.h>
- 
- built_headers_configure = \
- 	gstpluginsbaseversion.h
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/pbutils/Makefile.in gst-plugins-base-1.14.5/gst-libs/gst/pbutils/Makefile.in
---- gst-plugins-base-1.14.5.old/gst-libs/gst/pbutils/Makefile.in	2019-05-29 16:33:23.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/pbutils/Makefile.in	2020-01-25 02:42:51.676748131 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -671,7 +673,7 @@
- glib_gen_prefix = pbutils
- glib_gen_basename = pbutils
- glib_gen_decl_banner = GST_PBUTILS_API
--glib_gen_decl_include = \#include <gst/pbutils/pbutils-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/pbutils/pbutils-prelude.h>
- built_headers_configure = \
- 	gstpluginsbaseversion.h
- 
-@@ -719,7 +721,7 @@
- 
- # DISTCLEANFILES is for files generated by configure
- DISTCLEANFILES = $(built_headers_configure)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/rtp/Makefile.am gst-plugins-base-1.14.5/gst-libs/gst/rtp/Makefile.am
---- gst-plugins-base-1.14.5.old/gst-libs/gst/rtp/Makefile.am	2018-03-23 20:44:42.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/rtp/Makefile.am	2020-01-25 02:40:57.377758050 -0000
-@@ -35,12 +35,14 @@
- BUILT_SOURCES = $(built_headers) $(built_sources)
- CLEANFILES = $(BUILT_SOURCES)
- 
-+H := \#
-+
- glib_gen_prefix = __gst_rtp
- glib_enum_define = gst_rtp
- glib_enum_headers = $(libgstrtpinclude_HEADERS)
- glib_gen_basename = gstrtp
- glib_gen_decl_banner=GST_RTP_API
--glib_gen_decl_include=\#include <gst/rtp/rtp-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/rtp/rtp-prelude.h>
- 
- include $(top_srcdir)/common/gst-glib-gen.mak
- 
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/rtp/Makefile.in gst-plugins-base-1.14.5/gst-libs/gst/rtp/Makefile.in
---- gst-plugins-base-1.14.5.old/gst-libs/gst/rtp/Makefile.in	2019-05-29 16:33:23.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/rtp/Makefile.in	2020-01-25 02:42:51.672748132 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -675,8 +677,8 @@
- glib_enum_headers = $(libgstrtpinclude_HEADERS)
- glib_gen_basename = gstrtp
- glib_gen_decl_banner = GST_RTP_API
--glib_gen_decl_include = \#include <gst/rtp/rtp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtp/rtp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstrtpinclude_HEADERS)) \
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/rtsp/Makefile.am gst-plugins-base-1.14.5/gst-libs/gst/rtsp/Makefile.am
---- gst-plugins-base-1.14.5.old/gst-libs/gst/rtsp/Makefile.am	2018-03-23 20:44:42.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/rtsp/Makefile.am	2020-01-25 02:40:57.377758050 -0000
-@@ -41,12 +41,14 @@
- BUILT_SOURCES = $(built_headers) $(built_sources)
- CLEANFILES = $(BUILT_SOURCES)
- 
-+H := \#
-+
- glib_gen_prefix = __gst_rtsp
- glib_enum_define = gst_rtsp
- glib_enum_headers = $(libgstrtspinclude_HEADERS)
- glib_gen_basename = gstrtsp
- glib_gen_decl_banner=GST_RTSP_API
--glib_gen_decl_include=\#include <gst/rtsp/rtsp-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/rtsp/rtsp-prelude.h>
- 
- include $(top_srcdir)/common/gst-glib-gen.mak
- 
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/rtsp/Makefile.in gst-plugins-base-1.14.5/gst-libs/gst/rtsp/Makefile.in
---- gst-plugins-base-1.14.5.old/gst-libs/gst/rtsp/Makefile.in	2019-05-29 16:33:23.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/rtsp/Makefile.in	2020-01-25 02:42:51.681748131 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -679,8 +681,8 @@
- glib_enum_headers = $(libgstrtspinclude_HEADERS)
- glib_gen_basename = gstrtsp
- glib_gen_decl_banner = GST_RTSP_API
--glib_gen_decl_include = \#include <gst/rtsp/rtsp-prelude.h>
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+glib_gen_decl_include = $(H)include <gst/rtsp/rtsp-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstrtspinclude_HEADERS)) \
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/tag/Makefile.am gst-plugins-base-1.14.5/gst-libs/gst/tag/Makefile.am
---- gst-plugins-base-1.14.5.old/gst-libs/gst/tag/Makefile.am	2018-03-23 20:44:42.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/tag/Makefile.am	2020-01-25 02:40:57.378758050 -0000
-@@ -1,11 +1,13 @@
- libgsttagincludedir = \
- 	$(includedir)/gstreamer-@GST_API_VERSION@/gst/tag
- 
-+H := \#
-+
- glib_enum_define = GST_TAG
- glib_gen_prefix = gst_tag
- glib_gen_basename = tag
- glib_gen_decl_banner=GST_TAG_API
--glib_gen_decl_include=\#include <gst/tag/tag-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/tag/tag-prelude.h>
- 
- glib_enum_headers = tag.h gsttagdemux.h
- 
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/tag/Makefile.in gst-plugins-base-1.14.5/gst-libs/gst/tag/Makefile.in
---- gst-plugins-base-1.14.5.old/gst-libs/gst/tag/Makefile.in	2019-05-29 16:33:24.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/tag/Makefile.in	2020-01-25 02:42:51.689748130 -0000
-@@ -17,12 +17,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -680,12 +682,12 @@
- glib_gen_prefix = gst_tag
- glib_gen_basename = tag
- glib_gen_decl_banner = GST_TAG_API
--glib_gen_decl_include = \#include <gst/tag/tag-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/tag/tag-prelude.h>
- glib_enum_headers = tag.h gsttagdemux.h
- built_sources = tag-enumtypes.c
- built_headers = tag-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- libgsttaginclude_HEADERS = \
- 	tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h
- 
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/video/Makefile.am gst-plugins-base-1.14.5/gst-libs/gst/video/Makefile.am
---- gst-plugins-base-1.14.5.old/gst-libs/gst/video/Makefile.am	2018-05-09 06:29:09.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/video/Makefile.am	2020-01-25 02:40:57.378758050 -0000
-@@ -2,6 +2,8 @@
- ORC_SOURCE=video-orc
- include $(top_srcdir)/common/orc.mak
- 
-+H := \#
-+
- glib_enum_headers = video.h video-format.h video-color.h video-info.h video-dither.h \
- 			colorbalance.h navigation.h video-chroma.h video-tile.h video-converter.h \
- 			video-resampler.h video-frame.h video-scaler.h
-@@ -9,7 +11,7 @@
- glib_gen_prefix = gst_video
- glib_gen_basename = video
- glib_gen_decl_banner=GST_VIDEO_API
--glib_gen_decl_include=\#include <gst/video/video-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/video/video-prelude.h>
- 
- built_sources = video-enumtypes.c
- built_headers = video-enumtypes.h
-diff -Naur gst-plugins-base-1.14.5.old/gst-libs/gst/video/Makefile.in gst-plugins-base-1.14.5/gst-libs/gst/video/Makefile.in
---- gst-plugins-base-1.14.5.old/gst-libs/gst/video/Makefile.in	2019-05-29 16:33:24.000000000 -0000
-+++ gst-plugins-base-1.14.5/gst-libs/gst/video/Makefile.in	2020-01-25 02:42:51.680748131 -0000
-@@ -39,12 +39,14 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
- 
- 
-@@ -740,7 +742,7 @@
- glib_gen_prefix = gst_video
- glib_gen_basename = video
- glib_gen_decl_banner = GST_VIDEO_API
--glib_gen_decl_include = \#include <gst/video/video-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/video/video-prelude.h>
- built_sources = video-enumtypes.c
- built_headers = video-enumtypes.h
- lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la
-@@ -821,7 +823,7 @@
- 
- libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
- libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstvideo_@GST_API_VERSION@include_HEADERS)) \
diff --git a/patches/media-libs/gstreamer/gstreamer-1.14.5-make-fix.patch b/patches/media-libs/gstreamer/gstreamer-1.14.5-make-fix.patch
deleted file mode 100644
index 2ca8f83..0000000
--- a/patches/media-libs/gstreamer/gstreamer-1.14.5-make-fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- gstreamer-1.14.5.old/common/glib-gen.mak	2018-03-23 20:44:39.000000000 -0000
-+++ gstreamer-1.14.5/common/glib-gen.mak	2020-01-25 01:43:33.857056864 -0000
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
-diff -Naur gstreamer-1.14.5.old/common/gst-glib-gen.mak gstreamer-1.14.5/common/gst-glib-gen.mak
---- gstreamer-1.14.5.old/common/gst-glib-gen.mak	2018-03-23 20:44:39.000000000 -0000
-+++ gstreamer-1.14.5/common/gst-glib-gen.mak	2020-01-25 01:44:18.698052973 -0000
-@@ -1,14 +1,16 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
-diff -Naur gstreamer-1.14.5.old/libs/gst/controller/Makefile.am gstreamer-1.14.5/libs/gst/controller/Makefile.am
---- gstreamer-1.14.5.old/libs/gst/controller/Makefile.am	2018-03-23 20:44:36.000000000 -0000
-+++ gstreamer-1.14.5/libs/gst/controller/Makefile.am	2020-01-25 01:45:03.465049088 -0000
-@@ -4,11 +4,13 @@
- 	gstinterpolationcontrolsource.h \
- 	gstlfocontrolsource.h
- 
-+H := \#
-+
- glib_enum_define = GST_CONTROLLER
- glib_gen_prefix = gst
- glib_gen_basename = controller
- glib_gen_decl_banner=GST_CONTROLLER_API
--glib_gen_decl_include=\#include <gst/controller/controller-prelude.h>
-+glib_gen_decl_include=$(H)include <gst/controller/controller-prelude.h>
- 
- built_sources = controller-enumtypes.c
- built_headers = controller-enumtypes.h
diff --git a/patches/sys-libs/compiler-rt-sanitizers/fix-compile-with-glibc-2.31.patch b/patches/sys-libs/compiler-rt-sanitizers/fix-compile-with-glibc-2.31.patch
new file mode 100644
index 0000000..358f020
--- /dev/null
+++ b/patches/sys-libs/compiler-rt-sanitizers/fix-compile-with-glibc-2.31.patch
@@ -0,0 +1,11 @@
+--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2020-03-11 20:35:37.099808821 +0100
++++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc	2020-03-11 20:36:08.279808758 +0100
+@@ -1128,7 +1128,7 @@
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+ #if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
+ /* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
+-CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
++//CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+ 
+ CHECK_TYPE_SIZE(shmid_ds);