From a670b48c3d92dad43cff26334f562fe7c76bded9 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Thu, 9 Apr 2015 16:55:50 +0000 Subject: old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- games-engines/stratagus/ChangeLog | 6 +- games-engines/stratagus/Manifest | 25 +------- .../files/stratagus-2.2.5.5-libpng15.patch | 71 ---------------------- games-engines/stratagus/stratagus-2.2.5.5.ebuild | 62 ------------------- 4 files changed, 6 insertions(+), 158 deletions(-) delete mode 100644 games-engines/stratagus/files/stratagus-2.2.5.5-libpng15.patch delete mode 100644 games-engines/stratagus/stratagus-2.2.5.5.ebuild 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 + -files/stratagus-2.2.5.5-libpng15.patch, -stratagus-2.2.5.5.ebuild: + old 25 Feb 2015; Agostino Sarubbo stratagus-2.2.7.ebuild: Stable for x86, wrt bug #539926 diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest index 2c33da518cea..a63b27462d47 100644 --- a/games-engines/stratagus/Manifest +++ b/games-engines/stratagus/Manifest @@ -1,29 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX stratagus-2.2.5.5-libpng15.patch 2260 SHA256 bf36f8f99da8cace616923f6fd3979a147bf201b462a82f3f059cec01487c61f SHA512 8aa4e9541a68a08627a051a9a0f7382cd807abf1bb4e8fa9a69e2e9118b0d31f4f3ac6e85246c5e1cb008885e661c6f5d52c26283743530880e3cd1203bb02e9 WHIRLPOOL 8cde451b1915649dd3bfd7ec05860f223e81c195b21b08b02cbfe777451502e80cd71c044c0cfea11e44a89f73b9669c52d36901cd10ebab92f78610f590820e AUX stratagus-2.2.7-debug.patch 667 SHA256 ee11993b997cfbadca077618b0aacb489814d28d404bab66ef2aaf12ea071520 SHA512 751efd651b7beeeca702ad0fd6743c47041607ab0a127f4da1c219c10a55c44abf611aa7215c08f75a899d61cc8e499801d6d003f79520bff022df46ef98949f WHIRLPOOL 185fdc3200b5646fd7eae57d99409fb38f41915abdea56318680331410f5fd499cd450630baf708feb0cb3e236c02f202545b7403b7956c5b7c49f763ab95bc0 AUX stratagus-2.2.7-doc.patch 378 SHA256 96c118c1b80c76d990d48f0d6dfdb60ffb67190cf51423ac915bb3cde92f74d1 SHA512 185b4a82d4960369bdff7c5522418553838d0d2c0947d8f75a55bf7a22741b9be20a20b60ae086ee04bd31ecf963c5c58167ef6b57b777659832a82d79726483 WHIRLPOOL 8b51f361d5f0e9e6556da5f67828a0d02fcb9c904ced938d3dac11750f88f2321ee29b831159a0bf42898bf5a5f8def8c2916783f77c008e5f5ec36a1bf52573 -DIST stratagus_2.2.5.5.orig.tar.gz 976972 SHA256 e0c8fe592ee3ad0c5806937aa950aad39019780de5344987366fe76901377285 SHA512 c1e457c739b53b6912816ef88cd5d54b51aebebe1475a183598c719d0aaf7a9b5fbb5de9572f5fde7e12c979c278891e0678b55588d7ae5d9d2a0b7da01d561a WHIRLPOOL 02644119730dc0d35b44bd2b4a62359ac7d53f6cf13fc2f85f4d0fa470a8e984e312757b56a636a8e89fddd3c91eee58a056bb1ea24f9a02166a29d83f9ce339 DIST stratagus_2.2.7.orig.tar.gz 939967 SHA256 9bdaf207623b60a5e98451128bb7fb649e00ce4aba507320bde63e60f93e8c9f SHA512 965d7b87db209c03fbdb73bbc4a7a660e1de3073638ddb1883d62bd3f837c5785e130e5328cd704cb2859be5e49b1f5f09cadee42a1b202213f24859bf6dc10e WHIRLPOOL 55c975e75d2838fc3cc553f35a42ac5763243bd4c4970df713cc8f762a3aeb24ed23e291ecba5f948b24c1f6bbb4613706a80770d9baed1847cbb4cfcb4869f4 -EBUILD stratagus-2.2.5.5.ebuild 1436 SHA256 54c7003edc65356b103b7903900adbcbd1e27b12310cc99a87f4dc134fe8c55f SHA512 c11c4d5f4864c820a88036ea7acdd88170c963aa4629b626a396744457fd80c8ce3fe6f4120f0676cbf2765cebf9d4efe5ff1acb7c6ac8887bc8f8cfab5122df WHIRLPOOL 4354fd94177f6e8a246ad5f2905e7c8b89ae9249c969c1d9e5b745e721e48378f97249776dcb31aa8f99821201b9ac4ce2377438b725d5ca3a9b12e5b9a11eb2 EBUILD stratagus-2.2.7.ebuild 1708 SHA256 66bd8b09c3568fb54a911226aca3c3ec0a79bb3446e11a91c14d60c533b13279 SHA512 60a5e7b97f7edf55f7a6a3320f4608a981dcf50566c1e320afb1680ba32647d1892b4fd07f805752d7641e380d3eec5e60b0dbe4c89de7e607dd7f122d239da4 WHIRLPOOL ae9430baaa03c65275f2f185e0d54fa8449561fada155fe75f9954fbe37aa1eac8d7beebddf0c1ff148c7d01058a2a132d2d74f0328b09b68fcb3650ceeca329 -MISC ChangeLog 4912 SHA256 a60c7896b6b2181ae3d58c4a4728aff9685ddd42d21a48fd31f8dfec4a359b67 SHA512 4326c2f0e202f2db364b3251e62a4000174c7a0e28046800c5605eaa7d49f1182b73bd826460ab46592fdb5dc845663ca776012ee22abbb0ff278d70e4570356 WHIRLPOOL 77c5f3e8662ab4b331470d3cc26f93a9f67390d07787e754be091e6c56a6c9fd93a723ad7d48cb943a69fd8c548f7b5196f44fe609bfb3fbaeff3d47b247a712 +MISC ChangeLog 5050 SHA256 16e4cd092fa73738492c9ce83b5cc31d9121070c2f77e842614303c1deb09a90 SHA512 97a8bce4360cec7ffb9a8fb935095b53d8887b16e6003fd00395fb42e5ff85e2db4e3a458101175e5164a810a9a8be6740a3a072893d715a002b020407659384 WHIRLPOOL 099e657e42930b5ee42014865f8dcaacafcb075d784d27f1c6ef0eacc22c5e6f5fcdc8f0c9583bc9a6b20b94d930b220345293d0944a36f168834cdc0520b6a5 MISC metadata.xml 159 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69 SHA512 6352e00c52c5aea882fb49482fa13058b44892b9f0d348747a104a92bac4317beebdab189dada073ab9c87fbd9a4d276e725884741fc86bcb6f5b1857c031974 WHIRLPOOL abfa1ff25d21dc915422368c253795602590b470ca5cf3f099bf8675e2684baccac5e3d145391adac1fc5313f2e1d54bf9d8f21704e1b99fe22dec46f3f5acf5 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJU7e9iAAoJELp701BxlEWfORwP/A17MhsRH9a4uYseY7JX9/Ir -xf4AOiMNu4MsolzPvU5bSj8dkib4LblngEWl3WxtuM82AWx3PV/PTChmi04EgRML -TJ4WAw83KKCrOjCP7zDGzSa1HTx2rL4dw9HlxfNexlxOxQFshZiioWfoJAcQY9Gw -i32gqPBDVXHgBb+ABBypYtZrDMyAGNjxTe416c4xlynWy21TzphyNQ81tvnWJIFU -qNj87M6MFicwBiIVaoweX6stWvgWlADBFPpjFEXM6A6wrcLr27ianAwmi0nHTVXQ -slotfoNGLLbI6GAmTK4VEAnlmf0dbID1nopxN82FeA8H4ktymY7iNixOHAERaL9R -gqbZBlnfPMARw2xVVL8Kg8XZVHBDUuYsrpsZtDOwvkyz6Y9wvLRBXHGBg19ne+ca -tpna8FfBkB6VQ5ICwx2iHsu0BGuq9IM/GbBNLLf69EK4mVjSLODSNeSZhpSLUYx+ -W/r8Nq0LYNavQnJ6WeoYrJNXkSF3D0HUb80gjLvR2WSEggXUFXnnOFNUjLMhBE9n -lAVoA+UCT75wEEPeTnyJxsa45gem6oo0ai4Fsh6/kCzcTaMBugaBdJrXPtDvaZkz -xYz9VbmjXVBjFCae1lKew/0uoFGYoNutwMWOSX64uGiZRAcjukH/SSfJ1590h3PV -8EG7L047lvuVyNt6Mpbw -=lK3T ------END PGP SIGNATURE----- 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 -} -- cgit v1.2.3-65-gdbad