Create or update work folder Download latest sources From https://github.com/scummvm/scummvm b8bc864abd3..b4185bdf60f master -> origin/master Updating b8bc864abd3..b4185bdf60f Fast-forward devtools/README | 7 ++++--- devtools/make_class.py | 2 +- engines/hypno/detection.cpp | 10 ++++++++++ engines/kyra/engine/kyra_lok.cpp | 19 +------------------ engines/kyra/engine/kyra_lok.h | 2 -- engines/kyra/resource/staticres.cpp | 6 +++--- engines/kyra/sequence/sequences_lok.cpp | 8 ++++++-- engines/kyra/sound/drivers/halestorm.cpp | 7 ++++++- engines/macventure/detection.cpp | 3 +-- engines/scumm/charset.cpp | 11 ++++++++++- engines/scumm/string.cpp | 17 ++++++++++++++--- po/be-tarask.po | 22 +++++++++++----------- po/be_BY.po | 22 +++++++++++----------- po/ca_ES.po | 22 +++++++++++----------- po/cs_CZ.po | 22 +++++++++++----------- po/da.po | 22 +++++++++++----------- po/de_DE.po | 22 +++++++++++----------- po/el.po | 22 +++++++++++----------- po/es_ES.po | 22 +++++++++++----------- po/eu.po | 22 +++++++++++----------- po/fi_FI.po | 22 +++++++++++----------- po/fr_FR.po | 22 +++++++++++----------- po/gl_ES.po | 22 +++++++++++----------- po/he.po | 22 +++++++++++----------- po/hi.po | 22 +++++++++++----------- po/hu_HU.po | 22 +++++++++++----------- po/it_IT.po | 22 +++++++++++----------- po/ja.po | 22 +++++++++++----------- po/ko.po | 22 +++++++++++----------- po/nb_NO.po | 22 +++++++++++----------- po/nl_NL.po | 22 +++++++++++----------- po/nn_NO.po | 22 +++++++++++----------- po/pl_PL.po | 22 +++++++++++----------- po/pt_BR.po | 22 +++++++++++----------- po/pt_PT.po | 22 +++++++++++----------- po/ru_RU.po | 22 +++++++++++----------- po/scummvm.pot | 22 +++++++++++----------- po/sv_SE.po | 22 +++++++++++----------- po/tr.po | 22 +++++++++++----------- po/uk_UA.po | 22 +++++++++++----------- po/zh.po | 22 +++++++++++----------- 41 files changed, 386 insertions(+), 366 deletions(-) Current branch master is up to date. Apply latest libretro backend Already up to date. Current branch main is up to date. Apply patches patching file audio/softsynth/mt32.cpp patching file engines/cine/main_loop.cpp patching file engines/mads/nebular/game_nebular.cpp patching file engines/ags/engine/main/game_run.cpp Hunk #1 FAILED at 924. 1 out of 1 hunk FAILED -- saving rejects to file engines/ags/engine/main/game_run.cpp.rej patching file backends/platform/libretro/build/Makefile Hunk #1 succeeded at 456 (offset 14 lines). Update aux-data Compile sources PLATFORM: osx ARCHITECTURE: x86_64 TARGET: osx CC = x86_64-apple-darwin21.1-clang CXX = x86_64-apple-darwin21.1-clang++ CXX11 = CXX17 = STRIP = Compiler: CC="x86_64-apple-darwin21.1-clang" CXX="x86_64-apple-darwin21.1-clang++" === x86 CPU detected... === === x86_64 CPU detected... === osx osx === ScummVM Building scummvm... cd "/mnt/buildbot/develop/buildbot-toolchain-apple-osx-x86_64/libretro-super/libretro-scummvm/backends/platform/libretro/build" make platform="osx" -j3 CC="x86_64-apple-darwin21.1-clang" CXX="x86_64-apple-darwin21.1-clang++" Compiling detection.cpp... Compiling detection.cpp... Compiling version.cpp... Compiling charset.cpp... Compiling string.cpp... Compiling main_loop.cpp... Compiling kyra_lok.cpp... Compiling staticres.cpp... Compiling sequences_lok.cpp... Compiling halestorm.cpp... Compiling game_nebular.cpp... Compiling mt32.cpp... rm -f base/libbase.a x86_64-apple-darwin21.1-ar cru base/libbase.a base/test_new_standards.o base/main.o base/commandLine.o base/plugins.o base/version.o /usr/local/osxcross/bin/x86_64-apple-darwin21.1-ranlib: file: base/libbase.a(test_new_standards.o) has no symbols x86_64-apple-darwin21.1-ranlib base/libbase.a x86_64-apple-darwin21.1-ranlib: file: base/libbase.a(test_new_standards.o) has no symbols ls base/libbase.a base/libbase.a rm -f engines/scumm/libscumm.a x86_64-apple-darwin21.1-ar cru engines/scumm/libscumm.a engines/scumm/actor.o engines/scumm/akos.o engines/scumm/base-costume.o engines/scumm/bomp.o engines/scumm/boxes.o engines/scumm/camera.o engines/scumm/cdda.o engines/scumm/charset.o engines/scumm/charset-fontdata.o engines/scumm/costume.o engines/scumm/cursor.o engines/scumm/debugger.o engines/scumm/dialogs.o engines/scumm/file.o engines/scumm/file_nes.o engines/scumm/gfx_gui.o engines/scumm/gfx_mac.o engines/scumm/gfx_towns.o engines/scumm/gfx.o engines/scumm/he/resource_he.o engines/scumm/he/script_v60he.o engines/scumm/he/script_v70he.o engines/scumm/he/sound_he.o engines/scumm/help.o engines/scumm/imuse/imuse.o engines/scumm/imuse/imuse_part.o engines/scumm/imuse/imuse_player.o engines/scumm/imuse/instrument.o engines/scumm/imuse/sysex_samnmax.o engines/scumm/imuse/sysex_scumm.o engines/scumm/imuse/drivers/amiga.o engines/scumm/imuse/drivers/fmtowns.o engines/scumm/imuse/drivers/mac_m68k.o engines/scumm/imuse/drivers/pcspk.o engines/scumm/input.o engines/scumm/ks_check.o engines/scumm/metaengine.o engines/scumm/midiparser_ro.o engines/scumm/object.o engines/scumm/palette.o engines/scumm/players/player_ad.o engines/scumm/players/player_apple2.o engines/scumm/players/player_he.o engines/scumm/players/player_mac.o engines/scumm/players/player_mod.o engines/scumm/players/player_nes.o engines/scumm/players/player_pce.o engines/scumm/players/player_sid.o engines/scumm/players/player_towns.o engines/scumm/players/player_v1.o engines/scumm/players/player_v2.o engines/scumm/players/player_v2a.o engines/scumm/players/player_v2base.o engines/scumm/players/player_v2cms.o engines/scumm/players/player_v3a.o engines/scumm/players/player_v3m.o engines/scumm/players/player_v4a.o engines/scumm/players/player_v5m.o engines/scumm/resource_v2.o engines/scumm/resource_v3.o engines/scumm/resource_v4.o engines/scumm/resource.o engines/scumm/room.o engines/scumm/saveload.o engines/scumm/script_v0.o engines/scumm/script_v2.o engines/scumm/script_v3.o engines/scumm/script_v4.o engines/scumm/script_v5.o engines/scumm/script_v6.o engines/scumm/script.o engines/scumm/scumm.o engines/scumm/sound.o engines/scumm/string.o engines/scumm/usage_bits.o engines/scumm/util.o engines/scumm/vars.o engines/scumm/verbs.o engines/scumm/nut_renderer.o engines/scumm/string_v7.o engines/scumm/script_v8.o engines/scumm/imuse_digi/dimuse_bndmgr.o engines/scumm/imuse_digi/dimuse_codecs.o engines/scumm/imuse_digi/dimuse_sndmgr.o engines/scumm/imuse_digi/dimuse_tables.o engines/scumm/imuse_digi/dimuse_engine.o engines/scumm/imuse_digi/dimuse_cmds.o engines/scumm/imuse_digi/dimuse_dispatch.o engines/scumm/imuse_digi/dimuse_fades.o engines/scumm/imuse_digi/dimuse_files.o engines/scumm/imuse_digi/dimuse_groups.o engines/scumm/imuse_digi/dimuse_internalmixer.o engines/scumm/imuse_digi/dimuse_scripts.o engines/scumm/imuse_digi/dimuse_streamer.o engines/scumm/imuse_digi/dimuse_tracks.o engines/scumm/imuse_digi/dimuse_triggers.o engines/scumm/imuse_digi/dimuse_utils.o engines/scumm/imuse_digi/dimuse_wave.o engines/scumm/imuse_digi/dimuse_waveout.o engines/scumm/insane/insane.o engines/scumm/insane/insane_ben.o engines/scumm/insane/insane_enemy.o engines/scumm/insane/insane_scenes.o engines/scumm/insane/insane_iact.o engines/scumm/smush/codec1.o engines/scumm/smush/codec20.o engines/scumm/smush/codec37.o engines/scumm/smush/codec47.o engines/scumm/smush/smush_player.o engines/scumm/he/animation_he.o engines/scumm/he/cup_player_he.o engines/scumm/he/floodfill_he.o engines/scumm/he/logic_he.o engines/scumm/he/palette_he.o engines/scumm/he/script_v71he.o engines/scumm/he/script_v72he.o engines/scumm/he/script_v80he.o engines/scumm/he/script_v90he.o engines/scumm/he/script_v100he.o engines/scumm/he/sprite_he.o engines/scumm/he/wiz_he.o engines/scumm/he/localizer.o engines/scumm/he/logic/baseball2001.o engines/scumm/he/logic/basketball.o engines/scumm/he/logic/football.o engines/scumm/he/logic/funshop.o engines/scumm/he/logic/moonbase_logic.o engines/scumm/he/logic/puttrace.o engines/scumm/he/logic/soccer.o engines/scumm/he/moonbase/ai_defenseunit.o engines/scumm/he/moonbase/ai_main.o engines/scumm/he/moonbase/ai_node.o engines/scumm/he/moonbase/ai_targetacquisition.o engines/scumm/he/moonbase/ai_traveller.o engines/scumm/he/moonbase/ai_tree.o engines/scumm/he/moonbase/ai_types.o engines/scumm/he/moonbase/ai_weapon.o engines/scumm/he/moonbase/distortion.o engines/scumm/he/moonbase/moonbase.o engines/scumm/he/moonbase/moonbase_fow.o rm -f engines/cine/libcine.a x86_64-apple-darwin21.1-ar cru engines/cine/libcine.a engines/cine/anim.o engines/cine/bg.o engines/cine/bg_list.o engines/cine/console.o engines/cine/cine.o engines/cine/gfx.o engines/cine/main_loop.o engines/cine/metaengine.o engines/cine/msg.o engines/cine/object.o engines/cine/pal.o engines/cine/part.o engines/cine/prc.o engines/cine/rel.o engines/cine/saveload.o engines/cine/script_fw.o engines/cine/script_os.o engines/cine/sound.o engines/cine/texte.o engines/cine/unpack.o engines/cine/various.o x86_64-apple-darwin21.1-ranlib engines/cine/libcine.a ls engines/cine/libcine.a engines/cine/libcine.a rm -f engines/kyra/libkyra.a x86_64-apple-darwin21.1-ar cru engines/kyra/libkyra.a engines/kyra/engine/items_lok.o engines/kyra/engine/items_v2.o engines/kyra/engine/items_hof.o engines/kyra/engine/items_mr.o engines/kyra/engine/kyra_v1.o engines/kyra/engine/kyra_lok.o engines/kyra/engine/kyra_v2.o engines/kyra/engine/kyra_hof.o engines/kyra/engine/kyra_mr.o engines/kyra/engine/scene_v1.o engines/kyra/engine/scene_lok.o engines/kyra/engine/scene_v2.o engines/kyra/engine/scene_hof.o engines/kyra/engine/scene_mr.o engines/kyra/engine/sprites.o engines/kyra/engine/timer.o engines/kyra/engine/timer_lok.o engines/kyra/engine/timer_hof.o engines/kyra/engine/timer_mr.o engines/kyra/engine/util.o engines/kyra/graphics/animator_lok.o engines/kyra/graphics/animator_v2.o engines/kyra/graphics/animator_hof.o engines/kyra/graphics/animator_mr.o engines/kyra/graphics/animator_tim.o engines/kyra/graphics/screen.o engines/kyra/graphics/screen_lok.o engines/kyra/graphics/screen_v2.o engines/kyra/graphics/screen_hof.o engines/kyra/graphics/screen_mr.o engines/kyra/graphics/vqa.o engines/kyra/graphics/wsamovie.o engines/kyra/gui/debugger.o engines/kyra/gui/gui.o engines/kyra/gui/gui_v1.o engines/kyra/gui/gui_lok.o engines/kyra/gui/gui_v2.o engines/kyra/gui/gui_hof.o engines/kyra/gui/gui_mr.o engines/kyra/gui/saveload.o engines/kyra/gui/saveload_lok.o engines/kyra/gui/saveload_hof.o engines/kyra/gui/saveload_mr.o engines/kyra/metaengine.o engines/kyra/resource/resource.o engines/kyra/resource/resource_intern.o engines/kyra/resource/staticres.o engines/kyra/script/script_v1.o engines/kyra/script/script_lok.o engines/kyra/script/script_v2.o engines/kyra/script/script_hof.o engines/kyra/script/script_mr.o engines/kyra/script/script.o engines/kyra/script/script_tim.o engines/kyra/sequence/seqplayer_lok.o engines/kyra/sequence/sequences_lok.o engines/kyra/sequence/sequences_v2.o engines/kyra/sequence/sequences_hof.o engines/kyra/sequence/sequences_mr.o engines/kyra/sound/sound_amiga_lok.o engines/kyra/sound/sound_digital_mr.o engines/kyra/sound/sound_mac_lok.o engines/kyra/sound/sound_pc_midi.o engines/kyra/sound/sound_pc_v1.o engines/kyra/sound/sound_pc98_lok.o engines/kyra/sound/sound_pc98_v2.o engines/kyra/sound/sound_towns_lok.o engines/kyra/sound/sound.o engines/kyra/sound/sound_lok.o engines/kyra/sound/drivers/adlib.o engines/kyra/sound/drivers/audstream.o engines/kyra/sound/drivers/halestorm.o engines/kyra/sound/drivers/pcspeaker_v2.o engines/kyra/text/text.o engines/kyra/text/text_lok.o engines/kyra/text/text_hof.o engines/kyra/text/text_mr.o engines/kyra/engine/kyra_rpg.o engines/kyra/engine/scene_rpg.o engines/kyra/engine/sprites_rpg.o engines/kyra/engine/timer_rpg.o engines/kyra/gui/gui_rpg.o engines/kyra/gui/saveload_rpg.o engines/kyra/resource/staticres_rpg.o engines/kyra/text/text_rpg.o engines/kyra/engine/items_lol.o engines/kyra/engine/lol.o engines/kyra/engine/scene_lol.o engines/kyra/engine/sprites_lol.o engines/kyra/engine/timer_lol.o engines/kyra/graphics/screen_lol.o engines/kyra/gui/gui_lol.o engines/kyra/gui/saveload_lol.o engines/kyra/resource/staticres_lol.o engines/kyra/script/script_lol.o engines/kyra/sequence/sequences_lol.o engines/kyra/sound/sound_lol.o engines/kyra/text/text_lol.o engines/kyra/engine/chargen.o engines/kyra/engine/eobcommon.o engines/kyra/engine/eob.o engines/kyra/engine/darkmoon.o engines/kyra/engine/items_eob.o engines/kyra/engine/magic_eob.o engines/kyra/engine/scene_eob.o engines/kyra/engine/sprites_eob.o engines/kyra/engine/timer_eob.o engines/kyra/graphics/screen_eob.o engines/kyra/graphics/screen_eob_amiga.o engines/kyra/graphics/screen_eob_pc98.o engines/kyra/graphics/screen_eob_segacd.o engines/kyra/graphics/screen_eob_towns.o engines/kyra/gui/gui_eob.o engines/kyra/gui/gui_eob_segacd.o engines/kyra/gui/saveload_eob.o engines/kyra/resource/resource_segacd.o engines/kyra/resource/staticres_eob.o engines/kyra/script/script_eob.o engines/kyra/sequence/seqplayer_eob_segacd.o engines/kyra/sequence/sequences_eob.o engines/kyra/sequence/sequences_darkmoon.o engines/kyra/sound/sound_amiga_eob.o engines/kyra/sound/sound_pc98_eob.o engines/kyra/sound/sound_segacd_eob.o engines/kyra/sound/sound_towns_darkmoon.o engines/kyra/sound/drivers/audiomaster2.o engines/kyra/sound/drivers/mlalf98.o engines/kyra/sound/drivers/pcspeaker_v1.o engines/kyra/sound/drivers/segacd.o engines/kyra/text/text_eob_segacd.o rm -f engines/mads/libmads.a x86_64-apple-darwin21.1-ar cru engines/mads/libmads.a engines/mads/dragonsphere/game_dragonsphere.o engines/mads/dragonsphere/dragonsphere_scenes.o engines/mads/dragonsphere/dragonsphere_scenes1.o engines/mads/dragonsphere/globals_dragonsphere.o engines/mads/phantom/game_phantom.o engines/mads/phantom/globals_phantom.o engines/mads/phantom/phantom_scenes.o engines/mads/phantom/phantom_scenes1.o engines/mads/phantom/phantom_scenes2.o engines/mads/phantom/phantom_scenes3.o engines/mads/phantom/phantom_scenes4.o engines/mads/phantom/phantom_scenes5.o engines/mads/nebular/dialogs_nebular.o engines/mads/nebular/game_nebular.o engines/mads/nebular/globals_nebular.o engines/mads/nebular/menu_nebular.o engines/mads/nebular/sound_nebular.o engines/mads/nebular/nebular_scenes.o engines/mads/nebular/nebular_scenes1.o engines/mads/nebular/nebular_scenes2.o engines/mads/nebular/nebular_scenes3.o engines/mads/nebular/nebular_scenes4.o engines/mads/nebular/nebular_scenes5.o engines/mads/nebular/nebular_scenes6.o engines/mads/nebular/nebular_scenes7.o engines/mads/nebular/nebular_scenes8.o engines/mads/action.o engines/mads/animation.o engines/mads/assets.o engines/mads/audio.o engines/mads/camera.o engines/mads/compression.o engines/mads/conversations.o engines/mads/debugger.o engines/mads/dialogs.o engines/mads/events.o engines/mads/font.o engines/mads/game.o engines/mads/game_data.o engines/mads/globals.o engines/mads/hotspots.o engines/mads/inventory.o engines/mads/mads.o engines/mads/menu_views.o engines/mads/messages.o engines/mads/msurface.o engines/mads/metaengine.o engines/mads/palette.o engines/mads/player.o engines/mads/rails.o engines/mads/resources.o engines/mads/scene.o engines/mads/scene_data.o engines/mads/screen.o engines/mads/sequence.o engines/mads/sound.o engines/mads/sprites.o engines/mads/staticres.o engines/mads/user_interface.o x86_64-apple-darwin21.1-ranlib engines/mads/libmads.a ls engines/mads/libmads.a engines/mads/libmads.a rm -f audio/libaudio.a x86_64-apple-darwin21.1-ranlib engines/scumm/libscumm.a x86_64-apple-darwin21.1-ar cru audio/libaudio.a audio/adlib.o audio/adlib_ms.o audio/audiostream.o audio/casio.o audio/cms.o audio/fmopl.o audio/mididrv.o audio/mididrv_ms.o audio/midiparser_qt.o audio/midiparser_smf.o audio/midiparser_xmidi.o audio/midiparser.o audio/midiplayer.o audio/miles_adlib.o audio/miles_midi.o audio/mixer.o audio/mpu401.o audio/mt32gm.o audio/musicplugin.o audio/null.o audio/rate.o audio/timestamp.o audio/decoders/3do.o audio/decoders/aac.o audio/decoders/adpcm.o audio/decoders/aiff.o audio/decoders/asf.o audio/decoders/flac.o audio/decoders/g711.o audio/decoders/iff_sound.o audio/decoders/mac_snd.o audio/decoders/mp3.o audio/decoders/qdm2.o audio/decoders/quicktime.o audio/decoders/raw.o audio/decoders/voc.o audio/decoders/vorbis.o audio/decoders/wave.o audio/decoders/wma.o audio/decoders/xa.o audio/decoders/xan_dpcm.o audio/mods/infogrames.o audio/mods/maxtrax.o audio/mods/mod_xm_s3m.o audio/mods/module.o audio/mods/module_mod_xm_s3m.o audio/mods/protracker.o audio/mods/paula.o audio/mods/rjp1.o audio/mods/soundfx.o audio/mods/tfmx.o audio/softsynth/cms.o audio/softsynth/opl/dbopl.o audio/softsynth/opl/dosbox.o audio/softsynth/opl/mame.o audio/softsynth/fmtowns_pc98/pc98_audio.o audio/softsynth/fmtowns_pc98/pcm_common.o audio/softsynth/fmtowns_pc98/sega_audio.o audio/softsynth/fmtowns_pc98/towns_audio.o audio/softsynth/fmtowns_pc98/towns_euphony.o audio/softsynth/fmtowns_pc98/towns_pc98_driver.o audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.o audio/softsynth/fmtowns_pc98/towns_pc98_plugins.o audio/softsynth/appleiigs.o audio/softsynth/fluidsynth.o audio/softsynth/mt32.o audio/softsynth/eas.o audio/softsynth/pcspk.o audio/softsynth/sid.o audio/softsynth/wave6581.o audio/soundfont/rawfile.o audio/soundfont/rifffile.o audio/soundfont/sf2file.o audio/soundfont/synthfile.o audio/soundfont/vgmcoll.o audio/soundfont/vgminstrset.o audio/soundfont/vgmitem.o audio/soundfont/vgmsamp.o audio/soundfont/vab/psxspu.o audio/soundfont/vab/vab.o audio/softsynth/opl/nuked.o ls engines/scumm/libscumm.a engines/scumm/libscumm.a x86_64-apple-darwin21.1-ranlib engines/kyra/libkyra.a ls engines/kyra/libkyra.a engines/kyra/libkyra.a /usr/local/osxcross/bin/x86_64-apple-darwin21.1-ranlib: file: audio/libaudio.a(eas.o) has no symbols x86_64-apple-darwin21.1-ranlib audio/libaudio.a x86_64-apple-darwin21.1-ranlib: file: audio/libaudio.a(eas.o) has no symbols ls audio/libaudio.a audio/libaudio.a Linking scummvm_libretro.dylib... cp "scummvm_libretro.dylib" "/mnt/buildbot/develop/buildbot-toolchain-apple-osx-x86_64/libretro-super/dist/osx-x86_64/scummvm_libretro.dylib" 1 core(s) successfully processed: scummvm Compile successful Remove patches patching file audio/softsynth/mt32.cpp patching file engines/cine/main_loop.cpp patching file engines/mads/nebular/game_nebular.cpp patching file engines/ags/engine/main/game_run.cpp Hunk #1 FAILED at 924. 1 out of 1 hunk FAILED -- saving rejects to file engines/ags/engine/main/game_run.cpp.rej patching file backends/platform/libretro/build/Makefile Hunk #1 succeeded at 456 (offset 14 lines). Publish core