gentoo resync : 16.06.2019

4 files changed, 38 insertions, 158 deletions

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 26ae74514714..05b65d34ce7c 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,4 @@
-AUX gzdoom-4.1.2-static-libraries.patch 5077 BLAKE2B cd380317c8e6da864b527c03f295e3fe9f7d1f9c7d7b3e429a57e780209565c54a9dbc658924ba1341cd3ebbbeb4297cc6b6be71e3df4be1f8831e108e0227eb SHA512 2113cd9ec8f88d4be4728b172ff8bb5ae6c5c4138b87f19504aaca21f3c6fce56da3d8e528419444d156cf6b7c327a768a8d89414e9d455f8111cb3ee7009e89
-DIST gzdoom-4.1.2.tar.gz 13045742 BLAKE2B 38c70eb82ba266e5b41bf62f28f4cee77ba17c0cc1e4186bf11be9021386511346c111874b695ef56a4ed3c93668bb64a71ba4169183646e49d0ab60a1c0793a SHA512 915029e676b17dd330aeee17fa8a9e07bb8e7a16e8ebce9fcdcd24e5b2f0cc48fd8f6914314029b332112ad4215a0f0d45d8e448e9025ac3c2a708a5e0bbd399
-EBUILD gzdoom-4.1.2.ebuild 1409 BLAKE2B 342ca6b8c95ba368b22e7db70c00a13801b901ce74b259b642fff2f9b925d0f3c17a28d59e4a038984a8ddc59c3b2e0ca472703b979d5c83bbf097d31fdefab3 SHA512 2b9d8cd919863095e8f68b37ab208f3ad8964544cfb8f5b846ee9f1ea06b8f1fb3c46da7f94b7421166d0c4b94d294e31970f2303a685f6601320c054aad72da
+AUX gzdoom-4.1.3-fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1
+DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64 SHA512 16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac
+EBUILD gzdoom-4.1.3.ebuild 1379 BLAKE2B 34f6cdbe54a9d31eb7d47654f65abfce87b11ee505e28b3b986c4b0367d0be02ba25b5dc20df7b995d8c77c35d636429244713aee13c962d0272827d5135b755 SHA512 d4c325772bba09afd1674a7222a1a0dd9f768e2a1c501f4bf07ee4d62726fa1bc36abbfb70dd4fbe63df67d5fcfe914d7dafe8001aa286f53bdb99118f4a0da2
 MISC metadata.xml 971 BLAKE2B c8b8d21ceb52ed04b079e9fb5de2b30351e5bc613a20d73f8cd26be75615959ace1ac8bf4b61b6009455e5db68377fa093040e7dbd9c2591455a1813c7d2c7b6 SHA512 f8c7cb9aec78c3a6ac5a861a5a7bd9d96dfc18883aa1c9265608edb955f962a81e078b2bcd23524a649643165150fba2e3b04df92d56bba17ec9d5b10156b119
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 <vilhelm.gray@gmail.com>
-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
-<https://forum.zdoom.org/viewtopic.php?f=2&t=64633>).
----
- 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 <jengelh@inai.de>
+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 --------------------------------------------
diff --git a/games-fps/gzdoom/gzdoom-4.1.2.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
index e113cbd6734b..d3d5f880537b 100644
--- a/games-fps/gzdoom/gzdoom-4.1.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fluidsynth gtk gtk2 openal openmp"
+IUSE="fluidsynth gtk gtk2 +openal openmp"
 
 DEPEND="
 	media-libs/libsdl2[opengl]
@@ -24,7 +24,7 @@ DEPEND="
 	)"
 RDEPEND="
 	${DEPEND}
-	fluidsynth? ( media-sound/fluidsynth )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	openal? (
 		media-libs/libsndfile
 		media-libs/openal
@@ -32,8 +32,7 @@ RDEPEND="
 	)"
 
 S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES="${FILESDIR}/${P}-static-libraries.patch"
+PATCHES="${FILESDIR}/${P}-fluidsynth2.patch"
 
 src_prepare() {
 	rm -rf docs/licenses || die
@@ -44,6 +43,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
 		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+		-DDYN_FLUIDSYNTH=OFF
+		-DDYN_OPENAL=OFF
+		-DDYN_SNDFILE=OFF
+		-DDYN_MPG123=OFF
 		-DNO_GTK="$(usex !gtk)"
 		-DNO_OPENAL="$(usex !openal)"
 		-DNO_OPENMP="$(usex !openmp)"
@@ -56,15 +59,3 @@ src_install() {
 	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
 	cmake-utils_src_install
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}