diff --git a/recipes-games/scummvm/scummvm/0001-use-pkg-config-to-gather-sdl-information.patch b/recipes-games/scummvm/scummvm/0001-use-pkg-config-to-gather-sdl-information.patch index e96b31c..c4f4c28 100644 --- a/recipes-games/scummvm/scummvm/0001-use-pkg-config-to-gather-sdl-information.patch +++ b/recipes-games/scummvm/scummvm/0001-use-pkg-config-to-gather-sdl-information.patch @@ -14,7 +14,7 @@ Signed-off-by: Andreas Müller 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index 36a857e..e69e39c 100755 +index d8b22ac6f54..1474578b47c 100755 --- a/configure +++ b/configure @@ -3735,14 +3735,13 @@ fi @@ -22,12 +22,12 @@ index 36a857e..e69e39c 100755 # if test "$_sdl" = auto ; then - find_sdlconfig -- append_var SDL_CFLAGS "`$_sdlconfig --prefix="$_sdlpath" --cflags`" +- append_var SDL_CFLAGS "`$_sdlconfig --cflags | sed 's/[[:space:]]*-Dmain=SDL_main//g'`" + append_var SDL_CFLAGS "`pkg-config --cflags sdl2`" if test "$_static_build" = yes ; then - append_var SDL_LIBS "`$_sdlconfig --prefix="$_sdlpath" --static-libs`" + append_var SDL_LIBS "`$_sdlconfig --static-libs`" else -- append_var SDL_LIBS "`$_sdlconfig --prefix="$_sdlpath" --libs`" +- append_var SDL_LIBS "`$_sdlconfig --libs`" + append_var SDL_LIBS "`pkg-config --libs sdl2`" fi - _sdlversion=`$_sdlconfig --version` @@ -36,5 +36,5 @@ index 36a857e..e69e39c 100755 echocheck "SDL" _sdl=no -- -2.26.2 +2.31.1 diff --git a/recipes-games/scummvm/scummvm/0002-Do-not-split-binaries-during-install.patch b/recipes-games/scummvm/scummvm/0002-Do-not-split-binaries-during-install.patch index f8ffef4..e984a7e 100644 --- a/recipes-games/scummvm/scummvm/0002-Do-not-split-binaries-during-install.patch +++ b/recipes-games/scummvm/scummvm/0002-Do-not-split-binaries-during-install.patch @@ -9,25 +9,20 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [oe specific] Signed-off-by: Andreas Müller ---- +---- ports.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports.mk b/ports.mk -index b562799..fdca3df 100644 +index 27b00768b21..3a97938d6da 100644 --- a/ports.mk +++ b/ports.mk -@@ -29,7 +29,7 @@ endif +@@ -35,10 +35,10 @@ endif - install-strip: + install-strip: install-data $(INSTALL) -d "$(DESTDIR)$(bindir)" - $(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)" + $(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)" - $(INSTALL) -d "$(DESTDIR)$(mandir)/man6/" - $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(mandir)/man6/scummvm.6" - $(INSTALL) -d "$(DESTDIR)$(datarootdir)/pixmaps/" -@@ -46,7 +46,7 @@ install-strip: - $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.appdata.xml" "$(DESTDIR)$(datarootdir)/metainfo/scummvm.appdata.xml" ifdef DYNAMIC_MODULES $(INSTALL) -d "$(DESTDIR)$(libdir)/scummvm/" - $(INSTALL) -c -s -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/" @@ -36,5 +31,5 @@ index b562799..fdca3df 100644 uninstall: -- -2.26.2 +2.31.1 diff --git a/recipes-games/scummvm/scummvm/0003-FLUIDSYNTH-Simplify-FluidSynth-version-check.patch b/recipes-games/scummvm/scummvm/0003-FLUIDSYNTH-Simplify-FluidSynth-version-check.patch deleted file mode 100644 index 3e7da81..0000000 --- a/recipes-games/scummvm/scummvm/0003-FLUIDSYNTH-Simplify-FluidSynth-version-check.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 81cad79ae2a5aff72c0c655a608075b27cf9f02e Mon Sep 17 00:00:00 2001 -From: Le Philousophe -Date: Mon, 5 Apr 2021 12:22:51 +0200 -Subject: [PATCH 1/2] FLUIDSYNTH: Simplify FluidSynth version check - -Upstream-Status: Pending [https://github.com/scummvm/scummvm/pull/2915] ---- - audio/softsynth/fluidsynth.cpp | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp -index e0d7c4e..e07852f 100644 ---- a/audio/softsynth/fluidsynth.cpp -+++ b/audio/softsynth/fluidsynth.cpp -@@ -46,6 +46,14 @@ - #include "backends/platform/ios7/ios7_common.h" - #endif - -+// We assume here Fluidsynth minor will never be above 255 and -+// that micro versions won't break API compatibility -+#if defined(FLUIDSYNTH_VERSION_MAJOR) && defined(FLUIDSYNTH_VERSION_MINOR) -+#define FS_API_VERSION ((FLUIDSYNTH_VERSION_MAJOR << 8) | FLUIDSYNTH_VERSION_MINOR) -+#else -+#define FS_API_VERSION 0 -+#endif -+ - class MidiDriver_FluidSynth : public MidiDriver_Emulated { - private: - MidiChannel_MPU401 _midiChannels[16]; -@@ -75,7 +83,7 @@ public: - - void setEngineSoundFont(Common::SeekableReadStream *soundFontData) override; - bool acceptsSoundFontData() override { --#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1 -+#if FS_API_VERSION >= 0x0200 - return true; - #else - return false; -@@ -134,7 +142,7 @@ void MidiDriver_FluidSynth::setStr(const char *name, const char *val) { - - // Soundfont memory loader callback functions. - --#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1 -+#if FS_API_VERSION >= 0x0200 - static void *SoundFontMemLoader_open(const char *filename) { - void *p; - if (filename[0] != '&') { -@@ -166,7 +174,7 @@ int MidiDriver_FluidSynth::open() { - if (_isOpen) - return MERR_ALREADY_OPEN; - --#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1 -+#if FS_API_VERSION >= 0x0200 - // When provided with in-memory SoundFont data, only use the configured - // SoundFont instead if it's explicitly configured on the current game. - bool isUsingInMemorySoundFontData = _engineSoundFontData && !ConfMan.getActiveDomain()->contains("soundfont"); -@@ -246,7 +254,7 @@ int MidiDriver_FluidSynth::open() { - const char *soundfont = !isUsingInMemorySoundFontData ? - ConfMan.get("soundfont").c_str() : Common::String::format("&%p", (void *)_engineSoundFontData).c_str(); - --#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1 -+#if FS_API_VERSION >= 0x0200 - if (isUsingInMemorySoundFontData) { - fluid_sfloader_t *soundFontMemoryLoader = new_fluid_defsfloader(_settings); - fluid_sfloader_set_callbacks(soundFontMemoryLoader, --- -2.26.2 - diff --git a/recipes-games/scummvm/scummvm/0004-FLUIDSYNTH-Fix-compilation-with-Fluidsynth-2.2.patch b/recipes-games/scummvm/scummvm/0004-FLUIDSYNTH-Fix-compilation-with-Fluidsynth-2.2.patch deleted file mode 100644 index 10e1ea7..0000000 --- a/recipes-games/scummvm/scummvm/0004-FLUIDSYNTH-Fix-compilation-with-Fluidsynth-2.2.patch +++ /dev/null @@ -1,113 +0,0 @@ -From bcff6ee782fd58250d2365a08e3a6d29268d425e Mon Sep 17 00:00:00 2001 -From: Le Philousophe -Date: Mon, 5 Apr 2021 12:23:26 +0200 -Subject: [PATCH 2/2] FLUIDSYNTH: Fix compilation with Fluidsynth 2.2 - -We replace deprecated functions as well - -Upstream-Status: Pending [https://github.com/scummvm/scummvm/pull/2915] ---- - audio/softsynth/fluidsynth.cpp | 43 ++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) - -diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp -index e770fb6854..f01dd8c736 100644 ---- a/audio/softsynth/fluidsynth.cpp -+++ b/audio/softsynth/fluidsynth.cpp -@@ -180,11 +180,19 @@ static void *SoundFontMemLoader_open(const char *filename) { - return p; - } - -+#if FS_API_VERSION >= 0x0202 -+static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void *handle) { -+#else - static int SoundFontMemLoader_read(void *buf, int count, void *handle) { -+#endif - return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED; - } - -+#if FS_API_VERSION >= 0x0202 -+static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset, int origin) { -+#else - static int SoundFontMemLoader_seek(void *handle, long offset, int origin) { -+#endif - return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED; - } - -@@ -193,7 +201,11 @@ static int SoundFontMemLoader_close(void *handle) { - return FLUID_OK; - } - -+#if FS_API_VERSION >= 0x0202 -+static fluid_long_long_t SoundFontMemLoader_tell(void *handle) { -+#else - static long SoundFontMemLoader_tell(void *handle) { -+#endif - return ((Common::SeekableReadStream *) handle)->pos(); - } - #endif -@@ -237,7 +249,11 @@ int MidiDriver_FluidSynth::open() { - _synth = new_fluid_synth(_settings); - - if (ConfMan.getBool("fluidsynth_chorus_activate")) { -+#if FS_API_VERSION >= 0x0202 -+ fluid_synth_chorus_on(_synth, -1, 1); -+#else - fluid_synth_set_chorus_on(_synth, 1); -+#endif - - int chorusNr = ConfMan.getInt("fluidsynth_chorus_nr"); - double chorusLevel = (double)ConfMan.getInt("fluidsynth_chorus_level") / 100.0; -@@ -252,22 +268,49 @@ int MidiDriver_FluidSynth::open() { - chorusType = FLUID_CHORUS_MOD_TRIANGLE; - } - -+#if FS_API_VERSION >= 0x0202 -+ fluid_synth_set_chorus_group_nr(_synth, -1, chorusNr); -+ fluid_synth_set_chorus_group_level(_synth, -1, chorusLevel); -+ fluid_synth_set_chorus_group_speed(_synth, -1, chorusSpeed); -+ fluid_synth_set_chorus_group_depth(_synth, -1, chorusDepthMs); -+ fluid_synth_set_chorus_group_type(_synth, -1, chorusType); -+#else - fluid_synth_set_chorus(_synth, chorusNr, chorusLevel, chorusSpeed, chorusDepthMs, chorusType); -+#endif - } else { -+#if FS_API_VERSION >= 0x0202 -+ fluid_synth_chorus_on(_synth, -1, 0); -+#else - fluid_synth_set_chorus_on(_synth, 0); -+#endif - } - - if (ConfMan.getBool("fluidsynth_reverb_activate")) { -+#if FS_API_VERSION >= 0x0202 -+ fluid_synth_reverb_on(_synth, -1, 1); -+#else - fluid_synth_set_reverb_on(_synth, 1); -+#endif - - double reverbRoomSize = (double)ConfMan.getInt("fluidsynth_reverb_roomsize") / 100.0; - double reverbDamping = (double)ConfMan.getInt("fluidsynth_reverb_damping") / 100.0; - int reverbWidth = ConfMan.getInt("fluidsynth_reverb_width"); - double reverbLevel = (double)ConfMan.getInt("fluidsynth_reverb_level") / 100.0; - -+#if FS_API_VERSION >= 0x0202 -+ fluid_synth_set_reverb_group_roomsize(_synth, -1, reverbRoomSize); -+ fluid_synth_set_reverb_group_damp(_synth, -1, reverbDamping); -+ fluid_synth_set_reverb_group_width(_synth, -1, reverbWidth); -+ fluid_synth_set_reverb_group_level(_synth, -1, reverbLevel); -+#else - fluid_synth_set_reverb(_synth, reverbRoomSize, reverbDamping, reverbWidth, reverbLevel); -+#endif - } else { -+#if FS_API_VERSION >= 0x0202 -+ fluid_synth_reverb_on(_synth, -1, 0); -+#else - fluid_synth_set_reverb_on(_synth, 0); -+#endif - } - - Common::String interpolation = ConfMan.get("fluidsynth_misc_interpolation"); --- -2.26.2 - diff --git a/recipes-games/scummvm/scummvm_2.2.0.bb b/recipes-games/scummvm/scummvm_2.2.0.bb index 8ad0fff..54ae8c5 100644 --- a/recipes-games/scummvm/scummvm_2.2.0.bb +++ b/recipes-games/scummvm/scummvm_2.2.0.bb @@ -11,14 +11,14 @@ inherit autotools-brokensep pkgconfig gtk-icon-cache manpages features_check REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = " \ - https://downloads.scummvm.org/frs/scummvm/${PV}/${BPN}-${PV}.tar.xz \ + git://github.com/scummvm/scummvm.git;protocol=https \ file://0001-use-pkg-config-to-gather-sdl-information.patch \ file://0002-Do-not-split-binaries-during-install.patch \ - file://0003-FLUIDSYNTH-Simplify-FluidSynth-version-check.patch \ - file://0004-FLUIDSYNTH-Fix-compilation-with-Fluidsynth-2.2.patch \ file://scummvm.desktop \ " -SRC_URI[sha256sum] = "1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387" +SRCREV = "f45e3184ba6d90612c7a97a4ae17dbb61c063cc8" +S = "${WORKDIR}/git" +PV = "2.2.0+git${SRCPV}" DEPENDS = " \ virtual/libgl \