gentoo resync : 25.11.2020

4 files changed, 10 insertions, 108 deletions

diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index 5a8460e64199..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Sat, 31 Aug 2019 21:23:23 +0900
-Subject: [PATCH] Introduce the BUILD_NONFREE option
-
-This allow users to disable building nonfree components (brightmaps.pk3
-and game_support.pk3) if they so desire.
----
- CMakeLists.txt | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2019-10-20 15:16:08.000000000 +0100
-+++ b/CMakeLists.txt	2019-10-24 21:27:58.104006569 +0100
-@@ -444,10 +444,15 @@
- add_subdirectory( libraries/wildmidi )
- add_subdirectory( libraries/oplsynth )
- add_subdirectory( libraries/zmusic )
-+
- add_subdirectory( wadsrc )
--add_subdirectory( wadsrc_bm )
- add_subdirectory( wadsrc_lights )
--add_subdirectory( wadsrc_extra )
-+option (BUILD_NONFREE "Build nonfree components" ON)
-+if( BUILD_NONFREE )
-+	add_subdirectory( wadsrc_bm )
-+	add_subdirectory( wadsrc_extra )
-+endif()
-+
- add_subdirectory( src )
- 
- if( NOT CMAKE_CROSSCOMPILING )
--- 
-2.23.0
-
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
deleted file mode 100644
index 1fe0b99d9a8e..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Thu, 13 Jun 2019 18:01:08 +0900
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks
-
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the
-installation directory.
----
- src/CMakeLists.txt | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0bb16f39e..4ff15062d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD
- 	${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $<TARGET_FILE_DIR:zdoom>/fm_banks/gs-by-papiezak-and-sneakernets.wopn
- )
- 
-+if( WIN32 )
-+	set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+else()
-+	set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." )
-+endif()
-+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks"
-+		DESTINATION ${INSTALL_SOUNDFONT_PATH}
-+		COMPONENT "Soundfont resources")
-+
- if( CMAKE_COMPILER_IS_GNUCXX )
- 	# GCC misoptimizes this file
- 	set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" )
--- 
-2.21.0
-
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
deleted file mode 100644
index 779268ca6d7e..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-
diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
index d7ece785e25d..64a230dcd984 100644
--- a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch
+++ b/games-fps/gzdoom/files/gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch
@@ -1,35 +1,36 @@
-From decf1df37a22c87da78230941209c110f7763f4b Mon Sep 17 00:00:00 2001
+From 9270c7bdb35d4dce2c270592011498a12a1bf6e7 Mon Sep 17 00:00:00 2001
 From: William Breathitt Gray <vilhelm.gray@gmail.com>
 Date: Sat, 31 Aug 2019 21:23:23 +0900
 Subject: [PATCH] Introduce the BUILD_NONFREE option
 
-This allow users to disable building nonfree components (brightmaps.pk3
-and game_support.pk3) if they so desire.
+This allow users to disable building nonfree components (brightmaps.pk3,
+game_support.pk3, and game_widescreen_gfx.pk3) if they so desire.
 ---
- CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ CMakeLists.txt | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4e59452..c2f49b2 100644
+index a3763ec1f..d0c4720bd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -393,10 +393,14 @@ add_subdirectory( libraries/lzma )
+@@ -400,11 +400,14 @@ add_subdirectory( libraries/lzma )
  add_subdirectory( tools )
  add_subdirectory( libraries/gdtoa )
  add_subdirectory( wadsrc )
 -add_subdirectory( wadsrc_bm )
  add_subdirectory( wadsrc_lights )
 -add_subdirectory( wadsrc_extra )
+-add_subdirectory( wadsrc_widescreen )
  add_subdirectory( src )
 +option (BUILD_NONFREE "Build nonfree components" ON)
 +if( BUILD_NONFREE )
 +       add_subdirectory( wadsrc_bm )
 +       add_subdirectory( wadsrc_extra )
++       add_subdirectory( wadsrc_widescreen )
 +endif()
-+
  
  if( NOT CMAKE_CROSSCOMPILING )
  	export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" )
 -- 
-2.26.2
+2.28.0