From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SbYKl-0000xT-5N for garchives@archives.gentoo.org; Mon, 04 Jun 2012 14:32:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 183B9E05C1; Mon, 4 Jun 2012 14:32:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BD69FE075F for ; Mon, 4 Jun 2012 14:32:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE9491B4022 for ; Mon, 4 Jun 2012 14:32:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B68C6E5404 for ; Mon, 4 Jun 2012 14:32:28 +0000 (UTC) From: "Maxim Koltsov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maxim Koltsov" Message-ID: <1338233465.6d097666cbf895c6507b12f942c528a773404bfc.maksbotan@gentoo> Subject: [gentoo-commits] dev/maksbotan:master commit in: games-fps/doomsday/, games-fps/doomsday/files/ X-VCS-Repository: dev/maksbotan X-VCS-Files: games-fps/doomsday/ChangeLog games-fps/doomsday/Manifest games-fps/doomsday/doomsday-1.9.0_beta69-r1.ebuild games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch games-fps/doomsday/files/wrapper games-fps/doomsday/metadata.xml X-VCS-Directories: games-fps/doomsday/ games-fps/doomsday/files/ X-VCS-Committer: maksbotan X-VCS-Committer-Name: Maxim Koltsov X-VCS-Revision: 6d097666cbf895c6507b12f942c528a773404bfc X-VCS-Branch: master Date: Mon, 4 Jun 2012 14:32:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 1a582dfc-2fd9-44b3-ac1e-2046adacadb1 X-Archives-Hash: e65c1e35cd0ecc9785fdc0db96195e08 commit: 6d097666cbf895c6507b12f942c528a773404bfc Author: Maxim Koltsov gentoo org> AuthorDate: Mon May 28 18:18:14 2012 +0000 Commit: Maxim Koltsov gentoo org> CommitDate: Mon May 28 19:31:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/maksbotan.git;= a=3Dcommit;h=3D6d097666 Add enhanced doomsday ebuild (Portage version: 2.1.10.63/git/Linux x86_64, signed Manifest commit with= key F8DBDADE) --- games-fps/doomsday/ChangeLog | 191 ++++++++++++++= ++++++ games-fps/doomsday/Manifest | 21 +++ games-fps/doomsday/doomsday-1.9.0_beta69-r1.ebuild | 138 ++++++++++++++ .../files/doomsday-1.9.0_beta69-png15.patch | 86 +++++++++ .../files/doomsday-1.9.0_beta69-underlink.patch | 11 ++ games-fps/doomsday/files/wrapper | 6 + games-fps/doomsday/metadata.xml | 14 ++ 7 files changed, 467 insertions(+), 0 deletions(-) diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog new file mode 100644 index 0000000..ffb11a4 --- /dev/null +++ b/games-fps/doomsday/ChangeLog @@ -0,0 +1,191 @@ +# ChangeLog for games-fps/doomsday +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.41 2= 011/10/23 20:12:14 ssuominen Exp $ + + 23 Oct 2011; Samuli Suominen + -doomsday-1.9.0_beta62.ebuild: + old + + 15 Oct 2011; Kacper Kowalik + doomsday-1.9.0_beta69.ebuild: + ppc stable wrt #385793 + + 16 Sep 2011; Tupone Alfredo doomsday-1.9.0_beta69.= ebuild, + +files/doomsday-1.9.0_beta69-png15.patch: + Build with png-1.5 Bug #383219 by Diego Elio Petten=C3=B2 + + 16 May 2011; Tupone Alfredo doomsday-1.9.0_beta69.= ebuild, + +files/doomsday-1.9.0_beta69-underlink.patch: + Fix underlinking. Bug #367353 by Diego Elio Petten=C3=B2 + + 18 Mar 2011; Thomas Kahle doomsday-1.9.0_beta69.ebu= ild: + x86 stable per bug 356491 + + 20 Jan 2011; Michael Sterrett + doomsday-1.9.0_beta68.ebuild, doomsday-1.9.0_beta69.ebuild: + doomsday doesn't work on amd64 (bug #352271) + +*doomsday-1.9.0_beta69 (19 Jan 2011) + + 19 Jan 2011; Michael Sterrett + +doomsday-1.9.0_beta69.ebuild: + version bump (bug #348779) + + 31 May 2010; Pawel Hajdan jr + doomsday-1.9.0_beta68.ebuild: + x86 stable wrt bug #319293 + + 25 May 2010; Pacho Ramos doomsday-1.9.0_beta68.ebui= ld: + stable amd64, bug 319293 + +*doomsday-1.9.0_beta68 (10 Mar 2010) + + 10 Mar 2010; Michael Sterrett + +doomsday-1.9.0_beta68.ebuild: + version bump + + 23 Jan 2010; Samuli Suominen + doomsday-1.9.0_beta67.ebuild: + amd64 stable + + 10 Nov 2009; Samuli Suominen + doomsday-1.9.0_beta67.ebuild: + Keyword ~amd64. + + 10 Nov 2009; Joseph Jezak + doomsday-1.9.0_beta62.ebuild: + Marked ppc stable for bug #287614. + + 21 Oct 2009; Michael Sterrett + doomsday-1.9.0_beta52.ebuild, doomsday-1.9.0_beta62.ebuild, + doomsday-1.9.0_beta67.ebuild: + update HOMEPAGE + +*doomsday-1.9.0_beta67 (21 Oct 2009) + + 21 Oct 2009; Michael Sterrett + +doomsday-1.9.0_beta67.ebuild: + version bump + + 21 Oct 2009; Markus Meier + doomsday-1.9.0_beta62.ebuild: + x86 stable, bug #287614 + +*doomsday-1.9.0_beta62 (26 May 2009) + + 26 May 2009; Tristan Heaven + +doomsday-1.9.0_beta62.ebuild: + Version bump + + 25 Dec 2007; doomsday-1.9.0_beta52.ebuild: + - binary packages that are linked with libc.so.6 need to use sys-libs/= glibc + in RDEPEND + + 04 Dec 2007; Michael Sterrett + doomsday-1.9.0_beta52.ebuild: + mark stable to avoid p.mask downgrade + +*doomsday-1.9.0_beta52 (23 Nov 2007) + + 23 Nov 2007; Michael Sterrett + -files/doomsday-1.9.0_beta4-configure.patch, + -files/doomsday-1.9.0_beta4-music-driver.patch, + -doomsday-1.9.0_beta4.ebuild, -doomsday-1.9.0_beta4-r1.ebuild, + -doomsday-1.9.0_beta5.ebuild, +doomsday-1.9.0_beta52.ebuild: + version bump; clean out old, insecure versions + + 13 Mar 2007; Chris Gianelloni + doomsday-1.9.0_beta5.ebuild: + Change which to type -P for QA. + +*doomsday-1.9.0_beta5 (01 Feb 2007) + + 01 Feb 2007; Tristan Heaven + +doomsday-1.9.0_beta5.ebuild: + Version bump + + 04 Dec 2006; Chris Gianelloni + doomsday-1.9.0_beta4.ebuild, doomsday-1.9.0_beta4-r1.ebuild: + Removing old virtual/x11 dependency. + + 08 Oct 2006; doomsday-1.9.0_beta4.ebuild: + Adding missing dependency from app-arch/zip. Bug #143502 by Davide Cen= dron + +*doomsday-1.9.0_beta4-r1 (05 Sep 2006) + + 05 Sep 2006; +doomsday-1.9.0_beta4-r1.ebuild: + Make wrappers for the common wads. Bug #127397 by Paul Bredbury + + 02 Jun 2006; Tobias Scherbaum + doomsday-1.9.0_beta4.ebuild: + ppc stable, bug #128690 + + 31 May 2006; Chris Gianelloni + doomsday-1.9.0_beta4.ebuild: + Stable on x86 wrt bug #128690. + +*doomsday-1.9.0_beta4 (31 May 2006) + + 31 May 2006; Chris Gianelloni + -files/doomsday-1.8.6-music-driver.patch, + +files/doomsday-1.9.0_beta4-configure.patch, + +files/doomsday-1.9.0_beta4-music-driver.patch, -doomsday-1.8.6.ebuild= , + -doomsday-1.8.6-r1.ebuild, -doomsday-1.9.0_beta3.ebuild, + +doomsday-1.9.0_beta4.ebuild: + Version bump. This resolves bug #128690 from the games team's end. + +*doomsday-1.9.0_beta3 (22 Apr 2006) + + 22 Apr 2006; Mike Frysinger + +files/doomsday-1.8.6-music-driver.patch, +doomsday-1.9.0_beta3.ebuild= : + Version bump #128690 by Raphael Marichez / #115820 by Alexander Nicola= ysen + S=C3=B8rnes. + +*doomsday-1.8.6-r1 (13 Mar 2006) + + 13 Mar 2006; -files/1.8.0-filename-case.patch, + doomsday-1.8.6.ebuild, +doomsday-1.8.6-r1.ebuild: + Fix for bug #113067 (segfault with openal). Thanks Anton Romanov for r= eport. + Minor dependency fixes. + + 16 Sep 2005; Ciaran McCreesh ChangeLog: + Converted to UTF-8, fixed encoding screwups + + 09 Aug 2005; Michael Sterrett + -doomsday-1.8.0.ebuild, -doomsday-1.8.1.ebuild, -doomsday-1.8.3.ebuild= : + clean old versions + +*doomsday-1.8.6 (24 Jan 2005) + + 24 Jan 2005; Mike Frysinger +doomsday-1.8.6.ebuild= : + Version bump #78453 by Maxime Carey. + +*doomsday-1.8.3 (07 Dec 2004) + + 07 Dec 2004; Michael Sterrett +doomsday-1.8.3.e= build: + version bump (bug #72437) + + 28 Sep 2004; Sven Wegener : + Gentoo Technologies, Inc. -> Gentoo Foundation + + 05 Sep 2004; David Holm doomsday-1.8.1.ebuild: + Added to ~ppc. + + 01 Sep 2004; Chris Gianelloni + -files/1.8.1-ambient-light.patch, doomsday-1.8.1.ebuild: + Reverting patch. See bug #61072 for more details. + + 01 Sep 2004; Chris Gianelloni + +files/1.8.1-ambient-light.patch: + I forgot to add the patch. + +*doomsday-1.8.1 (31 Aug 2004) + + 31 Aug 2004; Chris Gianelloni +doomsday-1.8.1.eb= uild: + Version bumped to 1.8.1 and adding 1.8.1-ambient-light.patch submitted= by + dilipv@hotmail.com to bug #61072. + +*doomsday-1.8.0 (21 Jul 2004) + + 21 Jul 2004; Mike Frysinger : + Initial import. Ebuild submitted by Hinrik =C3=96rn Sigur=C3=B0sson #= 53793. diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest new file mode 100644 index 0000000..9f590a2 --- /dev/null +++ b/games-fps/doomsday/Manifest @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX doomsday-1.9.0_beta69-png15.patch 5042 RMD160 249fb6f153b01632c5d41c= 0b52ce9d0d84f57520 SHA1 adc25a193b07d6a13fb861d0d6bf77ecb4c46f3b SHA256 0= a406daa9afafffca641be96a7f153635655b5611d7747daaf67ca2f2a943d07 +AUX doomsday-1.9.0_beta69-underlink.patch 386 RMD160 4dc1504b2da9e0aba06= 1cffc348b5b414c02a2b9 SHA1 19c6b6d3e1ebabd3dbb2c92876d7c7786ddb2c45 SHA25= 6 b774ef4cdad497668728668ec49b46b17c90a399cce5949337e8c0756cdfe0b7 +AUX wrapper 136 RMD160 9eb253537d5e2b443cf0807401b86a7526ae3e4e SHA1 2cb= 84a8feca8d213ecf0ac92d3bfa36282d293c1 SHA256 64b959cfeb77bd778f16768c0ee5= 09cd128eb855fa4acd8e7c37046c5885dbc8 +DIST deng-1.9.0-beta6.9.tar.gz 6085833 RMD160 e91a4bc76b39da9e2e51925e03= 154ffcb128fea9 SHA1 e1f7d64b1b60eef2659bc4636fbe41a0abf6a6ce SHA256 3553f= 6a58660916fdedbe0594f5b22dac4738ee6e02b042992d3140d358954af +EBUILD doomsday-1.9.0_beta69-r1.ebuild 3827 RMD160 e2ae37dabf42ce34120cc= a74e0439c14ea7775c4 SHA1 e4783a6bb9f7d6de43570943c17c90c0997d75d0 SHA256 = 635f6fda5900d51c39f64f3245a3cb9ae3553acffac6d9121747616d12a40ad4 +MISC ChangeLog 6388 RMD160 6bc12faa8cf5299e9549b6ef0b8030bfc003c06d SHA1= 18adc40348c6a3fbca3e0b3c6ac3f32e44185241 SHA256 1cb97fd15867bdbf8dc1adf0= 45459fa95c2f0502022b572693db2db3b207c49a +MISC metadata.xml 718 RMD160 28e5d9cbc6c1cc8775dd782ad39de771387f12a6 SH= A1 5507160cdcd4555c86b22bf1492bce620b65d0d2 SHA256 0d8702a3ad1afd41e33156= 63411c97c3cf7a4faf2892f69785c2c497e7a694cd +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBAgAGBQJPw8FmAAoJEAmJmMX429readUH/29nm1gyJumFXRA8F0I6Trz9 +IgB+7Lf8F0Tob9KLQKLKTE1UsGFoyXBq2QyECTgQbLHm8SDZh42o7pygZ6wC1y6C +Gx0zzNvilGHkMRLBm7ecoQ0M6ExNuNN+ElFWv/FSEA9I4v35+tl3avuPMfKeV735 +9vQY3MXzsIXMGFGOZBUDALd1VKpFj2p/TXW1sdiwvAsa6JPhHbhu6gaQuVCdXzYX +H3v3kLJUjYN9AjywXrDie29YL7vu3EIs6uAxwHlcathHGeJPNn1B5OY2fnw5ZvLP +BGrlQySdbk6l0M7j/Sx7prU35lLAqYgN+gCcYVAC+KIOfQL8opUap976Y52KqMU=3D +=3D4Jur +-----END PGP SIGNATURE----- diff --git a/games-fps/doomsday/doomsday-1.9.0_beta69-r1.ebuild b/games-f= ps/doomsday/doomsday-1.9.0_beta69-r1.ebuild new file mode 100644 index 0000000..da83ec4 --- /dev/null +++ b/games-fps/doomsday/doomsday-1.9.0_beta69-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.0_bet= a69.ebuild,v 1.7 2011/10/15 14:08:01 xarthisius Exp $ + +EAPI=3D2 + +PYTHON_DEPEND=3D"snowberry? 2" + +inherit python confutils eutils cmake-utils games + +MY_P=3Ddeng-1.9.0-beta6.9 # FIXME, this is stupid +DESCRIPTION=3D"A modern gaming engine for Doom, Heretic, and Hexen" +HOMEPAGE=3D"http://www.dengine.net/" +SRC_URI=3D"mirror://sourceforge/deng/${MY_P}.tar.gz" + +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"-amd64 ~x86" +IUSE=3D"openal snowberry +doom demo freedoom heretic hexen resources" + +RDEPEND=3D"virtual/opengl + virtual/glu + media-libs/libsdl[video] + media-libs/sdl-mixer + media-libs/sdl-net + media-libs/libpng + net-misc/curl + openal? ( media-libs/openal ) + snowberry? ( dev-python/wxpython ) + " +DEPEND=3D"${RDEPEND} + app-arch/zip" +PDEPEND=3D" + demo? ( games-fps/doom-data ) + freedoom? ( games-fps/freedoom ) + resources? ( games-fps/doomsday-resources ) + " + +S=3D${WORKDIR}/${MY_P}/${PN} + +PATCHES=3D( "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-png15.patch +) + +pkg_setup(){ + python_pkg_setup + games_pkg_setup + + #Use confutils until games.eclass is ported to EAPI4 + confutils_require_any doom heretic hexen + confutils_use_depend_all demo doom + confutils_use_depend_all freedoom doom + confutils_use_depend_all resources doom +} + +src_configure() { + mycmakeargs=3D( + -Dbindir=3D"${GAMES_BINDIR}" + -Ddatadir=3D"${GAMES_DATADIR}"/${PN} + -Dlibdir=3D"$(games_get_libdir)"/${PN} + $(cmake-utils_use openal BUILDOPENAL) + $(cmake-utils_use doom BUILDJDOOM) + $(cmake-utils_use heretic BUILDJHERETIC) + $(cmake-utils_use hexen BUILDJHEXEN) + ) + cmake-utils_src_configure +} + +#Usage: doom_make_wrapper [args] +doom_make_wrapper() { + local name=3D$1 game=3D$2 de_title=3D$3 + shift 3 + games_make_wrapper $name \ + "doomsday -game ${game} $@" + make_desktop_entry $name "${de_title}" orb-${game#j*} +} + +src_install() { + cmake-utils_src_install + + mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die + dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom = || die + + doman engine/doc/${PN}.6 + dodoc engine/doc/*.txt build/README + + if use snowberry; then + pushd .. > /dev/null + insinto "${GAMES_DATADIR}"/${PN} + doins -r snowberry/ + doicon snowberry/graphics/snowberry.png + games_make_wrapper snowberry \ + "python2 \"${GAMES_DATADIR}\"/${PN}/snowberry/snowberry.py" \ + "${GAMES_DATADIR}"/${PN}/snowberry + make_desktop_entry snowberry "Snowberry DoomsDay" snowberry + popd > /dev/null + fi + + if use doom; then + local res_arg + if use resources; then + res_arg=3D"-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded" + fi + + doicon ../snowberry/graphics/orb-doom.png + doom_make_wrapper jdoom jdoom "DoomsDay Engine: Doom 1" "${res_arg}" + einfo "Created jdoom launcher. To play Doom place your doom.wad to" + einfo "\"${GAMES_DATADIR}\"/doom-data" + einfo + + if use demo; then + doom_make_wrapper jdoom-demo jdoom "DoomsDay Engine: Doom 1 Demo" \ + "-file \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}" + fi + if use freedoom; then + doom_make_wrapper jdoom-freedoom jdoom "DoomsDay Engine: FreeDoom" \ + "-file \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad" + fi + fi + if use hexen; then + doicon ../snowberry/graphics/orb-hexen.png + doom_make_wrapper jhexen jhexen "DoomsDay Engine: Hexen" + + einfo "Created jhexen launcher. To play Hexen place your hexen.wad to" + einfo "\"${GAMES_DATADIR}\"/${PN}/data/jhexen" + einfo + fi + if use heretic; then + doicon ../snowberry/graphics/orb-heretic.png + doom_make_wrapper jheretic jheretic "DoomsDay Engine: Heretic" + + einfo "Created jheretic launcher. To play Heretic place your heretic.w= ad to" + einfo "\"${GAMES_DATADIR}\"/${PN}/data/jheretic" + einfo + fi + + prepgamesdirs +} 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 new file mode 100644 index 0000000..ace2adf --- /dev/null +++ b/games-fps/doomsday/files/doomsday-1.9.0_beta69-png15.patch @@ -0,0 +1,86 @@ +--- engine/portable/src/gl_png.c.old 2011-09-16 13:42:35.684991097 +0200 ++++ engine/portable/src/gl_png.c 2011-09-16 13:55:18.835900517 +0200 +@@ -119,18 +119,18 @@ +=20 + // Check if it can be used. + canLoad =3D true; +- if(png_info->bit_depth !=3D 8) ++ if(png_get_bit_depth(png_ptr, png_info) !=3D 8) + { + Con_Message("PNG_Load: \"%s\": Bit depth must b= e 8.\n", fileName); + canLoad =3D false; + } +- else if(!png_info->width || !png_info->height) ++ else if(!png_get_image_width(png_ptr, png_info) || = !png_get_image_height(png_ptr, png_info)) + { + Con_Message("PNG_Load: \"%s\": Bad file? Size i= s zero.\n", fileName); + canLoad =3D false; + } +- else if(png_info->channels <=3D 2 &&=20 +- png_info->color_type =3D=3D PNG_COLOR_TYPE_= PALETTE && ++ else if(png_get_channels(png_ptr, png_info) <=3D 2 = &&=20 ++ png_get_color_type(png_ptr, png_info) =3D=3D= PNG_COLOR_TYPE_PALETTE && + !png_get_valid(png_ptr, png_info, PNG_INFO_= PLTE)) + { + Con_Message("PNG_Load: \"%s\": Palette is inval= id.\n", fileName); +@@ -140,9 +140,9 @@ + if(canLoad) + { + // Information about the image. +- *width =3D png_info->width; +- *height =3D png_info->height; +- *pixelSize =3D png_info->channels; ++ *width =3D png_get_image_width(png_ptr, png_inf= o); ++ *height =3D png_get_image_height(png_ptr, png_i= nfo); ++ *pixelSize =3D png_get_channels(png_ptr, png_in= fo); +=20 + // Paletted images have three color components + // per pixel. +@@ -154,33 +154,36 @@ + // OK, let's copy it into Doomsday's buffer. + // \fixme Why not load directly into it? + retbuf =3D +- M_Malloc(4 * png_info->width * png_info->he= ight); ++ M_Malloc(4 * (*width) * (*height)); + rows =3D png_get_rows(png_ptr, png_info); + for(i =3D 0; i < *height; ++i) + { +- if(png_info->channels >=3D 3) ++ if(png_get_channels(png_ptr, png_info) >=3D= 3) + { +- memcpy(retbuf + i * (*pixelSize) * png_= info->width, +- rows[i], (*pixelSize) * png_info= ->width); ++ memcpy(retbuf + i * (*pixelSize) * (*wi= dth), ++ rows[i], (*pixelSize) * (*width)= ); + } + else // Paletted image. + { + for(k =3D 0; k < *width; ++k) + { +- pixel =3D retbuf + ((*pixelSize) * = (i * png_info->width + k)); +- off =3D k * png_info->channels; +- if(png_info->color_type =3D=3D PNG_= COLOR_TYPE_PALETTE) ++ pixel =3D retbuf + ((*pixelSize) * = (i * (*width) + k)); ++ off =3D k * png_get_channels(png_pt= r, png_info); ++ if(png_get_color_type(png_ptr, png_= info) =3D=3D PNG_COLOR_TYPE_PALETTE) + { +- pixel[0] =3D png_info->palette[= rows[i][off]].red; +- pixel[1] =3D png_info->palette[= rows[i][off]].green; +- pixel[2] =3D png_info->palette[= rows[i][off]].blue; ++ png_colorp palette; ++ int num_palette; ++ png_get_PLTE(png_ptr, png_info, &palette, &num_palette); ++ pixel[0] =3D palette[rows[i][of= f]].red; ++ pixel[1] =3D palette[rows[i][of= f]].green; ++ pixel[2] =3D palette[rows[i][of= f]].blue; + } + else + { + // Grayscale. + pixel[0] =3D pixel[1] =3D pixel= [2] =3D rows[i][off]; + } +- if(png_info->channels =3D=3D 2) // = Alpha data. ++ if(png_get_channels(png_ptr, png_in= fo) =3D=3D 2) // Alpha data. + { + pixel[3] =3D rows[i][off + 1]; + } diff --git a/games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.pat= ch b/games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch new file mode 100644 index 0000000..782ebaf --- /dev/null +++ b/games-fps/doomsday/files/doomsday-1.9.0_beta69-underlink.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt.old 2011-05-16 16:00:22.000000000 +0200 ++++ CMakeLists.txt 2011-05-16 16:14:50.000000000 +0200 +@@ -645,7 +645,7 @@ +=20 + IF (UNIX) + IF (NOT WIN32) +- TARGET_LINK_LIBRARIES (doomsday dl) ++ TARGET_LINK_LIBRARIES (doomsday dl m) + IF (NOT APPLE) + TARGET_LINK_LIBRARIES (doomsday ${X11_LIBRARIES}) + ENDIF (NOT APPLE) diff --git a/games-fps/doomsday/files/wrapper b/games-fps/doomsday/files/= wrapper new file mode 100644 index 0000000..52eb0c8 --- /dev/null +++ b/games-fps/doomsday/files/wrapper @@ -0,0 +1,6 @@ +#!/bin/bash + +userdir=3D"${HOME}/.doomsday/GAME" +mkdir -p "${userdir}" +cd "${userdir}" +exec doomsday -game GAME -userdir "${userdir}" "$@" diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadat= a.xml new file mode 100644 index 0000000..1bb8e62 --- /dev/null +++ b/games-fps/doomsday/metadata.xml @@ -0,0 +1,14 @@ + + + +games + + Install Snowberry doomsday front-end + Install launcher for jdoom game + Install launcher dor doom1.wad from games-fps/= doom-data + Install launcher for doom1.wad from games-= fps/freefoom + Install launcher for jheretic game + Install launcher for jhexen game + Enable support for games-fps/doomsday-res= ources in jdoom launcher + +