diff --git a/ports/monkeys-audio/fix-C2471.patch b/ports/monkeys-audio/fix-C2471.patch deleted file mode 100644 index 879d3372d5843f..00000000000000 --- a/ports/monkeys-audio/fix-C2471.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/Projects/VS2019/MACDll/MACDll.vcxproj b/Source/Projects/VS2019/MACDll/MACDll.vcxproj -index 4dfa820..7ac4bce 100644 ---- a/Source/Projects/VS2019/MACDll/MACDll.vcxproj -+++ b/Source/Projects/VS2019/MACDll/MACDll.vcxproj -@@ -108,7 +108,7 @@ - false - Use - Level3 -- EditAndContinue -+ OldStyle - - - _DEBUG;%(PreprocessorDefinitions) diff --git a/ports/monkeys-audio/portfile.cmake b/ports/monkeys-audio/portfile.cmake index fee3f5b1c617ac..1375818ed1b102 100644 --- a/ports/monkeys-audio/portfile.cmake +++ b/ports/monkeys-audio/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -set(MA_VERSION 570) +set(MA_VERSION 904) vcpkg_download_distfile(ARCHIVE - URLS "https://monkeysaudio.com/files/MAC_SDK_${MA_VERSION}.zip" - "https://web.archive.org/web/20201229182615if_/https://monkeysaudio.com/files/MAC_SDK_570.zip" - FILENAME "MAC_SDK_${MA_VERSION}.zip" - SHA512 d3b5a10574dde1ea90578959378b87f8a8c94b3cc7198bc51b86f7128d66117d706c191d56a699dce0c2a53b7722e0893cb614f96f9ad725a266a871da587fd4 + URLS "https://monkeysaudio.com/files/MAC_${MA_VERSION}_SDK.zip" + "https://web.archive.org/web/20210129190227if_/https://monkeysaudio.com/files/MAC_SDK_607.zip" + FILENAME "MAC_${MA_VERSION}_SDK.zip" + SHA512 c42c9bae6690a28a69137445c84d53ad7acbd242c2cfe20f329fda46b56812c60de68874301d99cf72ade3bced90fc5aaedacb6fdbca241d4bf4806f6e238219 ) vcpkg_extract_source_archive( @@ -16,7 +16,6 @@ vcpkg_extract_source_archive( PATCHES fix-project-config.patch remove-certificate-step.patch - fix-C2471.patch ) file(REMOVE_RECURSE diff --git a/ports/monkeys-audio/remove-certificate-step.patch b/ports/monkeys-audio/remove-certificate-step.patch index 16fb24d2a7e694..118f9dbb343e44 100644 --- a/ports/monkeys-audio/remove-certificate-step.patch +++ b/ports/monkeys-audio/remove-certificate-step.patch @@ -1,23 +1,23 @@ ---- a/Source/Projects/VS2019/Console/Console.vcxproj 2020-12-23 21:42:15.672211100 +0100 -+++ b/Source/Projects/VS2019/Console/Console.vcxproj 2020-12-29 05:29:53.916306700 +0100 -@@ -180,10 +180,6 @@ +diff --git a/Source/Projects/VS2019/Console/Console.vcxproj b/Source/Projects/VS2019/Console/Console.vcxproj +index 3337a12..70c1942 100644 +--- a/Source/Projects/VS2019/Console/Console.vcxproj ++++ b/Source/Projects/VS2019/Console/Console.vcxproj +@@ -180,9 +180,6 @@ MachineX86 - -- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC3.pfx /p password /v "$(TargetPath)" --C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC3.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)" +- C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC3.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)" - -@@ -273,10 +269,6 @@ +@@ -272,9 +269,6 @@ MachineX64 - -- C:\MAC\Current\Source\Certificate\signtool.exe sign /t http://timestamp.digicert.com /f C:\MAC\Current\Source\Certificate\MAC3.pfx /p password /v "$(TargetPath)" --C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC3.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)" +- C:\MAC\Current\Source\Certificate\signtool.exe sign /f C:\MAC\Current\Source\Certificate\MAC3.pfx /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td sha256 /fd sha256 /a /as /p password "$(TargetPath)" - diff --git a/ports/monkeys-audio/vcpkg.json b/ports/monkeys-audio/vcpkg.json index 6df16d00c4aaa8..2f31c6cd1e0dd8 100644 --- a/ports/monkeys-audio/vcpkg.json +++ b/ports/monkeys-audio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "monkeys-audio", - "version": "5.70", - "port-version": 3, + "version-string": "9.04", "description": [ "Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods.", "Audio files compressed with it end with .ape extension." diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2cb2573acdcb70..3000256efeb850 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -592,10 +592,6 @@ mmx:arm-uwp=skip mmx:x64-uwp=skip mmx:arm64-windows=skip monkeys-audio:arm64-windows=fail -monkeys-audio:arm-uwp=fail -monkeys-audio:x64-linux=fail -monkeys-audio:x64-osx=fail -monkeys-audio:x64-uwp=fail monkeys-audio:x64-windows-static=fail moos-core:arm-uwp=fail moos-core:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index c610ae1196f261..720d36976c95ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5113,8 +5113,8 @@ "port-version": 0 }, "monkeys-audio": { - "baseline": "5.70", - "port-version": 3 + "baseline": "9.04", + "port-version": 0 }, "moos-core": { "baseline": "10.4.0", diff --git a/versions/m-/monkeys-audio.json b/versions/m-/monkeys-audio.json index 84acb3cca9ce75..e0f86ce77d83ff 100644 --- a/versions/m-/monkeys-audio.json +++ b/versions/m-/monkeys-audio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae5b8fee2db96b691e609427278a6974180e68d4", + "version-string": "9.04", + "port-version": 0 + }, { "git-tree": "029d9c14ce64feb48e15e8cd11b1a3123d016c62", "version": "5.70",