diff options
author | 2015-04-09 16:55:43 +0000 | |
---|---|---|
committer | 2015-04-09 16:55:43 +0000 | |
commit | 0d7e352672c778177bf6c00f4bb62f33670126cd (patch) | |
tree | 0b7210a325e7ae8f750416f18559332ab1d4e7ed /games-engines | |
parent | old (diff) | |
download | gentoo-2-0d7e352672c778177bf6c00f4bb62f33670126cd.tar.gz gentoo-2-0d7e352672c778177bf6c00f4bb62f33670126cd.tar.bz2 gentoo-2-0d7e352672c778177bf6c00f4bb62f33670126cd.zip |
old
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-engines')
-rw-r--r-- | games-engines/stratagus/ChangeLog | 6 | ||||
-rw-r--r-- | games-engines/stratagus/files/stratagus-2.2.5.5-libpng15.patch | 71 | ||||
-rw-r--r-- | games-engines/stratagus/stratagus-2.2.5.5.ebuild | 62 |
3 files changed, 5 insertions, 134 deletions
diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog index d7cb3c198cc0..f6dc56bbfabf 100644 --- a/games-engines/stratagus/ChangeLog +++ b/games-engines/stratagus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/stratagus # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.32 2015/02/25 15:50:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.33 2015/04/09 16:55:43 mr_bones_ Exp $ + + 09 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> + -files/stratagus-2.2.5.5-libpng15.patch, -stratagus-2.2.5.5.ebuild: + old 25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> stratagus-2.2.7.ebuild: Stable for x86, wrt bug #539926 diff --git a/games-engines/stratagus/files/stratagus-2.2.5.5-libpng15.patch b/games-engines/stratagus/files/stratagus-2.2.5.5-libpng15.patch deleted file mode 100644 index cc0a7380ce9b..000000000000 --- a/games-engines/stratagus/files/stratagus-2.2.5.5-libpng15.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- src/video/png.cpp -+++ src/video/png.cpp -@@ -147,7 +147,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - fprintf(stderr, "Error reading the PNG file.\n"); - ret = -1; - goto done; -@@ -227,11 +227,11 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { - int s; - -- s = (info_ptr->channels == 4) ? 0 : 8; -+ s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -239,7 +239,7 @@ - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth * info_ptr->channels, Rmask, Gmask, Bmask, Amask); -+ bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask, Bmask, Amask); - if (surface == NULL) { - fprintf(stderr, "Out of memory"); - goto done; -@@ -276,6 +276,8 @@ - png_read_end(png_ptr, info_ptr); - - /* Load the palette, if any */ -+ int png_num_palette; -+ png_colorp png_palette; - palette = surface->format->palette; - if (palette) { - if (color_type == PNG_COLOR_TYPE_GRAY) { -@@ -285,12 +287,12 @@ - palette->colors[i].g = i; - palette->colors[i].b = i; - } -- } else if (info_ptr->num_palette > 0) { -- palette->ncolors = info_ptr->num_palette; -- for (i = 0; i < info_ptr->num_palette; ++i) { -- palette->colors[i].b = info_ptr->palette[i].blue; -- palette->colors[i].g = info_ptr->palette[i].green; -- palette->colors[i].r = info_ptr->palette[i].red; -+ } else if (png_num_palette > 0) { -+ palette->ncolors = png_num_palette; -+ for (i = 0; i < png_num_palette; ++i) { -+ palette->colors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; - } - } - } -@@ -343,7 +345,7 @@ - return; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* If we get here, we had a problem reading the file */ - fclose(fp); - png_destroy_write_struct(&png_ptr, &info_ptr); diff --git a/games-engines/stratagus/stratagus-2.2.5.5.ebuild b/games-engines/stratagus/stratagus-2.2.5.5.ebuild deleted file mode 100644 index b19427174a7b..000000000000 --- a/games-engines/stratagus/stratagus-2.2.5.5.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.5.5.ebuild,v 1.8 2014/05/15 16:43:55 ulm Exp $ - -EAPI=2 -inherit autotools eutils games - -DESCRIPTION="A realtime strategy game engine" -HOMEPAGE="http://stratagus.sourceforge.net/" -SRC_URI="http://launchpad.net/stratagus/trunk/${PV}/+download/stratagus_${PV}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="bzip2 debug doc mikmod mng theora vorbis" - -RDEPEND="x11-libs/libX11 - virtual/opengl - >=dev-lang/lua-5 - media-libs/libpng - media-libs/libsdl[sound,opengl,video] - bzip2? ( app-arch/bzip2 ) - mikmod? ( media-libs/libmikmod ) - mng? ( media-libs/libmng ) - theora? ( media-libs/libtheora media-libs/libvorbis ) - vorbis? ( media-libs/libvorbis )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-libpng15.patch - sed -i \ - -e 's/-O.*\(-fsigned-char\).*/\1"/' \ - configure.in \ - || die "sed failed" - eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_with bzip2) \ - $(use_with mikmod) \ - $(use_with mng) \ - $(use_with theora) \ - $(use_with vorbis) -} -src_compile() { - emake -j1 || die - - if use doc ; then - emake doc || die - fi -} - -src_install() { - dogamesbin stratagus || die "dogamesbin failed" - dodoc README - dohtml -r doc/* - use doc && dohtml -r srcdoc/html/* - prepgamesdirs -} |