diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2020-07-11 14:38:33 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2020-07-11 14:39:26 +0100 |
| commit | 7cf54bdeb9936fbbe013e776c397933e7d04543b (patch) | |
| tree | 32319653b9744797e7cc02153276cbb56926939e /media-libs | |
| parent | dev-util/gtk-doc-am: remove old (diff) | |
| download | gentoo-7cf54bdeb9936fbbe013e776c397933e7d04543b.tar.gz gentoo-7cf54bdeb9936fbbe013e776c397933e7d04543b.tar.bz2 gentoo-7cf54bdeb9936fbbe013e776c397933e7d04543b.zip | |
media-libs/libsdl2: Fix building against the latest Vulkan headers
Closes: https://bugs.gentoo.org/721954
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch | 4 | ||||
| -rw-r--r-- | media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch | 17 | ||||
| -rw-r--r-- | media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild | 2 |
3 files changed, 22 insertions, 1 deletions
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 index 595d8a51fd39..f80dc6c222ca 100644 --- a/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch +++ b/media-libs/libsdl2/files/libsdl2-2.0.12-static-libs.patch @@ -1,3 +1,7 @@ +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 @@ 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 new file mode 100644 index 000000000000..717e5b5db38e --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.0.12-vulkan-headers.patch @@ -0,0 +1,17 @@ +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) diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild index cae1b46a7eb3..894a2e23e7aa 100644 --- a/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.12-r1.ebuild @@ -80,8 +80,8 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( - # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 "${FILESDIR}"/${PN}-2.0.12-static-libs.patch + "${FILESDIR}"/${PN}-2.0.12-vulkan-headers.patch ) S="${WORKDIR}/${MY_P}" |