1 |
commit: 2b3f989d1c050c6d792283a958138dd12d93ef73 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 19 22:10:10 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 19 22:10:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b3f989d |
7 |
|
8 |
games-fps/gzdoom: Drop old 4.2.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
12 |
|
13 |
games-fps/gzdoom/Manifest | 1 - |
14 |
...-4.2.0-Introduce-the-BUILD_NONFREE-option.patch | 36 ---------- |
15 |
.../gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch | 28 -------- |
16 |
.../files/gzdoom-4.2.0-install_soundfonts.patch | 34 ---------- |
17 |
games-fps/gzdoom/gzdoom-4.2.0.ebuild | 79 ---------------------- |
18 |
5 files changed, 178 deletions(-) |
19 |
|
20 |
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest |
21 |
index 6ea2bde6cef..bcb0430e517 100644 |
22 |
--- a/games-fps/gzdoom/Manifest |
23 |
+++ b/games-fps/gzdoom/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d |
26 |
DIST gzdoom-4.2.1.tar.gz 13660636 BLAKE2B f1399014441d1556cc16e8d89b8c321a0591996fbcf8ad85a99403faef3b4663636b2bc4543982f2fc9ebdba777e88e4685985390d2e798eb01c0cea683305f6 SHA512 37a21bf101442cbe36574666dfb92b28eeee6b4dc982d43a8d5c95255e1f49e2451740b54e100b59120cef67f68f6eb07f687155bbab712854ce7ddc7c0b6c4a |
27 |
|
28 |
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 |
29 |
deleted file mode 100644 |
30 |
index c74d08a24a4..00000000000 |
31 |
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch |
32 |
+++ /dev/null |
33 |
@@ -1,36 +0,0 @@ |
34 |
-From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001 |
35 |
-From: William Breathitt Gray <vilhelm.gray@×××××.com> |
36 |
-Date: Sat, 31 Aug 2019 21:23:23 +0900 |
37 |
-Subject: [PATCH] Introduce the BUILD_NONFREE option |
38 |
- |
39 |
-This allow users to disable building nonfree components (brightmaps.pk3 |
40 |
-and game_support.pk3) if they so desire. |
41 |
---- |
42 |
- CMakeLists.txt | 9 +++++++-- |
43 |
- 1 file changed, 7 insertions(+), 2 deletions(-) |
44 |
- |
45 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
46 |
-index 7860358ef..23d317f42 100644 |
47 |
---- a/CMakeLists.txt |
48 |
-+++ b/CMakeLists.txt |
49 |
-@@ -404,10 +404,15 @@ add_subdirectory( libraries/lzma ) |
50 |
- add_subdirectory( tools ) |
51 |
- add_subdirectory( libraries/dumb ) |
52 |
- add_subdirectory( libraries/gdtoa ) |
53 |
-+ |
54 |
- add_subdirectory( wadsrc ) |
55 |
--add_subdirectory( wadsrc_bm ) |
56 |
- add_subdirectory( wadsrc_lights ) |
57 |
--add_subdirectory( wadsrc_extra ) |
58 |
-+option (BUILD_NONFREE "Build nonfree components" ON) |
59 |
-+if( BUILD_NONFREE ) |
60 |
-+ add_subdirectory( wadsrc_bm ) |
61 |
-+ add_subdirectory( wadsrc_extra ) |
62 |
-+endif() |
63 |
-+ |
64 |
- add_subdirectory( src ) |
65 |
- |
66 |
- if( NOT CMAKE_CROSSCOMPILING ) |
67 |
--- |
68 |
-2.23.0 |
69 |
- |
70 |
|
71 |
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch |
72 |
deleted file mode 100644 |
73 |
index 1ae12a832b4..00000000000 |
74 |
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch |
75 |
+++ /dev/null |
76 |
@@ -1,28 +0,0 @@ |
77 |
-From: Jan Engelhardt <jengelh@××××.de> |
78 |
-Date: 2018-10-16 14:29:56.900427855 +0200 |
79 |
- |
80 |
-Make the build work with fluidsynth 2.x. |
81 |
- |
82 |
---- |
83 |
- src/sound/mididevices/music_fluidsynth_mididevice.cpp | 5 ++++- |
84 |
- 1 file changed, 4 insertions(+), 1 deletion(-) |
85 |
- |
86 |
-Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp |
87 |
-=================================================================== |
88 |
---- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp |
89 |
-+++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp |
90 |
-@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD |
91 |
- #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f |
92 |
- #define FLUID_CHORUS_DEFAULT_SPEED 0.3f |
93 |
- #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f |
94 |
--#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE |
95 |
- |
96 |
- #endif |
97 |
- |
98 |
-+#ifndef FLUID_CHORUS_DEFAULT_TYPE |
99 |
-+#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE |
100 |
-+#endif |
101 |
-+ |
102 |
- // TYPES ------------------------------------------------------------------- |
103 |
- |
104 |
- // EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- |
105 |
|
106 |
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 |
107 |
deleted file mode 100644 |
108 |
index 1fe0b99d9a8..00000000000 |
109 |
--- a/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch |
110 |
+++ /dev/null |
111 |
@@ -1,34 +0,0 @@ |
112 |
-From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001 |
113 |
-From: William Breathitt Gray <vilhelm.gray@×××××.com> |
114 |
-Date: Thu, 13 Jun 2019 18:01:08 +0900 |
115 |
-Subject: [PATCH] Install soundfonts and WOPL/WOPN banks |
116 |
- |
117 |
-The INSTALL_SOUNDFONT_PATH cache entry is used to configure the |
118 |
-installation directory. |
119 |
---- |
120 |
- src/CMakeLists.txt | 9 +++++++++ |
121 |
- 1 file changed, 9 insertions(+) |
122 |
- |
123 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
124 |
-index 0bb16f39e..4ff15062d 100644 |
125 |
---- a/src/CMakeLists.txt |
126 |
-+++ b/src/CMakeLists.txt |
127 |
-@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD |
128 |
- ${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $<TARGET_FILE_DIR:zdoom>/fm_banks/gs-by-papiezak-and-sneakernets.wopn |
129 |
- ) |
130 |
- |
131 |
-+if( WIN32 ) |
132 |
-+ set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." ) |
133 |
-+else() |
134 |
-+ set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." ) |
135 |
-+endif() |
136 |
-+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks" |
137 |
-+ DESTINATION ${INSTALL_SOUNDFONT_PATH} |
138 |
-+ COMPONENT "Soundfont resources") |
139 |
-+ |
140 |
- if( CMAKE_COMPILER_IS_GNUCXX ) |
141 |
- # GCC misoptimizes this file |
142 |
- set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" ) |
143 |
--- |
144 |
-2.21.0 |
145 |
- |
146 |
|
147 |
diff --git a/games-fps/gzdoom/gzdoom-4.2.0.ebuild b/games-fps/gzdoom/gzdoom-4.2.0.ebuild |
148 |
deleted file mode 100644 |
149 |
index 578941b1a1d..00000000000 |
150 |
--- a/games-fps/gzdoom/gzdoom-4.2.0.ebuild |
151 |
+++ /dev/null |
152 |
@@ -1,79 +0,0 @@ |
153 |
-# Copyright 1999-2019 Gentoo Authors |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
- |
156 |
-EAPI=7 |
157 |
- |
158 |
-inherit cmake-utils desktop xdg |
159 |
- |
160 |
-DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine" |
161 |
-HOMEPAGE="https://zdoom.org" |
162 |
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz" |
163 |
- |
164 |
-LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT |
165 |
- nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )" |
166 |
-SLOT="0" |
167 |
-KEYWORDS="~amd64 ~arm ~x86" |
168 |
-IUSE="gtk gtk2 +nonfree openmp" |
169 |
- |
170 |
-DEPEND=" |
171 |
- media-libs/libsdl2[opengl] |
172 |
- media-libs/libsndfile |
173 |
- media-libs/openal |
174 |
- media-sound/fluidsynth:= |
175 |
- media-sound/mpg123 |
176 |
- sys-libs/zlib |
177 |
- virtual/jpeg:0 |
178 |
- gtk? ( |
179 |
- gtk2? ( x11-libs/gtk+:2 ) |
180 |
- !gtk2? ( x11-libs/gtk+:3 ) |
181 |
- )" |
182 |
-RDEPEND="${DEPEND}" |
183 |
- |
184 |
-S="${WORKDIR}/${PN}-g${PV}" |
185 |
-PATCHES=( |
186 |
- "${FILESDIR}/${P}-fluidsynth2.patch" |
187 |
- "${FILESDIR}/${P}-install_soundfonts.patch" |
188 |
- "${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch" |
189 |
-) |
190 |
- |
191 |
-src_prepare() { |
192 |
- rm -rf docs/licenses || die |
193 |
- cmake-utils_src_prepare |
194 |
-} |
195 |
- |
196 |
-src_configure() { |
197 |
- local mycmakeargs=( |
198 |
- -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}" |
199 |
- -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom" |
200 |
- -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom" |
201 |
- -DDYN_FLUIDSYNTH=OFF |
202 |
- -DDYN_OPENAL=OFF |
203 |
- -DDYN_SNDFILE=OFF |
204 |
- -DDYN_MPG123=OFF |
205 |
- -DNO_GTK="$(usex !gtk)" |
206 |
- -DNO_OPENAL=OFF |
207 |
- -DNO_OPENMP="$(usex !openmp)" |
208 |
- -DBUILD_NONFREE="$(usex nonfree)" |
209 |
- ) |
210 |
- cmake-utils_src_configure |
211 |
-} |
212 |
- |
213 |
-src_install() { |
214 |
- newicon src/posix/zdoom.xpm "${PN}.xpm" |
215 |
- make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame" |
216 |
- cmake-utils_src_install |
217 |
-} |
218 |
- |
219 |
-pkg_postinst() { |
220 |
- xdg_pkg_postinst |
221 |
- |
222 |
- if ! use nonfree ; then |
223 |
- elog |
224 |
- elog "GZDoom installed without nonfree components." |
225 |
- elog "Note: The nonfree game_support.pk3 file is needed to play" |
226 |
- elog " games natively supported by GZDoom." |
227 |
- elog "A list of games natively supported by GZDoom may be found" |
228 |
- elog "on the ZDoom wiki: https://zdoom.org/wiki/IWAD" |
229 |
- elog |
230 |
- fi |
231 |
-} |