diff options
| author |   Nikos Chantziaras <realnc@gmail.com> | 2021-05-09 15:25:27 +0300 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-05-31 07:55:07 +0000 |
| commit | 55c6de3f88fef3cfd41daae00837edbbab4088d2 (patch) | |
| tree | c7bca815ce332a5e4e7643928a9e30f589772dd3 /games-engines | |
| parent | games-engines/frobtads: Remove old (diff) | |
| download | gentoo-55c6de3f88fef3cfd41daae00837edbbab4088d2.tar.gz gentoo-55c6de3f88fef3cfd41daae00837edbbab4088d2.tar.bz2 gentoo-55c6de3f88fef3cfd41daae00837edbbab4088d2.zip | |
games-engines/qtads: Fix build error when using >=fluidsynth-2.2
Closes: https://bugs.gentoo.org/785235
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Nikos Chantziaras <realnc@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20741
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/qtads/files/qtads-3.0-fluidsynth.patch | 55 | ||||
| -rw-r--r-- | games-engines/qtads/qtads-3.0.0.ebuild | 6 |
2 files changed, 60 insertions, 1 deletions
diff --git a/games-engines/qtads/files/qtads-3.0-fluidsynth.patch b/games-engines/qtads/files/qtads-3.0-fluidsynth.patch new file mode 100644 index 000000000000..0104d35098dc --- /dev/null +++ b/games-engines/qtads/files/qtads-3.0-fluidsynth.patch @@ -0,0 +1,55 @@ +From eedae0e7c67da4e12c65ef049665258c1d8f44a8 Mon Sep 17 00:00:00 2001 +From: Michal Petrucha <michal.petrucha@koniiiik.org> +Date: Thu, 22 Apr 2021 22:55:40 +0200 +Subject: [PATCH] Add support for fluidsynth 2.2.0 + +--- + SDL_audiolib/src/DecoderFluidsynth.cpp | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/SDL_audiolib/src/DecoderFluidsynth.cpp b/SDL_audiolib/src/DecoderFluidsynth.cpp +index 62a99df..0f4760d 100644 +--- a/SDL_audiolib/src/DecoderFluidsynth.cpp ++++ b/SDL_audiolib/src/DecoderFluidsynth.cpp +@@ -11,6 +11,14 @@ + #include <cstdio> + #include <fluidsynth.h> + ++#if FLUIDSYNTH_VERSION_MAJOR == 2 && FLUIDSYNTH_VERSION_MINOR >= 2 ++using read_cb_count_type = fluid_long_long_t; ++using seek_cb_offset_type = fluid_long_long_t; ++#else ++using read_cb_count_type = int; ++using seek_cb_offset_type = long; ++#endif ++ + namespace chrono = std::chrono; + + static fluid_settings_t* settings = nullptr; +@@ -36,7 +44,7 @@ static void* sfontOpenCb(const char* filename) + return rwops; + } + +-static int sfontReadCb(void* dst, int count, void* rwops) ++static int sfontReadCb(void* dst, read_cb_count_type count, void* rwops) + { + Buffer<char> buf(count); + if (SDL_RWread(static_cast<SDL_RWops*>(rwops), buf.get(), 1, count) <= 0) { +@@ -46,7 +54,7 @@ static int sfontReadCb(void* dst, int count, void* rwops) + return FLUID_OK; + } + +-static int sfontSeekCb(void* rwops, long offset, int whence) ++static int sfontSeekCb(void* rwops, seek_cb_offset_type offset, int whence) + { + switch (whence) { + case SEEK_SET: +@@ -72,7 +80,7 @@ static int sfontCloseCb(void* rwops) + return FLUID_OK; + } + +-static long sfontTellCb(void* rwops) ++static seek_cb_offset_type sfontTellCb(void* rwops) + { + auto pos = SDL_RWtell(static_cast<SDL_RWops*>(rwops)); + if (pos == -1) { diff --git a/games-engines/qtads/qtads-3.0.0.ebuild b/games-engines/qtads/qtads-3.0.0.ebuild index 57d338defea2..e375495f938f 100644 --- a/games-engines/qtads/qtads-3.0.0.ebuild +++ b/games-engines/qtads/qtads-3.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,6 +31,10 @@ DEPEND=" " RDEPEND=${DEPEND} +PATCHES=( + "${FILESDIR}"/${PN}-3.0-fluidsynth.patch #785235 +) + src_configure() { eqmake5 \ PREFIX="${EPREFIX}/usr" \ |