Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Maxim Koltsov <maksbotan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/maksbotan:master commit in: games-fps/doomsday/, games-fps/doomsday/files/
Date: Mon, 04 Jun 2012 14:32:39
Message-Id: 1338233465.6d097666cbf895c6507b12f942c528a773404bfc.maksbotan@gentoo
1 commit: 6d097666cbf895c6507b12f942c528a773404bfc
2 Author: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 28 18:18:14 2012 +0000
4 Commit: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
5 CommitDate: Mon May 28 19:31:05 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maksbotan.git;a=commit;h=6d097666
7
8 Add enhanced doomsday ebuild
9
10 (Portage version: 2.1.10.63/git/Linux x86_64, signed Manifest commit with key F8DBDADE)
11
12 ---
13 games-fps/doomsday/ChangeLog | 191 ++++++++++++++++++++
14 games-fps/doomsday/Manifest | 21 +++
15 games-fps/doomsday/doomsday-1.9.0_beta69-r1.ebuild | 138 ++++++++++++++
16 .../files/doomsday-1.9.0_beta69-png15.patch | 86 +++++++++
17 .../files/doomsday-1.9.0_beta69-underlink.patch | 11 ++
18 games-fps/doomsday/files/wrapper | 6 +
19 games-fps/doomsday/metadata.xml | 14 ++
20 7 files changed, 467 insertions(+), 0 deletions(-)
21
22 diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog
23 new file mode 100644
24 index 0000000..ffb11a4
25 --- /dev/null
26 +++ b/games-fps/doomsday/ChangeLog
27 @@ -0,0 +1,191 @@
28 +# ChangeLog for games-fps/doomsday
29 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.41 2011/10/23 20:12:14 ssuominen Exp $
31 +
32 + 23 Oct 2011; Samuli Suominen <ssuominen@g.o>
33 + -doomsday-1.9.0_beta62.ebuild:
34 + old
35 +
36 + 15 Oct 2011; Kacper Kowalik <xarthisius@g.o>
37 + doomsday-1.9.0_beta69.ebuild:
38 + ppc stable wrt #385793
39 +
40 + 16 Sep 2011; Tupone Alfredo <tupone@g.o> doomsday-1.9.0_beta69.ebuild,
41 + +files/doomsday-1.9.0_beta69-png15.patch:
42 + Build with png-1.5 Bug #383219 by Diego Elio Pettenò
43 +
44 + 16 May 2011; Tupone Alfredo <tupone@g.o> doomsday-1.9.0_beta69.ebuild,
45 + +files/doomsday-1.9.0_beta69-underlink.patch:
46 + Fix underlinking. Bug #367353 by Diego Elio Pettenò
47 +
48 + 18 Mar 2011; Thomas Kahle <tomka@g.o> doomsday-1.9.0_beta69.ebuild:
49 + x86 stable per bug 356491
50 +
51 + 20 Jan 2011; Michael Sterrett <mr_bones_@g.o>
52 + doomsday-1.9.0_beta68.ebuild, doomsday-1.9.0_beta69.ebuild:
53 + doomsday doesn't work on amd64 (bug #352271)
54 +
55 +*doomsday-1.9.0_beta69 (19 Jan 2011)
56 +
57 + 19 Jan 2011; Michael Sterrett <mr_bones_@g.o>
58 + +doomsday-1.9.0_beta69.ebuild:
59 + version bump (bug #348779)
60 +
61 + 31 May 2010; Pawel Hajdan jr <phajdan.jr@g.o>
62 + doomsday-1.9.0_beta68.ebuild:
63 + x86 stable wrt bug #319293
64 +
65 + 25 May 2010; Pacho Ramos <pacho@g.o> doomsday-1.9.0_beta68.ebuild:
66 + stable amd64, bug 319293
67 +
68 +*doomsday-1.9.0_beta68 (10 Mar 2010)
69 +
70 + 10 Mar 2010; Michael Sterrett <mr_bones_@g.o>
71 + +doomsday-1.9.0_beta68.ebuild:
72 + version bump
73 +
74 + 23 Jan 2010; Samuli Suominen <ssuominen@g.o>
75 + doomsday-1.9.0_beta67.ebuild:
76 + amd64 stable
77 +
78 + 10 Nov 2009; Samuli Suominen <ssuominen@g.o>
79 + doomsday-1.9.0_beta67.ebuild:
80 + Keyword ~amd64.
81 +
82 + 10 Nov 2009; Joseph Jezak <josejx@g.o>
83 + doomsday-1.9.0_beta62.ebuild:
84 + Marked ppc stable for bug #287614.
85 +
86 + 21 Oct 2009; Michael Sterrett <mr_bones_@g.o>
87 + doomsday-1.9.0_beta52.ebuild, doomsday-1.9.0_beta62.ebuild,
88 + doomsday-1.9.0_beta67.ebuild:
89 + update HOMEPAGE
90 +
91 +*doomsday-1.9.0_beta67 (21 Oct 2009)
92 +
93 + 21 Oct 2009; Michael Sterrett <mr_bones_@g.o>
94 + +doomsday-1.9.0_beta67.ebuild:
95 + version bump
96 +
97 + 21 Oct 2009; Markus Meier <maekke@g.o>
98 + doomsday-1.9.0_beta62.ebuild:
99 + x86 stable, bug #287614
100 +
101 +*doomsday-1.9.0_beta62 (26 May 2009)
102 +
103 + 26 May 2009; Tristan Heaven <nyhm@g.o>
104 + +doomsday-1.9.0_beta62.ebuild:
105 + Version bump
106 +
107 + 25 Dec 2007; <solar@g.o> doomsday-1.9.0_beta52.ebuild:
108 + - binary packages that are linked with libc.so.6 need to use sys-libs/glibc
109 + in RDEPEND
110 +
111 + 04 Dec 2007; Michael Sterrett <mr_bones_@g.o>
112 + doomsday-1.9.0_beta52.ebuild:
113 + mark stable to avoid p.mask downgrade
114 +
115 +*doomsday-1.9.0_beta52 (23 Nov 2007)
116 +
117 + 23 Nov 2007; Michael Sterrett <mr_bones_@g.o>
118 + -files/doomsday-1.9.0_beta4-configure.patch,
119 + -files/doomsday-1.9.0_beta4-music-driver.patch,
120 + -doomsday-1.9.0_beta4.ebuild, -doomsday-1.9.0_beta4-r1.ebuild,
121 + -doomsday-1.9.0_beta5.ebuild, +doomsday-1.9.0_beta52.ebuild:
122 + version bump; clean out old, insecure versions
123 +
124 + 13 Mar 2007; Chris Gianelloni <wolf31o2@g.o>
125 + doomsday-1.9.0_beta5.ebuild:
126 + Change which to type -P for QA.
127 +
128 +*doomsday-1.9.0_beta5 (01 Feb 2007)
129 +
130 + 01 Feb 2007; Tristan Heaven <nyhm@g.o>
131 + +doomsday-1.9.0_beta5.ebuild:
132 + Version bump
133 +
134 + 04 Dec 2006; Chris Gianelloni <wolf31o2@g.o>
135 + doomsday-1.9.0_beta4.ebuild, doomsday-1.9.0_beta4-r1.ebuild:
136 + Removing old virtual/x11 dependency.
137 +
138 + 08 Oct 2006; <tupone@g.o> doomsday-1.9.0_beta4.ebuild:
139 + Adding missing dependency from app-arch/zip. Bug #143502 by Davide Cendron
140 +
141 +*doomsday-1.9.0_beta4-r1 (05 Sep 2006)
142 +
143 + 05 Sep 2006; <tupone@g.o> +doomsday-1.9.0_beta4-r1.ebuild:
144 + Make wrappers for the common wads. Bug #127397 by Paul Bredbury
145 +
146 + 02 Jun 2006; Tobias Scherbaum <dertobi123@g.o>
147 + doomsday-1.9.0_beta4.ebuild:
148 + ppc stable, bug #128690
149 +
150 + 31 May 2006; Chris Gianelloni <wolf31o2@g.o>
151 + doomsday-1.9.0_beta4.ebuild:
152 + Stable on x86 wrt bug #128690.
153 +
154 +*doomsday-1.9.0_beta4 (31 May 2006)
155 +
156 + 31 May 2006; Chris Gianelloni <wolf31o2@g.o>
157 + -files/doomsday-1.8.6-music-driver.patch,
158 + +files/doomsday-1.9.0_beta4-configure.patch,
159 + +files/doomsday-1.9.0_beta4-music-driver.patch, -doomsday-1.8.6.ebuild,
160 + -doomsday-1.8.6-r1.ebuild, -doomsday-1.9.0_beta3.ebuild,
161 + +doomsday-1.9.0_beta4.ebuild:
162 + Version bump. This resolves bug #128690 from the games team's end.
163 +
164 +*doomsday-1.9.0_beta3 (22 Apr 2006)
165 +
166 + 22 Apr 2006; Mike Frysinger <vapier@g.o>
167 + +files/doomsday-1.8.6-music-driver.patch, +doomsday-1.9.0_beta3.ebuild:
168 + Version bump #128690 by Raphael Marichez / #115820 by Alexander Nicolaysen
169 + Sørnes.
170 +
171 +*doomsday-1.8.6-r1 (13 Mar 2006)
172 +
173 + 13 Mar 2006; <Tupone@g.o> -files/1.8.0-filename-case.patch,
174 + doomsday-1.8.6.ebuild, +doomsday-1.8.6-r1.ebuild:
175 + Fix for bug #113067 (segfault with openal). Thanks Anton Romanov for report.
176 + Minor dependency fixes.
177 +
178 + 16 Sep 2005; Ciaran McCreesh <ciaranm@g.o> ChangeLog:
179 + Converted to UTF-8, fixed encoding screwups
180 +
181 + 09 Aug 2005; Michael Sterrett <mr_bones_@g.o>
182 + -doomsday-1.8.0.ebuild, -doomsday-1.8.1.ebuild, -doomsday-1.8.3.ebuild:
183 + clean old versions
184 +
185 +*doomsday-1.8.6 (24 Jan 2005)
186 +
187 + 24 Jan 2005; Mike Frysinger <vapier@g.o> +doomsday-1.8.6.ebuild:
188 + Version bump #78453 by Maxime Carey.
189 +
190 +*doomsday-1.8.3 (07 Dec 2004)
191 +
192 + 07 Dec 2004; Michael Sterrett <mr_bones_@g.o> +doomsday-1.8.3.ebuild:
193 + version bump (bug #72437)
194 +
195 + 28 Sep 2004; Sven Wegener <swegener@g.o> :
196 + Gentoo Technologies, Inc. -> Gentoo Foundation
197 +
198 + 05 Sep 2004; David Holm <dholm@g.o> doomsday-1.8.1.ebuild:
199 + Added to ~ppc.
200 +
201 + 01 Sep 2004; Chris Gianelloni <wolf31o2@g.o>
202 + -files/1.8.1-ambient-light.patch, doomsday-1.8.1.ebuild:
203 + Reverting patch. See bug #61072 for more details.
204 +
205 + 01 Sep 2004; Chris Gianelloni <wolf31o2@g.o>
206 + +files/1.8.1-ambient-light.patch:
207 + I forgot to add the patch.
208 +
209 +*doomsday-1.8.1 (31 Aug 2004)
210 +
211 + 31 Aug 2004; Chris Gianelloni <wolf31o2@g.o> +doomsday-1.8.1.ebuild:
212 + Version bumped to 1.8.1 and adding 1.8.1-ambient-light.patch submitted by
213 + dilipv@×××××××.com to bug #61072.
214 +
215 +*doomsday-1.8.0 (21 Jul 2004)
216 +
217 + 21 Jul 2004; Mike Frysinger <vapier@g.o> :
218 + Initial import. Ebuild submitted by Hinrik Örn Sigurðsson #53793.
219
220 diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
221 new file mode 100644
222 index 0000000..9f590a2
223 --- /dev/null
224 +++ b/games-fps/doomsday/Manifest
225 @@ -0,0 +1,21 @@
226 +-----BEGIN PGP SIGNED MESSAGE-----
227 +Hash: SHA1
228 +
229 +AUX doomsday-1.9.0_beta69-png15.patch 5042 RMD160 249fb6f153b01632c5d41c0b52ce9d0d84f57520 SHA1 adc25a193b07d6a13fb861d0d6bf77ecb4c46f3b SHA256 0a406daa9afafffca641be96a7f153635655b5611d7747daaf67ca2f2a943d07
230 +AUX doomsday-1.9.0_beta69-underlink.patch 386 RMD160 4dc1504b2da9e0aba061cffc348b5b414c02a2b9 SHA1 19c6b6d3e1ebabd3dbb2c92876d7c7786ddb2c45 SHA256 b774ef4cdad497668728668ec49b46b17c90a399cce5949337e8c0756cdfe0b7
231 +AUX wrapper 136 RMD160 9eb253537d5e2b443cf0807401b86a7526ae3e4e SHA1 2cb84a8feca8d213ecf0ac92d3bfa36282d293c1 SHA256 64b959cfeb77bd778f16768c0ee509cd128eb855fa4acd8e7c37046c5885dbc8
232 +DIST deng-1.9.0-beta6.9.tar.gz 6085833 RMD160 e91a4bc76b39da9e2e51925e03154ffcb128fea9 SHA1 e1f7d64b1b60eef2659bc4636fbe41a0abf6a6ce SHA256 3553f6a58660916fdedbe0594f5b22dac4738ee6e02b042992d3140d358954af
233 +EBUILD doomsday-1.9.0_beta69-r1.ebuild 3827 RMD160 e2ae37dabf42ce34120cca74e0439c14ea7775c4 SHA1 e4783a6bb9f7d6de43570943c17c90c0997d75d0 SHA256 635f6fda5900d51c39f64f3245a3cb9ae3553acffac6d9121747616d12a40ad4
234 +MISC ChangeLog 6388 RMD160 6bc12faa8cf5299e9549b6ef0b8030bfc003c06d SHA1 18adc40348c6a3fbca3e0b3c6ac3f32e44185241 SHA256 1cb97fd15867bdbf8dc1adf045459fa95c2f0502022b572693db2db3b207c49a
235 +MISC metadata.xml 718 RMD160 28e5d9cbc6c1cc8775dd782ad39de771387f12a6 SHA1 5507160cdcd4555c86b22bf1492bce620b65d0d2 SHA256 0d8702a3ad1afd41e3315663411c97c3cf7a4faf2892f69785c2c497e7a694cd
236 +-----BEGIN PGP SIGNATURE-----
237 +Version: GnuPG v2.0.19 (GNU/Linux)
238 +
239 +iQEcBAEBAgAGBQJPw8FmAAoJEAmJmMX429readUH/29nm1gyJumFXRA8F0I6Trz9
240 +IgB+7Lf8F0Tob9KLQKLKTE1UsGFoyXBq2QyECTgQbLHm8SDZh42o7pygZ6wC1y6C
241 +Gx0zzNvilGHkMRLBm7ecoQ0M6ExNuNN+ElFWv/FSEA9I4v35+tl3avuPMfKeV735
242 +9vQY3MXzsIXMGFGOZBUDALd1VKpFj2p/TXW1sdiwvAsa6JPhHbhu6gaQuVCdXzYX
243 +H3v3kLJUjYN9AjywXrDie29YL7vu3EIs6uAxwHlcathHGeJPNn1B5OY2fnw5ZvLP
244 +BGrlQySdbk6l0M7j/Sx7prU35lLAqYgN+gCcYVAC+KIOfQL8opUap976Y52KqMU=
245 +=4Jur
246 +-----END PGP SIGNATURE-----
247
248 diff --git a/games-fps/doomsday/doomsday-1.9.0_beta69-r1.ebuild b/games-fps/doomsday/doomsday-1.9.0_beta69-r1.ebuild
249 new file mode 100644
250 index 0000000..da83ec4
251 --- /dev/null
252 +++ b/games-fps/doomsday/doomsday-1.9.0_beta69-r1.ebuild
253 @@ -0,0 +1,138 @@
254 +# Copyright 1999-2011 Gentoo Foundation
255 +# Distributed under the terms of the GNU General Public License v2
256 +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.0_beta69.ebuild,v 1.7 2011/10/15 14:08:01 xarthisius Exp $
257 +
258 +EAPI=2
259 +
260 +PYTHON_DEPEND="snowberry? 2"
261 +
262 +inherit python confutils eutils cmake-utils games
263 +
264 +MY_P=deng-1.9.0-beta6.9 # FIXME, this is stupid
265 +DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
266 +HOMEPAGE="http://www.dengine.net/"
267 +SRC_URI="mirror://sourceforge/deng/${MY_P}.tar.gz"
268 +
269 +LICENSE="GPL-2"
270 +SLOT="0"
271 +KEYWORDS="-amd64 ~x86"
272 +IUSE="openal snowberry +doom demo freedoom heretic hexen resources"
273 +
274 +RDEPEND="virtual/opengl
275 + virtual/glu
276 + media-libs/libsdl[video]
277 + media-libs/sdl-mixer
278 + media-libs/sdl-net
279 + media-libs/libpng
280 + net-misc/curl
281 + openal? ( media-libs/openal )
282 + snowberry? ( dev-python/wxpython )
283 + "
284 +DEPEND="${RDEPEND}
285 + app-arch/zip"
286 +PDEPEND="
287 + demo? ( games-fps/doom-data )
288 + freedoom? ( games-fps/freedoom )
289 + resources? ( games-fps/doomsday-resources )
290 + "
291 +
292 +S=${WORKDIR}/${MY_P}/${PN}
293 +
294 +PATCHES=( "${FILESDIR}"/${P}-underlink.patch
295 + "${FILESDIR}"/${P}-png15.patch
296 +)
297 +
298 +pkg_setup(){
299 + python_pkg_setup
300 + games_pkg_setup
301 +
302 + #Use confutils until games.eclass is ported to EAPI4
303 + confutils_require_any doom heretic hexen
304 + confutils_use_depend_all demo doom
305 + confutils_use_depend_all freedoom doom
306 + confutils_use_depend_all resources doom
307 +}
308 +
309 +src_configure() {
310 + mycmakeargs=(
311 + -Dbindir="${GAMES_BINDIR}"
312 + -Ddatadir="${GAMES_DATADIR}"/${PN}
313 + -Dlibdir="$(games_get_libdir)"/${PN}
314 + $(cmake-utils_use openal BUILDOPENAL)
315 + $(cmake-utils_use doom BUILDJDOOM)
316 + $(cmake-utils_use heretic BUILDJHERETIC)
317 + $(cmake-utils_use hexen BUILDJHEXEN)
318 + )
319 + cmake-utils_src_configure
320 +}
321 +
322 +#Usage: doom_make_wrapper <name> <game> <desktop entry title> [args]
323 +doom_make_wrapper() {
324 + local name=$1 game=$2 de_title=$3
325 + shift 3
326 + games_make_wrapper $name \
327 + "doomsday -game ${game} $@"
328 + make_desktop_entry $name "${de_title}" orb-${game#j*}
329 +}
330 +
331 +src_install() {
332 + cmake-utils_src_install
333 +
334 + mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die
335 + dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom || die
336 +
337 + doman engine/doc/${PN}.6
338 + dodoc engine/doc/*.txt build/README
339 +
340 + if use snowberry; then
341 + pushd .. > /dev/null
342 + insinto "${GAMES_DATADIR}"/${PN}
343 + doins -r snowberry/
344 + doicon snowberry/graphics/snowberry.png
345 + games_make_wrapper snowberry \
346 + "python2 \"${GAMES_DATADIR}\"/${PN}/snowberry/snowberry.py" \
347 + "${GAMES_DATADIR}"/${PN}/snowberry
348 + make_desktop_entry snowberry "Snowberry DoomsDay" snowberry
349 + popd > /dev/null
350 + fi
351 +
352 + if use doom; then
353 + local res_arg
354 + if use resources; then
355 + res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded"
356 + fi
357 +
358 + doicon ../snowberry/graphics/orb-doom.png
359 + doom_make_wrapper jdoom jdoom "DoomsDay Engine: Doom 1" "${res_arg}"
360 + einfo "Created jdoom launcher. To play Doom place your doom.wad to"
361 + einfo "\"${GAMES_DATADIR}\"/doom-data"
362 + einfo
363 +
364 + if use demo; then
365 + doom_make_wrapper jdoom-demo jdoom "DoomsDay Engine: Doom 1 Demo" \
366 + "-file \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}"
367 + fi
368 + if use freedoom; then
369 + doom_make_wrapper jdoom-freedoom jdoom "DoomsDay Engine: FreeDoom" \
370 + "-file \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad"
371 + fi
372 + fi
373 + if use hexen; then
374 + doicon ../snowberry/graphics/orb-hexen.png
375 + doom_make_wrapper jhexen jhexen "DoomsDay Engine: Hexen"
376 +
377 + einfo "Created jhexen launcher. To play Hexen place your hexen.wad to"
378 + einfo "\"${GAMES_DATADIR}\"/${PN}/data/jhexen"
379 + einfo
380 + fi
381 + if use heretic; then
382 + doicon ../snowberry/graphics/orb-heretic.png
383 + doom_make_wrapper jheretic jheretic "DoomsDay Engine: Heretic"
384 +
385 + einfo "Created jheretic launcher. To play Heretic place your heretic.wad to"
386 + einfo "\"${GAMES_DATADIR}\"/${PN}/data/jheretic"
387 + einfo
388 + fi
389 +
390 + prepgamesdirs
391 +}
392
393 diff --git a/games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch b/games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch
394 new file mode 100644
395 index 0000000..ace2adf
396 --- /dev/null
397 +++ b/games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch
398 @@ -0,0 +1,86 @@
399 +--- engine/portable/src/gl_png.c.old 2011-09-16 13:42:35.684991097 +0200
400 ++++ engine/portable/src/gl_png.c 2011-09-16 13:55:18.835900517 +0200
401 +@@ -119,18 +119,18 @@
402 +
403 + // Check if it can be used.
404 + canLoad = true;
405 +- if(png_info->bit_depth != 8)
406 ++ if(png_get_bit_depth(png_ptr, png_info) != 8)
407 + {
408 + Con_Message("PNG_Load: \"%s\": Bit depth must be 8.\n", fileName);
409 + canLoad = false;
410 + }
411 +- else if(!png_info->width || !png_info->height)
412 ++ else if(!png_get_image_width(png_ptr, png_info) || !png_get_image_height(png_ptr, png_info))
413 + {
414 + Con_Message("PNG_Load: \"%s\": Bad file? Size is zero.\n", fileName);
415 + canLoad = false;
416 + }
417 +- else if(png_info->channels <= 2 &&
418 +- png_info->color_type == PNG_COLOR_TYPE_PALETTE &&
419 ++ else if(png_get_channels(png_ptr, png_info) <= 2 &&
420 ++ png_get_color_type(png_ptr, png_info) == PNG_COLOR_TYPE_PALETTE &&
421 + !png_get_valid(png_ptr, png_info, PNG_INFO_PLTE))
422 + {
423 + Con_Message("PNG_Load: \"%s\": Palette is invalid.\n", fileName);
424 +@@ -140,9 +140,9 @@
425 + if(canLoad)
426 + {
427 + // Information about the image.
428 +- *width = png_info->width;
429 +- *height = png_info->height;
430 +- *pixelSize = png_info->channels;
431 ++ *width = png_get_image_width(png_ptr, png_info);
432 ++ *height = png_get_image_height(png_ptr, png_info);
433 ++ *pixelSize = png_get_channels(png_ptr, png_info);
434 +
435 + // Paletted images have three color components
436 + // per pixel.
437 +@@ -154,33 +154,36 @@
438 + // OK, let's copy it into Doomsday's buffer.
439 + // \fixme Why not load directly into it?
440 + retbuf =
441 +- M_Malloc(4 * png_info->width * png_info->height);
442 ++ M_Malloc(4 * (*width) * (*height));
443 + rows = png_get_rows(png_ptr, png_info);
444 + for(i = 0; i < *height; ++i)
445 + {
446 +- if(png_info->channels >= 3)
447 ++ if(png_get_channels(png_ptr, png_info) >= 3)
448 + {
449 +- memcpy(retbuf + i * (*pixelSize) * png_info->width,
450 +- rows[i], (*pixelSize) * png_info->width);
451 ++ memcpy(retbuf + i * (*pixelSize) * (*width),
452 ++ rows[i], (*pixelSize) * (*width));
453 + }
454 + else // Paletted image.
455 + {
456 + for(k = 0; k < *width; ++k)
457 + {
458 +- pixel = retbuf + ((*pixelSize) * (i * png_info->width + k));
459 +- off = k * png_info->channels;
460 +- if(png_info->color_type == PNG_COLOR_TYPE_PALETTE)
461 ++ pixel = retbuf + ((*pixelSize) * (i * (*width) + k));
462 ++ off = k * png_get_channels(png_ptr, png_info);
463 ++ if(png_get_color_type(png_ptr, png_info) == PNG_COLOR_TYPE_PALETTE)
464 + {
465 +- pixel[0] = png_info->palette[rows[i][off]].red;
466 +- pixel[1] = png_info->palette[rows[i][off]].green;
467 +- pixel[2] = png_info->palette[rows[i][off]].blue;
468 ++ png_colorp palette;
469 ++ int num_palette;
470 ++ png_get_PLTE(png_ptr, png_info, &palette, &num_palette);
471 ++ pixel[0] = palette[rows[i][off]].red;
472 ++ pixel[1] = palette[rows[i][off]].green;
473 ++ pixel[2] = palette[rows[i][off]].blue;
474 + }
475 + else
476 + {
477 + // Grayscale.
478 + pixel[0] = pixel[1] = pixel[2] = rows[i][off];
479 + }
480 +- if(png_info->channels == 2) // Alpha data.
481 ++ if(png_get_channels(png_ptr, png_info) == 2) // Alpha data.
482 + {
483 + pixel[3] = rows[i][off + 1];
484 + }
485
486 diff --git a/games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch b/games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch
487 new file mode 100644
488 index 0000000..782ebaf
489 --- /dev/null
490 +++ b/games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch
491 @@ -0,0 +1,11 @@
492 +--- CMakeLists.txt.old 2011-05-16 16:00:22.000000000 +0200
493 ++++ CMakeLists.txt 2011-05-16 16:14:50.000000000 +0200
494 +@@ -645,7 +645,7 @@
495 +
496 + IF (UNIX)
497 + IF (NOT WIN32)
498 +- TARGET_LINK_LIBRARIES (doomsday dl)
499 ++ TARGET_LINK_LIBRARIES (doomsday dl m)
500 + IF (NOT APPLE)
501 + TARGET_LINK_LIBRARIES (doomsday ${X11_LIBRARIES})
502 + ENDIF (NOT APPLE)
503
504 diff --git a/games-fps/doomsday/files/wrapper b/games-fps/doomsday/files/wrapper
505 new file mode 100644
506 index 0000000..52eb0c8
507 --- /dev/null
508 +++ b/games-fps/doomsday/files/wrapper
509 @@ -0,0 +1,6 @@
510 +#!/bin/bash
511 +
512 +userdir="${HOME}/.doomsday/GAME"
513 +mkdir -p "${userdir}"
514 +cd "${userdir}"
515 +exec doomsday -game GAME -userdir "${userdir}" "$@"
516
517 diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
518 new file mode 100644
519 index 0000000..1bb8e62
520 --- /dev/null
521 +++ b/games-fps/doomsday/metadata.xml
522 @@ -0,0 +1,14 @@
523 +<?xml version="1.0" encoding="UTF-8"?>
524 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
525 +<pkgmetadata>
526 +<herd>games</herd>
527 +<use>
528 + <flag name="snowberry">Install Snowberry doomsday front-end</flag>
529 + <flag name="doom">Install launcher for jdoom game</flag>
530 + <flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
531 + <flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freefoom</pkg></flag>
532 + <flag name="heretic">Install launcher for jheretic game</flag>
533 + <flag name="hexen">Install launcher for jhexen game</flag>
534 + <flag name="resources">Enable support for <pkg>games-fps/doomsday-resources</pkg> in jdoom launcher</flag>
535 +</use>
536 +</pkgmetadata>
Report Message
Find on MARC Find on Google Groups