gentoo resync : 16.09.2020

2 files changed, 24 insertions, 44 deletions

diff --git a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
deleted file mode 100644
index 0b01568af6ad..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.10-static-libs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- SDL2-2.0.10/configure.ac
-+++ SDL2-2.0.10/configure.ac
-@@ -3648,7 +3648,7 @@
-         if test -f /lib/w32api/libuuid.a; then
-             LIBUUID=/lib/w32api/libuuid.a
-         else
--            LIBUUID=-luuid
-+            LIBUUID=-Wl,-luuid
-         fi
-         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion $LIBUUID -static-libgcc"
-         # The Windows platform requires special setup
-@@ -4069,10 +4069,10 @@
- 
- VERSION_OBJECTS=`echo $VERSION_SOURCES`
- VERSION_DEPENDS=`echo $VERSION_SOURCES`
--VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
-+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
- VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
--\\$(objects)/\\2.o: \\1/\\2.rc\\\\
--	\\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
-+	\\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
- 
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
---- SDL2-2.0.10/Makefile.in
-+++ SDL2-2.0.10/Makefile.in
-@@ -147,13 +147,13 @@
- .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
- 
- $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
--	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- install: all install-bin install-hdrs install-lib install-data
- install-bin:
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch
new file mode 100644
index 000000000000..7655ca674947
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch
@@ -0,0 +1,24 @@
+Fix wayland support on systems without X11.
+
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5270
+
+--- a/configure	Tue Aug 25 04:05:36 2020 +0200
++++ a/configure	Tue Aug 25 06:40:03 2020 -0700
+@@ -22306,6 +22306,7 @@
+           #define LINUX
+           #define EGL_API_FB
+           #define MESA_EGL_NO_X11_HEADERS
++          #define EGL_NO_X11
+           #include <EGL/egl.h>
+           #include <EGL/eglext.h>
+
+--- a/configure.ac	Tue Aug 25 04:05:36 2020 +0200
++++ a/configure.ac	Tue Aug 25 06:40:03 2020 -0700
+@@ -2373,6 +2373,7 @@
+           #define LINUX
+           #define EGL_API_FB
+           #define MESA_EGL_NO_X11_HEADERS
++          #define EGL_NO_X11
+           #include <EGL/egl.h>
+           #include <EGL/eglext.h>
+         ],[