modplug-svn-commit — OpenMPT subversion commit notifications

[OMPT-svn-commit] OpenMPT r22971 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Tue Feb 25 21:04:24 2025
New Revision: 22971
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22971

Log:
[Fix] Sample tab: Drawing sample data from right to left instead of left to right caused the drawn lines to not be interpolated properly.

Modified:
   trunk/OpenMPT/mptrack/View_smp.cpp
   trunk/OpenMPT/mptrack/View_smp.h

Modified: trunk/OpenMPT/mptrack/View_smp.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp	Mon Feb 17 16:18:00 2025	(r22970)
+++ trunk/OpenMPT/mptrack/View_smp.cpp	Tue Feb 25 21:04:24 2025	(r22971)
@@ -1676,20 +1676,19 @@
 }
 
 
-template<class T, class uT>
+template<class T>
 T CViewSample::GetSampleValueFromPoint(const ModSample &smp, const CPoint &point) const
 {
-	static_assert(sizeof(T) == sizeof(uT) && sizeof(T) <= 2);
+	static_assert(sizeof(T) < sizeof(int));
 	const int channelHeight = (m_rcClient.Height() - m_timelineHeight) / smp.GetNumChannels();
-	int yPos = point.y - m_drawChannel * channelHeight - m_timelineHeight;
+	const int yPos = point.y - m_drawChannel * channelHeight - m_timelineHeight;
 
-	int value = std::numeric_limits<T>::max() - std::numeric_limits<uT>::max() * yPos / channelHeight;
-	Limit(value, std::numeric_limits<T>::min(), std::numeric_limits<T>::max());
-	return static_cast<T>(value);
+	const int value = std::numeric_limits<T>::max() - (std::numeric_limits<T>::max() - std::numeric_limits<T>::min()) * yPos / channelHeight;
+	return mpt::saturate_cast<T>(value);
 }
 
 
-template<class T, class uT>
+template<class T>
 void CViewSample::SetInitialDrawPoint(ModSample &smp, const CPoint &point)
 {
 	if(m_rcClient.Height() >= m_timelineHeight)
@@ -1699,24 +1698,29 @@
 	Limit(m_drawChannel, 0, (int)smp.GetNumChannels() - 1);
 
 	T *data = static_cast<T *>(smp.samplev()) + m_drawChannel;
-	data[m_dwEndDrag * smp.GetNumChannels()] = GetSampleValueFromPoint<T, uT>(smp, point);
+	data[m_dwEndDrag * smp.GetNumChannels()] = GetSampleValueFromPoint<T>(smp, point);
 }
 
 
-template<class T, class uT>
+template<class T>
 void CViewSample::SetSampleData(ModSample &smp, const CPoint &point, const SmpLength old)
 {
-	T *data = static_cast<T *>(smp.samplev()) + m_drawChannel + old * smp.GetNumChannels();
-	const int oldvalue = *data;
-	const int value = GetSampleValueFromPoint<T, uT>(smp, point);
-	const int inc = (m_dwEndDrag > old ? 1 : -1);
-	const int ptrInc = inc * smp.GetNumChannels();
+	SmpLength x1 = old, x2 = m_dwEndDrag;
+	T *data = static_cast<T *>(smp.samplev()) + m_drawChannel + x1 * smp.GetNumChannels();
+	T v1 = *data, v2 = GetSampleValueFromPoint<T>(smp, point);
+	if(x1 > x2)
+	{
+		data -= (x1 - x2) * smp.GetNumChannels();
+		std::swap(x1, x2);
+		std::swap(v1, v2);
+	}
 
-	for(SmpLength i = old; i != m_dwEndDrag; i += inc, data += ptrInc)
+	const uint8 ptrInc = smp.GetNumChannels();
+	for(SmpLength length = x2 - x1, remain = length; remain != 0; remain--, data += ptrInc)
 	{
-		*data = static_cast<T>(static_cast<double>(oldvalue) + (value - oldvalue) * (static_cast<double>(i - old) / static_cast<double>(m_dwEndDrag - old)));
+		*data = static_cast<T>(v2 + Util::muldivr(v1 - v2, remain, length));
 	}
-	*data = static_cast<T>(value);
+	*data = v2;
 }
 
 
@@ -1966,9 +1970,9 @@
 
 				LimitMax(old, sample.nLength);
 				if(sample.GetElementarySampleSize() == 2)
-					SetSampleData<int16, uint16>(sample, point, old);
+					SetSampleData<int16>(sample, point, old);
 				else if(sample.GetElementarySampleSize() == 1)
-					SetSampleData<int8, uint8>(sample, point, old);
+					SetSampleData<int8>(sample, point, old);
 
 				sample.PrecomputeLoops(sndFile, false);
 
@@ -2067,9 +2071,9 @@
 		m_lastDrawPoint = point;
 		pModDoc->GetSampleUndo().PrepareUndo(m_nSample, sundo_replace, "Draw Sample");
 		if(sample.GetElementarySampleSize() == 2)
-			SetInitialDrawPoint<int16, uint16>(sample, point);
+			SetInitialDrawPoint<int16>(sample, point);
 		else if(sample.GetElementarySampleSize() == 1)
-			SetInitialDrawPoint<int8, uint8>(sample, point);
+			SetInitialDrawPoint<int8>(sample, point);
 
 		sndFile.GetSample(m_nSample).PrecomputeLoops(sndFile, false);
 

Modified: trunk/OpenMPT/mptrack/View_smp.h
==============================================================================
--- trunk/OpenMPT/mptrack/View_smp.h	Mon Feb 17 16:18:00 2025	(r22970)
+++ trunk/OpenMPT/mptrack/View_smp.h	Tue Feb 25 21:04:24 2025	(r22971)
@@ -131,15 +131,15 @@
 	void DoPaste(PasteMode pasteMode);
 
 	// Sets sample data on sample draw.
-	template<class T, class uT>
+	template<class T>
 	void SetSampleData(ModSample &smp, const CPoint &point, const SmpLength old);
 
 	// Sets initial draw point on sample draw.
-	template<class T, class uT>
+	template<class T>
 	void SetInitialDrawPoint(ModSample &smp, const CPoint &point);
 
 	// Returns sample value corresponding given point in the sample view.
-	template<class T, class uT>
+	template<class T>
 	T GetSampleValueFromPoint(const ModSample &smp, const CPoint &point) const;
 
 	int GetZoomLevel(SmpLength length) const;

[OMPT-svn-commit] OpenMPT r22970 - trunk/OpenMPT/src/mpt/base

[<sv...@op...>]

Author: manx
Date: Mon Feb 17 16:18:00 2025
New Revision: 22970
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22970

Log:
[Fix] mpt/base/utility.hpp: And Android Clang is again lying about its version number...

Modified:
   trunk/OpenMPT/src/mpt/base/utility.hpp

Modified: trunk/OpenMPT/src/mpt/base/utility.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/utility.hpp	Mon Feb 17 09:54:17 2025	(r22969)
+++ trunk/OpenMPT/src/mpt/base/utility.hpp	Mon Feb 17 16:18:00 2025	(r22970)
@@ -46,12 +46,12 @@
 	static_assert(std::is_function<typename std::remove_pointer<typename std::remove_cv<Tsrc>::type>::type>::value);
 	static_assert(std::is_function<typename std::remove_pointer<typename std::remove_cv<Tdst>::type>::type>::value);
 #endif
-#if MPT_CLANG_AT_LEAST(19, 0, 0)
+#if (MPT_CLANG_AT_LEAST(19, 0, 0) && !MPT_OS_ANDROID) || MPT_CLANG_AT_LEAST(20, 0, 0)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
 #endif
 	return reinterpret_cast<Tdst>(f);
-#if MPT_CLANG_AT_LEAST(19, 0, 0)
+#if (MPT_CLANG_AT_LEAST(19, 0, 0) && !MPT_OS_ANDROID) || MPT_CLANG_AT_LEAST(20, 0, 0)
 #pragma clang diagnostic pop
 #endif
 }

[OMPT-svn-commit] OpenMPT r22969 - in trunk/OpenMPT: misc mptrack pluginBridge src/mpt/base src/mpt/library

[<sv...@op...>]

Author: manx
Date: Mon Feb 17 09:54:17 2025
New Revision: 22969
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22969

Log:
[Ref] mpt/base/utility.hpp: Add mpt::function_pointer_cast<Tdst>(Tsrc).
[Fix] mpt/base/utility.hpp: Silence Clang 19 warning that warns when casting between function pointer types of different signature, which is a necessity to do when using WinAPI GetProcAddress().
[Ref] mpt/library/library.hpp: Do not cast from void* to void(*)(void) and then to the destination function pointer. Instead, do the cast directly.
[Ref] Replace all reinterpret_cast function pointer casts with mpt::function_pointer_cast.
[Ref] mptLibrary: Use mpt::library::bind() instead of mpt::library::get_address().

Modified:
   trunk/OpenMPT/misc/WriteMemoryDump.h
   trunk/OpenMPT/misc/mptLibrary.cpp
   trunk/OpenMPT/misc/mptLibrary.h
   trunk/OpenMPT/mptrack/Vstplug.cpp
   trunk/OpenMPT/pluginBridge/Bridge.cpp
   trunk/OpenMPT/src/mpt/base/utility.hpp
   trunk/OpenMPT/src/mpt/library/library.hpp

Modified: trunk/OpenMPT/misc/WriteMemoryDump.h
==============================================================================
--- trunk/OpenMPT/misc/WriteMemoryDump.h	Mon Feb 17 09:40:33 2025	(r22968)
+++ trunk/OpenMPT/misc/WriteMemoryDump.h	Mon Feb 17 09:54:17 2025	(r22969)
@@ -12,6 +12,8 @@
 
 #include "openmpt/all/BuildSettings.hpp"
 
+#include "mpt/base/utility.hpp"
+
 #if MPT_COMPILER_MSVC
 #pragma warning(push)
 #pragma warning(disable:4091) // 'typedef ': ignored on left of '' when no variable is declared
@@ -32,7 +34,7 @@
 	HMODULE hDll = ::LoadLibrary(_T("DBGHELP.DLL"));
 	if(hDll)
 	{
-		MINIDUMPWRITEDUMP pDump = (MINIDUMPWRITEDUMP)::GetProcAddress(hDll, "MiniDumpWriteDump");
+		MINIDUMPWRITEDUMP pDump = mpt::function_pointer_cast<MINIDUMPWRITEDUMP>(::GetProcAddress(hDll, "MiniDumpWriteDump"));
 		if(pDump)
 		{
 

Modified: trunk/OpenMPT/misc/mptLibrary.cpp
==============================================================================
--- trunk/OpenMPT/misc/mptLibrary.cpp	Mon Feb 17 09:40:33 2025	(r22968)
+++ trunk/OpenMPT/misc/mptLibrary.cpp	Mon Feb 17 09:54:17 2025	(r22969)
@@ -119,7 +119,9 @@
 		{
 			return nullptr;
 		}
-		return lib->get_address(symbol);
+		FuncPtr result = nullptr;
+		lib->bind(result, symbol);
+		return result;
 	}
 
 };

Modified: trunk/OpenMPT/misc/mptLibrary.h
==============================================================================
--- trunk/OpenMPT/misc/mptLibrary.h	Mon Feb 17 09:40:33 2025	(r22968)
+++ trunk/OpenMPT/misc/mptLibrary.h	Mon Feb 17 09:54:17 2025	(r22969)
@@ -12,6 +12,8 @@
 
 #include "openmpt/all/BuildSettings.hpp"
 
+#include "mpt/base/utility.hpp"
+
 
 OPENMPT_NAMESPACE_BEGIN
 
@@ -97,7 +99,7 @@
 			static_assert(std::is_function<Tfunc>::value);
 		#endif
 		const FuncPtr addr = GetProcAddress(symbol);
-		f = reinterpret_cast<Tfunc*>(addr);
+		f = mpt::function_pointer_cast<Tfunc*>(addr);
 		return (addr != nullptr);
 	}
 };

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	Mon Feb 17 09:40:33 2025	(r22968)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	Mon Feb 17 09:54:17 2025	(r22969)
@@ -219,9 +219,9 @@
 
 	if(library != nullptr && library != INVALID_HANDLE_VALUE)
 	{
-		auto pMainProc = reinterpret_cast<Vst::MainProc>(GetProcAddress(library, "VSTPluginMain"));
+		auto pMainProc = mpt::function_pointer_cast<Vst::MainProc>(GetProcAddress(library, "VSTPluginMain"));
 		if(pMainProc == nullptr)
-			pMainProc = reinterpret_cast<Vst::MainProc>(GetProcAddress(library, "main"));
+			pMainProc = mpt::function_pointer_cast<Vst::MainProc>(GetProcAddress(library, "main"));
 
 		if(pMainProc != nullptr)
 		{

Modified: trunk/OpenMPT/pluginBridge/Bridge.cpp
==============================================================================
--- trunk/OpenMPT/pluginBridge/Bridge.cpp	Mon Feb 17 09:40:33 2025	(r22968)
+++ trunk/OpenMPT/pluginBridge/Bridge.cpp	Mon Feb 17 09:54:17 2025	(r22969)
@@ -368,9 +368,9 @@
 		return;
 	}
 
-	m_mainProc = reinterpret_cast<Vst::MainProc>(GetProcAddress(m_library, "VSTPluginMain"));
+	m_mainProc = mpt::function_pointer_cast<Vst::MainProc>(GetProcAddress(m_library, "VSTPluginMain"));
 	if(m_mainProc == nullptr)
-		m_mainProc = reinterpret_cast<Vst::MainProc>(GetProcAddress(m_library, "main"));
+		m_mainProc = mpt::function_pointer_cast<Vst::MainProc>(GetProcAddress(m_library, "main"));
 
 	if(m_mainProc != nullptr)
 	{

Modified: trunk/OpenMPT/src/mpt/base/utility.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/base/utility.hpp	Mon Feb 17 09:40:33 2025	(r22968)
+++ trunk/OpenMPT/src/mpt/base/utility.hpp	Mon Feb 17 09:54:17 2025	(r22969)
@@ -5,8 +5,7 @@
 
 
 
-#include "mpt/base/detect_compiler.hpp"
-#include "mpt/base/detect_libcxx.hpp"
+#include "mpt/base/detect.hpp"
 #include "mpt/base/namespace.hpp"
 
 #if MPT_CXX_BEFORE(20) || MPT_LIBCXX_LLVM_BEFORE(13000)
@@ -36,6 +35,28 @@
 }
 
 
+
+template <typename Tdst, typename Tsrc>
+MPT_CONSTEXPRINLINE Tdst function_pointer_cast(Tsrc f) {
+#if !(MPT_OS_WINDOWS && MPT_COMPILER_GCC)
+	// MinGW64 std::is_function is always false for non __cdecl functions.
+	// Issue is similar to <https://connect.microsoft.com/VisualStudio/feedback/details/774720/stl-is-function-bug>.
+	static_assert(std::is_pointer<typename std::remove_cv<Tsrc>::type>::value);
+	static_assert(std::is_pointer<typename std::remove_cv<Tdst>::type>::value);
+	static_assert(std::is_function<typename std::remove_pointer<typename std::remove_cv<Tsrc>::type>::type>::value);
+	static_assert(std::is_function<typename std::remove_pointer<typename std::remove_cv<Tdst>::type>::type>::value);
+#endif
+#if MPT_CLANG_AT_LEAST(19, 0, 0)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
+#endif
+	return reinterpret_cast<Tdst>(f);
+#if MPT_CLANG_AT_LEAST(19, 0, 0)
+#pragma clang diagnostic pop
+#endif
+}
+
+
 
 #if MPT_CXX_AT_LEAST(20) && !MPT_LIBCXX_LLVM_BEFORE(13000)
 

Modified: trunk/OpenMPT/src/mpt/library/library.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/library/library.hpp	Mon Feb 17 09:40:33 2025	(r22968)
+++ trunk/OpenMPT/src/mpt/library/library.hpp	Mon Feb 17 09:54:17 2025	(r22969)
@@ -9,6 +9,7 @@
 #include "mpt/base/macros.hpp"
 #include "mpt/base/namespace.hpp"
 #include "mpt/base/saturate_cast.hpp"
+#include "mpt/base/utility.hpp"
 #include "mpt/detect/dl.hpp"
 #include "mpt/detect/ltdl.hpp"
 #include "mpt/fs/common_directories.hpp"
@@ -315,8 +316,8 @@
 		return library{hModule};
 	}
 
-	func_ptr get_address(const std::string & symbol) const {
-		return reinterpret_cast<func_ptr>(::GetProcAddress(m_hModule, symbol.c_str()));
+	auto get_address(const std::string & symbol) const {
+		return ::GetProcAddress(m_hModule, symbol.c_str());
 	}
 
 	~library() {
@@ -370,8 +371,8 @@
 		return library{handle};
 	}
 
-	func_ptr get_address(const std::string & symbol) const {
-		return reinterpret_cast<func_ptr>(dlsym(handle, symbol.c_str()));
+	auto get_address(const std::string & symbol) const {
+		return dlsym(handle, symbol.c_str());
 	}
 
 	~library() {
@@ -428,8 +429,8 @@
 		return library{handle};
 	}
 
-	func_ptr get_address(const std::string & symbol) const {
-		return reinterpret_cast<func_ptr>(lt_dlsym(handle, symbol.c_str()));
+	auto get_address(const std::string & symbol) const {
+		return lt_dlsym(handle, symbol.c_str());
 	}
 
 	~library() {
@@ -468,7 +469,7 @@
 		return std::nullopt;
 	}
 
-	func_ptr get_address(const std::string & symbol) const {
+	void * get_address(const std::string & symbol) const {
 		MPT_UNUSED(symbol);
 		return nullptr;
 	}
@@ -486,9 +487,13 @@
 		// Issue is similar to <https://connect.microsoft.com/VisualStudio/feedback/details/774720/stl-is-function-bug>.
 		static_assert(std::is_function<Tfunc>::value);
 #endif
-		const func_ptr addr = get_address(symbol);
-		f = reinterpret_cast<Tfunc *>(addr);
-		return (addr != nullptr);
+		auto sym_ptr = get_address(symbol);
+		if constexpr (std::is_same<decltype(sym_ptr), void>::value) {
+			f = reinterpret_cast<Tfunc *>(sym_ptr);
+		} else {
+			f = mpt::function_pointer_cast<Tfunc *>(sym_ptr);
+		}
+		return (sym_ptr != nullptr);
 	}
 };
 

[OMPT-svn-commit] OpenMPT r22968 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: manx
Date: Mon Feb 17 09:40:33 2025
New Revision: 22968
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22968

Log:
[Ref] Silence Clang warning.

Modified:
   trunk/OpenMPT/mptrack/MainFrm.cpp

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Mon Feb 17 09:10:45 2025	(r22967)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Mon Feb 17 09:40:33 2025	(r22968)
@@ -2810,7 +2810,7 @@
 CInputHandler *CMainFrame::GetInputHandler()
 {
 	if(CMainFrame *mainFrm = GetMainFrame())
-		return GetMainFrame()->m_InputHandler.get();
+		return mainFrm->m_InputHandler.get();
 	return nullptr;
 }
 

[OMPT-svn-commit] OpenMPT r22967 - in branches/OpenMPT-1.30: . src/mpt/library

[<sv...@op...>]

Author: manx
Date: Mon Feb 17 09:10:45 2025
New Revision: 22967
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22967

Log:
Merged revision(s) 22964 from trunk/OpenMPT:
[Fix] mpt/library/library.hpp: Use lt_dlsym instead of dlsym in libltdl mode.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/src/mpt/library/library.hpp

Modified: branches/OpenMPT-1.30/src/mpt/library/library.hpp
==============================================================================
--- branches/OpenMPT-1.30/src/mpt/library/library.hpp	Mon Feb 17 09:10:17 2025	(r22966)
+++ branches/OpenMPT-1.30/src/mpt/library/library.hpp	Mon Feb 17 09:10:45 2025	(r22967)
@@ -408,7 +408,7 @@
 	}
 
 	func_ptr get_address(const std::string & symbol) const {
-		return reinterpret_cast<func_ptr>(dlsym(handle, symbol.c_str()));
+		return reinterpret_cast<func_ptr>(lt_dlsym(handle, symbol.c_str()));
 	}
 
 	~library() {

[OMPT-svn-commit] OpenMPT r22966 - in branches/OpenMPT-1.31: . src/mpt/library

[<sv...@op...>]

Author: manx
Date: Mon Feb 17 09:10:17 2025
New Revision: 22966
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22966

Log:
Merged revision(s) 22964 from trunk/OpenMPT:
[Fix] mpt/library/library.hpp: Use lt_dlsym instead of dlsym in libltdl mode.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/src/mpt/library/library.hpp

Modified: branches/OpenMPT-1.31/src/mpt/library/library.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/library/library.hpp	Mon Feb 17 09:09:53 2025	(r22965)
+++ branches/OpenMPT-1.31/src/mpt/library/library.hpp	Mon Feb 17 09:10:17 2025	(r22966)
@@ -429,7 +429,7 @@
 	}
 
 	func_ptr get_address(const std::string & symbol) const {
-		return reinterpret_cast<func_ptr>(dlsym(handle, symbol.c_str()));
+		return reinterpret_cast<func_ptr>(lt_dlsym(handle, symbol.c_str()));
 	}
 
 	~library() {

[OMPT-svn-commit] OpenMPT r22965 - in branches/OpenMPT-1.31: . src/mpt/check

[<sv...@op...>]

Author: manx
Date: Mon Feb 17 09:09:53 2025
New Revision: 22965
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22965

Log:
Merged revision(s) 22963 from trunk/OpenMPT:
[Fix] mpt/check/compiler.hpp: Fix exception detection on Clang-cl and generic compilers.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/src/mpt/check/compiler.hpp

Modified: branches/OpenMPT-1.31/src/mpt/check/compiler.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/check/compiler.hpp	Mon Feb 17 09:08:45 2025	(r22964)
+++ branches/OpenMPT-1.31/src/mpt/check/compiler.hpp	Mon Feb 17 09:09:53 2025	(r22965)
@@ -47,8 +47,12 @@
 MPT_WARNING("C++ compiler has no exception support.")
 #endif
 #elif MPT_COMPILER_CLANG
-#if (!defined(__EXCEPTIONS) || (__EXCEPTIONS != 1))
+#if (!__has_feature(cxx_exceptions) && (!defined(__EXCEPTIONS) || (__EXCEPTIONS != 1)) && !defined(_CPPUNWIND))
 MPT_WARNING("C++ compiler has no exception support.")
+#else
+#if (MPT_CXX_AT_LEAST(20) && !defined(__cpp_exceptions))
+MPT_WARNING("C++ compiler has no exception support.")
+#endif
 #endif
 #endif
 #endif

[OMPT-svn-commit] OpenMPT r22964 - trunk/OpenMPT/src/mpt/library

[<sv...@op...>]

Author: manx
Date: Mon Feb 17 09:08:45 2025
New Revision: 22964
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22964

Log:
[Fix] mpt/library/library.hpp: Use lt_dlsym instead of dlsym in libltdl mode.

Modified:
   trunk/OpenMPT/src/mpt/library/library.hpp

Modified: trunk/OpenMPT/src/mpt/library/library.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/library/library.hpp	Mon Feb 17 08:36:54 2025	(r22963)
+++ trunk/OpenMPT/src/mpt/library/library.hpp	Mon Feb 17 09:08:45 2025	(r22964)
@@ -429,7 +429,7 @@
 	}
 
 	func_ptr get_address(const std::string & symbol) const {
-		return reinterpret_cast<func_ptr>(dlsym(handle, symbol.c_str()));
+		return reinterpret_cast<func_ptr>(lt_dlsym(handle, symbol.c_str()));
 	}
 
 	~library() {

[OMPT-svn-commit] OpenMPT r22963 - trunk/OpenMPT/src/mpt/check

[<sv...@op...>]

Author: manx
Date: Mon Feb 17 08:36:54 2025
New Revision: 22963
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22963

Log:
[Fix] mpt/check/compiler.hpp: Fix exception detection on Clang-cl and generic compilers.

Modified:
   trunk/OpenMPT/src/mpt/check/compiler.hpp

Modified: trunk/OpenMPT/src/mpt/check/compiler.hpp
==============================================================================
--- trunk/OpenMPT/src/mpt/check/compiler.hpp	Mon Feb 17 07:53:17 2025	(r22962)
+++ trunk/OpenMPT/src/mpt/check/compiler.hpp	Mon Feb 17 08:36:54 2025	(r22963)
@@ -47,8 +47,12 @@
 MPT_WARNING("C++ compiler has no exception support.")
 #endif
 #elif MPT_COMPILER_CLANG
-#if (!defined(__EXCEPTIONS) || (__EXCEPTIONS != 1))
+#if (!__has_feature(cxx_exceptions) && (!defined(__EXCEPTIONS) || (__EXCEPTIONS != 1)) && !defined(_CPPUNWIND))
 MPT_WARNING("C++ compiler has no exception support.")
+#else
+#if (MPT_CXX_AT_LEAST(20) && !defined(__cpp_exceptions))
+MPT_WARNING("C++ compiler has no exception support.")
+#endif
 #endif
 #endif
 #endif

[OMPT-svn-commit] OpenMPT r22962 - trunk/OpenMPT/build/make

[<sv...@op...>]

Author: manx
Date: Mon Feb 17 07:53:17 2025
New Revision: 22962
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22962

Log:
[Fix] build: Makefile: Clang: Sanitizers: Link without -shared-libsan and without --no-undefined. Debian fails to provide the shared sanitizer runtime in PATH.

Modified:
   trunk/OpenMPT/build/make/config-clang.mk

Modified: trunk/OpenMPT/build/make/config-clang.mk
==============================================================================
--- trunk/OpenMPT/build/make/config-clang.mk	Sun Feb 16 13:54:09 2025	(r22961)
+++ trunk/OpenMPT/build/make/config-clang.mk	Mon Feb 17 07:53:17 2025	(r22962)
@@ -59,13 +59,15 @@
 endif
 
 ifeq ($(CHECKED_ADDRESS),1)
-CXXFLAGS += -fsanitize=address -shared-libsan
-CFLAGS   += -fsanitize=address -shared-libsan
+CXXFLAGS += -fsanitize=address
+CFLAGS   += -fsanitize=address
+NO_NO_UNDEFINED_LINKER_FLAG=1
 endif
 
 ifeq ($(CHECKED_UNDEFINED),1)
-CXXFLAGS += -fsanitize=undefined -shared-libsan
-CFLAGS   += -fsanitize=undefined -shared-libsan
+CXXFLAGS += -fsanitize=undefined
+CFLAGS   += -fsanitize=undefined
+NO_NO_UNDEFINED_LINKER_FLAG=1
 endif
 
 include build/make/warnings-clang.mk

[OMPT-svn-commit] OpenMPT r22961 - in trunk/OpenMPT: . build/autotools

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:54:09 2025
New Revision: 22961
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22961

Log:
[Imp] build: Makefile: Detect OpenBSD <= 7.5 for old tar compatibility.
[Imp] build: Autotools: Detect OpenBSD <= 7.5 for old tar compatibility.

Modified:
   trunk/OpenMPT/Makefile
   trunk/OpenMPT/build/autotools/autoconfiscate.sh

Modified: trunk/OpenMPT/Makefile
==============================================================================
--- trunk/OpenMPT/Makefile	Sun Feb 16 13:34:11 2025	(r22960)
+++ trunk/OpenMPT/Makefile	Sun Feb 16 13:54:09 2025	(r22961)
@@ -378,8 +378,36 @@
 ifeq ($(findstring Darwin,$(UNAME_S)),Darwin)
 TAR_C=tar -c --format pax -f
 else ifeq ($(findstring OpenBSD,$(UNAME_S)),OpenBSD)
-#TAR_C=tar -c -F pax -N
+UNAME_R:=$(shell uname -r)
+ifeq ($(findstring 1.,$(UNAME_R)),1.)
 TAR_C=tar -c -N
+else ifeq ($(findstring 1.,$(UNAME_R)),1.)
+TAR_C=tar -c -N
+else ifeq ($(findstring 2.,$(UNAME_R)),2.)
+TAR_C=tar -c -N
+else ifeq ($(findstring 3.,$(UNAME_R)),3.)
+TAR_C=tar -c -N
+else ifeq ($(findstring 4.,$(UNAME_R)),4.)
+TAR_C=tar -c -N
+else ifeq ($(findstring 5.,$(UNAME_R)),5.)
+TAR_C=tar -c -N
+else ifeq ($(findstring 6.,$(UNAME_R)),6.)
+TAR_C=tar -c -N
+else ifeq ($(findstring 7.0,$(UNAME_R)),7.0)
+TAR_C=tar -c -N
+else ifeq ($(findstring 7.1,$(UNAME_R)),7.1)
+TAR_C=tar -c -N
+else ifeq ($(findstring 7.2,$(UNAME_R)),7.2)
+TAR_C=tar -c -N
+else ifeq ($(findstring 7.3,$(UNAME_R)),7.3)
+TAR_C=tar -c -N
+else ifeq ($(findstring 7.4,$(UNAME_R)),7.4)
+TAR_C=tar -c -N
+else ifeq ($(findstring 7.5,$(UNAME_R)),7.5)
+TAR_C=tar -c -N
+else
+TAR_C=tar -c -F pax -N
+endif
 else ifeq ($(findstring BSD,$(UNAME_S)),BSD)
 TAR_C=tar -c --format pax --numeric-owner --uname "" --gname "" --uid 0 --gid 0
 else

Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh
==============================================================================
--- trunk/OpenMPT/build/autotools/autoconfiscate.sh	Sun Feb 16 13:34:11 2025	(r22960)
+++ trunk/OpenMPT/build/autotools/autoconfiscate.sh	Sun Feb 16 13:54:09 2025	(r22961)
@@ -20,6 +20,42 @@
  OpenBSD)
   TAR_FLAVOUR=bsd
   MAKE=gmake
+  UNAME_R="$(uname -r)"
+  case $UNAME_R in
+   1.*)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   2.*)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   3.*)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   4.*)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   5.*)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   6.*)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   7.1)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   7.2)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   7.3)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   7.4)
+    TAR_FLAVOUR=oldbsd
+    ;;
+   7.5)
+    TAR_FLAVOUR=oldbsd
+    ;;
+  esac
   ;;
  *BSD*)
   TAR_FLAVOUR=libarchive
@@ -296,10 +332,12 @@
  mac)
   tar -cv --format pax -f ../dist-autotools.tar libopenmpt
   ;;
- bsd)
-  #tar -cv -F pax -N -f ../dist-autotools.tar libopenmpt
+ oldbsd)
   tar -cv -N -f ../dist-autotools.tar libopenmpt
   ;;
+ bsd)
+  tar -cv -F pax -N -f ../dist-autotools.tar libopenmpt
+  ;;
  libarchive)
   tar -cv --format pax --numeric-owner --uname "" --gname "" --uid 0 --gid 0 -f ../dist-autotools.tar libopenmpt
   ;;

[OMPT-svn-commit] OpenMPT r22960 - branches/OpenMPT-1.31

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:34:11 2025
New Revision: 22960
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22960

Log:
Merged revision(s) 22959 from trunk/OpenMPT:
[Fix] build: CI: Cirrus-CI: FreeBSD: Update to 14.2.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.cirrus.yml

Modified: branches/OpenMPT-1.31/.cirrus.yml
==============================================================================
--- branches/OpenMPT-1.31/.cirrus.yml	Sun Feb 16 13:33:44 2025	(r22959)
+++ branches/OpenMPT-1.31/.cirrus.yml	Sun Feb 16 13:34:11 2025	(r22960)
@@ -1,7 +1,7 @@
 task:
-    name: freebsd-14-1
+    name: freebsd-14-2
     freebsd_instance:
-        image_family: freebsd-14-1
+        image_family: freebsd-14-2
     install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
     test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check

[OMPT-svn-commit] OpenMPT r22959 - trunk/OpenMPT

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:33:44 2025
New Revision: 22959
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22959

Log:
[Fix] build: CI: Cirrus-CI: FreeBSD: Update to 14.2.

Modified:
   trunk/OpenMPT/.cirrus.yml

Modified: trunk/OpenMPT/.cirrus.yml
==============================================================================
--- trunk/OpenMPT/.cirrus.yml	Sun Feb 16 13:27:29 2025	(r22958)
+++ trunk/OpenMPT/.cirrus.yml	Sun Feb 16 13:33:44 2025	(r22959)
@@ -1,7 +1,7 @@
 task:
-    name: freebsd-14-1
+    name: freebsd-14-2
     freebsd_instance:
-        image_family: freebsd-14-1
+        image_family: freebsd-14-2
     install_script: pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool doxygen help2man mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     build_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
     test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check

[OMPT-svn-commit] OpenMPT r22958 - branches/OpenMPT-1.30/.github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:27:29 2025
New Revision: 22958
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22958

Log:
[Fix] build: CI: GitHub: CPA: OpenBSD: Fix 7.6 dependencies.

Modified:
   branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml

Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml	Sun Feb 16 13:13:07 2025	(r22957)
+++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml	Sun Feb 16 13:27:29 2025	(r22958)
@@ -39,8 +39,8 @@
         shutdown_vm: false
         run: |
           sudo pkg_add -u
-          sudo pkg_add -I ghostscript-10.03.1
-          sudo pkg_add -I autoconf-2.71 automake-1.16.5
+          sudo pkg_add -I ghostscript-10.03.1p2
+          sudo pkg_add -I autoconf-2.72p0 automake-1.16.5
           sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
     - name: Build
       uses: cross-platform-actions/action@v0.27.0

[OMPT-svn-commit] OpenMPT r22957 - branches/OpenMPT-1.28/.github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:13:07 2025
New Revision: 22957
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22957

Log:
[Imp] build: CI: GitHub: Ubuntu: Add 22.04.

Added:
   branches/OpenMPT-1.28/.github/workflows/Ubuntu2204-Makefile.yml

Added: branches/OpenMPT-1.28/.github/workflows/Ubuntu2204-Makefile.yml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/OpenMPT-1.28/.github/workflows/Ubuntu2204-Makefile.yml	Sun Feb 16 13:13:07 2025	(r22957)
@@ -0,0 +1,25 @@
+name: Ubuntu 22.04 Makefile
+
+on:
+  push:
+    branches: [ OpenMPT-1.28 ]
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: install dependencies
+      run: sudo apt-get update && sudo apt-get install -y subversion libxml-xpath-perl git mawk zip unzip p7zip xz-utils make binutils gcc g++ clang tcc pkg-config help2man doxygen autoconf autoconf-archive automake libtool ccache zlib1g-dev libmpg123-dev libogg-dev libvorbis-dev portaudio19-dev libpulse-dev libflac-dev libsndfile1-dev libltdl-dev
+    - name: setup parallel make
+      run: echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
+    - name: make
+      run: make STRICT=1
+    - name: make check
+      run: make STRICT=1 check

[OMPT-svn-commit] OpenMPT r22956 - branches/OpenMPT-1.28/.github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:12:46 2025
New Revision: 22956
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22956

Log:
[Reg] build: CI: GitHub: Ubuntu: Remove 20.04 because of annoying GitHub deprecation practice.

Deleted:
   branches/OpenMPT-1.28/.github/workflows/Ubuntu2004-Makefile.yml

[OMPT-svn-commit] OpenMPT r22955 - branches/OpenMPT-1.29/.github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:11:11 2025
New Revision: 22955
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22955

Log:
[Reg] build: CI: GitHub: Ubuntu: Remove 20.04 because of annoying GitHub deprecation practice.

Deleted:
   branches/OpenMPT-1.29/.github/workflows/Ubuntu2004-Makefile.yml

[OMPT-svn-commit] OpenMPT r22954 - branches/OpenMPT-1.30/.github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:10:51 2025
New Revision: 22954
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22954

Log:
[Reg] build: CI: GitHub: Ubuntu: Remove 20.04 because of annoying GitHub deprecation practice.

Deleted:
   branches/OpenMPT-1.30/.github/workflows/Ubuntu2004-Makefile.yml

[OMPT-svn-commit] OpenMPT r22953 - in branches/OpenMPT-1.31: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:10:33 2025
New Revision: 22953
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22953

Log:
Merged revision(s) 22952 from trunk/OpenMPT:
[Reg] build: CI: GitHub: Ubuntu: Remove 20.04 because of annoying GitHub deprecation practice.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/Ubuntu-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/Ubuntu-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/Ubuntu-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/Ubuntu-Autotools.yml	Sun Feb 16 13:10:09 2025	(r22952)
+++ branches/OpenMPT-1.31/.github/workflows/Ubuntu-Autotools.yml	Sun Feb 16 13:10:33 2025	(r22953)
@@ -13,7 +13,6 @@
         include:
           - { version: '24.04' }
           - { version: '22.04' }
-          - { version: '20.04' }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools

Modified: branches/OpenMPT-1.31/.github/workflows/Ubuntu-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/Ubuntu-Makefile.yml	Sun Feb 16 13:10:09 2025	(r22952)
+++ branches/OpenMPT-1.31/.github/workflows/Ubuntu-Makefile.yml	Sun Feb 16 13:10:33 2025	(r22953)
@@ -17,9 +17,6 @@
           - { version: '22.04', deps: sys   }
           - { version: '22.04', deps: local }
           - { version: '22.04', deps: small }
-          - { version: '20.04', deps: sys   }
-          - { version: '20.04', deps: local }
-          - { version: '20.04', deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}

[OMPT-svn-commit] OpenMPT r22952 - trunk/OpenMPT/.github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:10:09 2025
New Revision: 22952
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22952

Log:
[Reg] build: CI: GitHub: Ubuntu: Remove 20.04 because of annoying GitHub deprecation practice.

Modified:
   trunk/OpenMPT/.github/workflows/Ubuntu-Autotools.yml
   trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/Ubuntu-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/Ubuntu-Autotools.yml	Sun Feb 16 13:08:44 2025	(r22951)
+++ trunk/OpenMPT/.github/workflows/Ubuntu-Autotools.yml	Sun Feb 16 13:10:09 2025	(r22952)
@@ -15,7 +15,6 @@
         include:
           - { version: '24.04' }
           - { version: '22.04' }
-          - { version: '20.04' }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-autotools

Modified: trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml	Sun Feb 16 13:08:44 2025	(r22951)
+++ trunk/OpenMPT/.github/workflows/Ubuntu-Makefile.yml	Sun Feb 16 13:10:09 2025	(r22952)
@@ -19,9 +19,6 @@
           - { version: '22.04', deps: sys   }
           - { version: '22.04', deps: local }
           - { version: '22.04', deps: small }
-          - { version: '20.04', deps: sys   }
-          - { version: '20.04', deps: local }
-          - { version: '20.04', deps: small }
 
     concurrency:
       group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}}

[OMPT-svn-commit] OpenMPT r22951 - branches/OpenMPT-1.30/.github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 13:08:44 2025
New Revision: 22951
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22951

Log:
[Imp] build: CI: GitHub: CPA: OpenBSD: Add 7.6.

Added:
   branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml

Added: branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml	Sun Feb 16 13:08:44 2025	(r22951)
@@ -0,0 +1,79 @@
+name: OpenBSD 7.6 Makefile
+
+on:
+  push:
+    branches: [ OpenMPT-1.30 ]
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+
+    runs-on: ubuntu-24.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Startup VM
+      uses: cross-platform-actions/action@v0.27.0
+      with:
+        architecture: x86_64
+        memory: 4G
+        operating_system: openbsd
+        version: '7.6'
+        shell: bash
+        sync_files: runner-to-vm
+        shutdown_vm: false
+        run: true
+    - name: Install dependencies
+      uses: cross-platform-actions/action@v0.27.0
+      with:
+        architecture: x86_64
+        memory: 4G
+        operating_system: openbsd
+        version: '7.6'
+        shell: bash
+        sync_files: false
+        shutdown_vm: false
+        run: |
+          sudo pkg_add -u
+          sudo pkg_add -I ghostscript-10.03.1
+          sudo pkg_add -I autoconf-2.71 automake-1.16.5
+          sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2
+    - name: Build
+      uses: cross-platform-actions/action@v0.27.0
+      with:
+        architecture: x86_64
+        memory: 4G
+        operating_system: openbsd
+        version: '7.6'
+        shell: bash
+        sync_files: false
+        shutdown_vm: false
+        run: |
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
+    - name: Test
+      uses: cross-platform-actions/action@v0.27.0
+      with:
+        architecture: x86_64
+        memory: 4G
+        operating_system: openbsd
+        version: '7.6'
+        shell: bash
+        sync_files: false
+        shutdown_vm: false
+        run: |
+          gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
+    - name: Shutdown VM
+      uses: cross-platform-actions/action@v0.27.0
+      with:
+        architecture: x86_64
+        memory: 4G
+        operating_system: openbsd
+        version: '7.6'
+        shell: bash
+        sync_files: false
+        shutdown_vm: true
+        run: true

[OMPT-svn-commit] OpenMPT r22950 - in trunk/OpenMPT: . build/autotools

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 11:57:56 2025
New Revision: 22950
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22950

Log:
[Fix] build: Makefile: Do not use PAX tar format for compatibility with OpenBSD 7.5 and 7.4.
[Fix] build: Autotools: Do not use PAX tar format for compatibility with OpenBSD 7.5 and 7.4.

Modified:
   trunk/OpenMPT/Makefile
   trunk/OpenMPT/build/autotools/autoconfiscate.sh

Modified: trunk/OpenMPT/Makefile
==============================================================================
--- trunk/OpenMPT/Makefile	Sun Feb 16 09:56:45 2025	(r22949)
+++ trunk/OpenMPT/Makefile	Sun Feb 16 11:57:56 2025	(r22950)
@@ -378,7 +378,8 @@
 ifeq ($(findstring Darwin,$(UNAME_S)),Darwin)
 TAR_C=tar -c --format pax -f
 else ifeq ($(findstring OpenBSD,$(UNAME_S)),OpenBSD)
-TAR_C=tar -c -F pax -N
+#TAR_C=tar -c -F pax -N
+TAR_C=tar -c -N
 else ifeq ($(findstring BSD,$(UNAME_S)),BSD)
 TAR_C=tar -c --format pax --numeric-owner --uname "" --gname "" --uid 0 --gid 0
 else

Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh
==============================================================================
--- trunk/OpenMPT/build/autotools/autoconfiscate.sh	Sun Feb 16 09:56:45 2025	(r22949)
+++ trunk/OpenMPT/build/autotools/autoconfiscate.sh	Sun Feb 16 11:57:56 2025	(r22950)
@@ -297,7 +297,8 @@
   tar -cv --format pax -f ../dist-autotools.tar libopenmpt
   ;;
  bsd)
-  tar -cv -F pax -N -f ../dist-autotools.tar libopenmpt
+  #tar -cv -F pax -N -f ../dist-autotools.tar libopenmpt
+  tar -cv -N -f ../dist-autotools.tar libopenmpt
   ;;
  libarchive)
   tar -cv --format pax --numeric-owner --uname "" --gname "" --uid 0 --gid 0 -f ../dist-autotools.tar libopenmpt

[OMPT-svn-commit] OpenMPT r22949 - in branches/OpenMPT-1.31: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 09:56:45 2025
New Revision: 22949
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22949

Log:
Merged revision(s) 22948 from trunk/OpenMPT:
[Fix] build: CI: GitHub: CPA: NetBSD: Fix subversion install.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml	Sun Feb 16 09:56:23 2025	(r22948)
+++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml	Sun Feb 16 09:56:45 2025	(r22949)
@@ -47,7 +47,7 @@
         run: |
           sudo pkgin -y update
           sudo pkgin -y full-upgrade
-          sudo pkgin -y install subversion-base p5-subversion py-subversion ruby-subversion git p5-XML-XPath mawk
+          sudo pkgin -y install subversion-base git p5-XML-XPath mawk
           sudo pkgin -y install gmake pkgconf
           sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2
           sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl

Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml	Sun Feb 16 09:56:23 2025	(r22948)
+++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml	Sun Feb 16 09:56:45 2025	(r22949)
@@ -51,7 +51,7 @@
         run: |
           sudo pkgin -y update
           sudo pkgin -y full-upgrade
-          sudo pkgin -y install subversion-base p5-subversion py-subversion ruby-subversion git p5-XML-XPath mawk
+          sudo pkgin -y install subversion-base git p5-XML-XPath mawk
           sudo pkgin -y install gmake pkgconf
           sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2
           sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl

[OMPT-svn-commit] OpenMPT r22948 - trunk/OpenMPT/.github/workflows

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 09:56:23 2025
New Revision: 22948
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22948

Log:
[Fix] build: CI: GitHub: CPA: NetBSD: Fix subversion install.

Modified:
   trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml
   trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml	Sun Feb 16 09:03:06 2025	(r22947)
+++ trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml	Sun Feb 16 09:56:23 2025	(r22948)
@@ -49,7 +49,7 @@
         run: |
           sudo pkgin -y update
           sudo pkgin -y full-upgrade
-          sudo pkgin -y install subversion-base p5-subversion py-subversion ruby-subversion git p5-XML-XPath mawk
+          sudo pkgin -y install subversion-base git p5-XML-XPath mawk
           sudo pkgin -y install gmake pkgconf
           sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2
           sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl

Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml	Sun Feb 16 09:03:06 2025	(r22947)
+++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml	Sun Feb 16 09:56:23 2025	(r22948)
@@ -53,7 +53,7 @@
         run: |
           sudo pkgin -y update
           sudo pkgin -y full-upgrade
-          sudo pkgin -y install subversion-base p5-subversion py-subversion ruby-subversion git p5-XML-XPath mawk
+          sudo pkgin -y install subversion-base git p5-XML-XPath mawk
           sudo pkgin -y install gmake pkgconf
           sudo pkgin -y install mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio SDL2
           sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl

[OMPT-svn-commit] OpenMPT r22947 - trunk/OpenMPT/build/make

[<sv...@op...>]

Author: manx
Date: Sun Feb 16 09:03:06 2025
New Revision: 22947
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22947

Log:
[Fix] build: Makefile: Clang: Build with sanitizer shared library instead of static library.

Modified:
   trunk/OpenMPT/build/make/config-clang.mk

Modified: trunk/OpenMPT/build/make/config-clang.mk
==============================================================================
--- trunk/OpenMPT/build/make/config-clang.mk	Sun Feb 16 08:42:21 2025	(r22946)
+++ trunk/OpenMPT/build/make/config-clang.mk	Sun Feb 16 09:03:06 2025	(r22947)
@@ -59,13 +59,13 @@
 endif
 
 ifeq ($(CHECKED_ADDRESS),1)
-CXXFLAGS += -fsanitize=address
-CFLAGS   += -fsanitize=address
+CXXFLAGS += -fsanitize=address -shared-libsan
+CFLAGS   += -fsanitize=address -shared-libsan
 endif
 
 ifeq ($(CHECKED_UNDEFINED),1)
-CXXFLAGS += -fsanitize=undefined
-CFLAGS   += -fsanitize=undefined
+CXXFLAGS += -fsanitize=undefined -shared-libsan
+CFLAGS   += -fsanitize=undefined -shared-libsan
 endif
 
 include build/make/warnings-clang.mk