[vcpkg] fatal_error when patch fails to apply (#8087)

vcpkg will now fail on failure to apply patches except when using `--head`.

3 files changed, 31 insertions, 31 deletions

diff --git a/ports/alac-decoder/CONTROL b/ports/alac-decoder/CONTROL
index dcbf3922e..10dfb6419 100644
--- a/ports/alac-decoder/CONTROL
+++ b/ports/alac-decoder/CONTROL
@@ -1,4 +1,4 @@
-Source: alac-decoder

-Version: 0.2-1

-Homepage: https://distfiles.macports.org/alac_decoder

-Description:  ALAC C implementation of a decoder, written from reverse engineering the file format

+Source: alac-decoder
+Version: 0.2-3
+Homepage: https://distfiles.macports.org/alac_decoder
+Description:  ALAC C implementation of a decoder, written from reverse engineering the file format
diff --git a/ports/alac-decoder/no-pragma-warning.patch b/ports/alac-decoder/no-pragma-warning.patch
index 97e2960c8..1dc7c0687 100644
--- a/ports/alac-decoder/no-pragma-warning.patch
+++ b/ports/alac-decoder/no-pragma-warning.patch
@@ -1,14 +1,14 @@
-diff --git a/alac.c b/alac.c

-index b829e29..8e8805f 100644

---- a/alac.c

-+++ b/alac.c

-@@ -284,7 +284,9 @@ static int count_leading_zeros(int input)

-     return output;

- }

- #else

-+#if !defined(_MSC_VER)

- #warning using generic count leading zeroes. You may wish to write one for your CPU / compiler

-+#endif

- static int count_leading_zeros(int input)

- {

-     int output = 0;

+diff --git a/alac.c b/alac.c
+index b829e29..8e8805f 100644
+--- a/alac.c
++++ b/alac.c
+@@ -284,7 +284,9 @@ static int count_leading_zeros(int input)
+     return output;
+ }
+ #else
++#if !defined(_MSC_VER)
+ #warning using generic count leading zeroes. You may wish to write one for your CPU / compiler
++#endif
+ static int count_leading_zeros(int input)
+ {
+     int output = 0;
diff --git a/ports/alac-decoder/portfile.cmake b/ports/alac-decoder/portfile.cmake
index ee4a109d9..058179b86 100644
--- a/ports/alac-decoder/portfile.cmake
+++ b/ports/alac-decoder/portfile.cmake
@@ -2,33 +2,33 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/alac_decoder)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://distfiles.macports.org/alac_decoder/alac_decoder-0.2.0.tgz"
     FILENAME "alac_decoder-0.2.0.tgz"
     SHA512 4b37d4fe37681bfccaa4a27fbaf11eb2a1fba5f14e77d219a6d9814ff44d1168534d05eb19443dd2fd11e6fcdf4da3a22e3f3c79314cb7a6767c152351b13e29
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/decomp.c DESTINATION ${SOURCE_PATH})
-
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/remove_stdint_headers.patch
-        ${CMAKE_CURRENT_LIST_DIR}/no-pragma-warning.patch
+        remove_stdint_headers.patch
+        no-pragma-warning.patch
 )
 
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/decomp.c DESTINATION ${SOURCE_PATH})
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
+    OPTIONS_DEBUG
+      -DDISABLE_INSTALL_HEADERS=ON
+      -DDISABLE_INSTALL_TOOLS=ON
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alac-decoder)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/alac-decoder RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)