diff --git a/ports/cuda/vcpkg.json b/ports/cuda/vcpkg.json index a448794d30090d..e6e874a57ebbe2 100644 --- a/ports/cuda/vcpkg.json +++ b/ports/cuda/vcpkg.json @@ -1,7 +1,8 @@ { "name": "cuda", "version-string": "10.1", - "port-version": 8, + "port-version": 9, "description": "A parallel computing platform and programming model", - "homepage": "https://developer.nvidia.com/cuda-toolkit" + "homepage": "https://developer.nvidia.com/cuda-toolkit", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))" } diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 8f4db92cea9fb9..993703ce7532e3 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 8, + "port-version": 9, "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." @@ -114,14 +114,6 @@ ], "platform": "!uwp" }, - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "opengl" - ], - "platform": "!uwp" - }, { "name": "ffmpeg", "default-features": false, @@ -174,9 +166,9 @@ "name": "ffmpeg", "default-features": false, "features": [ - "nvcodec" + "opengl" ], - "platform": "(windows | linux) & !uwp" + "platform": "!uwp & !(arm64 & windows)" }, { "name": "ffmpeg", @@ -185,6 +177,14 @@ "tesseract" ], "platform": "!(windows & arm) & !static & !uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "nvcodec" + ], + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" } ] }, @@ -442,6 +442,7 @@ }, "nvcodec": { "description": "Nvidia video decoding/encoding acceleration", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))", "dependencies": [ "ffnvcodec" ] diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index 7ef678a4b8095c..47418dc0ce0063 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,7 +1,8 @@ { "name": "ffnvcodec", "version": "11.1.5.0", + "port-version": 1, "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", - "supports": "(windows | linux) & !uwp" + "supports": "linux | (!osx & !uwp & !(arm64 & windows))" } diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 8a9dba7660bd68..25cfb74b8fcb9c 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -289,10 +289,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll" - "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb" - ) - file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + if (NOT VCPKG_BUILD_TYPE) + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb" + ) + file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll" "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb" ) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index b78cbc8d80a238..43bfd15e654f30 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 4, + "port-version": 5, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index a142735cf2a927..d4db3ea41c8948 100644 --- a/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -1,5 +1,6 @@ # For old projects where the minimum CMake version is lower than 3.3. cmake_policy(SET CMP0057 NEW) +include(CMakeFindDependencyMacro) if(TARGET harfbuzz) return() @@ -14,9 +15,7 @@ if(HARFBUZZ_LIBRARY_DEBUG) endif() find_library(HARFBUZZ_LIBRARY_RELEASE NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) -if(HARFBUZZ_LIBRARY_RELEASE) - target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) -endif() +target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) set(HARFBUZZ_FEATURES @FEATURES@) @@ -25,7 +24,7 @@ if(APPLE) target_link_libraries(harfbuzz INTERFACE ${APPLICATIONSERVICES_LIBRARY}) endif() -find_package(freetype CONFIG REQUIRED) +find_dependency(freetype CONFIG) target_link_libraries(harfbuzz INTERFACE freetype) if ("graphite2" IN_LIST HARFBUZZ_FEATURES) @@ -53,9 +52,20 @@ if ("glib" IN_LIST HARFBUZZ_FEATURES) endif() if ("icu" IN_LIST HARFBUZZ_FEATURES) - find_package(ICU 61 COMPONENTS uc REQUIRED) + find_dependency(ICU 61 COMPONENTS uc) target_link_libraries(harfbuzz INTERFACE ICU::uc) endif() get_filename_component(_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) -target_include_directories(harfbuzz INTERFACE ${_INSTALL_DIR}/include/harfbuzz) +target_include_directories(harfbuzz INTERFACE "${_INSTALL_DIR}/include/harfbuzz") + +set(HARFBUZZ_LIBRARY harfbuzz::harfbuzz PARENT_SCOPE) +set(HARFBUZZ_LIBRARIES harfbuzz::harfbuzz PARENT_SCOPE) +set(HARFBUZZ_INCLUDE_DIR "${_INSTALL_DIR}/include/harfbuzz" PARENT_SCOPE) +set(HARFBUZZ_INCLUDE_DIRS "${_INSTALL_DIR}/include/harfbuzz" PARENT_SCOPE) + +if(HARFBUZZ_LIBRARY_RELEASE) + set(HARFBUZZ_FOUND TRUE PARENT_SCOPE) +else() + set(HARFBUZZ_FOUND FALSE PARENT_SCOPE) +endif() diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index eda180cb197463..110a24c2913991 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "harfbuzz", "version-semver": "3.2.0", + "port-version": 1, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ diff --git a/ports/leptonica/Modify-include-dir.patch b/ports/leptonica/Modify-include-dir.patch deleted file mode 100644 index 59486c6e266b49..00000000000000 --- a/ports/leptonica/Modify-include-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5aed94f..9bfcff9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -212,7 +212,7 @@ include(Configure) - - configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY) - --set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/leptonica") -+set(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include" "\${CMAKE_CURRENT_LIST_DIR}/../../include/leptonica") - - ############################################################################### - # diff --git a/ports/leptonica/fix-cmakelists.patch b/ports/leptonica/fix-cmakelists.patch index 6d1d281693003c..86063c46355275 100644 --- a/ports/leptonica/fix-cmakelists.patch +++ b/ports/leptonica/fix-cmakelists.patch @@ -1,12 +1,39 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e474463..d2b999d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -14,7 +14,6 @@ if (MSVC) - set_source_files_properties(${src} PROPERTIES LANGUAGE CXX) - endif() - --string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") - - add_library (leptonica ${src} ${hdr}) - set_target_properties (leptonica PROPERTIES VERSION ${VERSION_PLAIN}) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,20 +58,19 @@ if(UNIX) + endif() + + if(NOT SW_BUILD) +- find_package(GIF) +- find_package(JPEG) +- find_package(PNG) +- find_package(TIFF) +- find_package(ZLIB) ++ find_package(GIF REQUIRED) ++ find_package(JPEG REQUIRED) ++ find_package(PNG REQUIRED) ++ find_package(TIFF REQUIRED) ++ find_package(ZLIB REQUIRED) + find_package(PkgConfig) ++ find_package(OpenJPEG REQUIRED) + if (PKG_CONFIG_FOUND) + pkg_check_modules(WEBP libwebp QUIET) + pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET) +- pkg_check_modules(JP2K libopenjp2>=2.0 QUIET) + endif() + if(NOT WEBP) +- find_path(WEBP_INCLUDE_DIR /webp/decode.h) +- find_library(WEBP_LIBRARY NAMES webp) ++ find_package(WebP CONFIG REQUIRED) + if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY) + set(WEBP 1) + set(WEBP_FOUND TRUE) +@@ -213,7 +212,7 @@ include(Configure) + + configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY) + +-set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/leptonica") ++set(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include" "\${CMAKE_CURRENT_LIST_DIR}/../../include/leptonica") + + ############################################################################### + # diff --git a/ports/leptonica/fix-find-libwebp.patch b/ports/leptonica/fix-find-libwebp.patch deleted file mode 100644 index 588cf0c5480374..00000000000000 --- a/ports/leptonica/fix-find-libwebp.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6535632..1740841 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,8 +70,7 @@ if(NOT SW_BUILD) - pkg_check_modules(JP2K libopenjp2>=2.0 QUIET) - endif() - if(NOT WEBP) -- find_path(WEBP_INCLUDE_DIR /webp/decode.h) -- find_library(WEBP_LIBRARY NAMES webp) -+ find_package(WebP CONFIG REQUIRED) - if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY) - set(WEBP 1) - set(WEBP_FOUND TRUE) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d2b999d..019ec7b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -52,7 +52,7 @@ if (TIFF_LIBRARIES) - endif() - if (WEBP_FOUND) - target_include_directories (leptonica PUBLIC ${WEBP_INCLUDE_DIRS}) -- target_link_libraries (leptonica ${WEBP_LIBRARIES}) -+ target_link_libraries (leptonica WebP::webp WebP::libwebpmux) - endif() - if (ZLIB_LIBRARIES) - target_include_directories (leptonica PUBLIC ${ZLIB_INCLUDE_DIRS}) diff --git a/ports/leptonica/fix-src-cmakelists.patch b/ports/leptonica/fix-src-cmakelists.patch new file mode 100644 index 00000000000000..d31153541c0a5e --- /dev/null +++ b/ports/leptonica/fix-src-cmakelists.patch @@ -0,0 +1,19 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -14,7 +14,6 @@ if (MSVC) + set_source_files_properties(${src} PROPERTIES LANGUAGE CXX) + endif() + +-string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") + + add_library (leptonica ${src} ${hdr}) + set_target_properties (leptonica PROPERTIES VERSION ${VERSION_PLAIN}) +@@ -52,7 +52,7 @@ if (TIFF_LIBRARIES) + endif() + if (WEBP_FOUND) + target_include_directories (leptonica PUBLIC ${WEBP_INCLUDE_DIRS}) +- target_link_libraries (leptonica ${WEBP_LIBRARIES}) ++ target_link_libraries (leptonica WebP::webp WebP::libwebpmux) + endif() + if (ZLIB_LIBRARIES) + target_include_directories (leptonica PUBLIC ${ZLIB_INCLUDE_DIRS}) diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake index 11dfb396769659..b9fb57b5eea533 100644 --- a/ports/leptonica/portfile.cmake +++ b/ports/leptonica/portfile.cmake @@ -6,9 +6,8 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-cmakelists.patch + fix-src-cmakelists.patch find-dependency.patch - fix-find-libwebp.patch - Modify-include-dir.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC) diff --git a/ports/leptonica/vcpkg.json b/ports/leptonica/vcpkg.json index b70a8332d10620..7d6bfe4861ab6f 100644 --- a/ports/leptonica/vcpkg.json +++ b/ports/leptonica/vcpkg.json @@ -1,6 +1,7 @@ { "name": "leptonica", "version": "1.81.1", + "port-version": 1, "description": "An open source library containing software that is broadly useful for image processing and image analysis applications", "homepage": "https://github.com/DanBloomberg/leptonica", "dependencies": [ diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 5d1864450dc551..89d49b28d9faaa 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -34,7 +34,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 java OGRE_BUILD_COMPONENT_JAVA python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + csharp OGRE_BUILD_COMPONENT_CSHARP overlay OGRE_BUILD_COMPONENT_OVERLAY zziplib OGRE_CONFIG_ENABLE_ZIP strict OGRE_RESOURCEMANAGER_STRICT @@ -47,6 +47,7 @@ string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=OFF" "OGRE_RESOURCEMANAGER_STRICT=0" vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DOGRE_BUILD_DEPENDENCIES=OFF -DOGRE_BUILD_SAMPLES=OFF -DOGRE_BUILD_TESTS=OFF @@ -68,9 +69,6 @@ vcpkg_cmake_configure( -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -DFREETYPE_FOUND=ON -# Optional stuff - ${FEATURE_OPTIONS} -# vcpkg specific stuff -DOGRE_CMAKE_DIR=share/ogre ) @@ -99,15 +97,13 @@ endif() #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #manual-link subfolder is here to the rescue! if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) - else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) - endif() + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) + else() + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") + if(NOT VCPKG_BUILD_TYPE) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 4c06d9db3ceb38..1abf6edaca8bde 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ogre", "version": "1.12.9", - "port-version": 6, + "port-version": 7, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", + "license": "MIT", "dependencies": [ "pugixml", "sdl2", diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 9ee68190bd43ea..6732038cd64853 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv", - "version": "4.5.4", - "port-version": 1, + "version": "4.5.5", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -123,6 +122,18 @@ } ] }, + "freetype": { + "description": "freetype support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "freetype" + ] + } + ] + }, "gdcm": { "description": "GDCM support for opencv", "dependencies": [ diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 7f8b5483804ac5..8db4a0ef29a4f5 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -405,6 +405,7 @@ vcpkg_cmake_configure( -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF + -DWITH_CPUFEATURES=OFF ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_dnn=${BUILD_opencv_dnn} diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 530cc0ca7efa8d..abc32bdfb84ea7 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.16", - "port-version": 3, + "port-version": 4, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/0013-fix-opengl.patch b/ports/opencv4/0013-fix-opengl.patch new file mode 100644 index 00000000000000..8cd38c9bb66306 --- /dev/null +++ b/ports/opencv4/0013-fix-opengl.patch @@ -0,0 +1,11 @@ +--- a/modules/highgui/CMakeLists.txt ++++ b/modules/highgui/CMakeLists.txt +@@ -271,7 +271,7 @@ if(APPLE) + add_apple_compiler_options(${the_module}) + endif() + +-if(OPENCV_HIGHGUI_BUILTIN_BACKEND STREQUAL "WIN32UI" AND HAVE_OPENGL AND OPENGL_LIBRARIES) ++if(HAVE_OPENGL AND OPENGL_LIBRARIES) + ocv_target_link_libraries(${the_module} PRIVATE "${OPENGL_LIBRARIES}") + endif() + diff --git a/ports/opencv4/0014-fix-gstreamer.patch b/ports/opencv4/0014-fix-gstreamer.patch new file mode 100644 index 00000000000000..d75c5ec2ec1bdd --- /dev/null +++ b/ports/opencv4/0014-fix-gstreamer.patch @@ -0,0 +1,29 @@ +--- a/modules/videoio/cmake/detect_gstreamer.cmake ++++ b/modules/videoio/cmake/detect_gstreamer.cmake +@@ -44,6 +44,10 @@ if(NOT HAVE_GSTREAMER AND WIN32) + NAMES gstvideo gstvideo-1.0 + PATHS ${env_paths} + PATH_SUFFIXES "lib") ++ find_library(GSTREAMER_audio_LIBRARY ++ NAMES gstvideo gstaudio-1.0 ++ PATHS ${env_paths} ++ PATH_SUFFIXES "lib") + + find_library(GSTREAMER_glib_LIBRARY + NAMES glib-2.0 +@@ -63,6 +67,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) + AND GSTREAMER_pbutils_LIBRARY + AND GSTREAMER_riff_LIBRARY + AND GSTREAMER_video_LIBRARY ++ AND GSTREAMER_audio_LIBRARY + AND GSTREAMER_glib_LIBRARY + AND GSTREAMER_gobject_LIBRARY) + file(STRINGS "${GSTREAMER_gst_INCLUDE_DIR}/gst/gstversion.h" ver_strings REGEX "#define +GST_VERSION_(MAJOR|MINOR|MICRO|NANO).*") +@@ -77,6 +82,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) + ${GSTREAMER_app_LIBRARY} + ${GSTREAMER_riff_LIBRARY} + ${GSTREAMER_video_LIBRARY} ++ ${GSTREAMER_audio_LIBRARY} + ${GSTREAMER_pbutils_LIBRARY} + ${GSTREAMER_glib_LIBRARY} + ${GSTREAMER_gobject_LIBRARY}) diff --git a/ports/opencv4/0015-fix-freetype.patch b/ports/opencv4/0015-fix-freetype.patch new file mode 100644 index 00000000000000..62c41f2f4f3bca --- /dev/null +++ b/ports/opencv4/0015-fix-freetype.patch @@ -0,0 +1,16 @@ +diff --git a/modules/gapi/cmake/init.cmake b/modules/gapi/cmake/init.cmake +index 1c46432..43fb8ad 100644 +--- a/modules/gapi/cmake/init.cmake ++++ b/modules/gapi/cmake/init.cmake +@@ -20,10 +20,8 @@ if(NOT TARGET ade) + endif() + + if(WITH_FREETYPE) +- ocv_check_modules(FREETYPE freetype2) +- if (FREETYPE_FOUND) ++ find_package(freetype CONFIG REQUIRED) + set(HAVE_FREETYPE TRUE) +- endif() + endif() + + if(WITH_PLAIDML) diff --git a/ports/opencv4/0016-fix-freetype-contrib.patch b/ports/opencv4/0016-fix-freetype-contrib.patch new file mode 100644 index 00000000000000..4d0637fd1be548 --- /dev/null +++ b/ports/opencv4/0016-fix-freetype-contrib.patch @@ -0,0 +1,17 @@ +diff --git a/modules/freetype/CMakeLists.txt b/modules/freetype/CMakeLists.txt +index 6dd4aaf..e734e97 100644 +--- a/modules/freetype/CMakeLists.txt ++++ b/modules/freetype/CMakeLists.txt +@@ -3,8 +5,10 @@ if(APPLE_FRAMEWORK) + ocv_module_disable(freetype) + endif() + +-ocv_check_modules(FREETYPE freetype2) +-ocv_check_modules(HARFBUZZ harfbuzz) ++if(WITH_FREETYPE) ++find_package(freetype CONFIG REQUIRED) ++find_package(harfbuzz CONFIG REQUIRED) ++endif() + + if(OPENCV_INITIAL_PASS) + if(NOT FREETYPE_FOUND) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 71c805b76da008..e01547d3c1259e 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,14 +6,14 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") endif() -set(OPENCV_VERSION "4.5.4") +set(OPENCV_VERSION "4.5.5") set(USE_QT_VERSION "5") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954 + SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02 HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -27,6 +27,9 @@ vcpkg_from_github( 0010-fix-uwp-tiff-imgcodecs.patch 0011-remove-python2.patch 0012-fix-zlib.patch + 0013-fix-opengl.patch + 0014-fix-gstreamer.patch + 0015-fix-freetype.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -54,6 +57,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "cudnn" WITH_CUDNN "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG + "freetype" WITH_FREETYPE "gdcm" WITH_GDCM "gstreamer" WITH_GSTREAMER "halide" WITH_HALIDE @@ -127,15 +131,18 @@ if("tbb" IN_LIST FEATURES) endif() set(WITH_PYTHON OFF) +set(BUILD_opencv_python3 OFF) if("python" IN_LIST FEATURES) - set(WITH_PYTHON ON) - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") - set(ENV{PYTHON} "${PYTHON3}") - - function(vcpkg_get_python_package PYTHON_DIR ) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static AND VCPKG_TARGET_IS_WINDOWS) + message(WARNING "The python module is currently unsupported on Windows when building static OpenCV libraries") + else() + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path("${PYTHON3_DIR}") + vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") + set(ENV{PYTHON} "${PYTHON3}") + + function(vcpkg_get_python_package PYTHON_DIR ) cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") if(NOT _vgpp_PYTHON_EXECUTABLE) @@ -155,26 +162,29 @@ if("python" IN_LIST FEATURES) endif() if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() + if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_from_github( + OUT_SOURCE_PATH PYFILE_PATH + REPO pypa/get-pip + REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 + SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a + HEAD_REF master + ) + execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) + endif() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) + endforeach() else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() + foreach(_package IN LISTS _vgpp_PACKAGES) + execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) + endforeach() endif() - endfunction() - vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) + endfunction() + vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) + set(BUILD_opencv_python3 ON) + set(WITH_PYTHON ON) + endif() endif() if("dnn" IN_LIST FEATURES) @@ -209,10 +219,11 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9 + SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35 HEAD_REF master PATCHES 0007-fix-hdf5.patch + 0016-fix-freetype-contrib.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -474,6 +485,7 @@ vcpkg_cmake_configure( ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_dnn=${BUILD_opencv_dnn} + -DBUILD_opencv_python3=${BUILD_opencv_python3} ###### The following modules are disabled for UWP -DBUILD_opencv_quality=${BUILD_opencv_quality} -DBUILD_opencv_gapi=${BUILD_opencv_gapi} @@ -542,7 +554,7 @@ find_dependency(Tesseract)") string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") endif() if(BUILD_opencv_ovis) - string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") + string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(freetype)") endif() if("quirc" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(quirc)") @@ -596,4 +608,6 @@ if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index ffdd95f97f527c..4d3ec55d05e08b 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,9 +1,9 @@ { "name": "opencv4", - "version": "4.5.4", - "port-version": 4, + "version": "4.5.5", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", @@ -116,6 +116,13 @@ } ] }, + "freetype": { + "description": "Freetype support for opencv", + "dependencies": [ + "freetype", + "harfbuzz" + ] + }, "gdcm": { "description": "GDCM support for opencv", "dependencies": [ @@ -210,7 +217,10 @@ ] }, "python": { - "description": "Python wrapper support for opencv" + "description": "Python wrapper support for opencv", + "dependencies": [ + "python3" + ] }, "qt": { "description": "Qt GUI support for opencv", diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index fd0110847ccfa5..c4a94114651fb7 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -49,6 +49,7 @@ if(NOT "${program}") PATCHES meson-intl.patch fix_linker_detection.patch ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases") endif() z_vcpkg_find_acquire_program_find_internal("${program}" @@ -56,6 +57,6 @@ z_vcpkg_find_acquire_program_find_internal("${program}" PATHS ${paths_to_search} NAMES ${search_names} ) -#vcpkg_find_acquire_program(MESON) + message(STATUS "Using meson: ${MESON}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${program_version}") # For vcpkg_find_acquire_program diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index ec48241bd25769..82a1d87aeb01ff 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-tool-meson", "version": "0.60.2", - "port-version": 1, + "port-version": 2, "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "supports": "native" diff --git a/scripts/detect_compiler/CONTROL b/scripts/detect_compiler/CONTROL deleted file mode 100644 index d76f041f0083ac..00000000000000 --- a/scripts/detect_compiler/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: detect-compiler -Version: 0 -Description: None diff --git a/scripts/detect_compiler/vcpkg.json b/scripts/detect_compiler/vcpkg.json new file mode 100644 index 00000000000000..64979dffe2c0db --- /dev/null +++ b/scripts/detect_compiler/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "detect-compiler", + "version": "0", + "description": "None" +} diff --git a/scripts/test_ports/llfio-run-tests/CONTROL b/scripts/test_ports/llfio-run-tests/CONTROL deleted file mode 100644 index eeac83f9155fec..00000000000000 --- a/scripts/test_ports/llfio-run-tests/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: llfio-run-tests -Version: 0 -Description: Ensures that LLFIO built with vcpkg version of dependencies produces working executables. -Build-Depends: llfio[run-tests], llfio[status-code,run-tests] -Supports: x64 diff --git a/scripts/test_ports/llfio-run-tests/vcpkg.json b/scripts/test_ports/llfio-run-tests/vcpkg.json new file mode 100644 index 00000000000000..32c0cf4a2ef17c --- /dev/null +++ b/scripts/test_ports/llfio-run-tests/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "llfio-run-tests", + "version-string": "0", + "port-version": 1, + "description": "Ensures that LLFIO built with vcpkg version of dependencies produces working executables.", + "supports": "x64", + "dependencies": [ + { + "name": "llfio", + "features": [ + "run-tests" + ] + }, + { + "name": "llfio", + "features": [ + "run-tests", + "status-code" + ] + } + ] +} diff --git a/scripts/test_ports/outcome-run-tests/CONTROL b/scripts/test_ports/outcome-run-tests/CONTROL deleted file mode 100644 index bc289efab9465b..00000000000000 --- a/scripts/test_ports/outcome-run-tests/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: outcome-run-tests -Version: 0 -Description: Ensures that outcome built with vcpkg version of dependencies produces working executables. -Build-Depends: outcome[run-tests] -Supports: x64 diff --git a/scripts/test_ports/outcome-run-tests/vcpkg.json b/scripts/test_ports/outcome-run-tests/vcpkg.json new file mode 100644 index 00000000000000..8a203953af182f --- /dev/null +++ b/scripts/test_ports/outcome-run-tests/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "outcome-run-tests", + "version-string": "0", + "port-version": 1, + "description": "Ensures that outcome built with vcpkg version of dependencies produces working executables.", + "supports": "x64", + "dependencies": [ + { + "name": "outcome", + "features": [ + "run-tests" + ] + } + ] +} diff --git a/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL b/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL deleted file mode 100644 index 47859b0769b2e9..00000000000000 --- a/scripts/test_ports/vcpkg-acquire-msys-test/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vcpkg-acquire-msys-test -Version: 0 -Description: Test port to exercise vcpkg_acquire_msys -Supports: x86 & windows diff --git a/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json b/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json new file mode 100644 index 00000000000000..808294bbc59cca --- /dev/null +++ b/scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-acquire-msys-test", + "version-string": "0", + "port-version": 1, + "description": "Test port to exercise vcpkg_acquire_msys", + "supports": "x86 & windows" +} diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL b/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL deleted file mode 100644 index 78687c423501f2..00000000000000 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: vcpkg-ci-ffmpeg -Version: 1 -Homepage: https://github.com/microsoft/vcpkg -Description: Port to force features of certain ports within CI -Build-Depends: ffmpeg[all-nonfree] diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json new file mode 100644 index 00000000000000..356aab21a25013 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-ci-ffmpeg", + "version-string": "1", + "port-version": 1, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "ffmpeg", + "features": [ + "all-nonfree" + ] + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json index 078276b2bb4fcc..7c404301038862 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json @@ -17,7 +17,6 @@ "jpeg", "nonfree", "png", - "python", "quirc", "tiff", "webp" @@ -48,6 +47,7 @@ "name": "opencv", "default-features": false, "features": [ + "freetype", "gdcm", "ipp", "jasper", @@ -60,6 +60,14 @@ "vtk" ], "platform": "!uwp & !(windows & (arm | arm64))" + }, + { + "name": "opencv", + "default-features": false, + "features": [ + "python" + ], + "platform": "!uwp" } ] } diff --git a/scripts/test_ports/vcpkg-ci-paraview/CONTROL b/scripts/test_ports/vcpkg-ci-paraview/CONTROL deleted file mode 100644 index 1377508422d025..00000000000000 --- a/scripts/test_ports/vcpkg-ci-paraview/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: vcpkg-ci-paraview -Version: 1 -Port-Version: 2 -Homepage: https://github.com/microsoft/vcpkg -Description: Port to force features of certain ports within CI -Build-Depends: paraview[core,vtkm,tools](!(x86&windows)), paraview[core,tools](x86&windows) diff --git a/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json b/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json new file mode 100644 index 00000000000000..cc1e43306cccd8 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "vcpkg-ci-paraview", + "version-string": "1", + "port-version": 3, + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "dependencies": [ + { + "name": "paraview", + "default-features": false, + "features": [ + "tools" + ], + "platform": "x86 & windows" + }, + { + "name": "paraview", + "default-features": false, + "features": [ + "tools", + "vtkm" + ], + "platform": "!(x86 & windows)" + } + ] +} diff --git a/scripts/test_ports/vcpkg-find-acquire-program/CONTROL b/scripts/test_ports/vcpkg-find-acquire-program/CONTROL deleted file mode 100644 index 6f248be58aff52..00000000000000 --- a/scripts/test_ports/vcpkg-find-acquire-program/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vcpkg-find-acquire-program -Version: 0 -Description: Test port to exercise vcpkg_find_acquire_program -Supports: windows diff --git a/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json b/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json new file mode 100644 index 00000000000000..987003b4cf0d3c --- /dev/null +++ b/scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-find-acquire-program", + "version-string": "0", + "port-version": 1, + "description": "Test port to exercise vcpkg_find_acquire_program", + "supports": "windows" +} diff --git a/versions/baseline.json b/versions/baseline.json index fb07913cbcd95f..823d6889348c2f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1698,7 +1698,7 @@ }, "cuda": { "baseline": "10.1", - "port-version": 8 + "port-version": 9 }, "cudnn": { "baseline": "7.6.5", @@ -2154,11 +2154,11 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 8 + "port-version": 9 }, "ffnvcodec": { "baseline": "11.1.5.0", - "port-version": 0 + "port-version": 1 }, "fftw3": { "baseline": "3.3.10", @@ -2618,7 +2618,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 4 + "port-version": 5 }, "gtest": { "baseline": "1.11.0", @@ -2670,7 +2670,7 @@ }, "harfbuzz": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "hayai": { "baseline": "2019-08-10", @@ -3302,7 +3302,7 @@ }, "leptonica": { "baseline": "1.81.1", - "port-version": 0 + "port-version": 1 }, "lerc": { "baseline": "2.2", @@ -4918,7 +4918,7 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 6 + "port-version": 7 }, "ogre-next": { "baseline": "2019-10-20", @@ -5001,8 +5001,8 @@ "port-version": 2 }, "opencv": { - "baseline": "4.5.4", - "port-version": 1 + "baseline": "4.5.5", + "port-version": 0 }, "opencv2": { "baseline": "2.4.13.7", @@ -5010,11 +5010,11 @@ }, "opencv3": { "baseline": "3.4.16", - "port-version": 3 + "port-version": 4 }, "opencv4": { - "baseline": "4.5.4", - "port-version": 4 + "baseline": "4.5.5", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.1", @@ -7226,7 +7226,7 @@ }, "vcpkg-tool-meson": { "baseline": "0.60.2", - "port-version": 1 + "port-version": 2 }, "vcpkg-tool-nodejs": { "baseline": "14.17.4", diff --git a/versions/c-/cuda.json b/versions/c-/cuda.json index 12a4ed37052bab..464080212fcb99 100644 --- a/versions/c-/cuda.json +++ b/versions/c-/cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7895738a8a164beddfb53c4c69352b202d8e13e9", + "version-string": "10.1", + "port-version": 9 + }, { "git-tree": "43b8008115ab934b4cf1b36c38bb02ed845712bd", "version-string": "10.1", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 3132380518760c..c71cdf0555b701 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "558575c9b18b2ff734d48fe175e61f5a11c02ce4", + "version": "4.4.1", + "port-version": 9 + }, { "git-tree": "03b7a2329bc927de9637d45738c23e607e4f4387", "version": "4.4.1", diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index c249b192e93062..dc6a492f982925 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f49e200522747c711e28db563004ce1f5a2f816", + "version": "11.1.5.0", + "port-version": 1 + }, { "git-tree": "b86f38b94c28605c5f3b2bc060b8e43e26e0ad42", "version": "11.1.5.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 28b750f938c8e2..4accf168ca7504 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0524a22dbda0c09201b9c677b6f72dbce870d6df", + "version": "1.19.2", + "port-version": 5 + }, { "git-tree": "78cacf62a38c4cfc4e399720463bef9312f115dc", "version": "1.19.2", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index e489937273972f..e8b32f499d3398 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2c918c04e1ecf5b6a591911cea03f7093ab6933", + "version-semver": "3.2.0", + "port-version": 1 + }, { "git-tree": "a504ad46b9acfebdf6cc5e32bd0057d045f39115", "version-semver": "3.2.0", diff --git a/versions/l-/leptonica.json b/versions/l-/leptonica.json index 6e1143686b29a9..4ee606ff8613af 100644 --- a/versions/l-/leptonica.json +++ b/versions/l-/leptonica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "677775654e1914afaf5791361e9de3fac4762edc", + "version": "1.81.1", + "port-version": 1 + }, { "git-tree": "215a8a32b41e1561998ac840c3c35404707186a2", "version": "1.81.1", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 186e758b50f26c..a717a3e98d97b8 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd55a098294ab4f2f8b46bc67172e6a8be3c1df0", + "version": "1.12.9", + "port-version": 7 + }, { "git-tree": "64cee22caf52cb15e120895e0689281e8664f42a", "version": "1.12.9", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 13ab9afd7e7d74..60ab4980b25a04 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afe6b1b5c7be14be0656724754f95e537416c763", + "version": "4.5.5", + "port-version": 0 + }, { "git-tree": "c120b015f37bc79900712d64e8ca612d71be22cc", "version": "4.5.4", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 167793486cc7fd..9f39b0559ec81a 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7060d481bf3045fdd24aa8ef0d83cf2db3b13a50", + "version": "3.4.16", + "port-version": 4 + }, { "git-tree": "76d605b750c5535590489574dc24fa30ffe249f8", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index ee29cc212f42a9..aa1ddf5aed8d80 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afed148d21295bf99e8ac657fdb808ed82467871", + "version": "4.5.5", + "port-version": 0 + }, { "git-tree": "ce474a40e6572ced8dd1229f22f6cbed9cc74212", "version": "4.5.4", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 69969c8559d818..c5143684dbbe85 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c", + "version": "0.60.2", + "port-version": 2 + }, { "git-tree": "932036adfc24dd5fa63787b825974b6938402700", "version": "0.60.2",