summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2021-07-24 20:39:37 -0400
committerIonen Wolkens <ionen@gentoo.org>2021-07-24 21:35:08 -0400
commitb7123d5088482b6a414f9f3b7da7738360b6d853 (patch)
treeb2f9a539b632f278c79f8ad01b39c1d98a6fbac9 /media-libs/libsdl2/files
parentapp-admin/helm: stabilize 3.5.4 (diff)
downloadgentoo-b7123d5088482b6a414f9f3b7da7738360b6d853.tar.gz
gentoo-b7123d5088482b6a414f9f3b7da7738360b6d853.tar.bz2
gentoo-b7123d5088482b6a414f9f3b7da7738360b6d853.zip
media-libs/libsdl2: drop vulnerable 2.0.12-r2
Bug: https://bugs.gentoo.org/766204 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'media-libs/libsdl2/files')
-rw-r--r--media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch24
-rw-r--r--media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch48
-rw-r--r--media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch17
3 files changed, 0 insertions, 89 deletions
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
deleted file mode 100644
index 7655ca674947..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-egl-detection.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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>
- ],[
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
deleted file mode 100644
index f80dc6c222ca..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Fix --disable-static.
-
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-
---- SDL2-2.0.12/configure.ac
-+++ SDL2-2.0.12/configure.ac
-@@ -3751,7 +3751,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
-@@ -4194,10 +4194,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 \\$(objects)/.created\\\\
-- \\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc \\$(objects)/.created\\\\
-+ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
-
- SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
- SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
---- SDL2-2.0.12/Makefile.in
-+++ SDL2-2.0.12/Makefile.in
-@@ -148,13 +148,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-vulkan-headers.patch b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch
deleted file mode 100644
index 717e5b5db38e..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix building against the latest Vulkan headers.
-
-Bug: https://bugs.gentoo.org/721954
-Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=5227
-
---- a/src/video/SDL_vulkan_utils.c 2020-03-10 21:36:18.000000000 -0400
-+++ b/src/video/SDL_vulkan_utils.c 2020-06-14 21:49:15.780898839 -0400
-@@ -85,7 +85,9 @@
- case VK_ERROR_INVALID_SHADER_NV:
- return "VK_ERROR_INVALID_SHADER_NV";
- case VK_RESULT_MAX_ENUM:
-+#if VK_HEADER_VERSION < 140
- case VK_RESULT_RANGE_SIZE:
-+#endif
- break;
- }
- if(result < 0)