[Scummvm-git-logs] scummvm master -> 0e679370acde9f83dea1ff4c2eeb12cf30c08311
sev-
noreply at scummvm.org
Tue Oct 27 11:07:59 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
a2c4035961 ALL: Turn Coktel decoder into a component
0e679370ac ALL: Marked sjis as a hard dependency for the engines that use it
Commit: a2c4035961d6c9360f7f069d2a3acb2349efc0da
https://github.com/scummvm/scummvm/commit/a2c4035961d6c9360f7f069d2a3acb2349efc0da
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-10-27T12:07:45+01:00
Commit Message:
ALL: Turn Coktel decoder into a component
Changed paths:
configure
engines/gob/configure.engine
engines/sci/configure.engine
video/coktel_decoder.cpp
video/coktel_decoder.h
video/module.mk
diff --git a/configure b/configure
index 92b1fd8790f..1f24e389a75 100755
--- a/configure
+++ b/configure
@@ -220,6 +220,7 @@ _enable_asan=no
_enable_tsan=no
_enable_ubsan=no
_bink=yes
+_coktel_decoder=auto
_cloud=auto
_dlc=no
_scummvmdlc=no
@@ -345,6 +346,7 @@ add_feature printing "Printing" "_printing"
# Components are features which may be disabled if unused by the engines
add_component cdtoons "CDTOONS" "_cdtoons" "USE_CDTOONS"
+add_component coktel_decoder "Coktel decoder" "_coktel_decoder" "USE_COKTEL_DECODER"
add_component enet "ENet" "_enet" "USE_ENET"
add_component fmtowns_pc98_audio "FM-TOWNS/PC98 audio" "_fmtowns_pc98_audio" "USE_FMTOWNS_PC98_AUDIO"
add_component gif "GIF" "_gif" "USE_GIF"
diff --git a/engines/gob/configure.engine b/engines/gob/configure.engine
index c6730dfde68..d271febf2b7 100644
--- a/engines/gob/configure.engine
+++ b/engines/gob/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine gob "Gobli*ns" yes "" "" "indeo3" "midi"
+add_engine gob "Gobli*ns" yes "" "" "indeo3 coktel_decoder" "midi"
diff --git a/engines/sci/configure.engine b/engines/sci/configure.engine
index 24161b84bab..dd206120bd2 100644
--- a/engines/sci/configure.engine
+++ b/engines/sci/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games" "" "midi fmtowns_pc98_audio sjis"
-add_engine sci32 "SCI32 games" yes "" "" "highres" "indeo3 truemotion1"
+add_engine sci32 "SCI32 games" yes "" "" "highres coktel_decoder" "indeo3 truemotion1"
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index 57096a58037..a5978bc5e79 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -40,8 +40,6 @@
#include "image/codecs/indeo3.h"
#endif
-#ifdef VIDEO_COKTELDECODER_H
-
#include "audio/audiostream.h"
#include "audio/decoders/raw.h"
#include "audio/decoders/adpcm_intern.h"
@@ -2373,7 +2371,7 @@ void VMDDecoder::processFrame() {
byte r = _stream->readByte() << 2;
byte g = _stream->readByte() << 2;
byte b = _stream->readByte() << 2;
- _palette.set(index + j, r, g, b);
+ _palette.set(index + j, r, g, b);
}
_stream->skip((255 - count) * 3);
@@ -3032,5 +3030,3 @@ Audio::AudioStream *AdvancedVMDDecoder::VMDAudioTrack::getAudioStream() const {
}
} // End of namespace Video
-
-#endif // VIDEO_COKTELDECODER_H
diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h
index c37d8213191..7933bb47144 100644
--- a/video/coktel_decoder.h
+++ b/video/coktel_decoder.h
@@ -25,12 +25,9 @@
*
*/
-// Currently, only GOB and SCI32 games play IMDs and VMDs, so skip compiling if GOB and SCI32 is disabled.
-#if !(defined(ENABLE_GOB) || defined(ENABLE_SCI32) || defined(DYNAMIC_MODULES))
+#include "common/scummsys.h"
-// Do not compile the CoktelDecoder code
-
-#else
+#ifdef USE_COKTEL_DECODER
#ifndef VIDEO_COKTELDECODER_H
#define VIDEO_COKTELDECODER_H
@@ -652,4 +649,4 @@ private:
#endif // VIDEO_COKTELDECODER_H
-#endif // Engine and dynamic plugins guard
+#endif // USE_COKTEL_DECODER
diff --git a/video/module.mk b/video/module.mk
index 04e84b2d33d..d4592b10f75 100644
--- a/video/module.mk
+++ b/video/module.mk
@@ -7,7 +7,6 @@ MODULE_OBJS := \
asf.o \
asf_decoder.o \
avi_decoder.o \
- coktel_decoder.o \
dxa_decoder.o \
flic_decoder.o \
mpegps_decoder.o \
@@ -25,6 +24,12 @@ MODULE_OBJS += \
bink_decoder.o
endif
+ifdef USE_COKTEL_DECODER
+MODULE_OBJS += \
+ coktel_decoder.o
+endif
+
+
ifdef USE_HNM
MODULE_OBJS += \
hnm_decoder.o
Commit: 0e679370acde9f83dea1ff4c2eeb12cf30c08311
https://github.com/scummvm/scummvm/commit/0e679370acde9f83dea1ff4c2eeb12cf30c08311
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-10-27T12:07:45+01:00
Commit Message:
ALL: Marked sjis as a hard dependency for the engines that use it
Changed paths:
engines/agos/configure.engine
engines/harold/configure.engine
engines/kyra/configure.engine
engines/saga/configure.engine
engines/sci/configure.engine
engines/scumm/configure.engine
diff --git a/engines/agos/configure.engine b/engines/agos/configure.engine
index e596aca3af8..2925f0d91de 100644
--- a/engines/agos/configure.engine
+++ b/engines/agos/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine agos "AGOS" yes "agos2" "AGOS 1 games" "" "midi fmtowns_pc98_audio sjis"
+add_engine agos "AGOS" yes "agos2" "AGOS 1 games" "sjis" "midi fmtowns_pc98_audio"
add_engine agos2 "AGOS 2 games" yes "" "" "highres"
diff --git a/engines/harold/configure.engine b/engines/harold/configure.engine
index 3418e2e2b2f..bac5e97c2b5 100644
--- a/engines/harold/configure.engine
+++ b/engines/harold/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine harold "J.B. Harold series" no "bcb"
-add_engine bcb "J.B. Harold: Blue Chicago Blues" no "" "" "highres 16bit" "msmpeg4 sjis"
+add_engine bcb "J.B. Harold: Blue Chicago Blues" no "" "" "highres 16bit sjis" "msmpeg4"
diff --git a/engines/kyra/configure.engine b/engines/kyra/configure.engine
index 47ad279f4c7..6bcf9dd591d 100644
--- a/engines/kyra/configure.engine
+++ b/engines/kyra/configure.engine
@@ -1,5 +1,5 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine kyra "Kyra" yes "lol eob" "Legend of Kyrandia 1-3" "" "midi fmtowns_pc98_audio sjis"
+add_engine kyra "Kyra" yes "lol eob" "Legend of Kyrandia 1-3" "sjis" "midi fmtowns_pc98_audio"
add_engine lol "Lands of Lore" yes
add_engine eob "Eye of the Beholder" yes
diff --git a/engines/saga/configure.engine b/engines/saga/configure.engine
index 068e0db01c1..a702a2abbf9 100644
--- a/engines/saga/configure.engine
+++ b/engines/saga/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine saga "SAGA" yes "ihnm" "ITE" "" "midi fmtowns_pc98_audio sjis"
+add_engine saga "SAGA" yes "ihnm" "ITE" "sjis" "midi fmtowns_pc98_audio"
add_engine ihnm "IHNM" yes "" "" "highres"
diff --git a/engines/sci/configure.engine b/engines/sci/configure.engine
index dd206120bd2..8eb8f9c7325 100644
--- a/engines/sci/configure.engine
+++ b/engines/sci/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games" "" "midi fmtowns_pc98_audio sjis"
+add_engine sci "SCI" yes "sci32" "SCI 0-1.1 games" "sjis" "midi fmtowns_pc98_audio"
add_engine sci32 "SCI32 games" yes "" "" "highres coktel_decoder" "indeo3 truemotion1"
diff --git a/engines/scumm/configure.engine b/engines/scumm/configure.engine
index 86274bfacc5..42e7bd7993e 100644
--- a/engines/scumm/configure.engine
+++ b/engines/scumm/configure.engine
@@ -1,6 +1,6 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine scumm "SCUMM" yes "scumm_7_8 he rebel2_psx" "v0-v6 games" "" "midi fmtowns_pc98_audio sid_audio imgui sjis"
+add_engine scumm "SCUMM" yes "scumm_7_8 he rebel2_psx" "v0-v6 games" "sjis" "midi fmtowns_pc98_audio sid_audio imgui"
add_engine scumm_7_8 "v7 & v8 games" yes
add_engine he "HE71+ games" yes "" "" "highres bink" "enet"
add_engine rebel2_psx "Rebel Assault II PlayStation" no "" "" "16bit 3d tinygl"
More information about the Scummvm-git-logs
mailing list