diff options
| author |   William Breathitt Gray <vilhelm.gray@gmail.com> | 2020-06-17 14:50:17 -0400 |
|---|---|---|
| committer |   James Le Cuirot <chewi@gentoo.org> | 2020-09-02 22:33:44 +0100 |
| commit | a5d01020198a3aca269e0cc5666db8da0727be0c (patch) | |
| tree | 9bceb28d62c749168fd660d752cb1c59b5ef5017 /games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch | |
| parent | media-libs/zmusic: New package (diff) | |
| download | gentoo-a5d01020198a3aca269e0cc5666db8da0727be0c.tar.gz gentoo-a5d01020198a3aca269e0cc5666db8da0727be0c.tar.bz2 gentoo-a5d01020198a3aca269e0cc5666db8da0727be0c.zip | |
games-fps/gzdoom: Version bump to 4.4.2
Closes: https://bugs.gentoo.org/727448
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16301
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch')
| -rw-r--r-- | games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch new file mode 100644 index 000000000000..779268ca6d7e --- /dev/null +++ b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch @@ -0,0 +1,30 @@ +From c904b7521657e55843bae34f1f958d689538b13b Mon Sep 17 00:00:00 2001 +From: William Breathitt Gray <vilhelm.gray@gmail.com> +Date: Wed, 17 Jun 2020 15:17:49 -0400 +Subject: [PATCH] Force STATIC for internal GZDoom SPIRV library + +This makes sure the internal version of this library bundled with the +GZDoom source code is used. This prevents the system from building +GZDoom for dynamic linking with an incompatible external library (see +commit 6fafa297bfe0f82696d898d66e39c50f4f5eef16 and +<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>). +--- + libraries/glslang/spirv/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/glslang/spirv/CMakeLists.txt b/libraries/glslang/spirv/CMakeLists.txt +index 453ac16b5..d39a6e300 100644 +--- a/libraries/glslang/spirv/CMakeLists.txt ++++ b/libraries/glslang/spirv/CMakeLists.txt +@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS + SPVRemapper.h + doc.h) + +-add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) ++add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS}) + set_property(TARGET SPIRV PROPERTY FOLDER glslang) + set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) + target_include_directories(SPIRV PUBLIC +-- +2.26.2 + |