From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2019 21:23:20 +0100 Subject: gentoo resync : 16.06.2019 --- .../files/gzdoom-4.1.2-static-libraries.patch | 139 --------------------- .../gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch | 28 +++++ 2 files changed, 28 insertions(+), 139 deletions(-) delete mode 100644 games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch create mode 100644 games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch (limited to 'games-fps/gzdoom/files') diff --git a/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch b/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch deleted file mode 100644 index 344fc0193d2d..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.1.2-static-libraries.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 6fafa297bfe0f82696d898d66e39c50f4f5eef16 Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray -Date: Wed, 15 May 2019 23:58:28 +0900 -Subject: [PATCH] Force STATIC for internal GZDoom libraries - -This makes sure the internal versions of these libraries bundled with -the GZDoom source code is used. This prevents the system from building -GZDoom for dynamic linking with incompatible external libraries (see -). ---- - asmjit/CMakeLists.txt | 2 +- - bzip2/CMakeLists.txt | 2 +- - game-music-emu/gme/CMakeLists.txt | 2 +- - gdtoa/CMakeLists.txt | 2 +- - glslang/glslang/CMakeLists.txt | 2 +- - glslang/spirv/CMakeLists.txt | 2 +- - jpeg/CMakeLists.txt | 2 +- - lzma/CMakeLists.txt | 2 +- - zlib/CMakeLists.txt | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt -index ab5c2fb4f..6b7636ebe 100644 ---- a/asmjit/CMakeLists.txt -+++ b/asmjit/CMakeLists.txt -@@ -97,7 +97,7 @@ set(ASMJIT_SRCS - asmjit/x86/x86regalloc.cpp - ) - --add_library(${ASMJITNAME} ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS}) -+add_library(${ASMJITNAME} STATIC ${ASMJIT_SRCS} ${ASMJIT_PUBLIC_HDRS}) - - set_target_properties(${ASMJITNAME} PROPERTIES OUTPUT_NAME asmjit) - -diff --git a/bzip2/CMakeLists.txt b/bzip2/CMakeLists.txt -index 6ff9a2172..7fefb2bf2 100644 ---- a/bzip2/CMakeLists.txt -+++ b/bzip2/CMakeLists.txt -@@ -7,7 +7,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE ) - endif() - - add_definitions( -DBZ_NO_STDIO ) --add_library( bz2 -+add_library( bz2 STATIC - blocksort.c - bzlib.c - compress.c -diff --git a/game-music-emu/gme/CMakeLists.txt b/game-music-emu/gme/CMakeLists.txt -index a5e06bc8a..5c37ebd29 100644 ---- a/game-music-emu/gme/CMakeLists.txt -+++ b/game-music-emu/gme/CMakeLists.txt -@@ -163,7 +163,7 @@ set (EXPORTED_HEADERS gme.h) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) - - # Add library to be compiled. --add_library(gme ${libgme_SRCS}) -+add_library(gme STATIC ${libgme_SRCS}) - - if(ZLIB_FOUND) - message(" ** ZLib library located, compressed file formats will be supported") -diff --git a/gdtoa/CMakeLists.txt b/gdtoa/CMakeLists.txt -index a0b76e0c3..485f3778b 100644 ---- a/gdtoa/CMakeLists.txt -+++ b/gdtoa/CMakeLists.txt -@@ -35,7 +35,7 @@ if( NOT MSVC AND NOT APPLE ) - set( GEN_FP_DEPS ${CMAKE_CURRENT_BINARY_DIR}/arith.h ${CMAKE_CURRENT_BINARY_DIR}/gd_qnan.h ) - endif() - --add_library( gdtoa -+add_library( gdtoa STATIC - ${GEN_FP_FILES} - dmisc.c - dtoa.c -diff --git a/glslang/glslang/CMakeLists.txt b/glslang/glslang/CMakeLists.txt -index c86eccb6e..e376a9178 100644 ---- a/glslang/glslang/CMakeLists.txt -+++ b/glslang/glslang/CMakeLists.txt -@@ -120,7 +120,7 @@ endmacro(glslang_pch) - - glslang_pch(SOURCES MachineIndependent/pch.cpp) - --add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -+add_library(glslang STATIC ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) - set_property(TARGET glslang PROPERTY FOLDER glslang) - set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) - target_link_libraries(glslang OGLCompiler OSDependent) -diff --git a/glslang/spirv/CMakeLists.txt b/glslang/spirv/CMakeLists.txt -index 8062f8067..03d34d8f4 100644 ---- a/glslang/spirv/CMakeLists.txt -+++ b/glslang/spirv/CMakeLists.txt -@@ -59,7 +59,7 @@ if(ENABLE_NV_EXTENSIONS) - GLSL.ext.NV.h) - endif(ENABLE_NV_EXTENSIONS) - --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 ..) -diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt -index 81834c742..33a3938cf 100644 ---- a/jpeg/CMakeLists.txt -+++ b/jpeg/CMakeLists.txt -@@ -6,7 +6,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE ) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" ) - endif() - --add_library( jpeg -+add_library( jpeg STATIC - jaricom.c - jcomapi.c - jdapimin.c -diff --git a/lzma/CMakeLists.txt b/lzma/CMakeLists.txt -index 3948ea2ee..4246a34f8 100644 ---- a/lzma/CMakeLists.txt -+++ b/lzma/CMakeLists.txt -@@ -34,5 +34,5 @@ else() - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_7ZIP_ST" ) - endif() - --add_library( lzma ${LZMA_FILES} ) -+add_library( lzma STATIC ${LZMA_FILES} ) - target_link_libraries( lzma ) -diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt -index 52542bbaa..a1d6637a9 100644 ---- a/zlib/CMakeLists.txt -+++ b/zlib/CMakeLists.txt -@@ -137,7 +137,7 @@ if(MINGW) - set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) - endif() - --add_library(${ZLIBNAME} ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -+add_library(${ZLIBNAME} STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) - set_target_properties(${ZLIBNAME} PROPERTIES DEFINE_SYMBOL ZLIB_DLL) - - set_target_properties(${ZLIBNAME} PROPERTIES SOVERSION 1) --- -2.21.0 - diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch new file mode 100644 index 000000000000..1ae12a832b4b --- /dev/null +++ b/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch @@ -0,0 +1,28 @@ +From: Jan Engelhardt +Date: 2018-10-16 14:29:56.900427855 +0200 + +Make the build work with fluidsynth 2.x. + +--- + src/sound/mididevices/music_fluidsynth_mididevice.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp +=================================================================== +--- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp ++++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp +@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD + #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f + #define FLUID_CHORUS_DEFAULT_SPEED 0.3f + #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f +-#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE + + #endif + ++#ifndef FLUID_CHORUS_DEFAULT_TYPE ++#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE ++#endif ++ + // TYPES ------------------------------------------------------------------- + + // EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- -- cgit v1.2.3