1 |
commit: 2b89f782ea206f0bac51cad18821aa6849022083 |
2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Oct 27 17:55:53 2016 +0000 |
4 |
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru> |
5 |
CommitDate: Thu Oct 27 17:56:16 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=2b89f782 |
7 |
|
8 |
games-fps/zdoom: bump to 2.8.1 |
9 |
|
10 |
Added unpacker DEPEND for 7zip (bug #598160). |
11 |
FMOD support had broken by upstream, temporary disabled. |
12 |
There few QA notices, I'm planning to fix them in upstream. |
13 |
|
14 |
Package-Manager: portage-2.3.0 |
15 |
Manifest-Sign-Key: A018DE8C |
16 |
|
17 |
games-fps/zdoom/metadata.xml | 6 ++- |
18 |
games-fps/zdoom/zdoom-2.7.1.ebuild | 75 ------------------------------------- |
19 |
games-fps/zdoom/zdoom-2.8.1.ebuild | 77 ++++++++++++++++++++++++++++++++++++++ |
20 |
games-fps/zdoom/zdoom-9999.ebuild | 75 ------------------------------------- |
21 |
4 files changed, 82 insertions(+), 151 deletions(-) |
22 |
|
23 |
diff --git a/games-fps/zdoom/metadata.xml b/games-fps/zdoom/metadata.xml |
24 |
index 202e559..36b28ff 100644 |
25 |
--- a/games-fps/zdoom/metadata.xml |
26 |
+++ b/games-fps/zdoom/metadata.xml |
27 |
@@ -1,7 +1,7 @@ |
28 |
<?xml version="1.0" encoding="UTF-8"?> |
29 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
30 |
<pkgmetadata> |
31 |
-<maintainer> |
32 |
+<maintainer type="person"> |
33 |
<email>azamat.hackimov@×××××.com</email> |
34 |
<name>Azamat H. Hackimov</name> |
35 |
</maintainer> |
36 |
@@ -11,5 +11,9 @@ ZDoom is an enhanced port of the official DOOM source code |
37 |
<longdescription lang="ru"> |
38 |
ZDoom - улучшенный порт движка DOOM |
39 |
</longdescription> |
40 |
+<use> |
41 |
+<flag name="asm">Enable assembly implementations</flag> |
42 |
+<!-- <flag name="fmod">Enable the fmod music and sound effects</flag> --> |
43 |
+</use> |
44 |
</pkgmetadata> |
45 |
|
46 |
|
47 |
diff --git a/games-fps/zdoom/zdoom-2.7.1.ebuild b/games-fps/zdoom/zdoom-2.7.1.ebuild |
48 |
deleted file mode 100644 |
49 |
index bfdb12e..0000000 |
50 |
--- a/games-fps/zdoom/zdoom-2.7.1.ebuild |
51 |
+++ /dev/null |
52 |
@@ -1,75 +0,0 @@ |
53 |
-# Copyright 1999-2015 Gentoo Foundation |
54 |
-# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: $ |
56 |
- |
57 |
-EAPI=5 |
58 |
-inherit cmake-utils eutils games versionator unpacker |
59 |
- |
60 |
-DESCRIPTION="ZDoom is an enhanced port of the official DOOM source code" |
61 |
-HOMEPAGE="http://www.zdoom.org" |
62 |
-SRC_URI="http://www.zdoom.org/files/${PN}/$(get_version_component_range 1-2)/${P}-src.7z" |
63 |
- |
64 |
-LICENSE="BSD BUILD DOOM" |
65 |
-SLOT="0" |
66 |
-KEYWORDS="~amd64 ~x86" |
67 |
-IUSE="cpu_flags_x86_mmx gtk" |
68 |
- |
69 |
-RDEPEND="app-arch/bzip2 |
70 |
- media-libs/fmod:1 |
71 |
- media-libs/libsdl:0 |
72 |
- media-sound/fluidsynth |
73 |
- sys-libs/zlib |
74 |
- virtual/jpeg:0 |
75 |
- x11-libs/libXcursor |
76 |
- gtk? ( x11-libs/gtk+:2 )" |
77 |
-DEPEND="${RDEPEND} |
78 |
- cpu_flags_x86_mmx? ( || ( dev-lang/nasm dev-lang/yasm ) )" |
79 |
- |
80 |
-S="${WORKDIR}" |
81 |
- |
82 |
-src_prepare() { |
83 |
- # Add new versions of FMOD |
84 |
- sed -i \ |
85 |
- -e "s:\(set( MAJOR_VERSIONS\):\1 \"40\" \"38\":" \ |
86 |
- src/CMakeLists.txt || die |
87 |
- # Use default game data path |
88 |
- sed -i \ |
89 |
- -e "s:/usr/local/share/:${GAMES_DATADIR}/doom-data/:" \ |
90 |
- src/sdl/i_system.h || die "sed i_system.h failed" |
91 |
-} |
92 |
- |
93 |
-src_configure() { |
94 |
- mycmakeargs=( |
95 |
- "-DFMOD_LOCAL_LIB_DIRS=/opt/fmodex/api/lib" |
96 |
- "-DFMOD_INCLUDE_DIR=/opt/fmodex/api/inc" |
97 |
-# "-DSHARE_DIR=\"${GAMES_DATADIR}/doom-data\"" |
98 |
- $(cmake-utils_use_no gtk GTK) |
99 |
- $(cmake-utils_use_no cpu_flags_x86_mmx ASM) |
100 |
- ) |
101 |
- cmake-utils_src_configure |
102 |
-} |
103 |
- |
104 |
-src_compile() { |
105 |
- cmake-utils_src_compile |
106 |
-} |
107 |
- |
108 |
-src_install() { |
109 |
- dogamesbin "${CMAKE_BUILD_DIR}/${PN}" || die "dogamesbin failed" |
110 |
- insinto "${GAMES_DATADIR}/doom-data" |
111 |
- doins "${CMAKE_BUILD_DIR}/${PN}.pk3" || die "doins failed" |
112 |
- dodoc docs/commands.txt |
113 |
- dohtml docs/console.{css,html} |
114 |
- prepgamesdirs |
115 |
-} |
116 |
- |
117 |
-pkg_postinst() { |
118 |
- games_pkg_postinst |
119 |
- echo |
120 |
- elog "Copy or link wad files into ${GAMES_DATADIR}/doom-data/" |
121 |
- elog "(the files must be readable by the 'games' group)." |
122 |
- elog |
123 |
- elog "To play, simply run:" |
124 |
- elog |
125 |
- elog " zdoom" |
126 |
- echo |
127 |
-} |
128 |
|
129 |
diff --git a/games-fps/zdoom/zdoom-2.8.1.ebuild b/games-fps/zdoom/zdoom-2.8.1.ebuild |
130 |
new file mode 100644 |
131 |
index 0000000..66e4ffe |
132 |
--- /dev/null |
133 |
+++ b/games-fps/zdoom/zdoom-2.8.1.ebuild |
134 |
@@ -0,0 +1,77 @@ |
135 |
+# Copyright 1999-2016 Gentoo Foundation |
136 |
+# Distributed under the terms of the GNU General Public License v2 |
137 |
+# $Id$ |
138 |
+ |
139 |
+EAPI=6 |
140 |
+inherit cmake-utils eutils versionator unpacker |
141 |
+ |
142 |
+DESCRIPTION="ZDoom is an enhanced port of the official DOOM source code" |
143 |
+HOMEPAGE="http://www.zdoom.org" |
144 |
+SRC_URI="http://www.zdoom.org/files/${PN}/$(get_version_component_range 1-2)/${P}-src.7z" |
145 |
+ |
146 |
+LICENSE="BSD BUILD DOOM" |
147 |
+SLOT="0" |
148 |
+KEYWORDS="~amd64 ~x86" |
149 |
+# FIXME fmod does not work |
150 |
+IUSE="asm gtk openal" |
151 |
+ |
152 |
+# fmod? ( media-libs/fmod:1 ) |
153 |
+RDEPEND="app-arch/bzip2 |
154 |
+ media-libs/game-music-emu |
155 |
+ media-libs/libsdl2 |
156 |
+ openal? ( media-libs/openal ) |
157 |
+ media-sound/fluidsynth |
158 |
+ sys-libs/zlib |
159 |
+ virtual/jpeg:0 |
160 |
+ x11-libs/libXcursor |
161 |
+ gtk? ( x11-libs/gtk+:2 )" |
162 |
+DEPEND="${RDEPEND} |
163 |
+ asm? ( || ( dev-lang/nasm dev-lang/yasm ) ) |
164 |
+ $(unpacker_src_uri_depends)" |
165 |
+ |
166 |
+S="${WORKDIR}" |
167 |
+ |
168 |
+DOCS=( "docs/commands.txt" ) |
169 |
+HTML_DOCS=( "docs/console.{css,html}" ) |
170 |
+ |
171 |
+src_prepare() { |
172 |
+ default |
173 |
+ |
174 |
+ sed -i \ |
175 |
+ -e "s:/usr/local/share/:/usr/share/doom-data/:" \ |
176 |
+ src/posix/i_system.h || die "sed i_system.h failed" |
177 |
+ |
178 |
+ sed -i \ |
179 |
+ -e "s:/usr/local/share/doom:/usr/share/doom-data/:" \ |
180 |
+ src/gameconfigfile.cpp || die "sed gameconfigfile.cpp failed" |
181 |
+} |
182 |
+ |
183 |
+src_configure() { |
184 |
+ mycmakeargs=( |
185 |
+# "-DFMOD_LOCAL_LIB_DIRS=/opt/fmodex/api/lib" |
186 |
+# "-DFMOD_INCLUDE_DIR=/opt/fmodex/api/inc" |
187 |
+ "-DGME_INCLUDE_DIR=/usr/include" |
188 |
+ "-DFORCE_INTERNAL_GME=no" |
189 |
+ -DNO_ASM=$(usex !asm) |
190 |
+# -DNO_FMOD=$(usex !fmod) |
191 |
+ -DNO_GTK=$(usex !gtk) |
192 |
+ -DNO_OPENAL=$(usex !openal) |
193 |
+ ) |
194 |
+ cmake-utils_src_configure |
195 |
+} |
196 |
+ |
197 |
+src_install() { |
198 |
+ dobin "${CMAKE_BUILD_DIR}/${PN}" |
199 |
+ insinto "/usr/share/doom-data" |
200 |
+ doins "${CMAKE_BUILD_DIR}/${PN}.pk3" |
201 |
+} |
202 |
+ |
203 |
+pkg_postinst() { |
204 |
+ echo |
205 |
+ elog "Copy or link wad files into /usr/share/doom-data/" |
206 |
+ elog |
207 |
+ elog "To play, simply run:" |
208 |
+ elog |
209 |
+ elog " zdoom" |
210 |
+ echo |
211 |
+} |
212 |
|
213 |
diff --git a/games-fps/zdoom/zdoom-9999.ebuild b/games-fps/zdoom/zdoom-9999.ebuild |
214 |
deleted file mode 100644 |
215 |
index ec827c8..0000000 |
216 |
--- a/games-fps/zdoom/zdoom-9999.ebuild |
217 |
+++ /dev/null |
218 |
@@ -1,75 +0,0 @@ |
219 |
-# Copyright 1999-2015 Gentoo Foundation |
220 |
-# Distributed under the terms of the GNU General Public License v2 |
221 |
-# $Header: $ |
222 |
- |
223 |
-EAPI=5 |
224 |
-inherit cmake-utils eutils games git-2 |
225 |
- |
226 |
-DESCRIPTION="ZDoom is an enhanced port of the official DOOM source code" |
227 |
-HOMEPAGE="http://www.zdoom.org" |
228 |
-EGIT_REPO_URI="https://github.com/rheit/zdoom" |
229 |
-#SRC_URI="http://www.zdoom.org/files/${PN}/2.5/${P}-src.7z" |
230 |
- |
231 |
-LICENSE="BSD BUILD DOOM" |
232 |
-SLOT="0" |
233 |
-KEYWORDS="" |
234 |
-IUSE="cpu_flags_x86_mmx gtk" |
235 |
- |
236 |
-RDEPEND="app-arch/bzip2 |
237 |
- media-libs/fmod:1 |
238 |
- media-sound/fluidsynth |
239 |
- sys-libs/zlib |
240 |
- virtual/jpeg:0 |
241 |
- x11-libs/libXcursor |
242 |
- gtk? ( x11-libs/gtk+:2 )" |
243 |
-DEPEND="${RDEPEND} |
244 |
- cpu_flags_x86_mmx? ( || ( dev-lang/nasm dev-lang/yasm ) )" |
245 |
- |
246 |
-S="${WORKDIR}" |
247 |
- |
248 |
-src_prepare() { |
249 |
- # Add new versions of FMOD |
250 |
- sed -i \ |
251 |
- -e "s:\(set( MAJOR_VERSIONS\):\1 \"40\" \"38\":" \ |
252 |
- src/CMakeLists.txt || die |
253 |
- # Use default game data path |
254 |
-# sed -i \ |
255 |
-# -e "s:/usr/local/share/:${GAMES_DATADIR}/doom-data/:" \ |
256 |
-# src/sdl/i_system.h || die "sed i_system.h failed" |
257 |
-} |
258 |
- |
259 |
-src_configure() { |
260 |
- mycmakeargs=( |
261 |
- "-DFMOD_LOCAL_LIB_DIRS=/opt/fmodex/api/lib" |
262 |
- "-DFMOD_INCLUDE_DIR=/opt/fmodex/api/inc" |
263 |
-# "-DSHARE_DIR=\"${GAMES_DATADIR}/doom-data\"" |
264 |
- $(cmake-utils_use_no gtk GTK) |
265 |
- $(cmake-utils_use_no cpu_flags_x86_mmx ASM) |
266 |
- ) |
267 |
- cmake-utils_src_configure |
268 |
-} |
269 |
- |
270 |
-src_compile() { |
271 |
- cmake-utils_src_compile |
272 |
-} |
273 |
- |
274 |
-src_install() { |
275 |
- dogamesbin "${CMAKE_BUILD_DIR}/${PN}" || die "dogamesbin failed" |
276 |
- insinto "${GAMES_DATADIR}/doom-data" |
277 |
- doins "${CMAKE_BUILD_DIR}/${PN}.pk3" || die "doins failed" |
278 |
- dodoc docs/commands.txt |
279 |
- dohtml docs/console.{css,html} |
280 |
- prepgamesdirs |
281 |
-} |
282 |
- |
283 |
-pkg_postinst() { |
284 |
- games_pkg_postinst |
285 |
- echo |
286 |
- elog "Copy or link wad files into ${GAMES_DATADIR}/doom-data/" |
287 |
- elog "(the files must be readable by the 'games' group)." |
288 |
- elog |
289 |
- elog "To play, simply run:" |
290 |
- elog |
291 |
- elog " zdoom" |
292 |
- echo |
293 |
-} |