diff --git a/ports/amd-amf/portfile.cmake b/ports/amd-amf/portfile.cmake new file mode 100644 index 00000000000000..2a7860df2825bf --- /dev/null +++ b/ports/amd-amf/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GPUOpen-LibrariesAndSDKs/AMF + REF v1.4.26 + SHA512 2c931ef7d38ade88a96041e0012605a5d25ec484bb2134f58310cf1a2c7212a869797cef99e2e751c8a6b3c473ba1f8762d4a5d41466d38cb5e31bf664a25f55 + HEAD_REF master +) + +# Install the AMF headers to the default vcpkg location +file(INSTALL "${SOURCE_PATH}/amf/public/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/AMF") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/amd-amf/vcpkg.json b/ports/amd-amf/vcpkg.json new file mode 100644 index 00000000000000..3cbb77e8a1c0e4 --- /dev/null +++ b/ports/amd-amf/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "amd-amf", + "version": "1.4.26", + "description": "AMD Advanced Media Framework headers", + "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/AMF", + "license": "MIT", + "supports": "!osx" +} diff --git a/ports/asio/asio-config.cmake b/ports/asio/asio-config.cmake index 32e00095a77fb9..12807227537f6a 100644 --- a/ports/asio/asio-config.cmake +++ b/ports/asio/asio-config.cmake @@ -1,6 +1,9 @@ include ("${CMAKE_CURRENT_LIST_DIR}/asio-targets.cmake") -add_library(asio::asio INTERFACE IMPORTED) -target_link_libraries(asio::asio INTERFACE asio) + +if(NOT TARGET asio::asio) + add_library(asio::asio INTERFACE IMPORTED) + target_link_libraries(asio::asio INTERFACE asio) +endif() get_target_property(_ASIO_INCLUDE_DIR asio INTERFACE_INCLUDE_DIRECTORIES) set(ASIO_INCLUDE_DIR "${_ASIO_INCLUDE_DIR}") diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index b3608e5a06853d..38c777dda3c604 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "asio", "version": "1.24.0", + "port-version": 1, "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.24.0/doc/", diff --git a/ports/bgfx/fix-dependencies.patch b/ports/bgfx/fix-dependencies.patch new file mode 100644 index 00000000000000..05b209a97096b4 --- /dev/null +++ b/ports/bgfx/fix-dependencies.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14eb13d..dad3b53 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,7 @@ if( BGFX_INSTALL ) + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) + if( NOT BGFX_LIBRARY_TYPE MATCHES "SHARED" ) +- install( TARGETS bimg bx astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr ++ install( TARGETS bimg bx astc-encoder edtaa3 etc1 etc2 iqa pvrtc + EXPORT "${TARGETS_EXPORT_NAME}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake +index 9519b3a..e4b6341 100644 +--- a/cmake/bimg.cmake ++++ b/cmake/bimg.cmake +@@ -14,10 +14,11 @@ include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/edtaa3.cmake ) + include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc1.cmake ) + include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc2.cmake ) + include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/iqa.cmake ) +-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/libsquish.cmake ) +-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/nvtt.cmake ) + include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/pvrtc.cmake ) +-include( ${CMAKE_CURRENT_LIST_DIR}/3rdparty/tinyexr.cmake ) ++find_package(tinyexr CONFIG REQUIRED) ++find_package(unofficial-libsquish CONFIG REQUIRED) ++find_library(NVTT_LIBRARIES NAMES nvtt libnvtt PATH_SUFFIXES static) ++find_path(NVTT_INCLUDE_DIRS NAMES nvtt.h PATH_SUFFIXES nvtt) + + # Ensure the directory exists + if( NOT IS_DIRECTORY ${BIMG_DIR} ) +@@ -33,12 +34,13 @@ add_library( bimg STATIC ${BIMG_SOURCES} ) + + # Add include directory of bimg + target_include_directories( bimg +- PUBLIC ++ PUBLIC + $ + $) + ++target_include_directories( bimg PRIVATE ${NVTT_INCLUDE_DIRS}) + # bimg dependencies +-target_link_libraries( bimg PUBLIC bx PRIVATE astc-encoder edtaa3 etc1 etc2 iqa squish nvtt pvrtc tinyexr ) ++target_link_libraries( bimg PUBLIC bx PRIVATE astc-encoder edtaa3 etc1 etc2 iqa unofficial::libsquish::squish ${NVTT_LIBRARIES} pvrtc unofficial::tinyexr::tinyexr ) + + # Put in a "bgfx" folder in Visual Studio + set_target_properties( bimg PROPERTIES FOLDER "bgfx" ) +\ No newline at end of file diff --git a/ports/bgfx/fix-headerfile.patch b/ports/bgfx/fix-headerfile.patch new file mode 100644 index 00000000000000..c464c12f4765fe --- /dev/null +++ b/ports/bgfx/fix-headerfile.patch @@ -0,0 +1,13 @@ +diff --git a/src/image_decode.cpp b/src/image_decode.cpp +index dd391e5..8218ac9 100644 +--- a/src/image_decode.cpp ++++ b/src/image_decode.cpp +@@ -19,7 +19,7 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4505) // warning C4505: 'tinyexr::miniz::def_r + #define MINIZ_NO_ARCHIVE_APIS + #define MINIZ_NO_STDIO + #define TINYEXR_IMPLEMENTATION +-#include ++#include + BX_PRAGMA_DIAGNOSTIC_POP() + + BX_PRAGMA_DIAGNOSTIC_PUSH(); diff --git a/ports/bgfx/portfile.cmake b/ports/bgfx/portfile.cmake index 9bc743d374a9ed..52a22f7a1ac162 100644 --- a/ports/bgfx/portfile.cmake +++ b/ports/bgfx/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( HEAD_REF master REF 85109d7cdbe775a0ab72cf38510df525d5e8d3da SHA512 b3e082cd249e802e6d209ed45a552843604713a06597277b2855d1fa1c39b3d5136d5589599a85126eda218ccfee0ce6177f004cb5dccb912fe64ea7e07af2a8 + PATCHES fix-headerfile.patch ) vcpkg_from_github( @@ -44,6 +45,7 @@ endif () vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES fix-dependencies.patch ) vcpkg_cmake_configure( diff --git a/ports/bgfx/vcpkg.json b/ports/bgfx/vcpkg.json index 63fc590dd78302..fd2dcc866b80a9 100644 --- a/ports/bgfx/vcpkg.json +++ b/ports/bgfx/vcpkg.json @@ -1,12 +1,16 @@ { "name": "bgfx", "version": "1.118.8384-362", + "port-version": 1, "maintainers": "Sandy Carter ", "description": "Cross-platform, graphics API agnostic, Bring Your Own Engine/Framework style rendering library.", "homepage": "https://bkaradzic.github.io/bgfx/overview.html", "documentation": "https://bkaradzic.github.io/bgfx", "license": "BSD-2-Clause", "dependencies": [ + "libsquish", + "nvtt", + "tinyexr", { "name": "vcpkg-cmake", "host": true diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 3674d279a09acc..bea51245379122 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 REF v${VERSION} - SHA512 983d37824a8d9e24ff107d27f11cb4f8ea53516dc2c5c9b32d4758c718f29041eecdb023d81a2776c87d283e3671722352c9f0eea02393b5bb191fa26bb12c82 + SHA512 f9be225ca042f03ea750e77e8a0118f631100d607181ffe505e74063f3a0eda95de6ff0b7db39b7a31e8ea3ce72da5a95b408a1d34c89f57c3b9ec8a97c4fe5b HEAD_REF devel PATCHES fix-install-path.patch diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index 8e100386f80b40..66bd6758e4c190 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "catch2", - "version-semver": "3.2.0", + "version-semver": "3.2.1", "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index 68163c6a1c20a7..3490fd2f84ab14 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -71,11 +71,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/cryptopp) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/cryptopp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cryptopp.pc") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/cryptopp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/cryptopp.pc") +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") # There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/cryptopp/vcpkg.json b/ports/cryptopp/vcpkg.json index d0800f61322474..6026cae25e5dad 100644 --- a/ports/cryptopp/vcpkg.json +++ b/ports/cryptopp/vcpkg.json @@ -1,8 +1,10 @@ { "name": "cryptopp", "version": "8.7.0", + "port-version": 1, "description": "Crypto++ is a free C++ class library of cryptographic schemes.", "homepage": "https://github.com/weidai11/cryptopp", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 1f4ba4f28a33dc..59650a60bb1c48 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang - REF 11.12.0 - SHA512 fd955f9912551668056dfe52835eef11e5dc0bf0d25b2d961a31f684adbd63bc6380759944c1921cfd63d359a58c7cc3a4a4d5eea69fa1b050f58960e5101271 + REF 11.13.0 + SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b HEAD_REF master PATCHES ignore-crt.patch diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 2d4d2e5b7c933f..4f65475dd42747 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glslang", - "version": "11.12.0", - "port-version": 1, + "version": "11.13.0", "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", diff --git a/ports/ideviceinstaller/Add-missing-lib.patch b/ports/ideviceinstaller/Add-missing-lib.patch new file mode 100644 index 00000000000000..5e662951606b88 --- /dev/null +++ b/ports/ideviceinstaller/Add-missing-lib.patch @@ -0,0 +1,40 @@ +diff --git a/ideviceinstaller.vcxproj b/ideviceinstaller.vcxproj +index dd8d483..4b15d7e 100644 +--- a/ideviceinstaller.vcxproj ++++ b/ideviceinstaller.vcxproj +@@ -112,7 +112,7 @@ + + Console + true +- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) ++ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies) + + + +@@ -126,7 +126,7 @@ + + Console + true +- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) ++ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies) + + + +@@ -144,7 +144,7 @@ + true + true + true +- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) ++ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies) + + + +@@ -162,7 +162,7 @@ + true + true + true +- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) ++ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;crypt32.lib;%(AdditionalDependencies) + + + diff --git a/ports/ideviceinstaller/portfile.cmake b/ports/ideviceinstaller/portfile.cmake index 869ada8d5f35fe..2d8caad8f197d4 100644 --- a/ports/ideviceinstaller/portfile.cmake +++ b/ports/ideviceinstaller/portfile.cmake @@ -1,13 +1,16 @@ +vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/ideviceinstaller - REF 1.1.2.23 + REF ${VERSION} SHA512 d0801b3a38eb02206a6f06e05cc19b794c69a87c06895165f64522c61e07030046499c5f0e436981682f9e17f91eae87913cca091e2e039a74ee35a5136100d4 HEAD_REF msvc-master + PATCHES Add-missing-lib.patch ) vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ideviceinstaller.vcxproj LICENSE_SUBPATH COPYING USE_VCPKG_INTEGRATION diff --git a/ports/ideviceinstaller/vcpkg.json b/ports/ideviceinstaller/vcpkg.json index dcdca8861df68a..ff9ea70725b521 100644 --- a/ports/ideviceinstaller/vcpkg.json +++ b/ports/ideviceinstaller/vcpkg.json @@ -1,8 +1,9 @@ { "name": "ideviceinstaller", "version": "1.1.2.23", - "port-version": 4, + "port-version": 5, "description": "Manage apps of iOS devices", + "homepage": "https://libimobiledevice.org/", "license": "LGPL-2.1-only", "supports": "windows & !arm64", "dependencies": [ diff --git a/ports/libirecovery/vcpkg.json b/ports/libirecovery/vcpkg.json index 8298c88ab53158..2a9a35287f4a92 100644 --- a/ports/libirecovery/vcpkg.json +++ b/ports/libirecovery/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libirecovery", "version": "1.0.25", - "port-version": 5, + "port-version": 6, "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux", "license": "LGPL-2.1-only", - "supports": "windows & !arm64", + "supports": "windows & !arm64 & !static & !staticcrt", "dependencies": [ "getopt", "libusbmuxd", diff --git a/ports/libphonenumber/vcpkg.json b/ports/libphonenumber/vcpkg.json index 0b6945307d82a5..073a2451bfb2c3 100644 --- a/ports/libphonenumber/vcpkg.json +++ b/ports/libphonenumber/vcpkg.json @@ -3,7 +3,7 @@ "version": "8.13.1", "description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.", "license": "Apache-2.0", - "supports": "!static & !linux & !osx", + "supports": "!linux & !osx", "dependencies": [ "abseil", "boost-date-time", diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index 0b972082c2f9ff..6764256007f362 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -30,12 +30,14 @@ vcpkg_cmake_configure( -DWITH_WEBKIT3=OFF -DWITH_KDE=${VCPKG_TARGET_IS_LINUX} -DMSVC_STATIC=${STATICCRT} + -DWITH_GNOME3=OFF MAYBE_UNUSED_VARIABLES WITH_DOTNET WITH_PERL WITH_PYTHON2 WITH_PYTHON3 WITH_VALA + MSVC_STATIC ) vcpkg_cmake_install() diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index a65c413e8102cd..75752ab39a6f2b 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libproxy", "version": "0.4.18", + "port-version": 1, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", "license": "LGPL-2.1-only", diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 0ea6fc111972a3..47167025a0fe61 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.8.1 - SHA512 97b14ddfa2fec4b582f4658cea96f61510b3eb1f367d770a642136ffbaf7e5d87e6a8c950f7ac6af47cc605899d0ff8e2b9c71a19a28ad1dfaa724f003339edc + REF v0.8.2 + SHA512 849c426484156faf91dde3f32f6c755c7698879b16dd83e13fb86b299b53ec9bbe4d55267581386302c8acb93d80ec044cc248371fdc8608cdd8f4ab12099f0a HEAD_REF master ) diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 3fc2b956d952ab..45c695ae9b35f4 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,6 +1,6 @@ { "name": "magic-enum", - "version": "0.8.1", + "version": "0.8.2", "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", "homepage": "https://github.com/Neargye/magic_enum", "license": "MIT", diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index ccc9c08f25de7c..0531f50f57da5e 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -224,12 +224,18 @@ else() "--without-readline" "--disable-test-modules" ) + if (VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS "ac_cv_file__dev_ptmx=no") + list(APPEND OPTIONS "ac_cv_file__dev_ptc=no") + endif() + if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS "LIBS=-liconv -lintl") endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" + DETERMINE_BUILD_TRIPLET OPTIONS ${OPTIONS} OPTIONS_DEBUG "--with-pydebug" ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index dbd322a7bf5dda..9d39896ab37c63 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.10.7", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/ports/qt5-base/cmake/install_qt.cmake b/ports/qt5-base/cmake/install_qt.cmake index 39781cebe01ee7..7a8a386224091d 100644 --- a/ports/qt5-base/cmake/install_qt.cmake +++ b/ports/qt5-base/cmake/install_qt.cmake @@ -78,16 +78,6 @@ function(install_qt) endif() endif() - if(VCPKG_TARGET_IS_OSX) - # For some reason there will be an error on MacOSX without this clean! - message(STATUS "Cleaning before build ${_build_triplet}") - vcpkg_execute_required_process( - COMMAND ${INVOKE_SINGLE} clean - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet} - LOGNAME cleaning-1-${_build_triplet} - ) - endif() - message(STATUS "Building ${_build_triplet}") vcpkg_execute_build_process( COMMAND ${INVOKE} @@ -101,8 +91,8 @@ function(install_qt) message(STATUS "Cleaning after build before install ${_build_triplet}") vcpkg_execute_required_process( COMMAND ${INVOKE_SINGLE} clean - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet} - LOGNAME cleaning-2-${_build_triplet} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${_build_triplet}/qmake + LOGNAME cleaning-after-build-${_build_triplet} ) endif() diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 6963c09a0b9302..9b6905382c6707 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version": "5.15.7", - "port-version": 2, + "port-version": 3, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/usbmuxd/vcpkg.json b/ports/usbmuxd/vcpkg.json index 72ddfb602fa66c..fdbb2ef8ed8027 100644 --- a/ports/usbmuxd/vcpkg.json +++ b/ports/usbmuxd/vcpkg.json @@ -1,11 +1,11 @@ { "name": "usbmuxd", "version": "1.2.235", - "port-version": 2, + "port-version": 3, "description": "A socket daemon to multiplex connections from and to iOS devices", "homepage": "http://www.libimobiledevice.org", "license": "LGPL-2.1-only", - "supports": "windows & !arm64", + "supports": "windows & !arm64 & !static", "dependencies": [ "libimobiledevice", "libusb", diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index d094d088f52e4a..5e0851cf6738f2 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-11-10' +$versionDate = '2022-12-14' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index b305e45a88e9ad..bb4ead8ed13ae1 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-11-10" +vcpkgToolReleaseTag="2022-12-14" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="eb32643dd2164c72b8a660ef52f1e701bb368324ae461e12d70d6a9aefc0c9573387ee2ed3828037ed62bb3e8f566416a2d3b3827a3928f0bff7c29f7662293e" + vcpkgToolReleaseSha="f50874fd20f46aadc8725139790e80d35189b9f96e0c23d6d94e3afe04fe0e3a32d7a0f9666af6e345a8acf1a69e582e366b651ef8196185cfb2810250f19a86" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="a6440a0618aa6d04c9668b40f58ed6316d817ed73bf9e9f7980867d3a4ee18564da3ca283a8b26fd1e124b0c5c2d3dfbff61ce61ace6371bb7168898c55053ca" + vcpkgToolReleaseSha="229dd7eb19af4ba4362926da5dae64b09382aff6a59ba0652315ff07ebf2cdfa63c8f4a86b634194e7c1c11452b5a70c6825ede915926d710d1d0f4b0605279a" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="5b339e897d6f61237a508cdc611aa997f4fb5d47531fcdd53e0ce53b289d9b99652ac9f0e0584adcd453b25e91a085f04f159f6724211c599f5437462726fca3" + vcpkgToolReleaseSha="f12911e70d643cd547875e951cc7c8c3d9941f072abe512cf96c86a1784ea38a8230c3813ff6e9d4149261dfb2ff953b2a3d8752ca4d6f023b9fd5392adec73e" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="941e8f0749d5475ffcc731909b8a506c4b08ab7e6b11752532482260b6f430c23e42903d7bf4431c088ef16b980685da1980e831b9623e831e339319b4ee9085" + vcpkgToolReleaseSha="63db6e7a2f6ac3924e6da07b278549ca043c29d38524ef7d5804dad0d2d0069f542d48ed31601845ddfcbf87471a90a2b4368f645fd3e43066ce7e72aa40bbf6" fi # Do the download or build. diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5fbf492203ef36..d059efa818acd9 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -468,7 +468,6 @@ libmysql:arm64-windows=fail libopusenc:arm-uwp=fail libopusenc:x64-uwp=fail libosip2:x64-windows-static-md=fail -libplist:x64-windows-static=fail libpng-apng:arm64-windows = skip libpng-apng:arm-uwp = skip libpng-apng:x64-linux = skip diff --git a/versions/a-/amd-amf.json b/versions/a-/amd-amf.json new file mode 100644 index 00000000000000..c5568b58282e15 --- /dev/null +++ b/versions/a-/amd-amf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c65d944ff736b48b7b94298ed4627cb49458e7ba", + "version": "1.4.26", + "port-version": 0 + } + ] +} diff --git a/versions/a-/asio.json b/versions/a-/asio.json index 3376212f660961..4b1f8d3344e6af 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b134a3e21a2ef661aa5e3802cefc22386c095aaa", + "version": "1.24.0", + "port-version": 1 + }, { "git-tree": "bba8740d419878e427c71f076d569f8a26833c6b", "version": "1.24.0", diff --git a/versions/b-/bgfx.json b/versions/b-/bgfx.json index 190c18afeb4de1..6805b47395c020 100644 --- a/versions/b-/bgfx.json +++ b/versions/b-/bgfx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9359637243730a77d0139bd3ecdf317bd16fa38e", + "version": "1.118.8384-362", + "port-version": 1 + }, { "git-tree": "6554186755cae40eef0b34bf0c447861d6e6dd7a", "version": "1.118.8384-362", diff --git a/versions/baseline.json b/versions/baseline.json index c5bac0dcbac8db..04a9ade1926909 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -80,6 +80,10 @@ "baseline": "1.2.6.1", "port-version": 1 }, + "amd-amf": { + "baseline": "1.4.26", + "port-version": 0 + }, "ampl-asl": { "baseline": "2020-11-11", "port-version": 3 @@ -198,7 +202,7 @@ }, "asio": { "baseline": "1.24.0", - "port-version": 0 + "port-version": 1 }, "asio-grpc": { "baseline": "2.3.0", @@ -486,7 +490,7 @@ }, "bgfx": { "baseline": "1.118.8384-362", - "port-version": 0 + "port-version": 1 }, "bigint": { "baseline": "2010.04.30", @@ -1317,7 +1321,7 @@ "port-version": 1 }, "catch2": { - "baseline": "3.2.0", + "baseline": "3.2.1", "port-version": 0 }, "cccapstone": { @@ -1758,7 +1762,7 @@ }, "cryptopp": { "baseline": "8.7.0", - "port-version": 0 + "port-version": 1 }, "cserialport": { "baseline": "4.2.1", @@ -2685,8 +2689,8 @@ "port-version": 0 }, "glslang": { - "baseline": "11.12.0", - "port-version": 1 + "baseline": "11.13.0", + "port-version": 0 }, "glui": { "baseline": "2019-11-30", @@ -2970,7 +2974,7 @@ }, "ideviceinstaller": { "baseline": "1.1.2.23", - "port-version": 4 + "port-version": 5 }, "idevicerestore": { "baseline": "1.0.12", @@ -3882,7 +3886,7 @@ }, "libirecovery": { "baseline": "1.0.25", - "port-version": 5 + "port-version": 6 }, "libjpeg-turbo": { "baseline": "2.1.4", @@ -4130,7 +4134,7 @@ }, "libproxy": { "baseline": "0.4.18", - "port-version": 0 + "port-version": 1 }, "libqcow": { "baseline": "20210419", @@ -4693,7 +4697,7 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.8.1", + "baseline": "0.8.2", "port-version": 0 }, "magic-get": { @@ -6050,7 +6054,7 @@ }, "python3": { "baseline": "3.10.7", - "port-version": 1 + "port-version": 2 }, "qca": { "baseline": "2.3.4", @@ -6110,7 +6114,7 @@ }, "qt5-base": { "baseline": "5.15.7", - "port-version": 2 + "port-version": 3 }, "qt5-canvas3d": { "baseline": "0", @@ -7730,7 +7734,7 @@ }, "usbmuxd": { "baseline": "1.2.235", - "port-version": 2 + "port-version": 3 }, "usd": { "baseline": "20.08", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index b1a79077d4b8aa..93c16a8bdfc6e5 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43e022b806928c512e298052ad4fae210998a846", + "version-semver": "3.2.1", + "port-version": 0 + }, { "git-tree": "9dd2bc1c39e6f6262dc7741b24514e76d6f1d8da", "version-semver": "3.2.0", diff --git a/versions/c-/cryptopp.json b/versions/c-/cryptopp.json index f387154c020591..1aed41dde0b6b5 100644 --- a/versions/c-/cryptopp.json +++ b/versions/c-/cryptopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b3216451005bcb10fe92fef34a00abead309247", + "version": "8.7.0", + "port-version": 1 + }, { "git-tree": "7e3fcbde366bc4af8cc2082053b671352963410d", "version": "8.7.0", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 64e313f19b9dd7..d5675e00c848b8 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "293344780ca0d14b1c23c0b78db72fdf5a059ce0", + "version": "11.13.0", + "port-version": 0 + }, { "git-tree": "64952d0b82498ceb8357b5fdf80abf86ec477718", "version": "11.12.0", diff --git a/versions/i-/ideviceinstaller.json b/versions/i-/ideviceinstaller.json index dfcc843b278d0b..cf24d12e20d61c 100644 --- a/versions/i-/ideviceinstaller.json +++ b/versions/i-/ideviceinstaller.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e54543ef504b74edb836a2c47abb3845b83b7c3", + "version": "1.1.2.23", + "port-version": 5 + }, { "git-tree": "82bc629affc514c34b77216d2a00cfbbcf1f2220", "version": "1.1.2.23", diff --git a/versions/l-/libirecovery.json b/versions/l-/libirecovery.json index a1fd2eebb6aa6d..bbd8f7740ba24d 100644 --- a/versions/l-/libirecovery.json +++ b/versions/l-/libirecovery.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da471f398ce0264ef333dfbaaa521c79c51ab5f9", + "version": "1.0.25", + "port-version": 6 + }, { "git-tree": "586b5bd01468f7690094397c1b3f8fed0456d65e", "version": "1.0.25", diff --git a/versions/l-/libphonenumber.json b/versions/l-/libphonenumber.json index 3488eeaa98f984..616ef5bd617b69 100644 --- a/versions/l-/libphonenumber.json +++ b/versions/l-/libphonenumber.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4a8a7aedced30ba3195353fdda4103829068e299", + "git-tree": "47877baf472150729025e7198ad6aa6e6574ff5a", "version": "8.13.1", "port-version": 0 } diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index e469d398d750cd..b82123c976cadd 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74ecff4623774abaa9333489e644bdbc881e268f", + "version": "0.4.18", + "port-version": 1 + }, { "git-tree": "1e70cf451a9b90297ce32751eb17760a31c0b394", "version": "0.4.18", diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index e39e687e286845..c9a857a5c7e1c3 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "579c97b898c772c488b1de1fef924cb8c767c511", + "version": "0.8.2", + "port-version": 0 + }, { "git-tree": "c67da42e72855b5d2d5d72d570fafb3a1149fa01", "version": "0.8.1", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 3562ff0b2b9ff9..71ec9d3729be23 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84623885a79a6bbf45a2bc65ab3328005af389ea", + "version": "3.10.7", + "port-version": 2 + }, { "git-tree": "cd1c4998e317f9fcfed85a04c1e276dff9ddde84", "version": "3.10.7", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index b37b6a9e9a6005..6a67139f9db0bf 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81ce731dc0595354a8eb77ea9557f4b7a6ca44d3", + "version": "5.15.7", + "port-version": 3 + }, { "git-tree": "5464e5c86a4d0f0e55e9962a0a4476669411fdaf", "version": "5.15.7", diff --git a/versions/u-/usbmuxd.json b/versions/u-/usbmuxd.json index ee07e21d441dad..e9f9614396e903 100644 --- a/versions/u-/usbmuxd.json +++ b/versions/u-/usbmuxd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3f2cea522d35497750ecfd9446e29bf034b4d21", + "version": "1.2.235", + "port-version": 3 + }, { "git-tree": "53c6e0e8c2a4f5db93d2a41d51d2aa8ba68b8e7e", "version": "1.2.235",