Updated libOpenMPT to version 0.7.13

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
losnoco · Jan 10, 2025 · 7e98a03 · 7e98a03
1 parent e400faf
commit 7e98a03
Show file tree

Hide file tree

Showing 50 changed files with 524 additions and 185 deletions.
diff --git a/Frameworks/OpenMPT/OpenMPT/LICENSE b/Frameworks/OpenMPT/OpenMPT/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors
+Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors
 Copyright (c) 1997-2003, Olivier Lapicque
 All rights reserved.
 

diff --git a/Frameworks/OpenMPT/OpenMPT/Makefile b/Frameworks/OpenMPT/OpenMPT/Makefile
@@ -256,6 +256,27 @@ NUMTHREADS:=$(shell nproc)
 
 else ifeq ($(OS),Windows_NT)
 
+ifeq ($(shell uname -o),Cygwin)
+
+HOST=unix
+HOST_FLAVOUR=CYGWIN
+
+TOOLCHAIN_SUFFIX=
+
+CPPCHECK = cppcheck
+
+MKDIR_P = mkdir -p
+RM = rm -f
+RMTREE = rm -rf
+INSTALL = install
+INSTALL_MAKE_DIR = install -d
+INSTALL_DIR = cp -r -v
+FIXPATH = $1
+
+NUMTHREADS:=$(NUMBER_OF_PROCESSORS)
+
+else
+
 HOST=windows
 HOST_FLAVOUR=
 
@@ -273,6 +294,8 @@ FIXPATH = $(subst /,\,$1)
 
 NUMTHREADS:=$(NUMBER_OF_PROCESSORS)
 
+endif
+
 else
 
 HOST=unix
@@ -689,7 +712,7 @@ ifeq ($(LOCAL_MPG123),1)
 CPPFLAGS_MPG123 := -DMPT_WITH_MPG123 -DMPG123_NO_LARGENAME
 LDFLAGS_MPG123  := 
 LDLIBS_MPG123   := 
-CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/
+CPPFLAGS_MPG123 += -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/
 LOCAL_MPG123_SOURCES := 
 LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat.c
 LOCAL_MPG123_SOURCES += include/mpg123/src/compat/compat_str.c
@@ -721,10 +744,10 @@ include/mpg123/src/compat/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENER
 include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
 include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
 include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CFLAGS+=$(CFLAGS_SILENT) -DOPT_GENERIC
-include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
-include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
-include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
-include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/makefile/ $(CPPFLAGS)
+include/mpg123/src/compat/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS)
+include/mpg123/src/compat/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS)
+include/mpg123/src/libmpg123/%$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS)
+include/mpg123/src/libmpg123/%.test$(FLAVOUR_O).o : CPPFLAGS:= -Iinclude/mpg123/src/include/ -Iinclude/mpg123/ports/generic/ $(CPPFLAGS)
 else
 ifeq ($(NO_MPG123),1)
 else

diff --git a/Frameworks/OpenMPT/OpenMPT/build/dist.mk b/Frameworks/OpenMPT/OpenMPT/build/dist.mk
@@ -1,4 +1,4 @@
 
-MPT_SVNVERSION=22406
-MPT_SVNURL=https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.7.12
-MPT_SVNDATE=2024-12-01T13:10:15.135688Z
+MPT_SVNVERSION=22826
+MPT_SVNURL=https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.7.13
+MPT_SVNDATE=2025-01-06T13:49:43.586768Z
diff --git a/Frameworks/OpenMPT/OpenMPT/build/download_externals.sh b/Frameworks/OpenMPT/OpenMPT/build/download_externals.sh
@@ -99,7 +99,7 @@ download "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b7
 download "build/externals/csdpmi7b.zip"                     71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip"
 download "build/externals/csdpmi7s.zip"                     89872 ea5652d31850d8eb0d15a919de0b51849f58efea0d16ad2aa4687fac4abd223d0ca34a2d1b616b02fafe84651dbef3e506df9262cfb399eb6d9909bffc89bfd3 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7s.zip https://djgpp.mirror.garr.it/current/v2misc/csdpmi7s.zip"
 download "build/externals/WA5.55_SDK.exe"                  336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe https://web.archive.org/web/20131217072017id_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe"
-download "build/externals/xmp-sdk.zip"                     322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip"
+download "build/externals/xmp-sdk.zip"                     322903 67b96c6e6aa794e9de4f446d23f969e3591457196fd100c5475f5df52308de861a0c411db54fcb2bf46a12e9136ddda9d2974a5167432a979a701ef2c4679ef9 "https://www.un4seen.com/files/xmp-sdk.zip"
 
 unpack "include/allegro42" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" "."
 unpack "include/cwsdpmi"   "build/externals/csdpmi7b.zip"                   "."

diff --git a/Frameworks/OpenMPT/OpenMPT/build/make/config-cygwin.mk b/Frameworks/OpenMPT/OpenMPT/build/make/config-cygwin.mk
@@ -0,0 +1,84 @@
+
+ifeq ($(origin CC),default)
+CC  = $(TOOLCHAIN_PREFIX)gcc$(TOOLCHAIN_SUFFIX)
+endif
+ifeq ($(origin CXX),default)
+CXX = $(TOOLCHAIN_PREFIX)g++$(TOOLCHAIN_SUFFIX)
+endif
+ifeq ($(origin LD),default)
+LD  = $(CXX)
+endif
+ifeq ($(origin AR),default)
+AR  = $(TOOLCHAIN_PREFIX)ar$(TOOLCHAIN_SUFFIX)
+endif
+
+ifneq ($(STDCXX),)
+CXXFLAGS_STDCXX = -std=$(STDCXX) -fexceptions -frtti -pthread
+else ifeq ($(shell printf '\n' > bin/empty.cpp ; if $(CXX) -std=c++20 -c bin/empty.cpp -o bin/empty.out > /dev/null 2>&1 ; then echo 'c++20' ; fi ), c++20)
+CXXFLAGS_STDCXX = -std=c++20 -fexceptions -frtti -pthread
+else
+CXXFLAGS_STDCXX = -std=c++17 -fexceptions -frtti -pthread
+endif
+ifneq ($(STDC),)
+CFLAGS_STDC = -std=$(STDC) -pthread
+else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c18 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c18' ; fi ), c18)
+CFLAGS_STDC = -std=c18 -pthread
+else ifeq ($(shell printf '\n' > bin/empty.c ; if $(CC) -std=c17 -c bin/empty.c -o bin/empty.out > /dev/null 2>&1 ; then echo 'c17' ; fi ), c17)
+CFLAGS_STDC = -std=c17 -pthread
+else
+CFLAGS_STDC = -std=c11 -pthread
+endif
+CXXFLAGS += $(CXXFLAGS_STDCXX)
+CFLAGS += $(CFLAGS_STDC)
+LDFLAGS += -pthread
+
+CPPFLAGS += 
+CXXFLAGS += -fPIC
+CFLAGS   += -fPIC
+LDFLAGS  += 
+LDLIBS   += -lm
+ARFLAGS  := rcs
+
+ifeq ($(NATIVE),1)
+CXXFLAGS += -march=native
+CFLAGS   += -march=native
+endif
+
+ifeq ($(MODERN),1)
+LDFLAGS  += -fuse-ld=gold
+endif
+
+ifeq ($(OPTIMIZE_LTO),1)
+CXXFLAGS += -flto
+CFLAGS   += -flto
+endif
+
+ifeq ($(ANALYZE),1)
+CXXFLAGS += -fanalyzer -Wno-analyzer-malloc-leak -Wno-analyzer-null-dereference -Wno-analyzer-possible-null-argument -Wno-analyzer-possible-null-dereference 
+CFLAGS   += -fanalyzer -Wno-analyzer-malloc-leak -Wno-analyzer-null-dereference -Wno-analyzer-possible-null-argument -Wno-analyzer-possible-null-dereference
+endif
+
+ifeq ($(CHECKED_ADDRESS),1)
+CXXFLAGS += -fsanitize=address
+CFLAGS   += -fsanitize=address
+endif
+
+ifeq ($(CHECKED_UNDEFINED),1)
+CXXFLAGS += -fsanitize=undefined
+CFLAGS   += -fsanitize=undefined
+endif
+
+include build/make/warnings-gcc.mk
+
+EXESUFFIX=.exe
+SOSUFFIX=.dll
+SOSUFFIXWINDOWS=1
+
+ALLOW_LGPL=0
+
+DYNLINK=0
+SHARED_LIB=1
+STATIC_LIB=0
+SHARED_SONAME=0
+
+ENABLE_DLL=1
diff --git a/Frameworks/OpenMPT/OpenMPT/build/make/config-defaults.mk b/Frameworks/OpenMPT/OpenMPT/build/make/config-defaults.mk
@@ -25,6 +25,10 @@ WINDOWS_ARCH=x86
 include build/make/config-mingw-w64.mk
 endif
 
+else ifeq ($(HOST_FLAVOUR),CYGWIN)
+
+include build/make/config-cygwin.mk
+
 else ifeq ($(HOST_FLAVOUR),LINUX)
 
 include build/make/config-gcc.mk

diff --git a/Frameworks/OpenMPT/OpenMPT/build/make/config-mingw-w64.mk b/Frameworks/OpenMPT/OpenMPT/build/make/config-mingw-w64.mk
@@ -55,10 +55,12 @@ CFLAGS += $(CFLAGS_STDC)
 
 CPPFLAGS += -DNOMINMAX
 ifeq ($(MINGW_COMPILER),clang)
+CPPFLAGS += -D_UNICODE
 CXXFLAGS += -municode
 CFLAGS   += -municode
 LDFLAGS  += -mconsole -mthreads
 else
+CPPFLAGS += -D_UNICODE
 CXXFLAGS += -municode -mthreads
 CFLAGS   += -municode -mthreads
 LDFLAGS  += -mconsole

diff --git a/Frameworks/OpenMPT/OpenMPT/build/svn_version/svn_version.h b/Frameworks/OpenMPT/OpenMPT/build/svn_version/svn_version.h
@@ -1,10 +1,10 @@
 
 #pragma once
-#define OPENMPT_VERSION_SVNVERSION "22406"
-#define OPENMPT_VERSION_REVISION 22406
+#define OPENMPT_VERSION_SVNVERSION "22826"
+#define OPENMPT_VERSION_REVISION 22826
 #define OPENMPT_VERSION_DIRTY 0
 #define OPENMPT_VERSION_MIXEDREVISIONS 0
-#define OPENMPT_VERSION_URL "https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.7.12"
-#define OPENMPT_VERSION_DATE "2024-12-01T13:10:15.135688Z"
+#define OPENMPT_VERSION_URL "https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.7.13"
+#define OPENMPT_VERSION_DATE "2025-01-06T13:49:43.586768Z"
 #define OPENMPT_VERSION_IS_PACKAGE 1
 
diff --git a/Frameworks/OpenMPT/OpenMPT/build/xcode-ios/ext/mpg123.xcodeproj/project.pbxproj b/Frameworks/OpenMPT/OpenMPT/build/xcode-ios/ext/mpg123.xcodeproj/project.pbxproj
@@ -257,7 +257,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SYMROOT = "../../../bin/debug/xcode4-ios/all";
 				USER_HEADER_SEARCH_PATHS = (
-					../../../include/mpg123/ports/Xcode,
+					../../../include/mpg123/ports/generic,
 					../../../include/mpg123/src/include,
 				);
 			};
@@ -295,7 +295,7 @@
 				ONLY_ACTIVE_ARCH = NO;
 				SYMROOT = "../../../bin/release/xcode4-ios/all";
 				USER_HEADER_SEARCH_PATHS = (
-					../../../include/mpg123/ports/Xcode,
+					../../../include/mpg123/ports/generic,
 					../../../include/mpg123/src/include,
 				);
 			};

diff --git a/Frameworks/OpenMPT/OpenMPT/build/xcode-macosx/ext/mpg123.xcodeproj/project.pbxproj b/Frameworks/OpenMPT/OpenMPT/build/xcode-macosx/ext/mpg123.xcodeproj/project.pbxproj
@@ -257,7 +257,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SYMROOT = "../../../bin/debug/xcode4-macosx/all";
 				USER_HEADER_SEARCH_PATHS = (
-					../../../include/mpg123/ports/Xcode,
+					../../../include/mpg123/ports/generic,
 					../../../include/mpg123/src/include,
 				);
 			};
@@ -295,7 +295,7 @@
 				ONLY_ACTIVE_ARCH = NO;
 				SYMROOT = "../../../bin/release/xcode4-macosx/all";
 				USER_HEADER_SEARCH_PATHS = (
-					../../../include/mpg123/ports/Xcode,
+					../../../include/mpg123/ports/generic,
 					../../../include/mpg123/src/include,
 				);
 			};

diff --git a/Frameworks/OpenMPT/OpenMPT/common/mptString.h b/Frameworks/OpenMPT/OpenMPT/common/mptString.h
@@ -429,7 +429,11 @@ inline mpt::ustring ToUnicode(uint16 codepage, Tencoding &&fallback, Tsrc &&str)
 		std::optional<mpt::common_encoding> charset = mpt::optional_encoding_from_codepage(codepage);
 		if(charset.has_value())
 		{
+#if defined(MPT_LIBCXX_QUIRK_NO_OPTIONAL_VALUE)
+			result = mpt::transcode<mpt::ustring>(*charset, std::forward<Tsrc>(str));
+#else
 			result = mpt::transcode<mpt::ustring>(charset.value(), std::forward<Tsrc>(str));
+#endif
 		} else if(mpt::has_codepage(static_cast<UINT>(codepage)))
 		{
 			result = mpt::transcode<mpt::ustring>(static_cast<UINT>(codepage), std::forward<Tsrc>(str));
@@ -440,7 +444,11 @@ inline mpt::ustring ToUnicode(uint16 codepage, Tencoding &&fallback, Tsrc &&str)
 		return result;
 	#else // !MPT_OS_WINDOWS
 		std::optional<mpt::common_encoding> charset = mpt::optional_encoding_from_codepage(codepage);
+#if defined(MPT_LIBCXX_QUIRK_NO_OPTIONAL_VALUE)
 		return charset.has_value() ? mpt::transcode<mpt::ustring>(charset.value(), std::forward<Tsrc>(str)) : mpt::transcode<mpt::ustring>(std::forward<Tencoding>(fallback), std::forward<Tsrc>(str));
+#else
+		return charset.has_value() ? mpt::transcode<mpt::ustring>(*charset, std::forward<Tsrc>(str)) : mpt::transcode<mpt::ustring>(std::forward<Tencoding>(fallback), std::forward<Tsrc>(str));
+#endif
 	#endif // MPT_OS_WINDOWS
 }
 

diff --git a/Frameworks/OpenMPT/OpenMPT/common/version.cpp b/Frameworks/OpenMPT/OpenMPT/common/version.cpp
@@ -600,12 +600,12 @@ mpt::ustring GetFullCreditsString()
 		"libopenmpt (based on OpenMPT / Open ModPlug Tracker)\n"
 #endif
 		"\n"
-		"Copyright \xC2\xA9 2004-2024 OpenMPT Project Developers and Contributors\n"
+		"Copyright \xC2\xA9 2004-2025 OpenMPT Project Developers and Contributors\n"
 		"Copyright \xC2\xA9 1997-2003 Olivier Lapicque\n"
 		"\n"
 		"Developers:\n"
-		"Johannes Schultz (2008-2024)\n"
-		"J\xC3\xB6rn Heusipp (2012-2024)\n"
+		"Johannes Schultz (2008-2025)\n"
+		"J\xC3\xB6rn Heusipp (2012-2025)\n"
 		"Ahti Lepp\xC3\xA4nen (2005-2011)\n"
 		"Robin Fernandes (2004-2007)\n"
 		"Sergiy Pylypenko (2007)\n"
@@ -803,7 +803,7 @@ mpt::ustring GetFullCreditsString()
 mpt::ustring GetLicenseString()
 {
 	return MPT_UTF8(
-		"Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors" "\n"
+		"Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors" "\n"
 		"Copyright (c) 1997-2003, Olivier Lapicque" "\n"
 		"All rights reserved." "\n"
 		"" "\n"

diff --git a/Frameworks/OpenMPT/OpenMPT/common/versionNumber.h b/Frameworks/OpenMPT/OpenMPT/common/versionNumber.h
@@ -17,7 +17,7 @@ OPENMPT_NAMESPACE_BEGIN
 // Version definitions. The only thing that needs to be changed when changing version number.
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      31
-#define VER_MINOR      13
+#define VER_MINOR      14
 #define VER_MINORMINOR 00
 
 OPENMPT_NAMESPACE_END
diff --git a/Frameworks/OpenMPT/OpenMPT/contrib/libmodplug-0.8.8.5/LICENSE b/Frameworks/OpenMPT/OpenMPT/contrib/libmodplug-0.8.8.5/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors
+Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors
 Copyright (c) 1997-2003, Olivier Lapicque
 All rights reserved.
 

diff --git a/Frameworks/OpenMPT/OpenMPT/contrib/libmodplug-0.8.9.0/LICENSE b/Frameworks/OpenMPT/OpenMPT/contrib/libmodplug-0.8.9.0/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2024, OpenMPT Project Developers and Contributors
+Copyright (c) 2004-2025, OpenMPT Project Developers and Contributors
 Copyright (c) 1997-2003, Olivier Lapicque
 All rights reserved.
 

diff --git a/Frameworks/OpenMPT/OpenMPT/examples/libopenmpt_example_c_unsafe.c b/Frameworks/OpenMPT/OpenMPT/examples/libopenmpt_example_c_unsafe.c
@@ -83,6 +83,9 @@ int main( int argc, char * argv[] ) {
 	file = fopen( argv[1], "rb" );
 #endif
 	mod = openmpt_module_create2( openmpt_stream_get_file_callbacks2(), file, NULL, NULL, NULL, NULL, NULL, NULL, NULL );
+#if defined( __clang__ ) && defined( __clang_analyzer__ )
+	[[clang::suppress]]
+#endif
 	fclose( file );
 	Pa_Initialize();
 	Pa_OpenDefaultStream( &stream, 0, 2, paInt16 | paNonInterleaved, SAMPLERATE, paFramesPerBufferUnspecified, NULL, NULL );

diff --git a/Frameworks/OpenMPT/OpenMPT/libopenmpt/in_openmpt/in_openmpt.cpp b/Frameworks/OpenMPT/OpenMPT/libopenmpt/in_openmpt/in_openmpt.cpp
@@ -223,7 +223,7 @@ static void config( HWND hwndParent ) {
 static void about( HWND hwndParent ) {
 	std::ostringstream about;
 	about << SHORT_TITLE << " version " << openmpt::string::get( "library_version" ) << " " << "(built " << openmpt::string::get( "build" ) << ")" << std::endl;
-	about << " Copyright (c) 2013-2024 OpenMPT Project Developers and Contributors (https://lib.openmpt.org/)" << std::endl;
+	about << " Copyright (c) 2013-2025 OpenMPT Project Developers and Contributors (https://lib.openmpt.org/)" << std::endl;
 	about << " OpenMPT version " << openmpt::string::get( "core_version" ) << std::endl;
 	about << std::endl;
 	about << openmpt::string::get( "contact" ) << std::endl;

diff --git a/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt.hpp b/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt.hpp
@@ -49,25 +49,25 @@
  *
  * libopenmpt can use 3 different strategies for file I/O.
  *
- * - openmpt::module::module() with any kind of memory buffer as parameter will
- * load the module from the provided memory buffer, which will require loading
- * all data upfront by the library
- * caller.
  * - openmpt::module::module() with a seekable std::istream as parameter will
- * load the module via the stream interface. libopenmpt will not implement an
- * additional buffering layer in this case whih means the callbacks are assumed
- * to be performant even with small i/o sizes.
+ * load the module via the stream interface. This is the recommended strategy.
  * - openmpt::module::module() with an unseekable std::istream as parameter
  * will load the module via the stream interface. libopempt will make an
  * internal copy as it goes along, and sometimes have to pre-cache the whole
  * file in case it needs to know the complete file size. This strategy is
  * intended to be used if the file is located on a high latency network.
+ * - openmpt::module::module() with any kind of memory buffer as parameter will
+ * load the module from the provided memory buffer, which will require loading
+ * all data upfront by the library caller. This strategy has the disadvantage of
+ * requiring all data to be loaded even when the module loading happens to fail
+ * after that. It should only be used when the data has already been loaded into
+ * memory for other reasons.
  *
- * | constructor       | speed  | memory consumption |
- * | ----------------: | :----: | :----------------: |
- * | memory buffer     | <p style="background-color:green" >fast  </p> | <p style="background-color:yellow">medium</p> | 
- * | seekable stream   | <p style="background-color:red"   >slow  </p> | <p style="background-color:green" >low   </p> |
+ * | constructor       | speed | memory consumption |
+ * | ----------------: | :---: | :----------------: |
+ * | seekable stream   | <p style="background-color:yellow">medium</p> | <p style="background-color:green" >low   </p> |
  * | unseekable stream | <p style="background-color:yellow">medium</p> | <p style="background-color:red"   >high  </p> |
+ * | memory buffer     | <p style="background-color:green" >fast  </p> | <p style="background-color:yellow">medium</p> |
  *
  * In all cases, the data or stream passed to the constructor is no longer
  * needed after the openmpt::module has been constructed and can be destroyed

diff --git a/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_version.h b/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_version.h
@@ -21,7 +21,7 @@
 /*! \brief libopenmpt minor version number */
 #define OPENMPT_API_VERSION_MINOR 7
 /*! \brief libopenmpt patch version number */
-#define OPENMPT_API_VERSION_PATCH 12
+#define OPENMPT_API_VERSION_PATCH 13
 /*! \brief libopenmpt pre-release tag */
 #define OPENMPT_API_VERSION_PREREL ""
 /*! \brief libopenmpt pre-release flag */

diff --git a/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_version.mk b/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_version.mk
@@ -1,8 +1,8 @@
 LIBOPENMPT_VERSION_MAJOR=0
 LIBOPENMPT_VERSION_MINOR=7
-LIBOPENMPT_VERSION_PATCH=12
+LIBOPENMPT_VERSION_PATCH=13
 LIBOPENMPT_VERSION_PREREL=
 
 LIBOPENMPT_LTVER_CURRENT=4
-LIBOPENMPT_LTVER_REVISION=12
+LIBOPENMPT_LTVER_REVISION=13
 LIBOPENMPT_LTVER_AGE=4
diff --git a/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_version.rc b/Frameworks/OpenMPT/OpenMPT/libopenmpt/libopenmpt_version.rc
@@ -192,7 +192,7 @@ BEGIN
             VALUE "FileDescription",  VER_FILEDESC_STR
             VALUE "FileVersion",      VER_FILEVERSION_STR
             VALUE "InternalName",     VER_FILENAME_STR
-            VALUE "LegalCopyright",   "Copyright � 2004-2024 OpenMPT Project Developers and Contributors, Copyright � 1997-2003 Olivier Lapicque"
+            VALUE "LegalCopyright",   "Copyright � 2004-2025 OpenMPT Project Developers and Contributors, Copyright � 1997-2003 Olivier Lapicque"
             VALUE "OriginalFilename", VER_FILENAME_STR
             VALUE "ProductName",      "libopenmpt"
             VALUE "ProductVersion",   VER_FILEVERSION_STR