From b6dceb505331a3ef1b9bc459e0866c906f1e91fe Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 17 Feb 2023 05:31:39 +0800 Subject: [PATCH] [vcpkg baseline][monkeys-audio] Fixing error C2471 and error C1090 (#29667) * Add patch to fix C1090 error * update * update --- ports/monkeys-audio/fix-C2471.patch | 13 +++++++++++++ ports/monkeys-audio/portfile.cmake | 1 + ports/monkeys-audio/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/monkeys-audio.json | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/monkeys-audio/fix-C2471.patch diff --git a/ports/monkeys-audio/fix-C2471.patch b/ports/monkeys-audio/fix-C2471.patch new file mode 100644 index 0000000000..2fb16d81d3 --- /dev/null +++ b/ports/monkeys-audio/fix-C2471.patch @@ -0,0 +1,13 @@ +diff --git a/Source/Projects/VS2019/MACDll/MACDll.vcxproj b/Source/Projects/VS2019/MACDll/MACDll.vcxproj +index 0fcfc94..c0caf12 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 1375818ed1..d779ba0a3e 100644 --- a/ports/monkeys-audio/portfile.cmake +++ b/ports/monkeys-audio/portfile.cmake @@ -16,6 +16,7 @@ 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/vcpkg.json b/ports/monkeys-audio/vcpkg.json index 2f31c6cd1e..7c77fa29a5 100644 --- a/ports/monkeys-audio/vcpkg.json +++ b/ports/monkeys-audio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "monkeys-audio", "version-string": "9.04", + "port-version": 1, "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/versions/baseline.json b/versions/baseline.json index 0b5388613a..7f5966a11e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5118,7 +5118,7 @@ }, "monkeys-audio": { "baseline": "9.04", - "port-version": 0 + "port-version": 1 }, "moos-core": { "baseline": "10.4.0", diff --git a/versions/m-/monkeys-audio.json b/versions/m-/monkeys-audio.json index e0f86ce77d..854d19c9b1 100644 --- a/versions/m-/monkeys-audio.json +++ b/versions/m-/monkeys-audio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65d1eadb4f2e5961fec2975b2450513b6c7b6d6a", + "version-string": "9.04", + "port-version": 1 + }, { "git-tree": "ae5b8fee2db96b691e609427278a6974180e68d4", "version-string": "9.04",