summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2019-09-19 23:10:10 +0100
committerJames Le Cuirot <chewi@gentoo.org>2019-09-19 23:10:10 +0100
commit2b3f989d1c050c6d792283a958138dd12d93ef73 (patch)
treebca6027a7c7dc135916dea8e1f9c50e665ed339c /games-fps/gzdoom/files
parentgames-fps/gzdoom: Bump to version 4.2.1 (diff)
downloadgentoo-2b3f989d1c050c6d792283a958138dd12d93ef73.tar.gz
gentoo-2b3f989d1c050c6d792283a958138dd12d93ef73.tar.bz2
gentoo-2b3f989d1c050c6d792283a958138dd12d93ef73.zip
games-fps/gzdoom: Drop old 4.2.0
Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'games-fps/gzdoom/files')
-rw-r--r--games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch36
-rw-r--r--games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch28
-rw-r--r--games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch34
3 files changed, 0 insertions, 98 deletions
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
deleted file mode 100644
index c74d08a24a47..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
+++ /dev/null
@@ -1,36 +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 --git a/CMakeLists.txt b/CMakeLists.txt
-index 7860358ef..23d317f42 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -404,10 +404,15 @@ add_subdirectory( libraries/lzma )
- add_subdirectory( tools )
- add_subdirectory( libraries/dumb )
- add_subdirectory( libraries/gdtoa )
-+
- 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.0-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
deleted file mode 100644
index 1ae12a832b4b..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/files/gzdoom-4.2.0-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch
deleted file mode 100644
index 1fe0b99d9a8e..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-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
-