games-roguelike/stone-soup: add 0.30.0_pre20230129

Signed-off-by: Erik Mackdanz <stasibear@gentoo.org>
This commit is contained in:
Erik Mackdanz 2023-01-29 17:41:14 -06:00
parent ba8fe703da
commit b4cc770e07
No known key found for this signature in database
GPG Key ID: 872D9B3D284D4A0A
3 changed files with 361 additions and 0 deletions

View File

@ -9,6 +9,9 @@ DIST stone-soup-0.28.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d2
DIST stone-soup-0.29.1.tar.gz 17510846 BLAKE2B 65b84797c8d8a268a3ce95de9d928e131bf6e21a1ea6ac3e72263c75f9d6288e9d95f9df6401528c06aefbda9bb642c79bf78065a65224297d33c050abf37056 SHA512 2ca49c4cd228526d47e4ad7e9556b6c26566595458423cd8e6b762298f229eb7ba273770ae1e12939ba66574a5b55e44812d06c4809d4327ed9bfd738501af04
DIST stone-soup-0.29.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
DIST stone-soup-0.29.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
DIST stone-soup-0.30.0_pre20230129.tar.gz 20929296 BLAKE2B 4ca826d5157c3530c3d7a1f36aa10cc8fbf961a33aca06e2dcd3afc1896e12babdc8e2e33fd937397d72cded0f208422f21757d95ad70171f4938237f6d4f034 SHA512 9d27d209eaee58bf33eaf84288e3f48b72bfb701496d8c3ac98f6207ef761d23134270a837194e0f18c9a6e64774949b4668929614db1f9a7334e7abbb5db4ea
DIST stone-soup-0.30.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
DIST stone-soup-0.30.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
DIST stone_soup-0.25.1.zip 95477710 BLAKE2B 0b38a6c7cb7c4c87acccb861b5aae665cd2b6b532f6e86d4a9fa594e0d363b86b4af1ea47275f7fd026ea69d85215be8cdf46258bd620e738b4850e5eceed006 SHA512 fa7e8be582c5c6615531884ade4c113542c06c164b6912095c1adf2f16a31cb2ecce057d74132b11b1b1c256a77433037948d4e54819739b7e222cc896cd5220
DIST stone_soup-0.26.1.zip 95585384 BLAKE2B 6d1cb99fc44e918cad4144608f259e67a26df444b93c8501590ff209e8856fd08c514d4c8c78cb0848d8e6127cdf4360b47d21ced5d919da982421934b46102d SHA512 637f1a07e9f35e18eda10c17dc28449364c56aee8456497e30552acb55608a9433cff8b64af877049c21cb2a42eb2fcad28f58a7e57a1d835eb8c252e580205d
DIST stone_soup-0.27.1.zip 96934633 BLAKE2B 8821920a4faad9474f08a34ae3c272cb9dcd3ddeb9029e033c22eb8e6650ef20bbc30e0c0ca1556d08c1b7b898fdbdd3667a3ac9a8527e0c322cd8c78ab391bb SHA512 845dafc9895ada3712903de63b95cca9eeb66160e4a04ba21193d916447fca8e7248b851f1e938f43b8d3937cf4f4437443bdc4fe2da893fe3918fed4e0b5204

View File

@ -0,0 +1,120 @@
--- a/Makefile 2023-01-29 16:54:29.445857641 -0600
+++ b/Makefile 2023-01-29 16:55:57.363274244 -0600
@@ -92,7 +92,7 @@
# processes. Not supported for MSYS2/cygwin builds, and will be overridden for
# mac universal builds. This does not count as a change in build flags.
ifndef GAME
- GAME = crawl
+ GAME = crawl-0.30
endif
# Disable GNU Make implicit rules and variables. Leaving them enabled will slow
@@ -206,7 +206,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
-HOST := $(shell sh -c 'cc -dumpmachine || echo unknown')
+HOST :=
ARCH := $(HOST)
ifdef CROSSHOST
@@ -509,15 +509,7 @@
GCC_VER_SUFFIX:=-$(GCC_VER)
endif
-# Attempt to use a full compiler name, to make
-# distcc builds work nicely.
-LMACH := $(shell gcc -dumpmachine)-
-ifeq ($(LMACH),-)
LMACH :=
-endif
-ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),)
-LMACH :=
-endif
ifneq ($(FORCE_CC),)
GCC := $(FORCE_CC)
@@ -862,10 +854,11 @@
COVERAGE=YesPlease
# current catch2 doesn't support c++11
STDFLAG = -std=c++14
+ # tests require this
+ LIBS += -lgcov
endif
ifdef HURRY
- NO_OPTIMIZE=YesPlease
endif
ifdef COVERAGE
@@ -1017,7 +1010,7 @@
INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
endif
else
- SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
+ SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
ifneq (,$(SYS_PROPORTIONAL_FONT))
ifeq (,$(COPY_FONTS))
DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
@@ -1037,7 +1030,7 @@
INSTALL_FONTS += "$(MONOSPACED_FONT)"
endif
else
- SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
+ SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
ifneq (,$(SYS_MONOSPACED_FONT))
ifeq (,$(COPY_FONTS))
DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
@@ -1177,14 +1170,8 @@
ifdef TILES_ANY
ifndef NO_OPTIMIZE
- ifneq (,$(shell which advpng))
- USE_ADVPNG = y
- else
- ifneq (,$(shell which pngcrush))
PNGCRUSH = pngcrush -q -m 113
PNGCRUSH_LABEL = PNGCRUSH
- endif
- endif
endif
endif
@@ -1280,9 +1266,8 @@
LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
SRC_PKG_BASE := stone_soup
-SRC_VERSION := $(shell git describe $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
+SRC_VERSION := $(shell cat util/release_ver)
MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
-RECENT_TAG := $(shell git describe --abbrev=0 $(MERGE_BASE))
WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
export SRC_VERSION
@@ -1644,7 +1629,7 @@
$(COPY) dat/tiles/stone_soup_icon-512x512.png $(prefix_fp)/share/icons/hicolor/512x512/apps/$(XDG_NAME).png
$(COPY) dat/tiles/stone_soup_icon.svg $(prefix_fp)/share/icons/hicolor/scalable/apps/$(XDG_NAME).svg
-install: all install-data
+install: install-data
[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
$(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
@@ -1667,7 +1652,6 @@
+$(MAKE) -C contrib clean
clean-android:
- $(RM) -r $(datadir_fp)
+cd android-project && rm -f local.properties && rm -f app/build.gradle
distclean: clean clean-contrib clean-rltiles
@@ -1899,9 +1883,6 @@
dat/tiles/%.png: $(RLTILES)/%.png
$(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@
-ifdef USE_ADVPNG
- $(QUIET_ADVPNG)$(ADVPNG) $@
-endif
clean-rltiles:
$(RM) $(DESTTILEFILES)

View File

@ -0,0 +1,238 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# There are many slots for this package because people in the community
# like to play old versions. Every release includes content changes
# where species/spells/monsters are added or removed. The public
# servers (e.g. http://crawl.akrasiac.org:8080) usually support playing
# versions back to 0.11.
# It's not necessary for Gentoo to support these old version but it's
# something nice that our distro can offer that others don't. If the
# maintenance burden becomes excessive than we can revisit that
# position.
EAPI=8
LUA_COMPAT=( lua5-1 )
LUA_REQ_USE="deprecated"
PYTHON_COMPAT=( python3_{9,10,11} )
VIRTUALX_REQUIRED="manual"
inherit desktop python-any-r1 lua-single xdg-utils toolchain-funcs
DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
HOMEPAGE="https://crawl.develz.org"
SLOT="0.30"
# Leave empty string if not a _pre release
COMMITSHA="c68057be0a1ad1b17d0337fd8baed0213a428039"
if [ -z "${COMMITSHA}" ]; then
# This is a tagged release
# Note the archive URI and file layout changed upstream between 0.29.0 and 0.29.1
SRC_URI="
https://github.com/crawl/crawl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
"
MY_P="crawl-${PV}/crawl-ref"
else
# This is a _pre release
SRC_URI="
https://github.com/crawl/crawl/archive/${COMMITSHA}.tar.gz -> ${P}.tar.gz
"
MY_P="crawl-${COMMITSHA}/crawl-ref"
fi
SRC_URI="
${SRC_URI}
https://dev.gentoo.org/~stasibear/distfiles/${PN}.png -> ${PN}-${SLOT}.png
https://dev.gentoo.org/~stasibear/distfiles/${PN}.svg -> ${PN}-${SLOT}.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"
KEYWORDS="~amd64 ~x86"
IUSE="advpng debug ncurses sound test +tiles"
RESTRICT="!test? ( test )"
REQUIRED_USE="${LUA_REQUIRED_USE}"
S=${WORKDIR}/${MY_P}/source
RDEPEND="
${LUA_DEPS}
dev-db/sqlite:3
sys-libs/zlib
!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
ncurses? ( sys-libs/ncurses:0 )
tiles? (
media-fonts/dejavu
media-libs/freetype:2
media-libs/libpng:0
sound? (
media-libs/libsdl2[X,opengl,sound,video]
media-libs/sdl2-mixer
)
!sound? ( media-libs/libsdl2[X,opengl,video] )
media-libs/sdl2-image[png]
virtual/glu
virtual/opengl
)"
DEPEND="${RDEPEND}
test? ( <dev-cpp/catch-3.0.0:0 )
tiles? (
sys-libs/ncurses:0
)
"
BDEPEND="
app-arch/unzip
dev-lang/perl
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
sys-devel/flex
tiles? (
advpng? (
app-arch/advancecomp
)
!advpng? (
media-gfx/pngcrush
)
)
virtual/pkgconfig
app-alternatives/yacc
"
PATCHES=(
"${FILESDIR}"/make-v2.patch
"${FILESDIR}"/rltiles-make.patch
)
python_check_deps() {
python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
}
pkg_setup() {
python-any-r1_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
if use sound && use !tiles ; then
ewarn "Sound support is only available with tiles."
fi
}
src_prepare() {
default
python_fix_shebang "${S}/util/species-gen.py"
if use advpng; then
eapply "${FILESDIR}/make-advpng.patch"
fi
sed -i -e "s/GAME = crawl$/GAME = crawl-${SLOT}/" "${S}/Makefile" \
|| die "Couldn't append slot to executable name"
# File required for a _pre build
if ! [ -f "${S}/util/release_ver" ]; then
echo "${SLOT}" >"${S}/util/release_ver" || die "Couldn't write release_ver"
fi
# Replace bundled catch2 package with system implementation
# https://bugs.gentoo.org/829950
if use test; then
cp /usr/include/catch2/catch.hpp "${S}/catch2-tests" || die "Couldn't substitute system catch2"
fi
}
src_compile() {
# Insurance that we're not using bundled lib sources
rm -rf contrib || die "Couldn't delete contrib directory"
myemakeargs=(
$(usex debug "FULLDEBUG=y DEBUG=y" "")
BUILD_LUA=
AR="$(tc-getAR)"
CFOPTIMIZE=''
# -DLUA_COMPAT_OPENLIB=1 is required to enable the
# deprecated (in 5.1) luaL_openlib API (#869671)
CFOTHERS="${CXXFLAGS} -DLUA_COMPAT_OPENLIB=1"
CONTRIBS=
DATADIR="/usr/share/${PN}-${SLOT}"
FORCE_CC="$(tc-getCC)"
FORCE_CXX="$(tc-getCXX)"
LDFLAGS="${LDFLAGS}"
MAKEOPTS="${MAKEOPTS}"
PKGCONFIG="$(tc-getPKG_CONFIG)"
RANLIB="$(tc-getRANLIB)"
SAVEDIR="~/.crawl-${SLOT}"
SOUND=$(usex sound "y" "")
STRIP=touch
USE_LUAJIT=
V=1
prefix="/usr"
)
if use ncurses || (use !ncurses && use !tiles) ; then
emake "${myemakeargs[@]}"
# move it in case we build both variants
use tiles && { mv "crawl-${SLOT}" "${WORKDIR}"/crawl-ncurses-${SLOT} || die ;}
fi
if use tiles ; then
emake "${myemakeargs[@]}" clean
emake "${myemakeargs[@]}" "TILES=y"
fi
}
src_test() {
emake "${myemakeargs[@]}" \
$(usex tiles "TILES=y" "") \
catch2-tests
}
src_install() {
emake "${myemakeargs[@]}" \
$(usex tiles "TILES=y" "") \
DESTDIR="${D}" \
prefix_fp="" \
bin_prefix="${D}/usr/bin" \
install
[[ -e "${WORKDIR}/crawl-ncurses-${SLOT}" ]] && dobin "${WORKDIR}/crawl-ncurses-${SLOT}"
# don't relocate docs, needed at runtime
rm -rf "${D}/usr/share/${PN}-${SLOT}"/docs/license
mv "${WORKDIR}/${MY_P}"/docs/crawl.6 "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6" \
|| die "Couldn't append slot to man page name"
doman "${WORKDIR}/${MY_P}/docs/crawl-${SLOT}.6"
# icons and menu for graphical build
if use tiles ; then
doicon -s 48 "${DISTDIR}"/${PN}-${SLOT}.png
doicon -s scalable "${DISTDIR}"/${PN}-${SLOT}.svg
make_desktop_entry "crawl-${SLOT}" "crawl-${SLOT}" "crawl-${SLOT}"
fi
}
pkg_postinst() {
xdg_icon_cache_update
elog "crawl is a slotted install that supports having"
elog "multiple versions installed. The binary has the"
elog "slot appended, e.g. 'crawl-"${SLOT}"'."
if use tiles && use ncurses ; then
elog
elog "Since you have enabled both tiles and ncurses frontends"
elog "the ncurses binary is called 'crawl-ncurses-"${SLOT}"' and the"
elog "tiles binary is called 'crawl-"${SLOT}"'."
fi
}
pkg_postrm() {
xdg_icon_cache_update
}