diff options
author | 2015-05-14 10:28:09 +0000 | |
---|---|---|
committer | 2015-05-14 10:28:09 +0000 | |
commit | c0a4d752f9fff46fad588a65718285a47fca8edc (patch) | |
tree | 9834babd072bbd6c8392b6ac8c901b7638221f2c /games-roguelike | |
parent | Revision bump: add dependency on net-dialup/ppp-scripts to improve pppd_compa... (diff) | |
download | gentoo-2-c0a4d752f9fff46fad588a65718285a47fca8edc.tar.gz gentoo-2-c0a4d752f9fff46fad588a65718285a47fca8edc.tar.bz2 gentoo-2-c0a4d752f9fff46fad588a65718285a47fca8edc.zip |
version bump
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'games-roguelike')
4 files changed, 328 insertions, 2 deletions
diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog index 12b165006587..0dbce8fe696e 100644 --- a/games-roguelike/stone-soup/ChangeLog +++ b/games-roguelike/stone-soup/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-roguelike/stone-soup -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.42 2014/10/27 19:59:02 hasufell Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.43 2015/05/14 10:28:09 hasufell Exp $ + +*stone-soup-0.16.1 (14 May 2015) + + 14 May 2015; Julian Ospald <hasufell@gentoo.org> +stone-soup-0.16.1.ebuild, + +files/stone-soup-0.16.1-Use-pkg-config-for-linking-to-ncurses.patch, + +files/stone-soup-0.16.1-respect-flags-and-compiler.patch: + version bump *stone-soup-0.15.2 (27 Oct 2014) diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.1-Use-pkg-config-for-linking-to-ncurses.patch b/games-roguelike/stone-soup/files/stone-soup-0.16.1-Use-pkg-config-for-linking-to-ncurses.patch new file mode 100644 index 000000000000..5ca192d3c929 --- /dev/null +++ b/games-roguelike/stone-soup/files/stone-soup-0.16.1-Use-pkg-config-for-linking-to-ncurses.patch @@ -0,0 +1,49 @@ +From 88579f929f0fc777762de1ad0895264ad077e0ee Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Mon, 27 Oct 2014 20:48:03 +0100 +Subject: [PATCH 2/2] Use pkg-config for linking to ncurses + +Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=527034 +--- + source/Makefile | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/source/Makefile b/source/Makefile +index df51e70..2db2781 100644 +--- a/source/Makefile ++++ b/source/Makefile +@@ -956,17 +956,15 @@ endif + # Your ncurses library may include Unicode support, and you may not have a + # separate libncursesw; this is the case on Mac OS/Darwin. + ifdef LIBNCURSES_IS_UNICODE +-NC_LIB = ncurses +-NC_INCLUDE = $(NC_PREFIX)/include/ncurses ++NC_LIBS = $(shell $(PKGCONFIG) --lib ncurses 2>/dev/null || echo "-L$(NC_PREFIX)/lib -lncurses") ++NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncurses") + else +-NC_LIB = ncursesw +-NC_INCLUDE = $(NC_PREFIX)/include/ncursesw ++NC_LIBS = $(shell $(PKGCONFIG) --lib ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw") ++NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncursesw") + endif + +-INCLUDES_L += -isystem $(NC_INCLUDE) +- + ifndef TILES +-LIBS += -L$(NC_PREFIX)/lib -l$(NC_LIB) ++LIBS += $(NC_LIBS) + endif + + endif +@@ -1111,7 +1109,7 @@ CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) + else + CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) + endif +-CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) ++CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) $(NC_CFLAGS) + ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L) + YACC_CFLAGS := $(ALL_CFLAGS) -Wno-unused-function -Wno-sign-compare -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 + +-- +2.1.2 + diff --git a/games-roguelike/stone-soup/files/stone-soup-0.16.1-respect-flags-and-compiler.patch b/games-roguelike/stone-soup/files/stone-soup-0.16.1-respect-flags-and-compiler.patch new file mode 100644 index 000000000000..bf07f4e07edf --- /dev/null +++ b/games-roguelike/stone-soup/files/stone-soup-0.16.1-respect-flags-and-compiler.patch @@ -0,0 +1,110 @@ +From aaa7cde91e4b086164f0c7f46569a34bfbb4e479 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 3 May 2015 15:05:43 +0200 +Subject: [PATCH] Respect flags and compiler + +--- + Makefile | 5 ++--- + rltiles/Makefile | 22 +++++++++++----------- + 2 files changed, 13 insertions(+), 14 deletions(-) + +diff --git a/Makefile b/Makefile +index 8b9efd9..0f37edf 100644 +--- a/Makefile ++++ b/Makefile +@@ -103,7 +103,7 @@ include Makefile.obj + # + + +-CFOTHERS := -pipe $(EXTERNAL_FLAGS) ++CFOTHERS := $(EXTERNAL_FLAGS) + CFWARN := + CFWARN_L := -Wall -Wformat-security -Wundef + +@@ -809,7 +809,6 @@ ifdef FULLDEBUG + DEFINES += -DFULLDEBUG + endif + ifdef DEBUG +-CFOTHERS := -ggdb $(CFOTHERS) + DEFINES += -DDEBUG + endif + ifndef NOWIZARD +@@ -1627,7 +1626,7 @@ ifdef ANDROID + # prove that tiles were generated properly + grep tile_info rltiles/*.cc| head + else +- +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES) ++ $(MAKE) -C $(RLTILES) all V=$(V) ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES) + endif + + $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles +diff --git a/rltiles/Makefile b/rltiles/Makefile +index ae11f43..464424f 100644 +--- a/rltiles/Makefile ++++ b/rltiles/Makefile +@@ -1,7 +1,7 @@ + uname_S := $(shell uname -s) + + ifneq (,$(findstring MINGW,$(uname_S))) +-LDFLAGS += -lmingw32 ++LIBS += -lmingw32 + endif + + # Note: since generation of tiles is done on the host, we don't care about +@@ -10,7 +10,7 @@ endif + # Also, cross-compilation with no system libraries for host rather than target + # is not supported. If host=target, contribs are enough. + +-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter ++CXXFLAGS := -Wall -Wextra -Wno-parentheses -Wno-unused-parameter + + ifdef ANDROID + CXXFLAGS := +@@ -27,24 +27,24 @@ ifdef TILES + PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a + endif + +- CFLAGS += $(PNG_INCLUDE) +- LDFLAGS += $(PNG_LIB) ++ CXXFLAGS += $(PNG_INCLUDE) ++ LIBS += $(PNG_LIB) + +- CFLAGS += -DUSE_TILE ++ CXXFLAGS += -DUSE_TILE + endif + + ifdef DEBUG +-CFLAGS += -O0 -DDEBUG -ggdb ++CXXFLAGS += -DDEBUG + endif + + ifneq (,$(findstring MINGW,$(uname_S))) +-LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid ++LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid + endif + ifeq ($(uname_S),Darwin) + LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL + endif + ifeq ($(uname_S),Linux) +-LDFLAGS += -ldl -lpthread ++LIBS += -ldl -lpthread + endif + + # Attempt to use a full compiler name, to make +@@ -129,10 +129,10 @@ clean: + + distclean: clean + +-%.o: %.cc .cflags +- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ ++%.o: %.cc ++ $(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) -c $< -o $@ + + $(TILEGEN): $(OBJECTS) +- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) ++ $(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS) + + .PHONY: all clean distclean +-- +2.3.5 + diff --git a/games-roguelike/stone-soup/stone-soup-0.16.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.16.1.ebuild new file mode 100644 index 000000000000..03b3e2be294d --- /dev/null +++ b/games-roguelike/stone-soup/stone-soup-0.16.1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/stone-soup-0.16.1.ebuild,v 1.1 2015/05/14 10:28:09 hasufell Exp $ + +## TODO +# add sound support (no sound files) + +EAPI=5 +VIRTUALX_REQUIRED="manual" +inherit eutils gnome2-utils virtualx toolchain-funcs games + +MY_P="stone_soup-${PV}" +DESCRIPTION="Dungeon Crawl Stone Soup is a role-playing roguelike game of exploration and treasure-hunting in dungeons" +HOMEPAGE="http://crawl.develz.org/wordpress/" +SRC_URI="https://crawl.develz.org/release/stone_soup-${PV}.tar.xz + http://dev.gentoo.org/~hasufell/distfiles/${PN}.png + http://dev.gentoo.org/~hasufell/distfiles/${PN}.svg" + +# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h +# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs +# Public Domain|CC0: most of tiles +# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/ +LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug luajit ncurses test +tiles" +# test is broken +# see https://crawl.develz.org/mantis/view.php?id=6121 +RESTRICT="test" + +RDEPEND=" + dev-db/sqlite:3 + luajit? ( >=dev-lang/luajit-2.0.0 ) + sys-libs/zlib + !ncurses? ( !tiles? ( sys-libs/ncurses ) ) + ncurses? ( sys-libs/ncurses ) + tiles? ( + media-fonts/dejavu + media-libs/freetype:2 + media-libs/libpng:0 + media-libs/libsdl2[opengl,video] + media-libs/sdl2-image[png] + virtual/glu + virtual/opengl + )" +DEPEND="${RDEPEND} + dev-lang/perl + sys-devel/flex + virtual/pkgconfig + virtual/yacc + tiles? ( + sys-libs/ncurses + test? ( ${VIRTUALX_DEPEND} ) + )" + +S=${WORKDIR}/${MY_P}/source +S_TEST=${WORKDIR}/${MY_P}_test/source + +pkg_setup() { + games_pkg_setup + if use !ncurses && use !tiles ; then + ewarn "Neither ncurses nor tiles frontend" + ewarn "selected, choosing ncurses only." + ewarn "Note that you can also enable both." + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-respect-flags-and-compiler.patch \ + "${FILESDIR}"/${P}-Use-pkg-config-for-linking-to-ncurses.patch + + rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die + +# if use test ; then +# cp -av "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_P}_test" \ +# || die "setting up test-dir failed" +# fi +} + +src_compile() { + export HOSTCXX=$(tc-getBUILD_CXX) + + # leave DATADIR at the top + myemakeargs=( + $(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled + USE_LUAJIT=$(usex luajit "yes" "") + DATADIR="${GAMES_DATADIR}/${PN}" + V=1 + prefix="${GAMES_PREFIX}" + SAVEDIR="~/.crawl" + $(usex debug "FULLDEBUG=y DEBUG=y" "") + CFOPTIMIZE="${CXXFLAGS}" + LDFLAGS="${LDFLAGS}" + MAKEOPTS="${MAKEOPTS}" + AR="$(tc-getAR)" + RANLIB="$(tc-getRANLIB)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + PKGCONFIG="$(tc-getPKG_CONFIG)" + STRIP=touch + ) + + if use ncurses || (use !ncurses && use !tiles) ; then + emake "${myemakeargs[@]}" + # move it in case we build both variants + use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;} + fi + + if use tiles ; then + emake clean + emake "${myemakeargs[@]}" "TILES=y" + fi + + # for test to work we need to compile with unset DATADIR +# if use test ; then +# emake ${myemakeargs[@]:1} -C "${S_TEST}" +# fi +} + +src_install() { + emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}${GAMES_BINDIR}" install + [[ -e "${WORKDIR}"/crawl-ncurses ]] && dogamesbin "${WORKDIR}"/crawl-ncurses + + # don't relocate docs, needed at runtime + rm -rf "${D}${GAMES_DATADIR}"/${PN}/docs/license + dodoc "${WORKDIR}"/${MY_P}/README.{txt,pdf} + + # icons and menu for graphical build + if use tiles ; then + doicon -s 48 "${DISTDIR}"/${PN}.png + doicon -s scalable "${DISTDIR}"/${PN}.svg + make_desktop_entry crawl + fi + + prepgamesdirs +} + +src_test() { + $(usex tiles "X" "")emake "${myemakeargs[@]:1}" -C "${S_TEST}" test +} + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + gnome2_icon_cache_update + + if use tiles && use ncurses ; then + elog "Since you have enabled both tiles and ncurses frontends" + elog "the ncurses binary is called 'crawl-ncurses' and the" + elog "tiles binary is called 'crawl'." + fi +} + +pkg_postrm() { + gnome2_icon_cache_update +} |