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 1SYk7K-0006Eq-09 for garchives@archives.gentoo.org; Sun, 27 May 2012 20:31:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66B10E06B7; Sun, 27 May 2012 20:30:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 21FCFE06B7 for ; Sun, 27 May 2012 20:30:57 +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 3354E1B402E for ; Sun, 27 May 2012 20:30:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E8A04E5428 for ; Sun, 27 May 2012 20:30:54 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1338150722.707b53ecef8c8cef38fa920e0f3d707679004cef.mgorny@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-engines/stratagus/, games-strategy/wargus/, games-strategy/wargus/files/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-engines/stratagus/metadata.xml games-engines/stratagus/stratagus-2.2.6.ebuild games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch games-strategy/wargus/metadata.xml games-strategy/wargus/wargus-2.2.6.ebuild X-VCS-Directories: games-engines/stratagus/ games-strategy/wargus/ games-strategy/wargus/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 707b53ecef8c8cef38fa920e0f3d707679004cef X-VCS-Branch: master Date: Sun, 27 May 2012 20:30:54 +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: c4c3906f-72f9-4a16-9377-baff930c0d8b X-Archives-Hash: 2c0d33f1872b15036c763c8bdb962e32 commit: 707b53ecef8c8cef38fa920e0f3d707679004cef Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sun May 27 20:32:02 2012 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sun May 27 20:32:02 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gamerlay.git;= a=3Dcommit;h=3D707b53ec games-engines/stratagus, games-strategy/wargus: Now in gx86. --- games-engines/stratagus/metadata.xml | 5 -- games-engines/stratagus/stratagus-2.2.6.ebuild | 74 --------------= ------ .../wargus/files/wargus-2.2.5.5-libpng.patch | 36 ---------- games-strategy/wargus/metadata.xml | 5 -- games-strategy/wargus/wargus-2.2.6.ebuild | 56 --------------= - 5 files changed, 0 insertions(+), 176 deletions(-) diff --git a/games-engines/stratagus/metadata.xml b/games-engines/stratag= us/metadata.xml deleted file mode 100644 index d3c2cc9..0000000 --- a/games-engines/stratagus/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -games - diff --git a/games-engines/stratagus/stratagus-2.2.6.ebuild b/games-engin= es/stratagus/stratagus-2.2.6.ebuild deleted file mode 100644 index 05991bb..0000000 --- a/games-engines/stratagus/stratagus-2.2.6.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D2 -inherit cmake-utils eutils games - -DESCRIPTION=3D"A realtime strategy game engine" -HOMEPAGE=3D"http://stratagus.sourceforge.net/" -SRC_URI=3D"http://launchpad.net/stratagus/trunk/${PV}/+download/stratagu= s_${PV}.orig.tar.gz" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"bzip2 debug doc mikmod mng theora vorbis" - -RDEPEND=3D"x11-libs/libX11 - virtual/opengl - dev-db/sqlite:3 - >=3Ddev-lang/lua-5 - dev-lua/toluapp - media-libs/libpng - media-libs/libsdl[audio,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=3D"${RDEPEND} - doc? ( app-doc/doxygen )" - -S=3D"${WORKDIR}/${PN}_${PV}.orig" - -src_prepare() { - sed -i \ - -e '/DESTINATION/s:games\|s\?bin:games/bin:' \ - -e '/DESTINATION/s:share/doc/stratagus:/tmp/doc:' \ - CMakeLists.txt || die 'fixing install paths failed' -} - -src_configure() { - local mycmakeargs=3D( - $(cmake-utils_use_with bzip2) - $(cmake-utils_use_with debug) - $(cmake-utils_use_enable doc) - $(cmake-utils_use_with mikmod) - $(cmake-utils_use_with mng) - $(cmake-utils_use_with theora) - $(cmake-utils_use_with vorbis oggvorbis) - - # install header files - -DENABLE_DEV=3DON - - # XXX: make sqlite (metaserver) optional - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - if use doc; then - # thanks to games.eclass we're stuck with EAPI 2 - dodoc "${D}"/tmp/doc/*.txt || die - rm -f "${D}"/tmp/doc/*.txt || die - dohtml -r "${D}"/tmp/doc/* || die - rm -rf "${D}"/tmp || die - fi -} diff --git a/games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch b/ga= mes-strategy/wargus/files/wargus-2.2.5.5-libpng.patch deleted file mode 100644 index 65ebc12..0000000 --- a/games-strategy/wargus/files/wargus-2.2.5.5-libpng.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- wartool.orig.c -+++ wartool.c -@@ -61,6 +61,7 @@ - #include - #endif - #include -+#include - #include -=20 - #include "endian.h" -@@ -1876,7 +1877,7 @@ - return 1; - } -=20 -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - // FIXME: must free buffers!! - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(fp); -@@ -1888,14 +1889,8 @@ - png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); -=20 - // prepare the file information -- info_ptr->width =3D w; -- info_ptr->height =3D h; -- info_ptr->bit_depth =3D 8; -- info_ptr->color_type =3D PNG_COLOR_TYPE_PALETTE; -- info_ptr->interlace_type =3D 0; -- info_ptr->valid |=3D PNG_INFO_PLTE; -- info_ptr->palette =3D (png_colorp)pal; -- info_ptr->num_palette =3D 256; -+ png_set_IHDR(png_ptr, info_ptr, w, h, 8, PNG_COLOR_TYPE_PALETTE, 0, PN= G_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); -+ png_set_PLTE(png_ptr, info_ptr, (png_colorp)pal, 256); -=20 - if (transparent) { - unsigned char* p; diff --git a/games-strategy/wargus/metadata.xml b/games-strategy/wargus/m= etadata.xml deleted file mode 100644 index f72870c..0000000 --- a/games-strategy/wargus/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - games - diff --git a/games-strategy/wargus/wargus-2.2.6.ebuild b/games-strategy/w= argus/wargus-2.2.6.ebuild deleted file mode 100644 index 18840bb..0000000 --- a/games-strategy/wargus/wargus-2.2.6.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.2.5.5.= ebuild,v 1.7 2012/05/17 18:06:23 mr_bones_ Exp $ - -EAPI=3D2 -inherit eutils cdrom cmake-utils games - -DESCRIPTION=3D"Warcraft II for the Stratagus game engine (Needs WC2 DOS = CD)" -HOMEPAGE=3D"http://wargus.sourceforge.net/" -SRC_URI=3D"http://launchpad.net/wargus/trunk/${PV}/+download/wargus_${PV= }.orig.tar.gz - mirror://gentoo/wargus.png" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"" - -DEPEND=3D"media-libs/libpng - media-sound/timidity++ - media-video/ffmpeg2theora" -RDEPEND=3D"=3Dgames-engines/stratagus-${PV}*" - -S=3D"${WORKDIR}/${PN}_${PV}.orig" - -src_prepare() { - cdrom_get_cds data/rezdat.war - epatch "${FILESDIR}/${PN}-2.2.5.5-libpng.patch" - - sed -i \ - -e '/TARGETS.*DESTINATION/s:games\|s\?bin:games/bin:' \ - CMakeLists.txt || die 'fixing install paths failed' -} - -src_configure() { - local mycmakeargs=3D( - -DSTRATAGUS=3D/usr/games/bin/stratagus - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - # XXX: -r to rip CD tracks? not sure if it is good idea to pass it - # by default - - local dir=3D${GAMES_DATADIR}/stratagus/${PN} - - "${D}"/usr/games/bin/wartool -m -v "${CDROM_ROOT}"/data "${D}/${dir}" \ - || die "Failed to extract data" -}