diff --git a/ports/intelrdfpmathlib/vcpkg.json b/ports/intelrdfpmathlib/vcpkg.json index 1be8cccde5..87415c924a 100644 --- a/ports/intelrdfpmathlib/vcpkg.json +++ b/ports/intelrdfpmathlib/vcpkg.json @@ -1,8 +1,9 @@ { "name": "intelrdfpmathlib", "version-string": "20U2", - "port-version": 3, + "port-version": 4, "description": "Intel(R) Decimal Floating-Point Math Library", + "supports": "!(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch b/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch index 9202f4bd9a..5f4749ae00 100644 --- a/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch +++ b/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch @@ -1,21 +1,21 @@ -diff --git a/build/make/configure.sh b/build/make/configure.sh -index 81d30a16c..d4f19cd97 100644 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -1370,12 +1370,14 @@ EOF - case ${tgt_os} in - win32) - add_asflags -f win32 -- enabled debug && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 - EXE_SFX=.exe - ;; - win64) - add_asflags -f win64 -- enabled debug && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 - EXE_SFX=.exe - ;; - linux*|solaris*|android*) +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 81d30a1..325017e 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1370,12 +1370,14 @@ EOF + case ${tgt_os} in + win32) + add_asflags -f win32 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + win64) + add_asflags -f win64 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + linux*|solaris*|android*) diff --git a/ports/libvpx/0003-add-uwp-and-v142-support.patch b/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch similarity index 73% rename from ports/libvpx/0003-add-uwp-and-v142-support.patch rename to ports/libvpx/0003-add-uwp-v142-and-v143-support.patch index 9d689ab59f..fd82486c10 100644 --- a/ports/libvpx/0003-add-uwp-and-v142-support.patch +++ b/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch @@ -1,5 +1,5 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index d4f19cd97..fb51368b1 100644 +index 325017e..5ab54e4 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -1016,7 +1016,7 @@ EOF @@ -47,10 +47,31 @@ index d4f19cd97..fb51368b1 100644 *-win*-vs*) ;; *-android-gcc) +diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh +index d1adfd7..a03ea59 100644 +--- a/build/make/gen_msvs_sln.sh ++++ b/build/make/gen_msvs_sln.sh +@@ -219,6 +219,7 @@ for opt in "$@"; do + 14) vs_year=2015 ;; + 15) vs_year=2017 ;; + 16) vs_year=2019 ;; ++ 17) vs_year=2022 ;; + *) die Unrecognized Visual Studio Version in $opt ;; + esac + ;; diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh -index 6f91ad478..916851662 100755 +index 6f91ad4..b4cad6c 100644 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh +@@ -170,7 +170,7 @@ for opt in "$@"; do + --ver=*) + vs_ver="$optval" + case "$optval" in +- 1[4-6]) ++ 1[4-7]) + ;; + *) die Unrecognized Visual Studio Version in $opt + ;; @@ -296,7 +296,22 @@ generate_vcxproj() { tag_content ProjectGuid "{${guid}}" tag_content RootNamespace ${name} @@ -75,7 +96,17 @@ index 6f91ad478..916851662 100755 tag_content AppContainerApplication true # The application type can be one of "Windows Store", # "Windows Phone" or "Windows Phone Silverlight". The -@@ -391,7 +406,7 @@ generate_vcxproj() { +@@ -344,6 +359,9 @@ generate_vcxproj() { + if [ "$vs_ver" = "16" ]; then + tag_content PlatformToolset v142 + fi ++ if [ "$vs_ver" = "17" ]; then ++ tag_content PlatformToolset v143 ++ fi + tag_content CharacterSet Unicode + if [ "$config" = "Release" ]; then + tag_content WholeProgramOptimization true +@@ -391,7 +409,7 @@ generate_vcxproj() { Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'" if [ "$name" == "vpx" ]; then hostplat=$plat @@ -85,47 +116,63 @@ index 6f91ad478..916851662 100755 fi fi diff --git a/configure b/configure -index da631a45e..da93474e5 100755 +index da631a4..2804678 100644 --- a/configure +++ b/configure -@@ -101,16 +101,20 @@ all_platforms="${all_platforms} arm64-android-gcc" +@@ -101,16 +101,24 @@ all_platforms="${all_platforms} arm64-android-gcc" all_platforms="${all_platforms} arm64-darwin-gcc" all_platforms="${all_platforms} arm64-darwin20-gcc" all_platforms="${all_platforms} arm64-linux-gcc" +all_platforms="${all_platforms} arm64-uwp-vs16" ++all_platforms="${all_platforms} arm64-uwp-vs17" all_platforms="${all_platforms} arm64-win64-gcc" all_platforms="${all_platforms} arm64-win64-vs15" +all_platforms="${all_platforms} arm64-win64-vs16" ++all_platforms="${all_platforms} arm64-win64-vs17" all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 +all_platforms="${all_platforms} armv7-uwp-vs16" ++all_platforms="${all_platforms} armv7-uwp-vs17" all_platforms="${all_platforms} armv7-win32-gcc" all_platforms="${all_platforms} armv7-win32-vs14" all_platforms="${all_platforms} armv7-win32-vs15" +all_platforms="${all_platforms} armv7-win32-vs16" ++all_platforms="${all_platforms} armv7-win32-vs17" all_platforms="${all_platforms} armv7s-darwin-gcc" all_platforms="${all_platforms} armv8-linux-gcc" all_platforms="${all_platforms} mips32-linux-gcc" -@@ -135,6 +139,7 @@ all_platforms="${all_platforms} x86-linux-gcc" +@@ -135,10 +143,13 @@ all_platforms="${all_platforms} x86-linux-gcc" all_platforms="${all_platforms} x86-linux-icc" all_platforms="${all_platforms} x86-os2-gcc" all_platforms="${all_platforms} x86-solaris-gcc" +all_platforms="${all_platforms} x86-uwp-vs16" ++all_platforms="${all_platforms} x86-uwp-vs17" all_platforms="${all_platforms} x86-win32-gcc" all_platforms="${all_platforms} x86-win32-vs14" all_platforms="${all_platforms} x86-win32-vs15" -@@ -156,6 +161,7 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" + all_platforms="${all_platforms} x86-win32-vs16" ++all_platforms="${all_platforms} x86-win32-vs17" + all_platforms="${all_platforms} x86_64-android-gcc" + all_platforms="${all_platforms} x86_64-darwin9-gcc" + all_platforms="${all_platforms} x86_64-darwin10-gcc" +@@ -156,10 +167,13 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-solaris-gcc" +all_platforms="${all_platforms} x86_64-uwp-vs16" ++all_platforms="${all_platforms} x86_64-uwp-vs17" all_platforms="${all_platforms} x86_64-win64-gcc" all_platforms="${all_platforms} x86_64-win64-vs14" all_platforms="${all_platforms} x86_64-win64-vs15" -@@ -476,11 +482,10 @@ process_targets() { + all_platforms="${all_platforms} x86_64-win64-vs16" ++all_platforms="${all_platforms} x86_64-win64-vs17" + all_platforms="${all_platforms} generic-gnu" + + # all_targets is a list of all targets that can be configured +@@ -476,11 +490,10 @@ process_targets() { ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt" ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs" DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}" @@ -141,7 +188,7 @@ index da631a45e..da93474e5 100755 if [ -f "${source_path}/build/make/version.sh" ]; then ver=`"$source_path/build/make/version.sh" --bare "$source_path"` DIST_DIR="${DIST_DIR}-${ver}" -@@ -569,6 +574,10 @@ process_detect() { +@@ -569,6 +582,10 @@ process_detect() { # Specialize windows and POSIX environments. case $toolchain in diff --git a/ports/libvpx/0004-remove-library-suffixes.patch b/ports/libvpx/0004-remove-library-suffixes.patch index c8feaf8f38..e7f827d7b1 100644 --- a/ports/libvpx/0004-remove-library-suffixes.patch +++ b/ports/libvpx/0004-remove-library-suffixes.patch @@ -1,13 +1,13 @@ -diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh -index 916851662..e60405bc9 100755 ---- a/build/make/gen_msvs_vcxproj.sh -+++ b/build/make/gen_msvs_vcxproj.sh -@@ -394,7 +394,7 @@ generate_vcxproj() { - else - config_suffix="" - fi -- tag_content TargetName "${name}${lib_sfx}${config_suffix}" -+ tag_content TargetName "${name}" - fi - close_tag PropertyGroup - done +diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh +index 916851662..e60405bc9 100755 +--- a/build/make/gen_msvs_vcxproj.sh ++++ b/build/make/gen_msvs_vcxproj.sh +@@ -394,7 +394,7 @@ generate_vcxproj() { + else + config_suffix="" + fi +- tag_content TargetName "${name}${lib_sfx}${config_suffix}" ++ tag_content TargetName "${name}" + fi + close_tag PropertyGroup + done diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index ac17dbbfa2..8126ad7223 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 0002-Fix-nasm-debug-format-flag.patch - 0003-add-uwp-and-v142-support.patch + 0003-add-uwp-v142-and-v143-support.patch 0004-remove-library-suffixes.patch ) @@ -19,12 +19,12 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) if(CMAKE_HOST_WIN32) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) - set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") else() - set(BASH /bin/bash) - set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") + set(BASH /bin/bash) + set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") endif() vcpkg_find_acquire_program(NASM) @@ -42,7 +42,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_CRT_SUFFIX md) endif() - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND VCPKG_PLATFORM_TOOLSET STREQUAL v142) + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND (VCPKG_PLATFORM_TOOLSET STREQUAL v142 OR VCPKG_PLATFORM_TOOLSET STREQUAL v143)) set(LIBVPX_TARGET_OS "uwp") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm) set(LIBVPX_TARGET_OS "win32") @@ -64,7 +64,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_ARCH_DIR "ARM") endif() - if(VCPKG_PLATFORM_TOOLSET STREQUAL v142) + if(VCPKG_PLATFORM_TOOLSET STREQUAL v143) + set(LIBVPX_TARGET_VS "vs17") + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL v142) set(LIBVPX_TARGET_VS "vs16") else() set(LIBVPX_TARGET_VS "vs15") @@ -143,10 +145,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}") configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vpx.pc" @ONLY) endif() - + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}/debug") - configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY) endif() else() diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index 321571a287..05d404362c 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libvpx", "version": "1.11.0", + "port-version": 1, "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", "license": "BSD-3-Clause", diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json index 15ef262df8..210c776d13 100644 --- a/ports/lmdb/vcpkg.json +++ b/ports/lmdb/vcpkg.json @@ -1,10 +1,11 @@ { "name": "lmdb", "version": "0.9.29", - "port-version": 1, + "port-version": 2, "description": "LMDB is an extraordinarily fast, memory-efficient database", "homepage": "https://github.com/LMDB/lmdb", "license": null, + "supports": "!(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f4ae0f062d..59ab14591e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -48,8 +48,6 @@ # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail -aubio:arm-uwp=fail -aubio:x64-uwp=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:x64-osx=fail @@ -288,7 +286,6 @@ freeglut:x64-uwp=fail freeglut:x64-osx=fail # Needs /bigobj freeopcua:arm64-windows=fail -freetype-gl:x64-uwp=fail ftgl:x64-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 functions-framework-cpp:x64-uwp=fail @@ -400,8 +397,6 @@ intel-mkl:x64-windows=fail intel-mkl:x64-windows-static=fail intel-mkl:x64-windows-static-md=fail intel-mkl:x86-windows=fail -intelrdfpmathlib:arm-uwp=fail -intelrdfpmathlib:x64-uwp=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail irrlicht:x64-uwp=fail @@ -450,8 +445,6 @@ libbf:x64-windows=fail libbf:x64-windows-static=fail libbf:x64-windows-static-md=fail libbf:x86-windows=fail -libbson:arm-uwp=fail -libbson:x64-uwp=fail libcopp:arm64-windows=fail libcopp:arm-uwp=fail # Missing system libraries on linux to run/prepare autoconf @@ -584,8 +577,6 @@ libsrt:x64-uwp=fail libssh:arm64-windows=fail libssh:arm-uwp=fail libssh:x64-uwp=fail -libtcod:arm-uwp=fail -libtcod:x64-uwp=fail libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail @@ -616,7 +607,6 @@ libvmdk:x64-windows-static-md=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip -libvpx:arm-uwp=fail libwandio:x86-windows=fail libwandio:x64-windows=fail libwandio:x64-windows-static=fail @@ -633,8 +623,6 @@ live555:x64-osx=fail live555:x64-uwp=fail llgl:arm-uwp=fail llgl:x64-uwp=fail -lmdb:arm-uwp=fail -lmdb:x64-uwp=fail log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail log4cxx:arm-uwp=fail @@ -676,8 +664,6 @@ mesa:x64-windows-static-md=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail -metis:arm-uwp=fail -metis:x64-uwp=fail mfl:x64-linux=skip mfl:x64-osx=skip milerius-sfml-imgui:x64-windows-static=fail @@ -933,8 +919,6 @@ pmdk:x64-windows-static=fail pmdk:x86-windows=fail popsift:x64-windows-static-md=fail portable-snippets:arm-uwp=fail -pqp:arm-uwp=fail -pqp:x64-uwp=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail @@ -1117,9 +1101,7 @@ skia:x64-uwp=fail sleef:x86-windows=fail slikenet:arm-uwp=fail slikenet:x64-uwp=fail -smpeg2:arm-uwp=fail smpeg2:x64-linux=fail -smpeg2:x64-uwp=fail soci:arm-uwp=fail soci:x64-uwp=fail sockpp:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index b4c17d93ee..d24eaa5d93 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2974,7 +2974,7 @@ }, "intelrdfpmathlib": { "baseline": "20U2", - "port-version": 3 + "port-version": 4 }, "io2d": { "baseline": "2020-09-14", @@ -4162,7 +4162,7 @@ }, "libvpx": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "libwandio": { "baseline": "4.2.1", @@ -4266,7 +4266,7 @@ }, "lmdb": { "baseline": "0.9.29", - "port-version": 1 + "port-version": 2 }, "lodepng": { "baseline": "2021-12-04", diff --git a/versions/i-/intelrdfpmathlib.json b/versions/i-/intelrdfpmathlib.json index 0795294158..fdeefa02e2 100644 --- a/versions/i-/intelrdfpmathlib.json +++ b/versions/i-/intelrdfpmathlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47e6c0bf433235a53c450a3c1c61388a10a643e0", + "version-string": "20U2", + "port-version": 4 + }, { "git-tree": "b105f0256b4fccc53e7653a732dc65459e1d8562", "version-string": "20U2", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index 03cd212ec3..7758ffc7ab 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d03c5487a2e01ccc310c1d3e5b0b2c78232cf2b", + "version": "1.11.0", + "port-version": 1 + }, { "git-tree": "3ec8aec9ecbcb2e3b5a0af7cea8045359d9aec94", "version": "1.11.0", diff --git a/versions/l-/lmdb.json b/versions/l-/lmdb.json index 22e21e7ef8..d150fa7f19 100644 --- a/versions/l-/lmdb.json +++ b/versions/l-/lmdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c94e6b90d91bc39a4307502116b20d7b38de413", + "version": "0.9.29", + "port-version": 2 + }, { "git-tree": "02d32452e2c5a3284fcdd1f448ab513dbb18a085", "version": "0.9.29",