diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /games-engines/frotz | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'games-engines/frotz')
| -rw-r--r-- | games-engines/frotz/Manifest | 5 | ||||
| -rw-r--r-- | games-engines/frotz/files/dumb-ldflags.patch | 25 | ||||
| -rw-r--r-- | games-engines/frotz/frotz-2.50_beta2.ebuild (renamed from games-engines/frotz/frotz-2.45_pre20190903.ebuild) | 16 |
3 files changed, 41 insertions, 5 deletions
diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest index 4a7f7d99fc9b..f9c533529699 100644 --- a/games-engines/frotz/Manifest +++ b/games-engines/frotz/Manifest @@ -1,3 +1,4 @@ -DIST frotz-57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9.tar.bz2 281258 BLAKE2B d85a53157e539bb1e79aade97726b5b6f752d7799faea0f35063c3321c97ddbadf7bb9318533badb212b49b397c52e3fd458d5d08868d90b564002de3ffe4324 SHA512 45fc40f4eebb338e4e4cba8ef446726a9126d45b6646ffcf3a2679dfde5630500e492667363c63f7806630d4b8d88a225080c0a2696c4170d86b1cf4d8b0a06c -EBUILD frotz-2.45_pre20190903.ebuild 1653 BLAKE2B 7d63a13020282e13680e122beaed3026c3e9cfe919cd3199641e6463e73c29dc3bda7e66ae73d09c9909bb4bbe0d4515b19fa1cc9da36b03c9f022087400a1be SHA512 1aece9a3243fe109de57b22ccc8d2f5c77c68a8439bbc17ea1e984f338df2ff1cbe5864a3be6e0e24f7262bc5e1c6ca19e928a540bbe4623ad19ed8b9abdc00b +AUX dumb-ldflags.patch 655 BLAKE2B 0016029ffcb71378dc3feaca92828b14437c67c9c7000fdac1daa2bedff70129611dd51e03a670c49bfa8d3829a4be0aac35b7f79603ecdc578751005716a8aa SHA512 767e0a1371bfa7c717a3639eb529ce94a1a38e4f8b386972e6e87d44a5a427222f44d4d2929ea9ecb1d8b4e6a5ee4ea1285c93843c00ed23cf97afcbdf0f1f87 +DIST frotz-2.50b2.tar.bz2 281065 BLAKE2B bffe35e9f77e7ef89b76bbe29a3f97ad94ac529bd4930790a25c147f336036b1bfdae1ea52cf87e62121189f4e1bce890f5bc3ddbfb0e68e9ffa290fc1567cc9 SHA512 12398c5bf963aaa7e1ad51a1ca3afaddf4849c2aed8e2cabffc411294b501181de69f99bad2a1c8de9777df4b448af6d85b695c56de4b3112cd32fd7d6cb33c7 +EBUILD frotz-2.50_beta2.ebuild 1815 BLAKE2B 38d7b788259b590ca78cce18c44497c93d9def5cedae2a562b727cb71e5dbb7775ca677b09f699a727f56cc7b51e85ebaacfcbe8f8e9525be6402e99614973c5 SHA512 126df75b58ad5f9bb1668592de3a559135cfc95053cc75d9cd71478308072983548f5a2e67d3fd383fea831d1d34d7aefc389f97535a4ef7a3bd4de045cc89ea MISC metadata.xml 337 BLAKE2B 58dbc1d02cdf6768759edb274b556b608135d088ab1b827abbe23726435e2595a9008a377bd27ebb1b4a517dc9e5ef74a9dcd2e08d829e0aacaa854fc258f830 SHA512 ace3f8702420d20cb543c88e0e22fae40cea97be5d86c40657107b9621c72ef462480a790f26735d212aec7fdffb27a1b00bd48f70d0e030f28efa53f51e0217 diff --git a/games-engines/frotz/files/dumb-ldflags.patch b/games-engines/frotz/files/dumb-ldflags.patch new file mode 100644 index 000000000000..2ac968b4b1da --- /dev/null +++ b/games-engines/frotz/files/dumb-ldflags.patch @@ -0,0 +1,25 @@ +From 4b4597d49dc024adf99a336d836709b876846128 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 26 Oct 2019 14:14:00 +0100 +Subject: [PATCH] Add missing LDFLAGS when linking dfrotz + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 3c3c318..ed71a7d 100644 +--- a/Makefile ++++ b/Makefile +@@ -261,7 +261,7 @@ nosound_helper: + + dumb: $(DFROTZ_BIN) + $(DFROTZ_BIN): $(COMMON_LIB) $(DUMB_LIB) $(BLORB_LIB) $(COMMON_LIB) +- $(CC) $+ -o $@$(EXTENSION) ++ $(CC) $+ -o $@$(EXTENSION) $(LDFLAGS) + @echo "** Done building Frotz with dumb interface." + + sdl: $(SFROTZ_BIN) +-- +2.23.0 + diff --git a/games-engines/frotz/frotz-2.45_pre20190903.ebuild b/games-engines/frotz/frotz-2.50_beta2.ebuild index f2a3485e522a..732495e1c963 100644 --- a/games-engines/frotz/frotz-2.45_pre20190903.ebuild +++ b/games-engines/frotz/frotz-2.50_beta2.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit toolchain-funcs -MY_PV="57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9" +MY_PV="${PV/_beta/b}" MY_P="${PN}-${MY_PV}" DESCRIPTION="Interpreter for Z-code based text games" HOMEPAGE="https://661.org/proj/if/frotz/" @@ -20,13 +20,19 @@ REQUIRED_USE="sound? ( || ( ncurses sdl ) )" DEPEND=" ncurses? ( sys-libs/ncurses:0=[unicode?] - sound? ( media-libs/libao ) + sound? ( + media-libs/libao + media-libs/libmodplug + media-libs/libsamplerate[sndfile] + media-libs/libsndfile[-minimal] + media-libs/libvorbis + ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] - media-libs/sdl2-mixer + media-libs/sdl2-mixer[mod,vorbis,wav] sys-libs/zlib virtual/jpeg:0= ) @@ -37,6 +43,10 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/dumb-ldflags.patch +) + src_compile() { emake \ dumb \ |