diff options
Diffstat (limited to 'games-roguelike/stone-soup/files')
-rw-r--r-- | games-roguelike/stone-soup/files/make-advpng.patch | 21 | ||||
-rw-r--r-- | games-roguelike/stone-soup/files/make-no-png-dep-fix.patch | 94 | ||||
-rw-r--r-- | games-roguelike/stone-soup/files/make.patch | 45 |
3 files changed, 150 insertions, 10 deletions
diff --git a/games-roguelike/stone-soup/files/make-advpng.patch b/games-roguelike/stone-soup/files/make-advpng.patch new file mode 100644 index 000000000000..683e478212b4 --- /dev/null +++ b/games-roguelike/stone-soup/files/make-advpng.patch @@ -0,0 +1,21 @@ +--- a/Makefile 2022-05-22 11:54:15.819138403 -0500 ++++ b/Makefile 2022-05-22 11:56:24.475145274 -0500 +@@ -1080,8 +1080,7 @@ + + ifdef TILES_ANY + ifndef NO_OPTIMIZE +- PNGCRUSH = pngcrush -q -m 113 +- PNGCRUSH_LABEL = PNGCRUSH ++ USE_ADVPNG = y + endif + endif + +@@ -1727,7 +1726,8 @@ + $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles + + dat/tiles/%.png: $(RLTILES)/%.png + $(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@ ++ $(QUIET_ADVPNG)$(ADVPNG) $@ + + clean-rltiles: + $(RM) $(DESTTILEFILES) diff --git a/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch b/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch new file mode 100644 index 000000000000..b43c9c41e8c8 --- /dev/null +++ b/games-roguelike/stone-soup/files/make-no-png-dep-fix.patch @@ -0,0 +1,94 @@ +--- a/Makefile 2021-08-02 13:54:26.603900984 -0500 ++++ b/Makefile 2021-08-02 13:57:26.018910565 -0500 +@@ -186,7 +186,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 +@@ -457,15 +457,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) +@@ -765,7 +757,6 @@ + FULLDEBUG=YesPlease + DEBUG=YesPlease + NO_OPTIMIZE=YesPlease +- COVERAGE=YesPlease + endif + + # Debug-Lite +@@ -773,7 +764,6 @@ + ifneq (,$(filter debug-lite,$(MAKECMDGOALS))) + DEBUG=YesPlease + NO_OPTIMIZE=YesPlease +- COVERAGE=YesPlease + endif + + # Profile +@@ -781,12 +771,10 @@ + ifneq (,$(filter profile,$(MAKECMDGOALS))) + FULLDEBUG=YesPlease + DEBUG=YesPlease +- COVERAGE=YesPlease + endif + + # Unit tests + ifneq (,$(filter catch2-tests,$(MAKECMDGOALS))) +- COVERAGE=YesPlease + endif + + ifdef HURRY +@@ -938,7 +926,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)\" +@@ -958,7 +946,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)\" +@@ -1187,9 +1175,8 @@ + + LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??))) + SRC_PKG_BASE := stone_soup +-SRC_VERSION := $(shell git describe --tags $(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 --tags $(MERGE_BASE)) + WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32) + + export SRC_VERSION +@@ -1523,7 +1510,7 @@ + endif + endif + +-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) diff --git a/games-roguelike/stone-soup/files/make.patch b/games-roguelike/stone-soup/files/make.patch index b43c9c41e8c8..e0d086520099 100644 --- a/games-roguelike/stone-soup/files/make.patch +++ b/games-roguelike/stone-soup/files/make.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2021-08-02 13:54:26.603900984 -0500 -+++ b/Makefile 2021-08-02 13:57:26.018910565 -0500 +--- a/Makefile 2022-05-22 11:25:51.733047395 -0500 ++++ b/Makefile 2022-05-22 11:42:54.240102003 -0500 @@ -186,7 +186,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') @@ -9,7 +9,7 @@ ARCH := $(HOST) ifdef CROSSHOST -@@ -457,15 +457,7 @@ +@@ -451,15 +451,7 @@ GCC_VER_SUFFIX:=-$(GCC_VER) endif @@ -25,7 +25,7 @@ ifneq ($(FORCE_CC),) GCC := $(FORCE_CC) -@@ -765,7 +757,6 @@ +@@ -759,7 +751,6 @@ FULLDEBUG=YesPlease DEBUG=YesPlease NO_OPTIMIZE=YesPlease @@ -33,7 +33,7 @@ endif # Debug-Lite -@@ -773,7 +764,6 @@ +@@ -767,7 +758,6 @@ ifneq (,$(filter debug-lite,$(MAKECMDGOALS))) DEBUG=YesPlease NO_OPTIMIZE=YesPlease @@ -41,7 +41,7 @@ endif # Profile -@@ -781,12 +771,10 @@ +@@ -775,12 +765,10 @@ ifneq (,$(filter profile,$(MAKECMDGOALS))) FULLDEBUG=YesPlease DEBUG=YesPlease @@ -54,7 +54,7 @@ endif ifdef HURRY -@@ -938,7 +926,7 @@ +@@ -932,7 +920,7 @@ INSTALL_FONTS += "$(PROPORTIONAL_FONT)" endif else @@ -63,7 +63,7 @@ ifneq (,$(SYS_PROPORTIONAL_FONT)) ifeq (,$(COPY_FONTS)) DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\" -@@ -958,7 +946,7 @@ +@@ -952,7 +940,7 @@ INSTALL_FONTS += "$(MONOSPACED_FONT)" endif else @@ -72,7 +72,22 @@ ifneq (,$(SYS_MONOSPACED_FONT)) ifeq (,$(COPY_FONTS)) DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\" -@@ -1187,9 +1175,8 @@ +@@ -1092,14 +1080,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 + +@@ -1181,9 +1163,8 @@ LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??))) SRC_PKG_BASE := stone_soup @@ -83,7 +98,7 @@ WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32) export SRC_VERSION -@@ -1523,7 +1510,7 @@ +@@ -1511,7 +1492,7 @@ endif endif @@ -92,3 +107,13 @@ [ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix) $(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/ $(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME) +@@ -1747,9 +1728,6 @@ + + dat/tiles/%.png: $(RLTILES)/%.png + $(QUIET_PNGCRUSH)$(PNGCRUSH) $< $@ +-ifdef USE_ADVPNG +- $(QUIET_ADVPNG)$(ADVPNG) $@ +-endif + + clean-rltiles: + $(RM) $(DESTTILEFILES) |