bobuc-havok · bobuc-havok · Jul 2, 2021 · Jun 29, 2021 · Jun 29, 2021 · Jun 29, 2021
diff --git a/README_ko_KR.md b/README_ko_KR.md
@@ -20,7 +20,7 @@ vcpkg 사용을 시작하는 방법은 [시작하기](#시작하기) 섹션을
 - [Vcpkg: 개요 둘러보기](#vcpkg-개요)
 - [목차](#목차)
 - [시작하기](#시작하기)
-  - [빠르게 시작하기: 원도우](#빠르게-시작하기-원도우)
+  - [빠르게 시작하기: 윈도우](#빠르게-시작하기-윈도우)
   - [빠르게 시작하기: 유닉스](#빠르게-시작하기-유닉스)
   - [리눅스 개발자 도구 설치하기](#리눅스-개발자-도구-설치하기)
   - [macOS 개발자 도구 설치하기](#macos-개발자-도구-설치하기)

diff --git a/ports/asio/inline_dummy_return.patch b/ports/asio/inline_dummy_return.patch
diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake
@@ -3,11 +3,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chriskohlhoff/asio
-    REF asio-1-18-1
-    SHA512 c84e6fca448ed419a976756840f3f4543291a5a7d4f62d4de7c06945b2cd9ececca6633049ad5e36367d60f67a4f2735be017445514ae9fa9497d4af2a4d48f8
+    REF asio-1-18-2
+    SHA512 5a2312f1a14106e3109a9f02e8ac65a1d639b411834f0aa301767a4dd30d8384f6f1a94034b6016ef989c7d7880fd4c8de11c7be0cb58b4dc64a49ec335a7113
     HEAD_REF master
-    PATCHES
-        inline_dummy_return.patch
 )
 
 # Always use "ASIO_STANDALONE" to avoid boost dependency
@@ -30,4 +28,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "asio",
-  "version": "1.18.1",
-  "port-version": 1,
+  "version": "1.18.2",
   "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
   "homepage": "https://github.com/chriskohlhoff/asio",
   "documentation": "https://think-async.com/Asio/asio-1.18.0/doc/",

diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake
@@ -1,10 +1,14 @@
-vcpkg_from_git(
+set(BZIP2_VERSION 1.0.8)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz"
+    FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
+    SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
+)
+
+vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    URL https://sourceware.org/git/bzip2.git
-    REF 75a94bea3918e612b879d6a11ca64b8689526147 # REFERENCE BZIP2 VERSION 1.0.8
-    SHA512 4611105f9090477b5f6f6dbd303a282099df71644e04d8a998ef81de487f6c8cac4c0ec1283ad737f6767c51f1e3b4e24e2ee021c6dd085925617d9ed145b2ba
-    PATCHES
-        fix-import-export-macros.patch
+    ARCHIVE ${ARCHIVE}
+    PATCHES fix-import-export-macros.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bzip2",
-  "version-string": "1.0.8",
-  "port-version": 1,
+  "version-semver": "1.0.8",
+  "port-version": 2,
   "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.",
   "homepage": "https://sourceware.org/bzip2/",
   "documentation": "https://sourceware.org/bzip2/docs.html"

diff --git a/ports/cnl/CONTROL b/ports/cnl/CONTROL
@@ -1,3 +1,4 @@
 Source: cnl
-Version: 2019-06-23
+Version: 1.1.7
 Description: A Compositional Numeric Library for C++
+Homepage: https://github.com/johnmcfarlane/cnl
diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake
@@ -1,11 +1,10 @@
 # header-only library
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO johnmcfarlane/cnl
-    REF 48428242e72b8239cb14c963e40f724929d54df7
-    SHA512 c7e012d99409977137a44915dd7a4df5014b6e8540ceee3e82492052541ce77a254d79e624d766b510e7d3a6b17a9d9b02391c6993ae55d3904334116e747983
-    HEAD_REF develop
+    REF 2dde6e62e608a4adc3c5504f067575efa4910568 #v1.1.7
+    SHA512 33a81ea726802c71a684bcd002b5119cde4db471ebc9ba02cd15c7487ab468eeca09fb8dcaed953e3f3cded2cd813a903f808d97527b0ec7f393647b64a22572
+    HEAD_REF main
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch
@@ -0,0 +1,16 @@
+diff -urw a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2021-05-10 20:46:52.204346972 +0200
++++ b/CMakeLists.txt	2021-05-11 19:39:00.065235266 +0200
+@@ -1482,6 +1482,12 @@
+       message(WARNING "Bad lib in library list: ${_libname}")
+       continue()
+     endif()
++  elseif(_lib MATCHES "^(.*)/([^/]*)[.]framework$")
++    if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES)
++      set(_lib "-framework ${CMAKE_MATCH_2}")
++    else()
++      set(_lib "-framework ${_lib}")
++    endif()
+   endif()
+   if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-")
+     set(LIBCURL_LIBS          "${LIBCURL_LIBS} ${_lib}")
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
         0010_fix_othertests_cmake.patch
         0011_fix_static_build.patch
         0012-fix-dependency-idn2.patch
+        0020-fix-pc-file.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)

diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "curl",
   "version": "7.74.0",
-  "port-version": 7,
+  "port-version": 8,
   "description": "A library for transferring data with URLs",
   "homepage": "https://github.com/curl/curl",
   "dependencies": [

diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL
@@ -1,5 +1,5 @@
 Source: drogon
-Version: 1.6.0
+Version: 1.7.1
 Homepage: https://github.com/an-tao/drogon
 Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows
 Build-Depends: trantor, zlib, jsoncpp, libmariadb (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows)

diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
@@ -1,14 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/drogon
-    REF v1.6.0
-    SHA512 3e3012bbee0a12cfabf79581bc0f57592065bc9618ed18c17ef77afee55750c8a8b8626053863208928b173cd0629f271a14a07e602f8ea93976c43b3ba5c9db
+    REF v1.7.1
+    SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6
     HEAD_REF master
     PATCHES
         vcpkg.patch
         resolv.patch
         drogon_config.patch
-        ssize_t.patch
 )
 
 vcpkg_check_features(
@@ -30,6 +29,9 @@ vcpkg_install_cmake()
 
 # Fix CMake files
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Drogon)
+
+vcpkg_fixup_pkgconfig()
+
 # Copy drogon_ctl
 if("ctl" IN_LIST FEATURES)
     message("copying tools")

diff --git a/ports/drogon/ssize_t.patch b/ports/drogon/ssize_t.patch
diff --git a/ports/ffmpeg/build.sh.in b/ports/ffmpeg/build.sh.in
@@ -15,6 +15,61 @@ cygpath() {
     fi
 }
 
+move_binary() {
+    SOURCE=$1
+    TARGET=$2
+    BINARY=$3
+
+    # run lipo over the command to check whether it really
+    # is a binary that we need to merge architectures
+    lipo $SOURCE/$BINARY -info &> /dev/null || return 0
+
+    # get the directory name the file is in
+    DIRNAME=$(dirname $BINARY)
+
+    # ensure the directory to move the binary to exists
+    mkdir -p $TARGET/$DIRNAME
+
+    # now finally move the binary
+    mv $SOURCE/$BINARY $TARGET/$BINARY
+}
+
+move_binaries() {
+    SOURCE=$1
+    TARGET=$2
+
+    [ ! -d $SOURCE ] && return 0
+    pushd $SOURCE
+
+    for BINARY in $(find . -type f); do
+        move_binary $SOURCE $TARGET $BINARY
+    done
+
+    popd
+}
+
+merge_binaries() {
+    TARGET=$1
+    SOURCE=$2
+
+    shift
+    shift
+
+    pushd $SOURCE/$1
+    BINARIES=$(find . -type f)
+    popd
+
+    for BINARY in $BINARIES; do
+        COMMAND="lipo -create -output $TARGET/$BINARY"
+
+        for ARCH in $@; do
+            COMMAND="$COMMAND -arch $ARCH $SOURCE/$ARCH/$BINARY"
+        done
+
+        $($COMMAND)
+    done
+}
+
 export PKG_CONFIG_PATH="$(cygpath -p "${PKG_CONFIG_PATH}")"
 
 # Export HTTP(S)_PROXY as http(s)_proxy:
@@ -27,19 +82,45 @@ PATH_TO_PACKAGE_DIR=$(cygpath "@INST_PREFIX@")
 
 JOBS=@VCPKG_CONCURRENCY@
 
+OSX_ARCHS="@OSX_ARCHS@"
+OSX_ARCH_COUNT=0@OSX_ARCH_COUNT@
+
 # Default to hardware concurrency if unset.
 : ${JOBS:=$(nproc)}
 
+build_ffmpeg() {
+    echo "=== CONFIGURING ==="
+
+    sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@ $@
+
+    echo "=== BUILDING ==="
+
+    make -j${JOBS}
+
+    echo "=== INSTALLING ==="
+
+    make install
+}
+
 cd "$PATH_TO_BUILD_DIR"
 
-echo "=== CONFIGURING ==="
+if [ $OSX_ARCH_COUNT -gt 1 ]; then
+    for ARCH in $OSX_ARCHS; do
+        echo "=== CLEANING FOR $ARCH ==="
+
+        make clean && make distclean
 
-sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@
+        build_ffmpeg --enable-cross-compile --arch=$ARCH --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH
 
-echo "=== BUILDING ==="
+        echo "=== COLLECTING BINARIES FOR $ARCH ==="
 
-make -j${JOBS}
+        move_binaries $PATH_TO_PACKAGE_DIR/lib $PATH_TO_BUILD_DIR/stage/$ARCH/lib
+        move_binaries $PATH_TO_PACKAGE_DIR/bin $PATH_TO_BUILD_DIR/stage/$ARCH/bin
+    done
 
-echo "=== INSTALLING ==="
+    echo "=== MERGING ARCHITECTURES ==="
 
-make install
+    merge_binaries $PATH_TO_PACKAGE_DIR $PATH_TO_BUILD_DIR/stage $OSX_ARCHS
+else
+    build_ffmpeg
+fi
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
@@ -550,8 +550,22 @@ else()
     set(OPTIONS "${OPTIONS} --disable-zlib")
 endif()
 
+set(CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/vars.cmake")
+vcpkg_internal_get_cmake_vars(OUTPUT_FILE CMAKE_VARS_FILE)
+include("${CMAKE_VARS_FILE}")
+
 if (VCPKG_TARGET_IS_OSX)
+    # if the sysroot isn't set in the triplet we fall back to whatever CMake detected for us
+    if ("${VCPKG_OSX_SYSROOT}" STREQUAL "")
+        set(VCPKG_OSX_SYSROOT ${VCPKG_DETECTED_CMAKE_OSX_SYSROOT})
+    endif()
+
     set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX
+    set(OPTIONS "${OPTIONS} --extra-cflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"")
+    set(OPTIONS "${OPTIONS} --extra-ldflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"")
+
+    list(JOIN VCPKG_OSX_ARCHITECTURES " " OSX_ARCHS)
+    LIST(LENGTH VCPKG_OSX_ARCHITECTURES OSX_ARCH_COUNT)
 endif()
 
 set(OPTIONS_CROSS "")
@@ -564,8 +578,17 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU
             get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY)
             set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}")
         endforeach(GAS_PATH)
-    elseif(VCPKG_TARGET_IS_OSX) # VCPKG_TARGET_ARCHITECTURE = arm64
-        set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=arm64 --extra-ldflags=-arch --extra-ldflags=arm64 --extra-cflags=-arch --extra-cflags=arm64 --extra-cxxflags=-arch --extra-cxxflags=arm64")
+    elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") # VCPKG_TARGET_ARCHITECTURE = arm64
+        # get the number of architectures requested
+        list(LENGTH VCPKG_OSX_ARCHITECTURES ARCHITECTURE_COUNT)
+
+        # ideally we should check the CMAKE_HOST_SYSTEM_PROCESSOR, but that seems to be
+        # broken when inside a vcpkg port, so we only set it when doing a simple build
+        # for a single platform. multi-platform builds use a different script
+        if (ARCHITECTURE_COUNT LESS 2)
+            message(STATUS "Building on host: ${CMAKE_SYSTEM_PROCESSOR}")
+            set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=arm64 --extra-ldflags=-arch --extra-ldflags=arm64 --extra-cflags=-arch --extra-cflags=arm64 --extra-cxxflags=-arch --extra-cxxflags=arm64")
+        endif()
     endif()
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4",
-  "port-version": 5,
+  "port-version": 6,
   "description": [
     "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
     "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."

diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch
@@ -2,11 +2,13 @@ diff --git a/include/fmt/format.h b/include/fmt/format.h
 index 4e96539..0f1d179 100644
 --- a/include/fmt/format.h
 +++ b/include/fmt/format.h
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,9 @@
  #ifndef FMT_FORMAT_H_
  #define FMT_FORMAT_H_
-
+
++#ifdef _MSC_VER
 +#pragma warning(disable:4189)
++#endif
  #include <algorithm>
  #include <cerrno>
  #include <cmath>
diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fmt",
   "version": "7.1.3",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "dependencies": [