diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2020-12-22 18:30:41 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-12-22 18:30:48 +0100 |
| commit | f348c75259048a39b2e8f7496b53627644e6282b (patch) | |
| tree | 48c1de1463e11718c7ae3377a669ce1f4384da67 /media-libs/libsdl2/files | |
| parent | dev-python/pymongo: x86 stable (bug #761163) (diff) | |
| download | gentoo-f348c75259048a39b2e8f7496b53627644e6282b.tar.gz gentoo-f348c75259048a39b2e8f7496b53627644e6282b.tar.bz2 gentoo-f348c75259048a39b2e8f7496b53627644e6282b.zip | |
media-libs/libsdl2: Bump to version 2.0.14
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'media-libs/libsdl2/files')
| -rw-r--r-- | media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch | 34 | ||||
| -rw-r--r-- | media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch | 13 |
2 files changed, 47 insertions, 0 deletions
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch new file mode 100644 index 000000000000..01b9c5134379 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch @@ -0,0 +1,34 @@ +Fix --disable-static. + +Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 + +--- SDL2-2.0.14/configure.ac ++++ SDL2-2.0.14/configure.ac +@@ -3863,7 +3863,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 +--- SDL2-2.0.14/Makefile.in ++++ SDL2-2.0.14/Makefile.in +@@ -151,13 +151,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.14-vulkan.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch new file mode 100644 index 000000000000..948f68fe2340 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.14-vulkan.patch @@ -0,0 +1,13 @@ +--- SDL2-2.0.14/src/video/SDL_vulkan_utils.c ++++ SDL2-2.0.14/src/video/SDL_vulkan_utils.c +@@ -91,8 +91,10 @@ + return "VK_ERROR_VALIDATION_FAILED_EXT"; + case VK_ERROR_INVALID_SHADER_NV: + return "VK_ERROR_INVALID_SHADER_NV"; ++#if VK_HEADER_VERSION < 162 + case VK_ERROR_INCOMPATIBLE_VERSION_KHR: + return "VK_ERROR_INCOMPATIBLE_VERSION_KHR"; ++#endif + case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT: + return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT"; + case VK_ERROR_NOT_PERMITTED_EXT: |