Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(189) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-03-09 11:55:14
|
Author: sagamusix Date: Sat Mar 9 12:55:02 2024 New Revision: 20309 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20309 Log: Merged revision(s) 20305 from trunk/OpenMPT: [Fix] IT: Allow Zxx to be used again in IT files made with older MPT versions (https://bugs.openmpt.org/view.php?id=1753). ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/soundlib/Load_it.cpp Modified: branches/OpenMPT-1.28/soundlib/Load_it.cpp ============================================================================== --- branches/OpenMPT-1.28/soundlib/Load_it.cpp Sat Mar 9 12:54:42 2024 (r20308) +++ branches/OpenMPT-1.28/soundlib/Load_it.cpp Sat Mar 9 12:55:02 2024 (r20309) @@ -697,14 +697,6 @@ m_MidiCfg.Sanitize(); } - // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. - // Example: denonde.it by Mystical - // Note: Do not compare against cwtv value, as IT 2.14 and 2.15 may write lower values there (see spx-visionsofthepast.it). - if(fileHeader.cmwt < 0x0214) - { - m_MidiCfg.ClearZxxMacros(); - } - // Read pattern names: "PNAM" FileReader patNames; if(file.ReadMagic("PNAM")) @@ -1250,6 +1242,17 @@ } } + // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. + // Example: denonde.it by Mystical + // Note: Only checking the cwtv "made with" version is not enough: spx-visionsofthepast.it has the strange combination of cwtv=2.00, cmwt=2.16 + // Hence to be sure, we check that both values are below 2.14. + // Note that all ModPlug Tracker alpha versions do not support filters yet. Earlier alphas identify as cwtv=2.02, cmwt=2.00, but later alpha versions identify as IT 2.14. + // Apart from that, there's an unknown XM conversion tool declaring a lower comaptible version, which naturally also does not support filters, so it's okay that it is caught here. + if((fileHeader.cwtv < 0x0214 && fileHeader.cmwt < 0x0214) || (m_dwLastSavedWithVersion && m_dwLastSavedWithVersion <= MPT_V("1.00.00.A6"))) + { + m_MidiCfg.ClearZxxMacros(); + } + if(GetType() == MOD_TYPE_MPT) { // START - mpt specific: |
|
From: <sv...@op...> - 2024-03-09 11:54:58
|
Author: sagamusix Date: Sat Mar 9 12:54:42 2024 New Revision: 20308 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20308 Log: Merged revision(s) 20305 from trunk/OpenMPT: [Fix] IT: Allow Zxx to be used again in IT files made with older MPT versions (https://bugs.openmpt.org/view.php?id=1753). ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/soundlib/Load_it.cpp Modified: branches/OpenMPT-1.29/soundlib/Load_it.cpp ============================================================================== --- branches/OpenMPT-1.29/soundlib/Load_it.cpp Sat Mar 9 12:54:25 2024 (r20307) +++ branches/OpenMPT-1.29/soundlib/Load_it.cpp Sat Mar 9 12:54:42 2024 (r20308) @@ -706,14 +706,6 @@ m_MidiCfg.Sanitize(); } - // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. - // Example: denonde.it by Mystical - // Note: Do not compare against cwtv value, as IT 2.14 and 2.15 may write lower values there (see spx-visionsofthepast.it). - if(fileHeader.cmwt < 0x0214) - { - m_MidiCfg.ClearZxxMacros(); - } - // Read pattern names: "PNAM" FileReader patNames; if(file.ReadMagic("PNAM")) @@ -1265,6 +1257,17 @@ } } + // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. + // Example: denonde.it by Mystical + // Note: Only checking the cwtv "made with" version is not enough: spx-visionsofthepast.it has the strange combination of cwtv=2.00, cmwt=2.16 + // Hence to be sure, we check that both values are below 2.14. + // Note that all ModPlug Tracker alpha versions do not support filters yet. Earlier alphas identify as cwtv=2.02, cmwt=2.00, but later alpha versions identify as IT 2.14. + // Apart from that, there's an unknown XM conversion tool declaring a lower comaptible version, which naturally also does not support filters, so it's okay that it is caught here. + if((fileHeader.cwtv < 0x0214 && fileHeader.cmwt < 0x0214) || (m_dwLastSavedWithVersion && m_dwLastSavedWithVersion <= MPT_V("1.00.00.A6"))) + { + m_MidiCfg.ClearZxxMacros(); + } + if(GetType() == MOD_TYPE_MPT) { // START - mpt specific: |
|
From: <sv...@op...> - 2024-03-09 11:54:39
|
Author: sagamusix Date: Sat Mar 9 12:54:25 2024 New Revision: 20307 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20307 Log: Merged revision(s) 20305 from trunk/OpenMPT: [Fix] IT: Allow Zxx to be used again in IT files made with older MPT versions (https://bugs.openmpt.org/view.php?id=1753). ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/Load_it.cpp Modified: branches/OpenMPT-1.30/soundlib/Load_it.cpp ============================================================================== --- branches/OpenMPT-1.30/soundlib/Load_it.cpp Sat Mar 9 12:53:54 2024 (r20306) +++ branches/OpenMPT-1.30/soundlib/Load_it.cpp Sat Mar 9 12:54:25 2024 (r20307) @@ -702,14 +702,6 @@ m_MidiCfg.Sanitize(); } - // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. - // Example: denonde.it by Mystical - // Note: Do not compare against cwtv value, as IT 2.14 and 2.15 may write lower values there (see spx-visionsofthepast.it). - if(fileHeader.cmwt < 0x0214) - { - m_MidiCfg.ClearZxxMacros(); - } - // Read pattern names: "PNAM" FileReader patNames; if(file.ReadMagic("PNAM")) @@ -1277,6 +1269,17 @@ } } + // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. + // Example: denonde.it by Mystical + // Note: Only checking the cwtv "made with" version is not enough: spx-visionsofthepast.it has the strange combination of cwtv=2.00, cmwt=2.16 + // Hence to be sure, we check that both values are below 2.14. + // Note that all ModPlug Tracker alpha versions do not support filters yet. Earlier alphas identify as cwtv=2.02, cmwt=2.00, but later alpha versions identify as IT 2.14. + // Apart from that, there's an unknown XM conversion tool declaring a lower comaptible version, which naturally also does not support filters, so it's okay that it is caught here. + if((fileHeader.cwtv < 0x0214 && fileHeader.cmwt < 0x0214) || (m_dwLastSavedWithVersion && m_dwLastSavedWithVersion <= MPT_V("1.00.00.A6"))) + { + m_MidiCfg.ClearZxxMacros(); + } + if(GetType() == MOD_TYPE_MPT) { // START - mpt specific: |
|
From: <sv...@op...> - 2024-03-09 11:54:12
|
Author: sagamusix Date: Sat Mar 9 12:53:54 2024 New Revision: 20306 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20306 Log: Merged revision(s) 20305 from trunk/OpenMPT: [Fix] IT: Allow Zxx to be used again in IT files made with older MPT versions (https://bugs.openmpt.org/view.php?id=1753). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_it.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_it.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_it.cpp Sat Mar 9 00:01:46 2024 (r20305) +++ branches/OpenMPT-1.31/soundlib/Load_it.cpp Sat Mar 9 12:53:54 2024 (r20306) @@ -687,14 +687,6 @@ m_MidiCfg.Sanitize(); } - // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. - // Example: denonde.it by Mystical - // Note: Do not compare against cwtv value, as IT 2.14 and 2.15 may write lower values there (see spx-visionsofthepast.it). - if(fileHeader.cmwt < 0x0214) - { - m_MidiCfg.ClearZxxMacros(); - } - bool hasModPlugExtensions = false; // Read pattern names: "PNAM" @@ -1330,6 +1322,17 @@ if(anyADPCM) madeWithTracker += U_(" (ADPCM packed)"); + // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. + // Example: denonde.it by Mystical + // Note: Only checking the cwtv "made with" version is not enough: spx-visionsofthepast.it has the strange combination of cwtv=2.00, cmwt=2.16 + // Hence to be sure, we check that both values are below 2.14. + // Note that all ModPlug Tracker alpha versions do not support filters yet. Earlier alphas identify as cwtv=2.02, cmwt=2.00, but later alpha versions identify as IT 2.14. + // Apart from that, there's an unknown XM conversion tool declaring a lower comaptible version, which naturally also does not support filters, so it's okay that it is caught here. + if((fileHeader.cwtv < 0x0214 && fileHeader.cmwt < 0x0214) || (m_dwLastSavedWithVersion && m_dwLastSavedWithVersion <= MPT_V("1.00.00.A6"))) + { + m_MidiCfg.ClearZxxMacros(); + } + if(GetType() == MOD_TYPE_MPT) { // START - mpt specific: |
|
From: <sv...@op...> - 2024-03-08 23:01:57
|
Author: sagamusix Date: Sat Mar 9 00:01:46 2024 New Revision: 20305 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20305 Log: [Fix] IT: Allow Zxx to be used again in IT files made with older MPT versions (https://bugs.openmpt.org/view.php?id=1753). Modified: trunk/OpenMPT/soundlib/Load_it.cpp Modified: trunk/OpenMPT/soundlib/Load_it.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_it.cpp Fri Mar 8 22:44:55 2024 (r20304) +++ trunk/OpenMPT/soundlib/Load_it.cpp Sat Mar 9 00:01:46 2024 (r20305) @@ -687,14 +687,6 @@ m_MidiCfg.Sanitize(); } - // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. - // Example: denonde.it by Mystical - // Note: Do not compare against cwtv value, as IT 2.14 and 2.15 may write lower values there (see spx-visionsofthepast.it). - if(fileHeader.cmwt < 0x0214) - { - m_MidiCfg.ClearZxxMacros(); - } - bool hasModPlugExtensions = false; // Read pattern names: "PNAM" @@ -1330,6 +1322,17 @@ if(anyADPCM) madeWithTracker += U_(" (ADPCM packed)"); + // Ignore MIDI data. Fixes some files like denonde.it that were made with old versions of Impulse Tracker (which didn't support Zxx filters) and have Zxx effects in the patterns. + // Example: denonde.it by Mystical + // Note: Only checking the cwtv "made with" version is not enough: spx-visionsofthepast.it has the strange combination of cwtv=2.00, cmwt=2.16 + // Hence to be sure, we check that both values are below 2.14. + // Note that all ModPlug Tracker alpha versions do not support filters yet. Earlier alphas identify as cwtv=2.02, cmwt=2.00, but later alpha versions identify as IT 2.14. + // Apart from that, there's an unknown XM conversion tool declaring a lower comaptible version, which naturally also does not support filters, so it's okay that it is caught here. + if((fileHeader.cwtv < 0x0214 && fileHeader.cmwt < 0x0214) || (m_dwLastSavedWithVersion && m_dwLastSavedWithVersion <= MPT_V("1.00.00.A6"))) + { + m_MidiCfg.ClearZxxMacros(); + } + if(GetType() == MOD_TYPE_MPT) { // START - mpt specific: |
|
From: <sv...@op...> - 2024-03-08 21:45:07
|
Author: sagamusix Date: Fri Mar 8 22:44:55 2024 New Revision: 20304 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20304 Log: Merged revision(s) 20302 from trunk/OpenMPT: [Fix] Chorus/Flanger: Avoid occasional popping once the mix rate exceeds ~136.5 kHz (https://bugs.openmpt.org/view.php?id=1752). [Mod] Chorus/Flanger: Rename Triangle waveshape to Square, because that's what those convoluted computations really end up doing in the end. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/plugins/dmo/Chorus.cpp branches/OpenMPT-1.30/soundlib/plugins/dmo/Chorus.h branches/OpenMPT-1.30/soundlib/plugins/dmo/Flanger.cpp branches/OpenMPT-1.30/soundlib/plugins/dmo/Flanger.h Modified: branches/OpenMPT-1.30/soundlib/plugins/dmo/Chorus.cpp ============================================================================== --- branches/OpenMPT-1.30/soundlib/plugins/dmo/Chorus.cpp Fri Mar 8 22:43:23 2024 (r20303) +++ branches/OpenMPT-1.30/soundlib/plugins/dmo/Chorus.cpp Fri Mar 8 22:44:55 2024 (r20304) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Chorus.h" +#include "../../Sndfile.h" #include "mpt/base/numbers.hpp" #endif // !NO_PLUGINS @@ -52,7 +52,7 @@ if(fpOffset < 0) fpOffset += m_bufSize * 4096; MPT_ASSERT(fpOffset >= 0); - return (fpOffset / 4096) % m_bufSize; + return (m_bufPos + (fpOffset / 4096)) % m_bufSize; } @@ -64,7 +64,7 @@ const float *in[2] = { m_mixBuffer.GetInputBuffer(0), m_mixBuffer.GetInputBuffer(1) }; float *out[2] = { m_mixBuffer.GetOutputBuffer(0), m_mixBuffer.GetOutputBuffer(1) }; - const bool isTriangle = IsTriangle(); + const bool isSquare = IsSquare(); const float feedback = Feedback() / 100.0f; const float wetDryMix = WetDryMix(); const uint32 phase = Phase(); @@ -75,8 +75,8 @@ const float leftIn = *(in[0])++; const float rightIn = *(in[1])++; - const int32 readOffset = GetBufferIntOffset(m_bufPos + m_delayOffset); - const int32 writeOffset = GetBufferIntOffset(m_bufPos); + const int32 readOffset = GetBufferIntOffset(m_delayOffset); + const int32 writeOffset = m_bufPos; if(m_isFlanger) { m_DryBufferL[m_dryWritePos] = leftIn; @@ -90,7 +90,7 @@ float waveMin; float waveMax; - if(isTriangle) + if(isSquare) { m_waveShapeMin += m_waveShapeVal; m_waveShapeMax += m_waveShapeVal; @@ -111,14 +111,14 @@ const float leftDelayIn = m_isFlanger ? m_DryBufferL[(m_dryWritePos + 2) % 3] : leftIn; const float rightDelayIn = m_isFlanger ? m_DryBufferR[(m_dryWritePos + 2) % 3] : rightIn; - float left1 = m_bufferL[GetBufferIntOffset(m_bufPos + m_delayL)]; - float left2 = m_bufferL[GetBufferIntOffset(m_bufPos + m_delayL + 4096)]; + float left1 = m_bufferL[GetBufferIntOffset(m_delayL)]; + float left2 = m_bufferL[GetBufferIntOffset(m_delayL + 4096)]; float fracPos = (m_delayL & 0xFFF) * (1.0f / 4096.0f); float leftOut = (left2 - left1) * fracPos + left1; *(out[0])++ = leftDelayIn + (leftOut - leftDelayIn) * wetDryMix; - float right1 = bufferR[GetBufferIntOffset(m_bufPos + m_delayR)]; - float right2 = bufferR[GetBufferIntOffset(m_bufPos + m_delayR + 4096)]; + float right1 = bufferR[GetBufferIntOffset(m_delayR)]; + float right2 = bufferR[GetBufferIntOffset(m_delayR + 4096)]; fracPos = (m_delayR & 0xFFF) * (1.0f / 4096.0f); float rightOut = (right2 - right1) * fracPos + right1; *(out[1])++ = rightDelayIn + (rightOut - rightDelayIn) * wetDryMix; @@ -132,8 +132,8 @@ m_delayR = m_delayOffset + (phase < 2 ? -1 : 1) * static_cast<int32>(((phase % 2u) ? waveMax : waveMin) * m_depthDelay); if(m_bufPos <= 0) - m_bufPos += m_bufSize * 4096; - m_bufPos -= 4096; + m_bufPos += m_bufSize; + m_bufPos--; } ProcessMixOps(pOutL, pOutR, m_mixBuffer.GetOutputBuffer(0), m_mixBuffer.GetOutputBuffer(1), numFrames); @@ -180,9 +180,8 @@ m_isResumed = true; m_waveShapeMin = 0.0f; - m_waveShapeMax = IsTriangle() ? 0.5f : 1.0f; + m_waveShapeMax = IsSquare() ? 0.5f : 1.0f; m_delayL = m_delayR = m_delayOffset; - m_bufPos = 0; m_dryWritePos = 0; } @@ -190,6 +189,7 @@ void Chorus::PositionChanged() { m_bufSize = Util::muldiv(m_SndFile.GetSampleRate(), 3840, 1000); + m_bufPos = 0; try { m_bufferL.assign(m_bufSize, 0.0f); @@ -256,7 +256,7 @@ value = FrequencyInHertz(); break; case kChorusWaveShape: - return (value < 1) ? _T("Triangle") : _T("Sine"); + return (value < 1) ? _T("Square") : _T("Sine"); break; case kChorusPhase: switch(Phase()) @@ -290,7 +290,7 @@ m_delayOffset = mpt::saturate_round<int32>(4096.0f * (delaySamples + 2.0f)); m_frequency = FrequencyInHertz(); const float frequencySamples = m_frequency / sampleRate; - if(IsTriangle()) + if(IsSquare()) m_waveShapeVal = frequencySamples * 2.0f; else m_waveShapeVal = std::sin(frequencySamples * mpt::numbers::pi_v<float>) * 2.0f; Modified: branches/OpenMPT-1.30/soundlib/plugins/dmo/Chorus.h ============================================================================== --- branches/OpenMPT-1.30/soundlib/plugins/dmo/Chorus.h Fri Mar 8 22:43:23 2024 (r20303) +++ branches/OpenMPT-1.30/soundlib/plugins/dmo/Chorus.h Fri Mar 8 22:44:55 2024 (r20304) @@ -106,7 +106,7 @@ int32 GetBufferIntOffset(int32 fpOffset) const; virtual float WetDryMix() const { return m_param[kChorusWetDryMix]; } - virtual bool IsTriangle() const { return m_param[kChorusWaveShape] < 1; } + virtual bool IsSquare() const { return m_param[kChorusWaveShape] < 1; } virtual float Depth() const { return m_param[kChorusDepth]; } virtual float Feedback() const { return -99.0f + m_param[kChorusFeedback] * 198.0f; } virtual float Delay() const { return m_param[kChorusDelay] * 20.0f; } Modified: branches/OpenMPT-1.30/soundlib/plugins/dmo/Flanger.cpp ============================================================================== --- branches/OpenMPT-1.30/soundlib/plugins/dmo/Flanger.cpp Fri Mar 8 22:43:23 2024 (r20303) +++ branches/OpenMPT-1.30/soundlib/plugins/dmo/Flanger.cpp Fri Mar 8 22:44:55 2024 (r20304) @@ -11,9 +11,9 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Flanger.h" -#endif // !NO_PLUGINS +#include "../../Sndfile.h" +#endif // !NO_PLUGINS OPENMPT_NAMESPACE_BEGIN Modified: branches/OpenMPT-1.30/soundlib/plugins/dmo/Flanger.h ============================================================================== --- branches/OpenMPT-1.30/soundlib/plugins/dmo/Flanger.h Fri Mar 8 22:43:23 2024 (r20303) +++ branches/OpenMPT-1.30/soundlib/plugins/dmo/Flanger.h Fri Mar 8 22:44:55 2024 (r20304) @@ -58,7 +58,7 @@ protected: float WetDryMix() const override { return m_param[kFlangerWetDryMix]; } - bool IsTriangle() const override { return m_param[kFlangerWaveShape] < 1; } + bool IsSquare() const override { return m_param[kFlangerWaveShape] < 1; } float Depth() const override { return m_param[kFlangerDepth]; } float Feedback() const override { return -99.0f + m_param[kFlangerFeedback] * 198.0f; } float Delay() const override { return m_param[kFlangerDelay] * 4.0f; } |
|
From: <sv...@op...> - 2024-03-08 21:43:38
|
Author: sagamusix Date: Fri Mar 8 22:43:23 2024 New Revision: 20303 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20303 Log: Merged revision(s) 20302 from trunk/OpenMPT: [Fix] Chorus/Flanger: Avoid occasional popping once the mix rate exceeds ~136.5 kHz (https://bugs.openmpt.org/view.php?id=1752). [Mod] Chorus/Flanger: Rename Triangle waveshape to Square, because that's what those convoluted computations really end up doing in the end. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/plugins/dmo/Chorus.cpp branches/OpenMPT-1.31/soundlib/plugins/dmo/Chorus.h branches/OpenMPT-1.31/soundlib/plugins/dmo/Flanger.cpp branches/OpenMPT-1.31/soundlib/plugins/dmo/Flanger.h Modified: branches/OpenMPT-1.31/soundlib/plugins/dmo/Chorus.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/plugins/dmo/Chorus.cpp Fri Mar 8 22:42:42 2024 (r20302) +++ branches/OpenMPT-1.31/soundlib/plugins/dmo/Chorus.cpp Fri Mar 8 22:43:23 2024 (r20303) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Chorus.h" +#include "../../Sndfile.h" #include "mpt/base/numbers.hpp" #endif // !NO_PLUGINS @@ -51,7 +51,7 @@ if(fpOffset < 0) fpOffset += m_bufSize * 4096; MPT_ASSERT(fpOffset >= 0); - return (fpOffset / 4096) % m_bufSize; + return (m_bufPos + (fpOffset / 4096)) % m_bufSize; } @@ -63,7 +63,7 @@ const float *in[2] = { m_mixBuffer.GetInputBuffer(0), m_mixBuffer.GetInputBuffer(1) }; float *out[2] = { m_mixBuffer.GetOutputBuffer(0), m_mixBuffer.GetOutputBuffer(1) }; - const bool isTriangle = IsTriangle(); + const bool isSquare = IsSquare(); const float feedback = Feedback() / 100.0f; const float wetDryMix = WetDryMix(); const uint32 phase = Phase(); @@ -74,8 +74,8 @@ const float leftIn = *(in[0])++; const float rightIn = *(in[1])++; - const int32 readOffset = GetBufferIntOffset(m_bufPos + m_delayOffset); - const int32 writeOffset = GetBufferIntOffset(m_bufPos); + const int32 readOffset = GetBufferIntOffset(m_delayOffset); + const int32 writeOffset = m_bufPos; if(m_isFlanger) { m_DryBufferL[m_dryWritePos] = leftIn; @@ -89,7 +89,7 @@ float waveMin; float waveMax; - if(isTriangle) + if(isSquare) { m_waveShapeMin += m_waveShapeVal; m_waveShapeMax += m_waveShapeVal; @@ -110,14 +110,14 @@ const float leftDelayIn = m_isFlanger ? m_DryBufferL[(m_dryWritePos + 2) % 3] : leftIn; const float rightDelayIn = m_isFlanger ? m_DryBufferR[(m_dryWritePos + 2) % 3] : rightIn; - float left1 = m_bufferL[GetBufferIntOffset(m_bufPos + m_delayL)]; - float left2 = m_bufferL[GetBufferIntOffset(m_bufPos + m_delayL + 4096)]; + float left1 = m_bufferL[GetBufferIntOffset(m_delayL)]; + float left2 = m_bufferL[GetBufferIntOffset(m_delayL + 4096)]; float fracPos = static_cast<float>(m_delayL & 0xFFF) * (1.0f / 4096.0f); float leftOut = (left2 - left1) * fracPos + left1; *(out[0])++ = leftDelayIn + (leftOut - leftDelayIn) * wetDryMix; - float right1 = bufferR[GetBufferIntOffset(m_bufPos + m_delayR)]; - float right2 = bufferR[GetBufferIntOffset(m_bufPos + m_delayR + 4096)]; + float right1 = bufferR[GetBufferIntOffset(m_delayR)]; + float right2 = bufferR[GetBufferIntOffset(m_delayR + 4096)]; fracPos = static_cast<float>(m_delayR & 0xFFF) * (1.0f / 4096.0f); float rightOut = (right2 - right1) * fracPos + right1; *(out[1])++ = rightDelayIn + (rightOut - rightDelayIn) * wetDryMix; @@ -131,8 +131,8 @@ m_delayR = m_delayOffset + (phase < 2 ? -1 : 1) * static_cast<int32>(((phase % 2u) ? waveMax : waveMin) * m_depthDelay); if(m_bufPos <= 0) - m_bufPos += m_bufSize * 4096; - m_bufPos -= 4096; + m_bufPos += m_bufSize; + m_bufPos--; } ProcessMixOps(pOutL, pOutR, m_mixBuffer.GetOutputBuffer(0), m_mixBuffer.GetOutputBuffer(1), numFrames); @@ -179,9 +179,8 @@ m_isResumed = true; m_waveShapeMin = 0.0f; - m_waveShapeMax = IsTriangle() ? 0.5f : 1.0f; + m_waveShapeMax = IsSquare() ? 0.5f : 1.0f; m_delayL = m_delayR = m_delayOffset; - m_bufPos = 0; m_dryWritePos = 0; } @@ -189,6 +188,7 @@ void Chorus::PositionChanged() { m_bufSize = Util::muldiv(m_SndFile.GetSampleRate(), 3840, 1000); + m_bufPos = 0; try { m_bufferL.assign(m_bufSize, 0.0f); @@ -255,7 +255,7 @@ value = FrequencyInHertz(); break; case kChorusWaveShape: - return (value < 1) ? _T("Triangle") : _T("Sine"); + return (value < 1) ? _T("Square") : _T("Sine"); break; case kChorusPhase: switch(Phase()) @@ -289,7 +289,7 @@ m_delayOffset = mpt::saturate_round<int32>(4096.0f * (delaySamples + 2.0f)); m_frequency = FrequencyInHertz(); const float frequencySamples = m_frequency / sampleRate; - if(IsTriangle()) + if(IsSquare()) m_waveShapeVal = frequencySamples * 2.0f; else m_waveShapeVal = std::sin(frequencySamples * mpt::numbers::pi_v<float>) * 2.0f; Modified: branches/OpenMPT-1.31/soundlib/plugins/dmo/Chorus.h ============================================================================== --- branches/OpenMPT-1.31/soundlib/plugins/dmo/Chorus.h Fri Mar 8 22:42:42 2024 (r20302) +++ branches/OpenMPT-1.31/soundlib/plugins/dmo/Chorus.h Fri Mar 8 22:43:23 2024 (r20303) @@ -105,7 +105,7 @@ int32 GetBufferIntOffset(int32 fpOffset) const; virtual float WetDryMix() const { return m_param[kChorusWetDryMix]; } - virtual bool IsTriangle() const { return m_param[kChorusWaveShape] < 1; } + virtual bool IsSquare() const { return m_param[kChorusWaveShape] < 1; } virtual float Depth() const { return m_param[kChorusDepth]; } virtual float Feedback() const { return -99.0f + m_param[kChorusFeedback] * 198.0f; } virtual float Delay() const { return m_param[kChorusDelay] * 20.0f; } Modified: branches/OpenMPT-1.31/soundlib/plugins/dmo/Flanger.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/plugins/dmo/Flanger.cpp Fri Mar 8 22:42:42 2024 (r20302) +++ branches/OpenMPT-1.31/soundlib/plugins/dmo/Flanger.cpp Fri Mar 8 22:43:23 2024 (r20303) @@ -11,9 +11,9 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Flanger.h" -#endif // !NO_PLUGINS +#include "../../Sndfile.h" +#endif // !NO_PLUGINS OPENMPT_NAMESPACE_BEGIN Modified: branches/OpenMPT-1.31/soundlib/plugins/dmo/Flanger.h ============================================================================== --- branches/OpenMPT-1.31/soundlib/plugins/dmo/Flanger.h Fri Mar 8 22:42:42 2024 (r20302) +++ branches/OpenMPT-1.31/soundlib/plugins/dmo/Flanger.h Fri Mar 8 22:43:23 2024 (r20303) @@ -57,7 +57,7 @@ protected: float WetDryMix() const override { return m_param[kFlangerWetDryMix]; } - bool IsTriangle() const override { return m_param[kFlangerWaveShape] < 1; } + bool IsSquare() const override { return m_param[kFlangerWaveShape] < 1; } float Depth() const override { return m_param[kFlangerDepth]; } float Feedback() const override { return -99.0f + m_param[kFlangerFeedback] * 198.0f; } float Delay() const override { return m_param[kFlangerDelay] * 4.0f; } |
|
From: <sv...@op...> - 2024-03-08 21:42:58
|
Author: sagamusix Date: Fri Mar 8 22:42:42 2024 New Revision: 20302 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20302 Log: [Fix] Chorus/Flanger: Avoid occasional popping once the mix rate exceeds ~136.5 kHz (https://bugs.openmpt.org/view.php?id=1752). [Mod] Chorus/Flanger: Rename Triangle waveshape to Square, because that's what those convoluted computations really end up doing in the end. Modified: trunk/OpenMPT/soundlib/plugins/dmo/Chorus.cpp trunk/OpenMPT/soundlib/plugins/dmo/Chorus.h trunk/OpenMPT/soundlib/plugins/dmo/Flanger.cpp trunk/OpenMPT/soundlib/plugins/dmo/Flanger.h Modified: trunk/OpenMPT/soundlib/plugins/dmo/Chorus.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Chorus.cpp Fri Mar 8 22:06:14 2024 (r20301) +++ trunk/OpenMPT/soundlib/plugins/dmo/Chorus.cpp Fri Mar 8 22:42:42 2024 (r20302) @@ -11,8 +11,8 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Chorus.h" +#include "../../Sndfile.h" #include "mpt/base/numbers.hpp" #endif // !NO_PLUGINS @@ -51,7 +51,7 @@ if(fpOffset < 0) fpOffset += m_bufSize * 4096; MPT_ASSERT(fpOffset >= 0); - return (fpOffset / 4096) % m_bufSize; + return (m_bufPos + (fpOffset / 4096)) % m_bufSize; } @@ -63,7 +63,7 @@ const float *in[2] = { m_mixBuffer.GetInputBuffer(0), m_mixBuffer.GetInputBuffer(1) }; float *out[2] = { m_mixBuffer.GetOutputBuffer(0), m_mixBuffer.GetOutputBuffer(1) }; - const bool isTriangle = IsTriangle(); + const bool isSquare = IsSquare(); const float feedback = Feedback() / 100.0f; const float wetDryMix = WetDryMix(); const uint32 phase = Phase(); @@ -74,8 +74,8 @@ const float leftIn = *(in[0])++; const float rightIn = *(in[1])++; - const int32 readOffset = GetBufferIntOffset(m_bufPos + m_delayOffset); - const int32 writeOffset = GetBufferIntOffset(m_bufPos); + const int32 readOffset = GetBufferIntOffset(m_delayOffset); + const int32 writeOffset = m_bufPos; if(m_isFlanger) { m_DryBufferL[m_dryWritePos] = leftIn; @@ -89,7 +89,7 @@ float waveMin; float waveMax; - if(isTriangle) + if(isSquare) { m_waveShapeMin += m_waveShapeVal; m_waveShapeMax += m_waveShapeVal; @@ -110,14 +110,14 @@ const float leftDelayIn = m_isFlanger ? m_DryBufferL[(m_dryWritePos + 2) % 3] : leftIn; const float rightDelayIn = m_isFlanger ? m_DryBufferR[(m_dryWritePos + 2) % 3] : rightIn; - float left1 = m_bufferL[GetBufferIntOffset(m_bufPos + m_delayL)]; - float left2 = m_bufferL[GetBufferIntOffset(m_bufPos + m_delayL + 4096)]; + float left1 = m_bufferL[GetBufferIntOffset(m_delayL)]; + float left2 = m_bufferL[GetBufferIntOffset(m_delayL + 4096)]; float fracPos = static_cast<float>(m_delayL & 0xFFF) * (1.0f / 4096.0f); float leftOut = (left2 - left1) * fracPos + left1; *(out[0])++ = leftDelayIn + (leftOut - leftDelayIn) * wetDryMix; - float right1 = bufferR[GetBufferIntOffset(m_bufPos + m_delayR)]; - float right2 = bufferR[GetBufferIntOffset(m_bufPos + m_delayR + 4096)]; + float right1 = bufferR[GetBufferIntOffset(m_delayR)]; + float right2 = bufferR[GetBufferIntOffset(m_delayR + 4096)]; fracPos = static_cast<float>(m_delayR & 0xFFF) * (1.0f / 4096.0f); float rightOut = (right2 - right1) * fracPos + right1; *(out[1])++ = rightDelayIn + (rightOut - rightDelayIn) * wetDryMix; @@ -131,8 +131,8 @@ m_delayR = m_delayOffset + (phase < 2 ? -1 : 1) * static_cast<int32>(((phase % 2u) ? waveMax : waveMin) * m_depthDelay); if(m_bufPos <= 0) - m_bufPos += m_bufSize * 4096; - m_bufPos -= 4096; + m_bufPos += m_bufSize; + m_bufPos--; } ProcessMixOps(pOutL, pOutR, m_mixBuffer.GetOutputBuffer(0), m_mixBuffer.GetOutputBuffer(1), numFrames); @@ -179,9 +179,8 @@ m_isResumed = true; m_waveShapeMin = 0.0f; - m_waveShapeMax = IsTriangle() ? 0.5f : 1.0f; + m_waveShapeMax = IsSquare() ? 0.5f : 1.0f; m_delayL = m_delayR = m_delayOffset; - m_bufPos = 0; m_dryWritePos = 0; } @@ -189,6 +188,7 @@ void Chorus::PositionChanged() { m_bufSize = Util::muldiv(m_SndFile.GetSampleRate(), 3840, 1000); + m_bufPos = 0; try { m_bufferL.assign(m_bufSize, 0.0f); @@ -255,7 +255,7 @@ value = FrequencyInHertz(); break; case kChorusWaveShape: - return (value < 1) ? _T("Triangle") : _T("Sine"); + return (value < 1) ? _T("Square") : _T("Sine"); break; case kChorusPhase: switch(Phase()) @@ -289,7 +289,7 @@ m_delayOffset = mpt::saturate_round<int32>(4096.0f * (delaySamples + 2.0f)); m_frequency = FrequencyInHertz(); const float frequencySamples = m_frequency / sampleRate; - if(IsTriangle()) + if(IsSquare()) m_waveShapeVal = frequencySamples * 2.0f; else m_waveShapeVal = std::sin(frequencySamples * mpt::numbers::pi_v<float>) * 2.0f; Modified: trunk/OpenMPT/soundlib/plugins/dmo/Chorus.h ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Chorus.h Fri Mar 8 22:06:14 2024 (r20301) +++ trunk/OpenMPT/soundlib/plugins/dmo/Chorus.h Fri Mar 8 22:42:42 2024 (r20302) @@ -105,7 +105,7 @@ int32 GetBufferIntOffset(int32 fpOffset) const; virtual float WetDryMix() const { return m_param[kChorusWetDryMix]; } - virtual bool IsTriangle() const { return m_param[kChorusWaveShape] < 1; } + virtual bool IsSquare() const { return m_param[kChorusWaveShape] < 1; } virtual float Depth() const { return m_param[kChorusDepth]; } virtual float Feedback() const { return -99.0f + m_param[kChorusFeedback] * 198.0f; } virtual float Delay() const { return m_param[kChorusDelay] * 20.0f; } Modified: trunk/OpenMPT/soundlib/plugins/dmo/Flanger.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Flanger.cpp Fri Mar 8 22:06:14 2024 (r20301) +++ trunk/OpenMPT/soundlib/plugins/dmo/Flanger.cpp Fri Mar 8 22:42:42 2024 (r20302) @@ -11,9 +11,9 @@ #include "stdafx.h" #ifndef NO_PLUGINS -#include "../../Sndfile.h" #include "Flanger.h" -#endif // !NO_PLUGINS +#include "../../Sndfile.h" +#endif // !NO_PLUGINS OPENMPT_NAMESPACE_BEGIN Modified: trunk/OpenMPT/soundlib/plugins/dmo/Flanger.h ============================================================================== --- trunk/OpenMPT/soundlib/plugins/dmo/Flanger.h Fri Mar 8 22:06:14 2024 (r20301) +++ trunk/OpenMPT/soundlib/plugins/dmo/Flanger.h Fri Mar 8 22:42:42 2024 (r20302) @@ -57,7 +57,7 @@ protected: float WetDryMix() const override { return m_param[kFlangerWetDryMix]; } - bool IsTriangle() const override { return m_param[kFlangerWaveShape] < 1; } + bool IsSquare() const override { return m_param[kFlangerWaveShape] < 1; } float Depth() const override { return m_param[kFlangerDepth]; } float Feedback() const override { return -99.0f + m_param[kFlangerFeedback] * 198.0f; } float Delay() const override { return m_param[kFlangerDelay] * 4.0f; } |
|
From: <sv...@op...> - 2024-03-08 21:06:25
|
Author: manx Date: Fri Mar 8 22:06:14 2024 New Revision: 20301 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20301 Log: Merged revision(s) 20300 from branches/OpenMPT-1.29: Merged revision(s) 20299 from branches/OpenMPT-1.30: [Reg] build: CI: Cirrus: Remove all tasks except for FreeBSD 13 and macOS 13 to reduce monthly free compute limit use. ........ ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/.cirrus.yml Modified: branches/OpenMPT-1.28/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.28/.cirrus.yml Fri Mar 8 22:05:30 2024 (r20300) +++ branches/OpenMPT-1.28/.cirrus.yml Fri Mar 8 22:06:14 2024 (r20301) @@ -7,41 +7,9 @@ test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-13-3-minimal - freebsd_instance: - image_family: freebsd-13-3 - 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 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check - -task: name: macos13-xcode14 macos_instance: image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3.1 install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 check - -task: - name: macos12-xcode14 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:14 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 check - -task: - name: macos12-xcode13 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 check - -task: - name: macos12-xcode13-legacy - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-08 21:05:43
|
Author: manx Date: Fri Mar 8 22:05:30 2024 New Revision: 20300 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20300 Log: Merged revision(s) 20299 from branches/OpenMPT-1.30: [Reg] build: CI: Cirrus: Remove all tasks except for FreeBSD 13 and macOS 13 to reduce monthly free compute limit use. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/.cirrus.yml Modified: branches/OpenMPT-1.29/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.29/.cirrus.yml Fri Mar 8 22:04:43 2024 (r20299) +++ branches/OpenMPT-1.29/.cirrus.yml Fri Mar 8 22:05:30 2024 (r20300) @@ -7,41 +7,9 @@ test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-13-3-minimal - freebsd_instance: - image_family: freebsd-13-3 - 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 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check - -task: name: macos13-xcode14 macos_instance: image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3.1 install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 check - -task: - name: macos12-xcode14 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:14 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 check - -task: - name: macos12-xcode13 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 NO_PULSEAUDIO=1 check - -task: - name: macos12-xcode13-legacy - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-08 21:04:54
|
Author: manx Date: Fri Mar 8 22:04:43 2024 New Revision: 20299 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20299 Log: [Reg] build: CI: Cirrus: Remove all tasks except for FreeBSD 13 and macOS 13 to reduce monthly free compute limit use. Modified: branches/OpenMPT-1.30/.cirrus.yml Modified: branches/OpenMPT-1.30/.cirrus.yml ============================================================================== --- branches/OpenMPT-1.30/.cirrus.yml Fri Mar 8 22:03:46 2024 (r20298) +++ branches/OpenMPT-1.30/.cirrus.yml Fri Mar 8 22:04:43 2024 (r20299) @@ -7,41 +7,9 @@ test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-13-3-minimal - freebsd_instance: - image_family: freebsd-13-3 - 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 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check - -task: name: macos13-xcode14 macos_instance: image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3.1 install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos12-xcode14 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:14 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos12-xcode13 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos12-xcode13-legacy - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-08 21:03:56
|
Author: manx Date: Fri Mar 8 22:03:46 2024 New Revision: 20298 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20298 Log: Merged revision(s) 20297 from trunk/OpenMPT: [Reg] build: CI: Cirrus: Remove all tasks except for FreeBSD 14 and macOS 14 to reduce monthly free compute limit use. ........ 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 Fri Mar 8 22:03:18 2024 (r20297) +++ branches/OpenMPT-1.31/.cirrus.yml Fri Mar 8 22:03:46 2024 (r20298) @@ -7,73 +7,9 @@ test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-14-0-minimal - freebsd_instance: - image_family: freebsd-14-0 - 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 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check - -task: - name: freebsd-13-3 - freebsd_instance: - image_family: freebsd-13-3 - 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 - -task: - name: freebsd-13-3-minimal - freebsd_instance: - image_family: freebsd-13-3 - 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 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check - -task: name: macos14-xcode15 macos_instance: image: ghcr.io/cirruslabs/macos-sonoma-xcode:15.3 install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos13-xcode15 - macos_instance: - image: ghcr.io/cirruslabs/macos-ventura-xcode:15 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos13-xcode14 - macos_instance: - image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3.1 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos12-xcode14 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:14 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos12-xcode13 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos12-xcode13-legacy - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-08 21:03:34
|
Author: manx Date: Fri Mar 8 22:03:18 2024 New Revision: 20297 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20297 Log: [Reg] build: CI: Cirrus: Remove all tasks except for FreeBSD 14 and macOS 14 to reduce monthly free compute limit use. Modified: trunk/OpenMPT/.cirrus.yml Modified: trunk/OpenMPT/.cirrus.yml ============================================================================== --- trunk/OpenMPT/.cirrus.yml Fri Mar 8 22:01:04 2024 (r20296) +++ trunk/OpenMPT/.cirrus.yml Fri Mar 8 22:03:18 2024 (r20297) @@ -7,73 +7,9 @@ test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check task: - name: freebsd-14-0-minimal - freebsd_instance: - image_family: freebsd-14-0 - 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 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check - -task: - name: freebsd-13-3 - freebsd_instance: - image_family: freebsd-13-3 - 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 - -task: - name: freebsd-13-3-minimal - freebsd_instance: - image_family: freebsd-13-3 - 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 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check - -task: name: macos14-xcode15 macos_instance: image: ghcr.io/cirruslabs/macos-sonoma-xcode:15.3 install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos13-xcode15 - macos_instance: - image: ghcr.io/cirruslabs/macos-ventura-xcode:15 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos13-xcode14 - macos_instance: - image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3.1 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos12-xcode14 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:14 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos12-xcode13 - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 - test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check - -task: - name: macos12-xcode13-legacy - macos_instance: - image: ghcr.io/cirruslabs/macos-monterey-xcode:13 - install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - build_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 - test_script: env CFLAGS="-mmacosx-version-min=10.13 -arch x86_64" CXXFLAGS="-mmacosx-version-min=10.13 -arch x86_64" LDFLAGS="-mmacosx-version-min=10.13 -arch x86_64" make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 CONFIG= NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_STBVORBIS=0 NO_MINIMP3=0 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 OPENMPT123=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_SNDFILE=1 NO_FLAC=1 check |
|
From: <sv...@op...> - 2024-03-08 21:01:14
|
Author: manx Date: Fri Mar 8 22:01:04 2024 New Revision: 20296 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20296 Log: Merged revision(s) 20295 from trunk/OpenMPT: [Mod] build: CI: Cirrus: Update macOS 14 XCode to 15.3. ........ 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 Fri Mar 8 22:00:28 2024 (r20295) +++ branches/OpenMPT-1.31/.cirrus.yml Fri Mar 8 22:01:04 2024 (r20296) @@ -33,7 +33,7 @@ task: name: macos14-xcode15 macos_instance: - image: ghcr.io/cirruslabs/macos-sonoma-xcode:15.1 + image: ghcr.io/cirruslabs/macos-sonoma-xcode:15.3 install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check |
|
From: <sv...@op...> - 2024-03-08 21:00:44
|
Author: manx Date: Fri Mar 8 22:00:28 2024 New Revision: 20295 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20295 Log: [Mod] build: CI: Cirrus: Update macOS 14 XCode to 15.3. Modified: trunk/OpenMPT/.cirrus.yml Modified: trunk/OpenMPT/.cirrus.yml ============================================================================== --- trunk/OpenMPT/.cirrus.yml Fri Mar 8 16:38:34 2024 (r20294) +++ trunk/OpenMPT/.cirrus.yml Fri Mar 8 22:00:28 2024 (r20295) @@ -33,7 +33,7 @@ task: name: macos14-xcode15 macos_instance: - image: ghcr.io/cirruslabs/macos-sonoma-xcode:15.1 + image: ghcr.io/cirruslabs/macos-sonoma-xcode:15.3 install_script: brew update && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 build_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 test_script: make -j$(sysctl -n hw.ncpu) STRICT=1 FORCE_DEPS=1 check |
|
From: <sv...@op...> - 2024-03-08 15:38:50
|
Author: manx Date: Fri Mar 8 16:38:34 2024 New Revision: 20294 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20294 Log: Merged revision(s) 20293 from trunk/OpenMPT: [Mod] build: CI: GitHub: Disable fail-fast for matrix runners. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 16:38:10 2024 (r20293) +++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 16:38:34 2024 (r20294) @@ -8,6 +8,7 @@ build: strategy: + fail-fast: false matrix: include: - { version: '14.0', deps: sys } Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 16:38:10 2024 (r20293) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 16:38:34 2024 (r20294) @@ -8,6 +8,7 @@ build: strategy: + fail-fast: false matrix: include: - { version: '9.3', deps: sys } Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 16:38:10 2024 (r20293) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 16:38:34 2024 (r20294) @@ -8,6 +8,7 @@ build: strategy: + fail-fast: false matrix: include: - { version: '7.4', deps: sys } Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Fri Mar 8 16:38:10 2024 (r20293) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Fri Mar 8 16:38:34 2024 (r20294) @@ -8,6 +8,7 @@ jobs: build: strategy: + fail-fast: false matrix: include: - { host: macos-14, compiler: '15.2', arch: '' , target: '' , deps: sys, check: true } |
|
From: <sv...@op...> - 2024-03-08 15:38:26
|
Author: manx Date: Fri Mar 8 16:38:10 2024 New Revision: 20293 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20293 Log: [Mod] build: CI: GitHub: Disable fail-fast for matrix runners. Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 16:38:10 2024 (r20293) @@ -10,6 +10,7 @@ build: strategy: + fail-fast: false matrix: include: - { version: '14.0', deps: sys } Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 16:38:10 2024 (r20293) @@ -10,6 +10,7 @@ build: strategy: + fail-fast: false matrix: include: - { version: '9.3', deps: sys } Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 16:38:10 2024 (r20293) @@ -10,6 +10,7 @@ build: strategy: + fail-fast: false matrix: include: - { version: '7.4', deps: sys } Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Fri Mar 8 16:38:10 2024 (r20293) @@ -10,6 +10,7 @@ jobs: build: strategy: + fail-fast: false matrix: include: - { host: macos-14, compiler: '15.2', arch: '' , target: '' , deps: sys, check: true } |
|
From: <sv...@op...> - 2024-03-08 15:05:55
|
Author: manx Date: Fri Mar 8 16:05:40 2024 New Revision: 20292 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20292 Log: Merged revision(s) 20291 from trunk/OpenMPT: [Fix] build: CI: GitHub: Properly quote version numbers. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) +++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) @@ -10,12 +10,12 @@ strategy: matrix: include: - - { version: 14.0, deps: sys } - - { version: 14.0, deps: local } - - { version: 14.0, deps: small } - - { version: 13.3, deps: sys } - - { version: 13.3, deps: local } - - { version: 13.3, deps: small } + - { version: '14.0', deps: sys } + - { version: '14.0', deps: local } + - { version: '14.0', deps: small } + - { version: '13.3', deps: sys } + - { version: '13.3', deps: local } + - { version: '13.3', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) @@ -10,9 +10,9 @@ strategy: matrix: include: - - { version: 9.3, deps: sys } - - { version: 9.3, deps: local } - - { version: 9.3, deps: small } + - { version: '9.3', deps: sys } + - { version: '9.3', deps: local } + - { version: '9.3', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) @@ -10,9 +10,9 @@ strategy: matrix: include: - - { version: 7.4, deps: sys } - - { version: 7.4, deps: local } - - { version: 7.4, deps: small } + - { version: '7.4', deps: sys } + - { version: '7.4', deps: local } + - { version: '7.4', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Fri Mar 8 16:05:40 2024 (r20292) @@ -10,30 +10,30 @@ strategy: matrix: include: - - { host: macos-14, compiler: 15.2, arch: '' , target: '' , deps: sys, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: '' , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: '' , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: '' , deps: small, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: '' , deps: small, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.14, deps: local, check: false } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-13, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-13, compiler: 15.2, arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-12, compiler: 14.2, arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: small, check: true } - - { host: macos-12, compiler: 14.2, arch: i386 , target: 10.13, deps: small, check: false } + - { host: macos-14, compiler: '15.2', arch: '' , target: '' , deps: sys, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.15, deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.14, deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.14, deps: local, check: false } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-13, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-13, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: small, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: small, check: false } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}} cancel-in-progress: true |
|
From: <sv...@op...> - 2024-03-08 15:05:09
|
Author: manx Date: Fri Mar 8 16:04:54 2024 New Revision: 20291 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20291 Log: [Fix] build: CI: GitHub: Properly quote version numbers. Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 15:58:13 2024 (r20290) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) @@ -12,12 +12,12 @@ strategy: matrix: include: - - { version: 14.0, deps: sys } - - { version: 14.0, deps: local } - - { version: 14.0, deps: small } - - { version: 13.3, deps: sys } - - { version: 13.3, deps: local } - - { version: 13.3, deps: small } + - { version: '14.0', deps: sys } + - { version: '14.0', deps: local } + - { version: '14.0', deps: small } + - { version: '13.3', deps: sys } + - { version: '13.3', deps: local } + - { version: '13.3', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 15:58:13 2024 (r20290) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) @@ -12,9 +12,9 @@ strategy: matrix: include: - - { version: 9.3, deps: sys } - - { version: 9.3, deps: local } - - { version: 9.3, deps: small } + - { version: '9.3', deps: sys } + - { version: '9.3', deps: local } + - { version: '9.3', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 15:58:13 2024 (r20290) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) @@ -12,9 +12,9 @@ strategy: matrix: include: - - { version: 7.4, deps: sys } - - { version: 7.4, deps: local } - - { version: 7.4, deps: small } + - { version: '7.4', deps: sys } + - { version: '7.4', deps: local } + - { version: '7.4', deps: small } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.version}}-${{matrix.deps}} Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Fri Mar 8 15:58:13 2024 (r20290) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Fri Mar 8 16:04:54 2024 (r20291) @@ -12,30 +12,30 @@ strategy: matrix: include: - - { host: macos-14, compiler: 15.2, arch: '' , target: '' , deps: sys, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: '' , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: '' , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: '' , deps: small, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: '' , deps: small, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11 , deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.14, deps: local, check: false } - - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-13, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-13, compiler: 15.2, arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: local, check: true } - - { host: macos-12, compiler: 14.2, arch: i386 , target: 10.13, deps: local, check: false } - - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: small, check: true } - - { host: macos-12, compiler: 14.2, arch: i386 , target: 10.13, deps: small, check: false } + - { host: macos-14, compiler: '15.2', arch: '' , target: '' , deps: sys, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: '' , deps: small, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 14 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 13 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 12 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: arm64 , target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 11 , deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.15, deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.14, deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.14, deps: local, check: false } + - { host: macos-14, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-14, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-13, compiler: '15.2', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-13, compiler: '15.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: local, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: local, check: false } + - { host: macos-12, compiler: '14.2', arch: x64_64, target: 10.13, deps: small, check: true } + - { host: macos-12, compiler: '14.2', arch: i386 , target: 10.13, deps: small, check: false } concurrency: group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}} cancel-in-progress: true |
|
From: <sv...@op...> - 2024-03-08 14:58:28
|
Author: manx Date: Fri Mar 8 15:58:13 2024 New Revision: 20290 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20290 Log: Merged revision(s) 19896 from trunk/OpenMPT: [Ref] build: Makefile: Avoid patching Vorbis for DJGPP. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/Makefile branches/OpenMPT-1.31/build/make/config-djgpp.mk branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt branches/OpenMPT-1.31/include/vorbis/lib/os.h Modified: branches/OpenMPT-1.31/Makefile ============================================================================== --- branches/OpenMPT-1.31/Makefile Fri Mar 8 14:06:00 2024 (r20289) +++ branches/OpenMPT-1.31/Makefile Fri Mar 8 15:58:13 2024 (r20290) @@ -800,7 +800,10 @@ CPPFLAGS_VORBIS := -DMPT_WITH_VORBIS LDFLAGS_VORBIS := LDLIBS_VORBIS := -CPPFLAGS_VORBIS += -Iinclude/vorbis/include/ -Iinclude/vorbis/lib/ -DHAVE_ALLOCA_H +CPPFLAGS_VORBIS += -Iinclude/vorbis/include/ -Iinclude/vorbis/lib/ +ifneq ($(MPT_COMPILER_NOALLOCAH),1) +CPPFLAGS_VORBIS += -DHAVE_ALLOCA_H +endif LOCAL_VORBIS_SOURCES := LOCAL_VORBIS_SOURCES += include/vorbis/lib/analysis.c LOCAL_VORBIS_SOURCES += include/vorbis/lib/bitrate.c Modified: branches/OpenMPT-1.31/build/make/config-djgpp.mk ============================================================================== --- branches/OpenMPT-1.31/build/make/config-djgpp.mk Fri Mar 8 14:06:00 2024 (r20289) +++ branches/OpenMPT-1.31/build/make/config-djgpp.mk Fri Mar 8 15:58:13 2024 (r20290) @@ -393,6 +393,8 @@ # causes crashes on process shutdown with liballegro MPT_COMPILER_NOGCSECTIONS=1 +MPT_COMPILER_NOALLOCAH=1 + ifeq ($(OPTIMIZE_LTO),1) CXXFLAGS += -flto=auto -Wno-attributes CFLAGS += -flto=auto -Wno-attributes Modified: branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt Fri Mar 8 14:06:00 2024 (r20289) +++ branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt Fri Mar 8 15:58:13 2024 (r20290) @@ -2,7 +2,6 @@ The following changes have been made: - Obviously, unnecessary folders and files (doc, examples, m4, macos, macosx, symbian, test, vq) have been removed. -- Building for DJGPP has been fixed. - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. - All modifications have been marked with /* OpenMPT */. Modified: branches/OpenMPT-1.31/include/vorbis/lib/os.h ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/lib/os.h Fri Mar 8 14:06:00 2024 (r20289) +++ branches/OpenMPT-1.31/include/vorbis/lib/os.h Fri Mar 8 15:58:13 2024 (r20290) @@ -62,11 +62,9 @@ #endif /* _V_IFDEFJAIL_H_ */ -#if !defined(__DJGPP__) /* OpenMPT */ #ifdef HAVE_ALLOCA_H # include <alloca.h> #endif -#endif /* OpenMPT */ #ifdef USE_MEMORY_H # include <memory.h> |
|
From: <sv...@op...> - 2024-03-08 13:06:12
|
Author: manx Date: Fri Mar 8 14:06:00 2024 New Revision: 20289 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20289 Log: Merged revision(s) 20288 from trunk/OpenMPT: [Fix] build: Makefile: OpenBSD/FreeBSD/NetBSD do not have alloca.h. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/make/config-defaults.mk Modified: branches/OpenMPT-1.31/build/make/config-defaults.mk ============================================================================== --- branches/OpenMPT-1.31/build/make/config-defaults.mk Fri Mar 8 14:05:32 2024 (r20288) +++ branches/OpenMPT-1.31/build/make/config-defaults.mk Fri Mar 8 14:06:00 2024 (r20289) @@ -32,11 +32,13 @@ else ifeq ($(HOST_FLAVOUR),NETBSD) include build/make/config-gcc.mk +MPT_COMPILER_NOALLOCAH=1 NO_PORTAUDIOCPP?=1 else ifeq ($(HOST_FLAVOUR),FREEBSD) include build/make/config-clang.mk +MPT_COMPILER_NOALLOCAH=1 NO_PORTAUDIOCPP?=1 else ifeq ($(HOST_FLAVOUR),OPENBSD) @@ -44,6 +46,7 @@ NO_PORTAUDIOCPP?=1 NO_PULSEAUDIO?=1 include build/make/config-clang.mk +MPT_COMPILER_NOALLOCAH=1 else ifeq ($(HOST_FLAVOUR),HAIKU) |
|
From: <sv...@op...> - 2024-03-08 13:05:47
|
Author: manx Date: Fri Mar 8 14:05:32 2024 New Revision: 20288 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20288 Log: [Fix] build: Makefile: OpenBSD/FreeBSD/NetBSD do not have alloca.h. Modified: trunk/OpenMPT/build/make/config-defaults.mk Modified: trunk/OpenMPT/build/make/config-defaults.mk ============================================================================== --- trunk/OpenMPT/build/make/config-defaults.mk Fri Mar 8 13:55:51 2024 (r20287) +++ trunk/OpenMPT/build/make/config-defaults.mk Fri Mar 8 14:05:32 2024 (r20288) @@ -32,11 +32,13 @@ else ifeq ($(HOST_FLAVOUR),NETBSD) include build/make/config-gcc.mk +MPT_COMPILER_NOALLOCAH=1 NO_PORTAUDIOCPP?=1 else ifeq ($(HOST_FLAVOUR),FREEBSD) include build/make/config-clang.mk +MPT_COMPILER_NOALLOCAH=1 NO_PORTAUDIOCPP?=1 else ifeq ($(HOST_FLAVOUR),OPENBSD) @@ -44,6 +46,7 @@ NO_PORTAUDIOCPP?=1 NO_PULSEAUDIO?=1 include build/make/config-clang.mk +MPT_COMPILER_NOALLOCAH=1 else ifeq ($(HOST_FLAVOUR),HAIKU) |
|
From: <sv...@op...> - 2024-03-08 12:56:03
|
Author: manx Date: Fri Mar 8 13:55:51 2024 New Revision: 20287 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20287 Log: Merged revision(s) 20257, 20259 from trunk/OpenMPT: [Imp] build: Makefile: Add explicit CONFIG=macos and provide MACOSX_VERSION_MIN= and ARCH= options. ........ [Fix] build: Makefile: macOS: Assume cross-compiling when specifying ARCH=. [Fix] build: Makefile: macOS: Fix copy-paste-error. ........ Added: branches/OpenMPT-1.31/build/make/config-macos.mk - copied, changed from r20257, trunk/OpenMPT/build/make/config-macos.mk Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/make/config-defaults.mk Modified: branches/OpenMPT-1.31/build/make/config-defaults.mk ============================================================================== --- branches/OpenMPT-1.31/build/make/config-defaults.mk Fri Mar 8 13:55:03 2024 (r20286) +++ branches/OpenMPT-1.31/build/make/config-defaults.mk Fri Mar 8 13:55:51 2024 (r20287) @@ -3,13 +3,7 @@ ifeq ($(HOST_FLAVOUR),MACOSX) -NO_PULSEAUDIO?=1 -include build/make/config-clang.mk -# Mac OS X overrides -DYNLINK=0 -SHARED_SONAME=0 -MPT_COMPILER_NOSECTIONS=1 -MPT_COMPILER_NOGCSECTIONS=1 +include build/make/config-macos.mk else ifeq ($(HOST_FLAVOUR),MSYS2) Copied and modified: branches/OpenMPT-1.31/build/make/config-macos.mk (from r20257, trunk/OpenMPT/build/make/config-macos.mk) ============================================================================== --- trunk/OpenMPT/build/make/config-macos.mk Wed Mar 6 17:56:22 2024 (r20257, copy source) +++ branches/OpenMPT-1.31/build/make/config-macos.mk Fri Mar 8 13:55:51 2024 (r20287) @@ -10,7 +10,6 @@ # 10.13 .. ifeq ($(MACOSX_VERSION_MIN),) else -MPT_OS_MACOSX_OR_IOS CFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) CXXFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) LDFLAGS += -mmacosx-version-min=$(MACOSX_VERSION_MIN) @@ -19,6 +18,7 @@ # arm64/x86_64/i386 ifeq ($(ARCH),) else +IS_CROSS=1 CFLAGS += -arch $(ARCH) CXXFLAGS += -arch $(ARCH) LDFLAGS += -arch $(ARCH) |
|
From: <sv...@op...> - 2024-03-08 12:55:19
|
Author: manx Date: Fri Mar 8 13:55:03 2024 New Revision: 20286 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20286 Log: Merged revision(s) 20258 from trunk/OpenMPT: [Fix] build: Makefile: Clang: Set -Wno-unused-but-set-variable for external code. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/make/warnings-clang.mk Modified: branches/OpenMPT-1.31/build/make/warnings-clang.mk ============================================================================== --- branches/OpenMPT-1.31/build/make/warnings-clang.mk Fri Mar 8 13:50:13 2024 (r20285) +++ branches/OpenMPT-1.31/build/make/warnings-clang.mk Fri Mar 8 13:55:03 2024 (r20286) @@ -24,6 +24,7 @@ CFLAGS_SILENT += -Wno-frame-larger-than CFLAGS_SILENT += -Wno-missing-prototypes CFLAGS_SILENT += -Wno-sign-compare +CFLAGS_SILENT += -Wno-unused-but-set-variable CFLAGS_SILENT += -Wno-unused-function CFLAGS_SILENT += -Wno-unused-parameter CFLAGS_SILENT += -Wno-unused-variable |
|
From: <sv...@op...> - 2024-03-08 12:50:30
|
Author: manx Date: Fri Mar 8 13:50:13 2024 New Revision: 20285 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20285 Log: Merged revision(s) 20273 from trunk/OpenMPT: [Imp] build: CI: GitHub: CPA: FreeBSD:Update FreeBSD 13 to 13.3. ........ Added: branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.3-Makefile.yml - copied, changed from r20284, branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.2-Makefile.yml Deleted: branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.2-Makefile.yml Modified: branches/OpenMPT-1.28/ (props changed) Copied and modified: branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.3-Makefile.yml (from r20284, branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.2-Makefile.yml) ============================================================================== --- branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.2-Makefile.yml Fri Mar 8 13:49:46 2024 (r20284, copy source) +++ branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.3-Makefile.yml Fri Mar 8 13:50:13 2024 (r20285) @@ -1,4 +1,4 @@ -name: FreeBSD 13.2 Makefile +name: FreeBSD 13.3 Makefile on: push: @@ -17,64 +17,64 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9 with: architecture: x86_64 hypervisor: qemu memory: 4G operating_system: freebsd - version: '13.2' + version: '13.3' shell: bash sync_files: runner-to-vm shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9 with: architecture: x86_64 hypervisor: qemu memory: 4G operating_system: freebsd - version: '13.2' + version: '13.3' shell: bash sync_files: false shutdown_vm: false run: | sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9 with: architecture: x86_64 hypervisor: qemu memory: 4G operating_system: freebsd - version: '13.2' + version: '13.3' 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.23.0 + uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9 with: architecture: x86_64 hypervisor: qemu memory: 4G operating_system: freebsd - version: '13.2' + version: '13.3' 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.23.0 + uses: cross-platform-actions/action@c127ecaef41abd571584abbbc5eaf17364bfbbe9 with: architecture: x86_64 hypervisor: qemu memory: 4G operating_system: freebsd - version: '13.2' + version: '13.3' shell: bash sync_files: false shutdown_vm: true |
3 messages has been excluded from this view by a project administrator.
