Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libopenmpt for openSUSE:Factory checked in at 2023-02-07 18:47:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libopenmpt (Old) and /work/SRC/openSUSE:Factory/.libopenmpt.new.4462 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libopenmpt" Tue Feb 7 18:47:41 2023 rev:40 rq:1063428 version:0.6.8 Changes: -------- --- /work/SRC/openSUSE:Factory/libopenmpt/libopenmpt.changes 2023-01-10 14:58:59.292942306 +0100 +++ /work/SRC/openSUSE:Factory/.libopenmpt.new.4462/libopenmpt.changes 2023-02-07 18:47:44.686699452 +0100 @@ -1,0 +2,11 @@ +Sat Feb 4 18:44:20 UTC 2023 - Dirk Müller <dmuel...@suse.com> + +- update to 0.6.8: + * [Bug] DSYM: Loading DSYM files got broken in 0.6.7. + * When seeking around in a module, the tempo was sometimes + incorrectly limited to 255 BPM + * Initial instrument cutoff was broken for OPL instruments in + libopenmnpt 0.6.7 + * mpg123: Update to v1.31.2 + +------------------------------------------------------------------- Old: ---- libopenmpt-0.6.7+release.autotools.tar.gz New: ---- libopenmpt-0.6.8+release.autotools.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopenmpt.spec ++++++ --- /var/tmp/diff_new_pack.Vcn3bN/_old 2023-02-07 18:47:45.178702097 +0100 +++ /var/tmp/diff_new_pack.Vcn3bN/_new 2023-02-07 18:47:45.186702139 +0100 @@ -21,7 +21,7 @@ %define libopenmpt_modplug_version 0.8.9.0 Name: libopenmpt -Version: 0.6.7 +Version: 0.6.8 Release: 0 Summary: C++ and C library to decode tracker music files License: BSD-3-Clause ++++++ libopenmpt-0.6.7+release.autotools.tar.gz -> libopenmpt-0.6.8+release.autotools.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/Makefile.am new/libopenmpt-0.6.8+release.autotools/Makefile.am --- old/libopenmpt-0.6.7+release.autotools/Makefile.am 2022-05-12 14:31:43.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/Makefile.am 2023-01-17 10:17:37.000000000 +0100 @@ -173,6 +173,7 @@ MPT_FILES_SRC_MPT += src/mpt/format/default_integer.hpp MPT_FILES_SRC_MPT += src/mpt/format/default_string.hpp MPT_FILES_SRC_MPT += src/mpt/format/helpers.hpp +MPT_FILES_SRC_MPT += src/mpt/format/join.hpp MPT_FILES_SRC_MPT += src/mpt/format/message.hpp MPT_FILES_SRC_MPT += src/mpt/format/message_macros.hpp MPT_FILES_SRC_MPT += src/mpt/format/simple.hpp @@ -209,6 +210,7 @@ MPT_FILES_SRC_MPT += src/mpt/osinfo/windows_version.hpp MPT_FILES_SRC_MPT += src/mpt/out_of_memory/out_of_memory.hpp MPT_FILES_SRC_MPT += src/mpt/parse/parse.hpp +MPT_FILES_SRC_MPT += src/mpt/parse/split.hpp #MPT_FILES_SRC_MPT += src/mpt/path/path.hpp MPT_FILES_SRC_MPT += src/mpt/random/crand.hpp MPT_FILES_SRC_MPT += src/mpt/random/default_engines.hpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/Makefile.in new/libopenmpt-0.6.8+release.autotools/Makefile.in --- old/libopenmpt-0.6.7+release.autotools/Makefile.in 2023-01-08 15:34:58.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/Makefile.in 2023-01-29 13:25:44.000000000 +0100 @@ -344,8 +344,8 @@ src/mpt/format/default_formatter.hpp \ src/mpt/format/default_integer.hpp \ src/mpt/format/default_string.hpp src/mpt/format/helpers.hpp \ - src/mpt/format/message.hpp src/mpt/format/message_macros.hpp \ - src/mpt/format/simple.hpp \ + src/mpt/format/join.hpp src/mpt/format/message.hpp \ + src/mpt/format/message_macros.hpp src/mpt/format/simple.hpp \ src/mpt/format/simple_floatingpoint.hpp \ src/mpt/format/simple_integer.hpp \ src/mpt/format/simple_spec.hpp src/mpt/io/base.hpp \ @@ -370,12 +370,12 @@ src/mpt/mutex/mutex.hpp src/mpt/osinfo/class.hpp \ src/mpt/osinfo/windows_version.hpp \ src/mpt/out_of_memory/out_of_memory.hpp \ - src/mpt/parse/parse.hpp src/mpt/random/crand.hpp \ - src/mpt/random/default_engines.hpp src/mpt/random/device.hpp \ - src/mpt/random/engine.hpp src/mpt/random/engine_lcg.hpp \ - src/mpt/random/random.hpp src/mpt/random/seed.hpp \ - src/mpt/string/buffer.hpp src/mpt/string/types.hpp \ - src/mpt/string/utility.hpp \ + src/mpt/parse/parse.hpp src/mpt/parse/split.hpp \ + src/mpt/random/crand.hpp src/mpt/random/default_engines.hpp \ + src/mpt/random/device.hpp src/mpt/random/engine.hpp \ + src/mpt/random/engine_lcg.hpp src/mpt/random/random.hpp \ + src/mpt/random/seed.hpp src/mpt/string/buffer.hpp \ + src/mpt/string/types.hpp src/mpt/string/utility.hpp \ src/mpt/string_transcode/transcode.hpp \ src/mpt/string_transcode/macros.hpp \ src/mpt/system_error/system_error.hpp src/mpt/test/test.hpp \ @@ -532,8 +532,8 @@ src/mpt/format/default_formatter.hpp \ src/mpt/format/default_integer.hpp \ src/mpt/format/default_string.hpp src/mpt/format/helpers.hpp \ - src/mpt/format/message.hpp src/mpt/format/message_macros.hpp \ - src/mpt/format/simple.hpp \ + src/mpt/format/join.hpp src/mpt/format/message.hpp \ + src/mpt/format/message_macros.hpp src/mpt/format/simple.hpp \ src/mpt/format/simple_floatingpoint.hpp \ src/mpt/format/simple_integer.hpp \ src/mpt/format/simple_spec.hpp src/mpt/io/base.hpp \ @@ -558,12 +558,12 @@ src/mpt/mutex/mutex.hpp src/mpt/osinfo/class.hpp \ src/mpt/osinfo/windows_version.hpp \ src/mpt/out_of_memory/out_of_memory.hpp \ - src/mpt/parse/parse.hpp src/mpt/random/crand.hpp \ - src/mpt/random/default_engines.hpp src/mpt/random/device.hpp \ - src/mpt/random/engine.hpp src/mpt/random/engine_lcg.hpp \ - src/mpt/random/random.hpp src/mpt/random/seed.hpp \ - src/mpt/string/buffer.hpp src/mpt/string/types.hpp \ - src/mpt/string/utility.hpp \ + src/mpt/parse/parse.hpp src/mpt/parse/split.hpp \ + src/mpt/random/crand.hpp src/mpt/random/default_engines.hpp \ + src/mpt/random/device.hpp src/mpt/random/engine.hpp \ + src/mpt/random/engine_lcg.hpp src/mpt/random/random.hpp \ + src/mpt/random/seed.hpp src/mpt/string/buffer.hpp \ + src/mpt/string/types.hpp src/mpt/string/utility.hpp \ src/mpt/string_transcode/transcode.hpp \ src/mpt/string_transcode/macros.hpp \ src/mpt/system_error/system_error.hpp src/mpt/test/test.hpp \ @@ -1761,8 +1761,8 @@ src/mpt/format/default_formatter.hpp \ src/mpt/format/default_integer.hpp \ src/mpt/format/default_string.hpp src/mpt/format/helpers.hpp \ - src/mpt/format/message.hpp src/mpt/format/message_macros.hpp \ - src/mpt/format/simple.hpp \ + src/mpt/format/join.hpp src/mpt/format/message.hpp \ + src/mpt/format/message_macros.hpp src/mpt/format/simple.hpp \ src/mpt/format/simple_floatingpoint.hpp \ src/mpt/format/simple_integer.hpp \ src/mpt/format/simple_spec.hpp src/mpt/io/base.hpp \ @@ -1787,12 +1787,12 @@ src/mpt/mutex/mutex.hpp src/mpt/osinfo/class.hpp \ src/mpt/osinfo/windows_version.hpp \ src/mpt/out_of_memory/out_of_memory.hpp \ - src/mpt/parse/parse.hpp src/mpt/random/crand.hpp \ - src/mpt/random/default_engines.hpp src/mpt/random/device.hpp \ - src/mpt/random/engine.hpp src/mpt/random/engine_lcg.hpp \ - src/mpt/random/random.hpp src/mpt/random/seed.hpp \ - src/mpt/string/buffer.hpp src/mpt/string/types.hpp \ - src/mpt/string/utility.hpp \ + src/mpt/parse/parse.hpp src/mpt/parse/split.hpp \ + src/mpt/random/crand.hpp src/mpt/random/default_engines.hpp \ + src/mpt/random/device.hpp src/mpt/random/engine.hpp \ + src/mpt/random/engine_lcg.hpp src/mpt/random/random.hpp \ + src/mpt/random/seed.hpp src/mpt/string/buffer.hpp \ + src/mpt/string/types.hpp src/mpt/string/utility.hpp \ src/mpt/string_transcode/transcode.hpp \ src/mpt/string_transcode/macros.hpp \ src/mpt/system_error/system_error.hpp src/mpt/test/test.hpp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/common/mptString.cpp new/libopenmpt-0.6.8+release.autotools/common/mptString.cpp --- old/libopenmpt-0.6.7+release.autotools/common/mptString.cpp 2022-02-14 09:52:01.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/common/mptString.cpp 2023-01-28 16:29:49.000000000 +0100 @@ -516,14 +516,20 @@ #ifdef UNICODE return str.c_str(); #else + // cppcheck false-positive + // cppcheck-suppress returnDanglingLifetime return ToCharset(Charset::Locale, str).c_str(); #endif } CString ToCString(Charset from, const std::string &str) { #ifdef UNICODE + // cppcheck false-positive + // cppcheck-suppress returnDanglingLifetime return ToWide(from, str).c_str(); #else + // cppcheck false-positive + // cppcheck-suppress returnDanglingLifetime return ToCharset(Charset::Locale, from, str).c_str(); #endif } @@ -547,6 +553,8 @@ CString ToCString(const mpt::lstring &str) { #ifdef UNICODE + // cppcheck false-positive + // cppcheck-suppress returnDanglingLifetime return ToWide(str).c_str(); #else return str.c_str(); @@ -635,8 +643,12 @@ CString ToCString(const mpt::ustring &str) { #ifdef UNICODE + // cppcheck false-positive + // cppcheck-suppress returnDanglingLifetime return String::DecodeImpl<mpt::ustring>(mpt::Charset::UTF8, str).c_str(); #else // !UNICODE + // cppcheck false-positive + // cppcheck-suppress returnDanglingLifetime return String::ConvertImpl<std::string, mpt::ustring>(mpt::Charset::Locale, mpt::Charset::UTF8, str).c_str(); #endif // UNICODE } @@ -810,7 +822,7 @@ #endif // UNICODE #else // !MPT_WITH_MFC std::wstring ws = mpt::ToWide(s); - std::transform(ws.begin(), ws.end(), ws.begin(), &std::towlower); + std::transform(ws.begin(), ws.end(), ws.begin(), &std::towupper); return mpt::ToUnicode(ws); #endif // MPT_WITH_MFC } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/common/versionNumber.h new/libopenmpt-0.6.8+release.autotools/common/versionNumber.h --- old/libopenmpt-0.6.7+release.autotools/common/versionNumber.h 2023-01-08 14:39:18.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/common/versionNumber.h 2023-01-29 12:59:32.000000000 +0100 @@ -17,7 +17,7 @@ // Version definitions. The only thing that needs to be changed when changing version number. #define VER_MAJORMAJOR 1 #define VER_MAJOR 30 -#define VER_MINOR 09 +#define VER_MINOR 10 #define VER_MINORMINOR 00 OPENMPT_NAMESPACE_END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/configure new/libopenmpt-0.6.8+release.autotools/configure --- old/libopenmpt-0.6.7+release.autotools/configure 2023-01-08 15:34:55.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/configure 2023-01-29 13:25:43.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libopenmpt 0.6.7+release.autotools. +# Generated by GNU Autoconf 2.69 for libopenmpt 0.6.8+release.autotools. # # Report bugs to <https://bugs.openmpt.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libopenmpt' PACKAGE_TARNAME='libopenmpt' -PACKAGE_VERSION='0.6.7+release.autotools' -PACKAGE_STRING='libopenmpt 0.6.7+release.autotools' +PACKAGE_VERSION='0.6.8+release.autotools' +PACKAGE_STRING='libopenmpt 0.6.8+release.autotools' PACKAGE_BUGREPORT='https://bugs.openmpt.org/' PACKAGE_URL='https://lib.openmpt.org/' @@ -1475,7 +1475,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libopenmpt 0.6.7+release.autotools to adapt to many kinds of systems. +\`configure' configures libopenmpt 0.6.8+release.autotools to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1546,7 +1546,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libopenmpt 0.6.7+release.autotools:";; + short | recursive ) echo "Configuration of libopenmpt 0.6.8+release.autotools:";; esac cat <<\_ACEOF @@ -1732,7 +1732,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libopenmpt configure 0.6.7+release.autotools +libopenmpt configure 0.6.8+release.autotools generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2222,7 +2222,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libopenmpt $as_me 0.6.7+release.autotools, which was +It was created by libopenmpt $as_me 0.6.8+release.autotools, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3086,7 +3086,7 @@ # Define the identity of the package. PACKAGE='libopenmpt' - VERSION='0.6.7+release.autotools' + VERSION='0.6.8+release.autotools' cat >>confdefs.h <<_ACEOF @@ -17253,13 +17253,13 @@ -$as_echo "#define MPT_SVNURL \"https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.6.7\"" >>confdefs.h +$as_echo "#define MPT_SVNURL \"https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.6.8\"" >>confdefs.h -$as_echo "#define MPT_SVNVERSION \"18457\"" >>confdefs.h +$as_echo "#define MPT_SVNVERSION \"18680\"" >>confdefs.h -$as_echo "#define MPT_SVNDATE \"2023-01-08T14:11:42.475836Z\"" >>confdefs.h +$as_echo "#define MPT_SVNDATE \"2023-01-29T12:13:49.877060Z\"" >>confdefs.h $as_echo "#define MPT_PACKAGE true" >>confdefs.h @@ -22545,7 +22545,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libopenmpt $as_me 0.6.7+release.autotools, which was +This file was extended by libopenmpt $as_me 0.6.8+release.autotools, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22603,7 +22603,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libopenmpt config.status 0.6.7+release.autotools +libopenmpt config.status 0.6.8+release.autotools configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/configure.ac new/libopenmpt-0.6.8+release.autotools/configure.ac --- old/libopenmpt-0.6.7+release.autotools/configure.ac 2023-01-08 15:34:34.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/configure.ac 2023-01-29 13:25:29.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([libopenmpt], [0.6.7+release.autotools], [https://bugs.openmpt.org/], [libopenmpt], [https://lib.openmpt.org/]) +AC_INIT([libopenmpt], [0.6.8+release.autotools], [https://bugs.openmpt.org/], [libopenmpt], [https://lib.openmpt.org/]) AC_PREREQ([2.68]) AC_CONFIG_MACRO_DIR([m4]) @@ -26,9 +26,9 @@ AC_SUBST([LIBOPENMPT_LTVER_REVISION]) AC_SUBST([LIBOPENMPT_LTVER_AGE]) -AC_DEFINE([MPT_SVNURL], ["https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.6.7"], [svn version]) -AC_DEFINE([MPT_SVNVERSION], ["18457"], [svn version]) -AC_DEFINE([MPT_SVNDATE], ["2023-01-08T14:11:42.475836Z"], [svn date]) +AC_DEFINE([MPT_SVNURL], ["https://source.openmpt.org/svn/openmpt/tags/libopenmpt-0.6.8"], [svn version]) +AC_DEFINE([MPT_SVNVERSION], ["18680"], [svn version]) +AC_DEFINE([MPT_SVNDATE], ["2023-01-29T12:13:49.877060Z"], [svn date]) AC_DEFINE([MPT_PACKAGE], [true], [is package]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/libopenmpt/dox/changelog.md new/libopenmpt-0.6.8+release.autotools/libopenmpt/dox/changelog.md --- old/libopenmpt-0.6.7+release.autotools/libopenmpt/dox/changelog.md 2023-01-08 15:11:39.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/libopenmpt/dox/changelog.md 2023-01-29 13:13:46.000000000 +0100 @@ -5,6 +5,17 @@ For fully detailed change log, please see the source repository directly. This is just a high-level summary. +### libopenmpt 0.6.8 (2023-01-29) + + * [**Bug**] DSYM: Loading DSYM files got broken in 0.6.7. + + * When seeking around in a module, the tempo was sometimes incorrectly limited + to 255 BPM. + * Initial instrument cutoff was broken for OPL instruments in + libopenmnpt 0.6.7. + + * mpg123: Update to v1.31.2 (2023-01-14). + ### libopenmpt 0.6.7 (2023-01-08) * [**Bug**] openmpt123: openmpt123 crashed on Windows 9x when showing any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/libopenmpt/libopenmpt_version.h new/libopenmpt-0.6.8+release.autotools/libopenmpt/libopenmpt_version.h --- old/libopenmpt-0.6.7+release.autotools/libopenmpt/libopenmpt_version.h 2023-01-08 15:11:39.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/libopenmpt/libopenmpt_version.h 2023-01-29 13:13:46.000000000 +0100 @@ -21,7 +21,7 @@ /*! \brief libopenmpt minor version number */ #define OPENMPT_API_VERSION_MINOR 6 /*! \brief libopenmpt patch version number */ -#define OPENMPT_API_VERSION_PATCH 7 +#define OPENMPT_API_VERSION_PATCH 8 /*! \brief libopenmpt pre-release tag */ #define OPENMPT_API_VERSION_PREREL "" /*! \brief libopenmpt pre-release flag */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/libopenmpt/libopenmpt_version.mk new/libopenmpt-0.6.8+release.autotools/libopenmpt/libopenmpt_version.mk --- old/libopenmpt-0.6.7+release.autotools/libopenmpt/libopenmpt_version.mk 2023-01-08 15:11:39.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/libopenmpt/libopenmpt_version.mk 2023-01-29 13:13:46.000000000 +0100 @@ -1,8 +1,8 @@ LIBOPENMPT_VERSION_MAJOR=0 LIBOPENMPT_VERSION_MINOR=6 -LIBOPENMPT_VERSION_PATCH=7 +LIBOPENMPT_VERSION_PATCH=8 LIBOPENMPT_VERSION_PREREL= LIBOPENMPT_LTVER_CURRENT=3 -LIBOPENMPT_LTVER_REVISION=7 +LIBOPENMPT_LTVER_REVISION=8 LIBOPENMPT_LTVER_AGE=3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/man/openmpt123.1 new/libopenmpt-0.6.8+release.autotools/man/openmpt123.1 --- old/libopenmpt-0.6.7+release.autotools/man/openmpt123.1 2023-01-08 15:34:33.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/man/openmpt123.1 2023-01-29 13:25:28.000000000 +0100 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. -.TH OPENMPT123 "1" "January 2023" "openmpt123 v0.6.7" "User Commands" +.TH OPENMPT123 "1" "January 2023" "openmpt123 v0.6.8" "User Commands" .SH NAME openmpt123 - command line module music player based on libopenmpt .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/openmpt123/openmpt123.hpp new/libopenmpt-0.6.8+release.autotools/openmpt123/openmpt123.hpp --- old/libopenmpt-0.6.7+release.autotools/openmpt123/openmpt123.hpp 2023-01-07 08:21:59.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/openmpt123/openmpt123.hpp 2023-01-24 15:57:24.000000000 +0100 @@ -120,7 +120,7 @@ s << text; #else s << mpt::transcode<std::string>( mpt::logical_encoding::locale, mpt::common_encoding::utf8, text ); - #endif + #endif s.flush(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/soundlib/ContainerXPK.cpp new/libopenmpt-0.6.8+release.autotools/soundlib/ContainerXPK.cpp --- old/libopenmpt-0.6.7+release.autotools/soundlib/ContainerXPK.cpp 2021-12-12 17:57:56.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/soundlib/ContainerXPK.cpp 2023-01-15 15:51:47.000000000 +0100 @@ -98,6 +98,8 @@ }; if(index < 0) throw XPK_error(); if(static_cast<std::size_t>(index) >= std::size(xpk_table)) throw XPK_error(); + // cppcheck false-positive + // cppcheck-suppress arrayIndexOutOfBoundsCond return xpk_table[index]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/soundlib/ITCompression.cpp new/libopenmpt-0.6.8+release.autotools/soundlib/ITCompression.cpp --- old/libopenmpt-0.6.7+release.autotools/soundlib/ITCompression.cpp 2021-06-04 09:41:34.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/soundlib/ITCompression.cpp 2023-01-28 15:36:16.000000000 +0100 @@ -187,6 +187,8 @@ int8 ITCompression::GetWidthChangeSize(int8 w, bool is16) { MPT_ASSERT(w > 0 && static_cast<unsigned int>(w) <= std::size(ITWidthChangeSize)); + // cppcheck false-positive + // cppcheck-suppress negativeIndex int8 wcs = ITWidthChangeSize[w - 1]; if(w <= 6 && is16) wcs++; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/soundlib/Load_dsym.cpp new/libopenmpt-0.6.8+release.autotools/soundlib/Load_dsym.cpp --- old/libopenmpt-0.6.7+release.autotools/soundlib/Load_dsym.cpp 2022-12-23 18:28:27.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/soundlib/Load_dsym.cpp 2023-01-23 19:02:50.000000000 +0100 @@ -259,16 +259,14 @@ const auto allowedCommands = file.ReadArray<uint8, 8>(); std::vector<uint16le> sequence; + if(fileHeader.numOrders) { std::vector<std::byte> sequenceData; - if(fileHeader.numOrders) - { - const uint32 sequenceSize = fileHeader.numOrders * fileHeader.numChannels * 2u; - if(!ReadDSymChunk(file, sequenceData, sequenceSize)) - return false; - FileReader sequenceChunk = FileReader(mpt::as_span(sequenceData)); - sequenceChunk.ReadVector(sequenceData, sequenceData.size() / 2u); - } + const uint32 sequenceSize = fileHeader.numOrders * fileHeader.numChannels * 2u; + if(!ReadDSymChunk(file, sequenceData, sequenceSize)) + return false; + FileReader sequenceChunk = FileReader(mpt::as_span(sequenceData)); + sequenceChunk.ReadVector(sequence, sequenceData.size() / 2u); } std::vector<std::byte> trackData; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/soundlib/ModSample.cpp new/libopenmpt-0.6.8+release.autotools/soundlib/ModSample.cpp --- old/libopenmpt-0.6.7+release.autotools/soundlib/ModSample.cpp 2022-01-30 15:53:58.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/soundlib/ModSample.cpp 2023-01-23 22:33:58.000000000 +0100 @@ -31,12 +31,12 @@ nFineTune = 0; // TransposeToFrequency assumes NTSC middle-C frequency like FT2, but we play MODs with PAL middle-C! if(fromType == MOD_TYPE_MOD) - nC5Speed = Util::muldivr_unsigned(nC5Speed, 8272, 8363); + nC5Speed = Util::muldivr_unsigned(nC5Speed, 8287, 8363); } else if((toType & (MOD_TYPE_MOD | MOD_TYPE_XM)) && (!(fromType & (MOD_TYPE_MOD | MOD_TYPE_XM)))) { // FrequencyToTranspose assumes NTSC middle-C frequency like FT2, but we play MODs with PAL middle-C! if(toType == MOD_TYPE_MOD) - nC5Speed = Util::muldivr_unsigned(nC5Speed, 8363, 8272); + nC5Speed = Util::muldivr_unsigned(nC5Speed, 8363, 8287); FrequencyToTranspose(); } @@ -162,7 +162,7 @@ rate = nC5Speed; // TransposeToFrequency assumes NTSC middle-C frequency like FT2, but we play MODs with PAL middle-C! if(type == MOD_TYPE_MOD) - rate = Util::muldivr_unsigned(rate, 8272, 8363); + rate = Util::muldivr_unsigned(rate, 8287, 8363); return (rate > 0) ? rate : 8363; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/soundlib/Snd_fx.cpp new/libopenmpt-0.6.8+release.autotools/soundlib/Snd_fx.cpp --- old/libopenmpt-0.6.7+release.autotools/soundlib/Snd_fx.cpp 2023-01-07 15:48:47.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/soundlib/Snd_fx.cpp 2023-01-12 09:15:47.000000000 +0100 @@ -612,8 +612,17 @@ if (tempo.GetInt()) chn.nOldTempo = static_cast<uint8>(tempo.GetInt()); else tempo.Set(chn.nOldTempo); } - if (tempo.GetInt() >= 0x20) playState.m_nMusicTempo = tempo; - else + const auto &specs = GetModSpecifications(); + if(tempo.GetInt() >= 0x20) + { +#if MPT_MSVC_BEFORE(2019, 0) + // Work-around for VS2017 /std:c++17 /permissive- + // which fails to find operator < for templated user types inside std::min. + playState.m_nMusicTempo.SetRaw(std::min(tempo.GetRaw(), specs.GetTempoMax().GetRaw())); +#else + playState.m_nMusicTempo = std::min(tempo, specs.GetTempoMax()); +#endif + } else { // Tempo Slide TEMPO tempoDiff((tempo.GetInt() & 0x0F) * nonRowTicks, 0); @@ -627,14 +636,14 @@ else playState.m_nMusicTempo.Set(0); } - } - TEMPO tempoMin = GetModSpecifications().GetTempoMin(), tempoMax = GetModSpecifications().GetTempoMax(); - if(m_playBehaviour[kTempoClamp]) // clamp tempo correctly in compatible mode - { - tempoMax.Set(255); + TEMPO tempoMin = specs.GetTempoMin(), tempoMax = specs.GetTempoMax(); + if(m_playBehaviour[kTempoClamp]) // clamp tempo correctly in compatible mode + { + tempoMax.Set(255); + } + Limit(playState.m_nMusicTempo, tempoMin, tempoMax); } - Limit(playState.m_nMusicTempo, tempoMin, tempoMax); } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/soundlib/Sndmix.cpp new/libopenmpt-0.6.8+release.autotools/soundlib/Sndmix.cpp --- old/libopenmpt-0.6.7+release.autotools/soundlib/Sndmix.cpp 2023-01-07 15:48:47.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/soundlib/Sndmix.cpp 2023-01-28 17:08:59.000000000 +0100 @@ -2290,9 +2290,9 @@ // After MIDI macros have been processed, we can also process the pitch / filter envelope and other pitch-related things. if(samplePlaying) { - cutoff = ProcessPitchFilterEnvelope(chn, period); - if(cutoff >= 0) - cutoff /= 4; + int envCutoff = ProcessPitchFilterEnvelope(chn, period); + if(envCutoff >= 0) + cutoff = envCutoff / 4; } // Cutoff doubles as modulator intensity for FM instruments @@ -2544,6 +2544,7 @@ } chn.dwOldFlags = chn.dwFlags; + chn.triggerNote = false; // For SONG_PAUSED mode } // If there are more channels being mixed than allowed, order them by volume and discard the most quiet ones diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/soundlib/modcommand.cpp new/libopenmpt-0.6.8+release.autotools/soundlib/modcommand.cpp --- old/libopenmpt-0.6.7+release.autotools/soundlib/modcommand.cpp 2022-05-31 19:39:11.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/soundlib/modcommand.cpp 2023-01-13 21:55:59.000000000 +0100 @@ -79,7 +79,7 @@ case 0x20: command = CMD_PORTAMENTODOWN; param |= 0xF0; break; case 0x30: param = (param & 0x0F) | 0x10; break; case 0x40: param = (param & 0x03) | 0x30; break; - case 0x50: param = (param & 0x0F) | 0x20; break; + case 0x50: param = (param ^ 0x58) | 0x20; break; case 0x60: param = (param & 0x0F) | 0xB0; break; case 0x70: param = (param & 0x03) | 0x40; break; case 0x90: command = CMD_RETRIG; param = (param & 0x0F); break; @@ -102,7 +102,7 @@ switch(param & 0xF0) { case 0x10: param = (param & 0x0F) | 0x30; break; - case 0x20: param = (param & 0x0F) | 0x50; break; + case 0x20: param = (param ^ 0x28) | 0x50; break; case 0x30: param = (param & 0x0F) | 0x40; break; case 0x40: param = (param & 0x0F) | 0x70; break; case 0x50: command = CMD_XFINEPORTAUPDOWN; break; // map to unused X5x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/mpt/binary/tests/tests_binary.hpp new/libopenmpt-0.6.8+release.autotools/src/mpt/binary/tests/tests_binary.hpp --- old/libopenmpt-0.6.7+release.autotools/src/mpt/binary/tests/tests_binary.hpp 2021-05-04 09:21:58.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/src/mpt/binary/tests/tests_binary.hpp 2023-01-26 23:06:50.000000000 +0100 @@ -5,6 +5,7 @@ +#include "mpt/base/alloc.hpp" #include "mpt/base/detect_compiler.hpp" #include "mpt/base/memory.hpp" #include "mpt/base/namespace.hpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/mpt/format/join.hpp new/libopenmpt-0.6.8+release.autotools/src/mpt/format/join.hpp --- old/libopenmpt-0.6.7+release.autotools/src/mpt/format/join.hpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/src/mpt/format/join.hpp 2021-05-26 15:26:03.000000000 +0200 @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: BSL-1.0 OR BSD-3-Clause */ + +#ifndef MPT_FORMAT_JOIN_HPP +#define MPT_FORMAT_JOIN_HPP + + + +#include "mpt/base/namespace.hpp" +#include "mpt/format/simple.hpp" +#include "mpt/string/utility.hpp" + +#include <vector> + +#include <cstddef> + + + +namespace mpt { +inline namespace MPT_INLINE_NS { + + + +template <typename Tstring, typename T> +Tstring join_format(const std::vector<T> & vals, const Tstring & sep = Tstring(1, char_constants<typename Tstring::value_type>::comma)) { + Tstring str; + for (std::size_t i = 0; i < vals.size(); ++i) { + if (i > 0) { + str += sep; + } + str += mpt::format<Tstring>::val(vals[i]); + } + return str; +} + + + +} // namespace MPT_INLINE_NS +} // namespace mpt + + + +#endif // MPT_FORMAT_JOIN_HPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/mpt/format/tests/tests_format_simple.hpp new/libopenmpt-0.6.8+release.autotools/src/mpt/format/tests/tests_format_simple.hpp --- old/libopenmpt-0.6.7+release.autotools/src/mpt/format/tests/tests_format_simple.hpp 2022-06-30 09:13:06.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/src/mpt/format/tests/tests_format_simple.hpp 2023-01-09 13:01:53.000000000 +0100 @@ -14,6 +14,7 @@ #include "mpt/test/test_macros.hpp" #include <limits> +#include <string> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/mpt/io/tests/tests_io.hpp new/libopenmpt-0.6.8+release.autotools/src/mpt/io/tests/tests_io.hpp --- old/libopenmpt-0.6.7+release.autotools/src/mpt/io/tests/tests_io.hpp 2021-06-04 19:00:55.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/src/mpt/io/tests/tests_io.hpp 2023-01-26 23:20:36.000000000 +0100 @@ -5,6 +5,7 @@ +#include "mpt/base/alloc.hpp" #include "mpt/base/integer.hpp" #include "mpt/base/namespace.hpp" #include "mpt/base/utility.hpp" @@ -354,7 +355,7 @@ // Run-time in case some weird compiler gets confused by our templates // and only writes the first array element. std::ostringstream f; - uint16be data[2]; + mpt::uint16be data[2]; mpt::reset(data); data[0] = 0x1234; data[1] = 0x5678; @@ -363,7 +364,7 @@ } { std::ostringstream f; - std::vector<int16be> data; + std::vector<mpt::int16be> data; data.resize(3); data[0] = 0x1234; data[1] = 0x5678; @@ -373,7 +374,7 @@ } { std::ostringstream f; - int16be data[3]; + mpt::int16be data[3]; mpt::reset(data); data[0] = 0x1234; data[1] = 0x5678; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/mpt/io_read/filedata_base_seekable.hpp new/libopenmpt-0.6.8+release.autotools/src/mpt/io_read/filedata_base_seekable.hpp --- old/libopenmpt-0.6.7+release.autotools/src/mpt/io_read/filedata_base_seekable.hpp 2021-06-03 19:07:13.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/src/mpt/io_read/filedata_base_seekable.hpp 2023-01-26 22:24:43.000000000 +0100 @@ -5,8 +5,10 @@ +#include "mpt/base/alloc.hpp" #include "mpt/base/memory.hpp" #include "mpt/base/namespace.hpp" +#include "mpt/base/span.hpp" #include "mpt/io_read/filedata.hpp" #include <algorithm> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/mpt/io_write/buffer.hpp new/libopenmpt-0.6.8+release.autotools/src/mpt/io_write/buffer.hpp --- old/libopenmpt-0.6.7+release.autotools/src/mpt/io_write/buffer.hpp 2021-06-03 15:18:10.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/src/mpt/io_write/buffer.hpp 2023-01-26 22:25:16.000000000 +0100 @@ -8,6 +8,7 @@ #include "mpt/base/memory.hpp" #include "mpt/base/namespace.hpp" #include "mpt/base/integer.hpp" +#include "mpt/base/span.hpp" #include "mpt/io/base.hpp" #include <cstddef> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/mpt/parse/split.hpp new/libopenmpt-0.6.8+release.autotools/src/mpt/parse/split.hpp --- old/libopenmpt-0.6.7+release.autotools/src/mpt/parse/split.hpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libopenmpt-0.6.8+release.autotools/src/mpt/parse/split.hpp 2021-05-26 15:26:03.000000000 +0200 @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: BSL-1.0 OR BSD-3-Clause */ + +#ifndef MPT_PARSE_SPLIT_HPP +#define MPT_PARSE_SPLIT_HPP + + + +#include "mpt/base/namespace.hpp" +#include "mpt/parse/parse.hpp" +#include "mpt/string/utility.hpp" + +#include <vector> + +#include <cstddef> + + + +namespace mpt { +inline namespace MPT_INLINE_NS { + + + +template <typename T, typename Tstring> +std::vector<T> split_parse(const Tstring & str, const Tstring & sep = Tstring(1, char_constants<typename Tstring::value_type>::comma)) { + std::vector<T> vals; + std::size_t pos = 0; + while (str.find(sep, pos) != std::string::npos) { + vals.push_back(mpt::ConvertStringTo<T>(str.substr(pos, str.find(sep, pos) - pos))); + pos = str.find(sep, pos) + sep.length(); + } + if (!vals.empty() || (str.substr(pos).length() > 0)) { + vals.push_back(mpt::ConvertStringTo<T>(str.substr(pos))); + } + return vals; +} + + + +} // namespace MPT_INLINE_NS +} // namespace mpt + + + +#endif // MPT_PARSE_SPLIT_HPP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/mpt/string_transcode/tests/tests_string_transcode.hpp new/libopenmpt-0.6.8+release.autotools/src/mpt/string_transcode/tests/tests_string_transcode.hpp --- old/libopenmpt-0.6.7+release.autotools/src/mpt/string_transcode/tests/tests_string_transcode.hpp 2022-04-15 16:59:22.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/src/mpt/string_transcode/tests/tests_string_transcode.hpp 2023-01-09 14:38:00.000000000 +0100 @@ -7,11 +7,14 @@ #include "mpt/base/detect.hpp" #include "mpt/base/namespace.hpp" +#include "mpt/string/types.hpp" #include "mpt/string_transcode/macros.hpp" #include "mpt/string_transcode/transcode.hpp" #include "mpt/test/test.hpp" #include "mpt/test/test_macros.hpp" +#include <string> + namespace mpt { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/openmpt/soundbase/DitherModPlug.hpp new/libopenmpt-0.6.8+release.autotools/src/openmpt/soundbase/DitherModPlug.hpp --- old/libopenmpt-0.6.7+release.autotools/src/openmpt/soundbase/DitherModPlug.hpp 2021-05-24 22:48:24.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/src/openmpt/soundbase/DitherModPlug.hpp 2023-01-26 22:29:40.000000000 +0100 @@ -35,11 +35,11 @@ { if constexpr(targetbits == 0) { - MPT_UNREFERENCED_PARAMETER(rng); + MPT_UNUSED(rng); return sample; } else if constexpr(targetbits + MixSampleIntTraits::mix_headroom_bits + 1 >= 32) { - MPT_UNREFERENCED_PARAMETER(rng); + MPT_UNUSED(rng); return sample; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libopenmpt-0.6.7+release.autotools/src/openmpt/soundbase/DitherSimple.hpp new/libopenmpt-0.6.8+release.autotools/src/openmpt/soundbase/DitherSimple.hpp --- old/libopenmpt-0.6.7+release.autotools/src/openmpt/soundbase/DitherSimple.hpp 2021-05-25 07:48:39.000000000 +0200 +++ new/libopenmpt-0.6.8+release.autotools/src/openmpt/soundbase/DitherSimple.hpp 2023-01-26 22:29:40.000000000 +0100 @@ -38,7 +38,7 @@ { if constexpr(targetbits == 0) { - MPT_UNREFERENCED_PARAMETER(prng); + MPT_UNUSED(prng); return sample; } else { @@ -46,7 +46,7 @@ constexpr int rshift = (32 - targetbits) - MixSampleIntTraits::mix_headroom_bits; if constexpr(rshift <= 1) { - MPT_UNREFERENCED_PARAMETER(prng); + MPT_UNUSED(prng); // nothing to dither return sample; } else