1 |
commit: 657a8f058b0cf5ee648ea8376ed7c73bbae83c45 |
2 |
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Aug 31 11:25:49 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 5 20:20:28 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657a8f05 |
7 |
|
8 |
games-fps/gzdoom: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
11 |
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com> |
12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
13 |
|
14 |
games-fps/gzdoom/Manifest | 1 - |
15 |
.../gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch | 28 ---------- |
16 |
.../files/gzdoom-4.1.3-install_soundfonts.patch | 34 ------------ |
17 |
games-fps/gzdoom/gzdoom-4.1.3.ebuild | 62 ---------------------- |
18 |
4 files changed, 125 deletions(-) |
19 |
|
20 |
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest |
21 |
index d7ccd5b9e28..1a1880d9565 100644 |
22 |
--- a/games-fps/gzdoom/Manifest |
23 |
+++ b/games-fps/gzdoom/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64 SHA512 16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac |
26 |
DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d |
27 |
|
28 |
diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch |
29 |
deleted file mode 100644 |
30 |
index 1ae12a832b4..00000000000 |
31 |
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch |
32 |
+++ /dev/null |
33 |
@@ -1,28 +0,0 @@ |
34 |
-From: Jan Engelhardt <jengelh@××××.de> |
35 |
-Date: 2018-10-16 14:29:56.900427855 +0200 |
36 |
- |
37 |
-Make the build work with fluidsynth 2.x. |
38 |
- |
39 |
---- |
40 |
- src/sound/mididevices/music_fluidsynth_mididevice.cpp | 5 ++++- |
41 |
- 1 file changed, 4 insertions(+), 1 deletion(-) |
42 |
- |
43 |
-Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp |
44 |
-=================================================================== |
45 |
---- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp |
46 |
-+++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp |
47 |
-@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD |
48 |
- #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f |
49 |
- #define FLUID_CHORUS_DEFAULT_SPEED 0.3f |
50 |
- #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f |
51 |
--#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE |
52 |
- |
53 |
- #endif |
54 |
- |
55 |
-+#ifndef FLUID_CHORUS_DEFAULT_TYPE |
56 |
-+#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE |
57 |
-+#endif |
58 |
-+ |
59 |
- // TYPES ------------------------------------------------------------------- |
60 |
- |
61 |
- // EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- |
62 |
|
63 |
diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch |
64 |
deleted file mode 100644 |
65 |
index 1fe0b99d9a8..00000000000 |
66 |
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch |
67 |
+++ /dev/null |
68 |
@@ -1,34 +0,0 @@ |
69 |
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001 |
70 |
-From: William Breathitt Gray <vilhelm.gray@×××××.com> |
71 |
-Date: Thu, 13 Jun 2019 18:01:08 +0900 |
72 |
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks |
73 |
- |
74 |
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the |
75 |
-installation directory. |
76 |
---- |
77 |
- src/CMakeLists.txt | 9 +++++++++ |
78 |
- 1 file changed, 9 insertions(+) |
79 |
- |
80 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
81 |
-index 0bb16f39e..4ff15062d 100644 |
82 |
---- a/src/CMakeLists.txt |
83 |
-+++ b/src/CMakeLists.txt |
84 |
-@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD |
85 |
- ${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $<TARGET_FILE_DIR:zdoom>/fm_banks/gs-by-papiezak-and-sneakernets.wopn |
86 |
- ) |
87 |
- |
88 |
-+if( WIN32 ) |
89 |
-+ set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." ) |
90 |
-+else() |
91 |
-+ set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." ) |
92 |
-+endif() |
93 |
-+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks" |
94 |
-+ DESTINATION ${INSTALL_SOUNDFONT_PATH} |
95 |
-+ COMPONENT "Soundfont resources") |
96 |
-+ |
97 |
- if( CMAKE_COMPILER_IS_GNUCXX ) |
98 |
- # GCC misoptimizes this file |
99 |
- set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" ) |
100 |
--- |
101 |
-2.21.0 |
102 |
- |
103 |
|
104 |
diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild |
105 |
deleted file mode 100644 |
106 |
index 242bd4e9287..00000000000 |
107 |
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild |
108 |
+++ /dev/null |
109 |
@@ -1,62 +0,0 @@ |
110 |
-# Copyright 1999-2019 Gentoo Authors |
111 |
-# Distributed under the terms of the GNU General Public License v2 |
112 |
- |
113 |
-EAPI=7 |
114 |
- |
115 |
-inherit cmake-utils desktop xdg |
116 |
- |
117 |
-DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine" |
118 |
-HOMEPAGE="https://zdoom.org" |
119 |
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz" |
120 |
- |
121 |
-LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT" |
122 |
-SLOT="0" |
123 |
-KEYWORDS="~amd64 ~x86" |
124 |
-IUSE="gtk gtk2 openmp" |
125 |
- |
126 |
-DEPEND=" |
127 |
- media-libs/libsdl2[opengl] |
128 |
- media-libs/libsndfile |
129 |
- media-libs/openal |
130 |
- media-sound/fluidsynth:= |
131 |
- media-sound/mpg123 |
132 |
- sys-libs/zlib |
133 |
- virtual/jpeg:0 |
134 |
- gtk? ( |
135 |
- gtk2? ( x11-libs/gtk+:2 ) |
136 |
- !gtk2? ( x11-libs/gtk+:3 ) |
137 |
- )" |
138 |
-RDEPEND="${DEPEND}" |
139 |
- |
140 |
-S="${WORKDIR}/${PN}-g${PV}" |
141 |
-PATCHES=( |
142 |
- "${FILESDIR}/${P}-fluidsynth2.patch" |
143 |
- "${FILESDIR}/${P}-install_soundfonts.patch" |
144 |
-) |
145 |
- |
146 |
-src_prepare() { |
147 |
- rm -rf docs/licenses || die |
148 |
- cmake-utils_src_prepare |
149 |
-} |
150 |
- |
151 |
-src_configure() { |
152 |
- local mycmakeargs=( |
153 |
- -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}" |
154 |
- -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom" |
155 |
- -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom" |
156 |
- -DDYN_FLUIDSYNTH=OFF |
157 |
- -DDYN_OPENAL=OFF |
158 |
- -DDYN_SNDFILE=OFF |
159 |
- -DDYN_MPG123=OFF |
160 |
- -DNO_GTK="$(usex !gtk)" |
161 |
- -DNO_OPENAL=OFF |
162 |
- -DNO_OPENMP="$(usex !openmp)" |
163 |
- ) |
164 |
- cmake-utils_src_configure |
165 |
-} |
166 |
- |
167 |
-src_install() { |
168 |
- newicon src/posix/zdoom.xpm "${PN}.xpm" |
169 |
- make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame" |
170 |
- cmake-utils_src_install |
171 |
-} |