From c332e63c8237053e46d2c43f0e9e0b4f87086ce8 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 25 Jan 2022 16:55:37 +0100 Subject: [PATCH 01/57] [OpenCV4] update to v4.5.5 --- ports/opencv4/portfile.cmake | 4 +++- ports/opencv4/vcpkg.json | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index c616a3990b03f4..8c1dd7476eabaf 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,7 +6,7 @@ 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( @@ -594,4 +594,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 5f97c6cf53e9d6..ebb8f86b55c4d8 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,9 +1,9 @@ { "name": "opencv4", - "version": "4.5.4", - "port-version": 2, + "version": "4.5.5", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", From b204659c40750caae5e9380b68a5a96598be7ade Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 25 Jan 2022 16:55:54 +0100 Subject: [PATCH 02/57] [OpenCV] bump version --- ports/opencv/vcpkg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 9ee68190bd43ea..3ca6f5152073bf 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": [ From d88511846185fc5981952ee7e1b3f6a9ccde0b74 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 25 Jan 2022 16:56:13 +0100 Subject: [PATCH 03/57] [gstreamer] fix build for opencv --- ports/gstreamer/portfile.cmake | 32 ++++++++++++++++++-------------- ports/gstreamer/vcpkg.json | 2 +- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 6739f0bddd86e6..7e8a95cc7f0fa2 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -65,7 +65,7 @@ file(RENAME ${GST_PLUGIN_UGLY_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/ file(RENAME ${GST_MESON_PORTS_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers) if(VCPKG_TARGET_IS_OSX) - # In Darwin platform, there can be an old version of `bison`, + # In Darwin platform, there can be an old version of `bison`, # Which can't be used for `gst-build`. It requires 2.4+ vcpkg_find_acquire_program(BISON) execute_process( @@ -215,9 +215,11 @@ vcpkg_configure_meson( -Dgst-plugins-bad:glib-checks=disabled ) if(VCPKG_TARGET_IS_WINDOWS) - # note: can't find where z.lib comes from. replace it to appropriate library name manually - get_filename_component(BUILD_NINJA_DBG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja ABSOLUTE) - vcpkg_replace_string(${BUILD_NINJA_DBG} "z.lib" "zlibd.lib") + if(NOT VCPKG_BUILD_TYPE) + # note: can't find where z.lib comes from. replace it to appropriate library name manually + get_filename_component(BUILD_NINJA_DBG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja ABSOLUTE) + vcpkg_replace_string(${BUILD_NINJA_DBG} "z.lib" "zlibd.lib") + endif() get_filename_component(BUILD_NINJA_REL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja ABSOLUTE) vcpkg_replace_string(${BUILD_NINJA_REL} "z.lib" "zlib.lib") vcpkg_replace_string(${BUILD_NINJA_REL} "\"-Wno-unused\"" "") # todo: may need a patch for `gst_debug=false` @@ -228,11 +230,10 @@ vcpkg_install_meson() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR ${CURRENT_PACKAGES_DIR}/include/GL ) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h +file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h ${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gl/gstglconfig.h ) -file(INSTALL ${GST_BUILD_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/debug/libexec ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/include @@ -243,21 +244,24 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin ) - set(PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX}) - set(SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX} - ${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX} + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${CMAKE_SHARED_LIBRARY_PREFIX}gstreamer-full-1.0${CMAKE_SHARED_LIBRARY_SUFFIX} + ${CURRENT_PACKAGES_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}gstreamer-full-1.0${CMAKE_SHARED_LIBRARY_SUFFIX} ) 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 ) file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE ${DBG_BINS} ${REL_BINS}) endif() + vcpkg_fixup_pkgconfig() + +file(INSTALL ${GST_BUILD_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index ca0ed44eb13858..0c680c41358094 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 2, + "port-version": 3, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", From a7c30afbaa370734e725701279882057ee0b2a03 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 25 Jan 2022 16:56:48 +0100 Subject: [PATCH 04/57] fix references --- versions/baseline.json | 10 +++++----- versions/g-/gstreamer.json | 5 +++++ versions/o-/opencv.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 89788d025abbed..6602b70487a19f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2614,7 +2614,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 2 + "port-version": 3 }, "gtest": { "baseline": "1.11.0", @@ -4977,8 +4977,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", @@ -4989,8 +4989,8 @@ "port-version": 2 }, "opencv4": { - "baseline": "4.5.4", - "port-version": 2 + "baseline": "4.5.5", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 62cc11ebf3984d..70c803dab58858 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "607a242952a58684c83d4e53ef47f34c2324d16e", + "version": "1.19.2", + "port-version": 3 + }, { "git-tree": "ec9fdf057bbec637e21db3a56297439e420106d4", "version": "1.19.2", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 13ab9afd7e7d74..3439d665218665 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92e09f516acb17424caf1e2cec828dcbbb73188b", + "version": "4.5.5", + "port-version": 0 + }, { "git-tree": "c120b015f37bc79900712d64e8ca612d71be22cc", "version": "4.5.4", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 2bde4f038f4c55..557e4b8a46e35f 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "464c18a2d3e50e46becbaef471901bf787ae827a", + "version": "4.5.5", + "port-version": 0 + }, { "git-tree": "537abba5a070d173cf42510f86ff4ffe057dd77f", "version": "4.5.4", From 0250b18aadd855f8e2c757b13a1c1ec9e6247429 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 26 Jan 2022 14:49:53 +0100 Subject: [PATCH 05/57] [vcpkg-tool-meson] fix nuget packaging --- ports/ogre/portfile.cmake | 16 +++++++--------- ports/ogre/vcpkg.json | 2 +- ports/opencv4/portfile.cmake | 4 ++-- ports/vcpkg-tool-meson/portfile.cmake | 3 ++- ports/vcpkg-tool-meson/vcpkg.json | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index c14da2fac93b22..c0122a1b891170 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -33,7 +33,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 @@ -99,15 +99,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 d084653e719bfb..279c70699b6298 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre", "version-string": "1.12.9", - "port-version": 5, + "port-version": 6, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "dependencies": [ diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 8c1dd7476eabaf..3c1e8ccce6019c 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -13,7 +13,7 @@ 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 @@ -208,7 +208,7 @@ 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 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" From 5044c263559df6d5638f188f4984743f068f22dc Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 26 Jan 2022 14:50:41 +0100 Subject: [PATCH 06/57] fix references --- versions/baseline.json | 4 ++-- versions/o-/ogre.json | 5 +++++ versions/o-/opencv4.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 6602b70487a19f..eb73f3b98fa390 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4894,7 +4894,7 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 5 + "port-version": 6 }, "ogre-next": { "baseline": "2019-10-20", @@ -7190,7 +7190,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/o-/ogre.json b/versions/o-/ogre.json index 5dd8f1b76d14f4..f9a6228c026a60 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4497a197252a3d3c32dafc9e6bf5467fb18eca81", + "version-string": "1.12.9", + "port-version": 6 + }, { "git-tree": "322b9a5290ce1656aa66b684b07d1e327b18eeeb", "version-string": "1.12.9", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 557e4b8a46e35f..9a8fe010131b43 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "464c18a2d3e50e46becbaef471901bf787ae827a", + "git-tree": "b41bc36985f072c2391e549dcbf4e22ab23aa0de", "version": "4.5.5", "port-version": 0 }, 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", From 0016991d7e90c45887efb2999c651925c07c3022 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 26 Jan 2022 15:05:31 +0100 Subject: [PATCH 07/57] [gstreamer] fix references --- ports/gstreamer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 0c680c41358094..04c9b4e4bdd877 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 3, + "port-version": 4, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e0243de6394834..6f4a5bcb42a60c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2614,7 +2614,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 3 + "port-version": 4 }, "gtest": { "baseline": "1.11.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index c3f52893a3d55b..105a59adc46fc4 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84d5be664880df35aec35ccec3120f80fdef5f01", + "version": "1.19.2", + "port-version": 4 + }, { "git-tree": "25482001e85b34b144a67fc9cc86127f9e8c89ea", "version": "1.19.2", From 59e6fc371ad9859ddc2d63afbd3d2a97c1d5466d Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 26 Jan 2022 15:25:56 +0100 Subject: [PATCH 08/57] [ogre] update vcpkg tools --- ports/ogre/portfile.cmake | 11 ++++------- ports/ogre/vcpkg.json | 9 +++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index c0122a1b891170..5a99e1d77d54d4 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -43,10 +43,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=ON" "OGRE_RESOURCEMANAGER_STRICT=1" FEATURE_OPTIONS "${FEATURE_OPTIONS}") string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=OFF" "OGRE_RESOURCEMANAGER_STRICT=0" FEATURE_OPTIONS "${FEATURE_OPTIONS}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS + ${FEATURE_OPTIONS} -DOGRE_BUILD_DEPENDENCIES=OFF -DOGRE_BUILD_SAMPLES=OFF -DOGRE_BUILD_TESTS=OFF @@ -68,14 +68,11 @@ vcpkg_configure_cmake( -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 ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 279c70699b6298..630d65eab9b652 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -4,9 +4,18 @@ "port-version": 6, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", + "license": "MIT", "dependencies": [ "pugixml", "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ From da30ffdbe7514495637092c090540624f7abee1e Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 26 Jan 2022 15:26:11 +0100 Subject: [PATCH 09/57] fix references --- versions/g-/gstreamer.json | 2 +- versions/o-/ogre.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 105a59adc46fc4..79c750a6282874 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "84d5be664880df35aec35ccec3120f80fdef5f01", + "git-tree": "9b1d16e135fe46d97a04615e5744775332d5fb16", "version": "1.19.2", "port-version": 4 }, diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index f9a6228c026a60..fa5012acb672b4 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4497a197252a3d3c32dafc9e6bf5467fb18eca81", + "git-tree": "2f9eb2f05cc55f405d746624422d1d925c444142", "version-string": "1.12.9", "port-version": 6 }, From 4d989fc3cf1f7f9a6f8d0d3687f5a054ef098709 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 10:48:50 +0100 Subject: [PATCH 10/57] [OpenCV4] fixes from CI runs --- ports/opencv/vcpkg.json | 12 +++++++ ports/opencv4/0012-fix-opengl.patch | 13 ++++++++ ports/opencv4/0013-fix-gstreamer.patch | 31 +++++++++++++++++++ ports/opencv4/portfile.cmake | 3 ++ ports/opencv4/vcpkg.json | 11 ++++++- scripts/test_ports/vcpkg-ci-opencv/vcpkg.json | 1 + 6 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 ports/opencv4/0012-fix-opengl.patch create mode 100644 ports/opencv4/0013-fix-gstreamer.patch diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 3ca6f5152073bf..6732038cd64853 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -122,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/opencv4/0012-fix-opengl.patch b/ports/opencv4/0012-fix-opengl.patch new file mode 100644 index 00000000000000..ffa7f0e5313e13 --- /dev/null +++ b/ports/opencv4/0012-fix-opengl.patch @@ -0,0 +1,13 @@ +diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt +index 0d63d42..1986bb1 100644 +--- 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/0013-fix-gstreamer.patch b/ports/opencv4/0013-fix-gstreamer.patch new file mode 100644 index 00000000000000..ec17c6343a4353 --- /dev/null +++ b/ports/opencv4/0013-fix-gstreamer.patch @@ -0,0 +1,31 @@ +diff --git a/modules/videoio/cmake/detect_gstreamer.cmake b/modules/videoio/cmake/detect_gstreamer.cmake +index fc6c347..94936d2 100644 +--- 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/portfile.cmake b/ports/opencv4/portfile.cmake index 3c1e8ccce6019c..a7029383929571 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -26,6 +26,8 @@ vcpkg_from_github( 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch 0011-remove-python2.patch + 0012-fix-opengl.patch + 0013-fix-gstreamer.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -53,6 +55,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 diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index ebb8f86b55c4d8..5d1ed008f79744 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -116,6 +116,12 @@ } ] }, + "freetype": { + "description": "Freetype support for opencv", + "dependencies": [ + "freetype" + ] + }, "gdcm": { "description": "GDCM support for opencv", "dependencies": [ @@ -210,7 +216,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/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json index 078276b2bb4fcc..bfe26f543e96f4 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json @@ -48,6 +48,7 @@ "name": "opencv", "default-features": false, "features": [ + "freetype", "gdcm", "ipp", "jasper", From 2278dc11f8b3505c1af87e90f5707ab67f6d9e04 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 10:50:57 +0100 Subject: [PATCH 11/57] fix references --- versions/o-/opencv.json | 2 +- versions/o-/opencv4.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 3439d665218665..60ab4980b25a04 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "92e09f516acb17424caf1e2cec828dcbbb73188b", + "git-tree": "afe6b1b5c7be14be0656724754f95e537416c763", "version": "4.5.5", "port-version": 0 }, diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 9a8fe010131b43..9edc05080a58f7 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b41bc36985f072c2391e549dcbf4e22ab23aa0de", + "git-tree": "439290ac831de48b29d8465bdd94ca4704e5e941", "version": "4.5.5", "port-version": 0 }, From 413baa5baab3c8d59986a3745c83d1d47a3b533c Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 11:41:34 +0100 Subject: [PATCH 12/57] [OpenCV4] force python module also in debug builds --- ports/opencv4/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index a7029383929571..b8871bbf99ee49 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -129,8 +129,8 @@ 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}") @@ -177,6 +177,8 @@ if("python" IN_LIST FEATURES) endif() endfunction() vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) + set(BUILD_opencv_python3 ON) + set(WITH_PYTHON ON) endif() if("dnn" IN_LIST FEATURES) From 9040a9c428079d418a70bb2d1b35fc3c57615d7d Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 11:41:49 +0100 Subject: [PATCH 13/57] fix references --- versions/o-/opencv4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 9edc05080a58f7..8711979fcd7f1e 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "439290ac831de48b29d8465bdd94ca4704e5e941", + "git-tree": "43dccdaf8db006aa2a6b79dd962ff82ff20c6719", "version": "4.5.5", "port-version": 0 }, From 0325a00cc84cc6a253f8583f4054e00d853dc4a0 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 13:27:58 +0100 Subject: [PATCH 14/57] [harfbuzz] fix cmake config --- ports/harfbuzz/harfbuzzConfig.cmake.in | 9 +++++++-- ports/harfbuzz/vcpkg.json | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index a142735cf2a927..ec9e07abc2b2cb 100644 --- a/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -7,6 +7,8 @@ endif() add_library(harfbuzz INTERFACE IMPORTED GLOBAL) add_library(harfbuzz::harfbuzz ALIAS harfbuzz) +add_library(HARFBUZZ_LIBRARY ALIAS harfbuzz) +add_library(HARFBUZZ_LIBRARIES ALIAS harfbuzz) find_library(HARFBUZZ_LIBRARY_DEBUG NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) if(HARFBUZZ_LIBRARY_DEBUG) @@ -25,7 +27,7 @@ if(APPLE) target_link_libraries(harfbuzz INTERFACE ${APPLICATIONSERVICES_LIBRARY}) endif() -find_package(freetype CONFIG REQUIRED) +find_package(freetype CONFIG) target_link_libraries(harfbuzz INTERFACE freetype) if ("graphite2" IN_LIST HARFBUZZ_FEATURES) @@ -53,9 +55,12 @@ if ("glib" IN_LIST HARFBUZZ_FEATURES) endif() if ("icu" IN_LIST HARFBUZZ_FEATURES) - find_package(ICU 61 COMPONENTS uc REQUIRED) + find_package(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) +if(HARFBUZZ_LIBRARY_DEBUG AND HARFBUZZ_LIBRARY_RELEASE) + set(HARFBUZZ_FOUND TRUE CACHE BOOL "") +endif() diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 58ccedd5f5896a..5cdd376be80253 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", "version-semver": "3.0.0", - "port-version": 1, + "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ From e8631a786f51a38a0e3a26d3bd80aaad2d0c6791 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 13:29:01 +0100 Subject: [PATCH 15/57] harfbuzz fixes --- ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index b8871bbf99ee49..db7591deb9e0c1 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -477,6 +477,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} diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 5d1ed008f79744..4d3ec55d05e08b 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -119,7 +119,8 @@ "freetype": { "description": "Freetype support for opencv", "dependencies": [ - "freetype" + "freetype", + "harfbuzz" ] }, "gdcm": { From bafeff70fc2924e072832f4096674680b6858c3c Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 13:29:20 +0100 Subject: [PATCH 16/57] fix references --- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ versions/o-/opencv4.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 6f4a5bcb42a60c..a8c8d6f7e79f72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2666,7 +2666,7 @@ }, "harfbuzz": { "baseline": "3.0.0", - "port-version": 1 + "port-version": 2 }, "hayai": { "baseline": "2019-08-10", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index fb4840943b23e1..319d4eff3a91fb 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0edce60e6fa4670bfef957957bdabe7d1c21c65a", + "version-semver": "3.0.0", + "port-version": 2 + }, { "git-tree": "151b8dba4351ec70354a0cc1485e5eb720df5f75", "version-semver": "3.0.0", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 8711979fcd7f1e..c632f95ce68d17 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "43dccdaf8db006aa2a6b79dd962ff82ff20c6719", + "git-tree": "cb6f6d7dc0e8bac957b794b2c09bc1764d6d8c39", "version": "4.5.5", "port-version": 0 }, From af4822757ce64aff38983315a27a6bc0a1f2916a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 14:15:49 +0100 Subject: [PATCH 17/57] [OpenCV4] remove unnecessary lines from patches --- ports/opencv4/0012-fix-opengl.patch | 2 -- ports/opencv4/0013-fix-gstreamer.patch | 2 -- 2 files changed, 4 deletions(-) diff --git a/ports/opencv4/0012-fix-opengl.patch b/ports/opencv4/0012-fix-opengl.patch index ffa7f0e5313e13..8cd38c9bb66306 100644 --- a/ports/opencv4/0012-fix-opengl.patch +++ b/ports/opencv4/0012-fix-opengl.patch @@ -1,5 +1,3 @@ -diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt -index 0d63d42..1986bb1 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -271,7 +271,7 @@ if(APPLE) diff --git a/ports/opencv4/0013-fix-gstreamer.patch b/ports/opencv4/0013-fix-gstreamer.patch index ec17c6343a4353..d75c5ec2ec1bdd 100644 --- a/ports/opencv4/0013-fix-gstreamer.patch +++ b/ports/opencv4/0013-fix-gstreamer.patch @@ -1,5 +1,3 @@ -diff --git a/modules/videoio/cmake/detect_gstreamer.cmake b/modules/videoio/cmake/detect_gstreamer.cmake -index fc6c347..94936d2 100644 --- a/modules/videoio/cmake/detect_gstreamer.cmake +++ b/modules/videoio/cmake/detect_gstreamer.cmake @@ -44,6 +44,10 @@ if(NOT HAVE_GSTREAMER AND WIN32) From 1aa6f6d4e7ef59d83d89776b81f0ba242a2cfc7e Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 14:16:02 +0100 Subject: [PATCH 18/57] fix references --- versions/o-/opencv4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index c632f95ce68d17..87a975f2aeee94 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cb6f6d7dc0e8bac957b794b2c09bc1764d6d8c39", + "git-tree": "9842aeee538c9cc536ea87d57e9729709124179d", "version": "4.5.5", "port-version": 0 }, From 8e95e3c923cbc7431491c468ed87ea81ffa1c7ab Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 14:20:11 +0100 Subject: [PATCH 19/57] [harfbuzz] bump version --- ports/harfbuzz/vcpkg.json | 1 + 1 file changed, 1 insertion(+) 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": [ From b1866d543416302d34ce5ad7b8ed6c058ad43e04 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 14:20:29 +0100 Subject: [PATCH 20/57] fix references --- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 34ce3c427190cd..3f7d109c45bdce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2670,7 +2670,7 @@ }, "harfbuzz": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "hayai": { "baseline": "2019-08-10", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index e489937273972f..372272a7aa350a 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b3bcc819d7b298339f8e0c393f9edb24c316cdb", + "version-semver": "3.2.0", + "port-version": 1 + }, { "git-tree": "a504ad46b9acfebdf6cc5e32bd0057d045f39115", "version-semver": "3.2.0", From e2a2d3828675169bf43af7dbb1f5fa0a057f91fa Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 15:53:35 +0100 Subject: [PATCH 21/57] [harfbuzz] fix for single config builds --- ports/harfbuzz/harfbuzzConfig.cmake.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index ec9e07abc2b2cb..6b90ee24ff0ebc 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() @@ -16,9 +17,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@) @@ -27,7 +26,7 @@ if(APPLE) target_link_libraries(harfbuzz INTERFACE ${APPLICATIONSERVICES_LIBRARY}) endif() -find_package(freetype CONFIG) +find_dependency(freetype CONFIG) target_link_libraries(harfbuzz INTERFACE freetype) if ("graphite2" IN_LIST HARFBUZZ_FEATURES) @@ -55,12 +54,12 @@ if ("glib" IN_LIST HARFBUZZ_FEATURES) endif() if ("icu" IN_LIST HARFBUZZ_FEATURES) - find_package(ICU 61 COMPONENTS uc) + 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) -if(HARFBUZZ_LIBRARY_DEBUG AND HARFBUZZ_LIBRARY_RELEASE) - set(HARFBUZZ_FOUND TRUE CACHE BOOL "") +if(HARFBUZZ_LIBRARY_RELEASE) + set(HARFBUZZ_FOUND TRUE CACHE BOOL "" FORCE) endif() From bbfb1ca50da17fea23abe4a133f4747a6a8e0be5 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 28 Jan 2022 15:53:48 +0100 Subject: [PATCH 22/57] fix references --- versions/h-/harfbuzz.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 372272a7aa350a..f93e5b0855adca 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4b3bcc819d7b298339f8e0c393f9edb24c316cdb", + "git-tree": "4436e83d2fa7e5354338780a65bc5d31f5b03904", "version-semver": "3.2.0", "port-version": 1 }, From 2fac3f8bb03c324616dc2cf246d080be28b53a04 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 31 Jan 2022 10:18:51 +0100 Subject: [PATCH 23/57] freetype fixes --- ports/harfbuzz/harfbuzzConfig.cmake.in | 14 +++++++++----- ports/opencv4/0014-fix-freetype.patch | 16 ++++++++++++++++ ports/opencv4/0015-fix-freetype-contrib.patch | 15 +++++++++++++++ ports/opencv4/portfile.cmake | 2 ++ 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 ports/opencv4/0014-fix-freetype.patch create mode 100644 ports/opencv4/0015-fix-freetype-contrib.patch diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index 6b90ee24ff0ebc..d8d387e7355214 100644 --- a/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -8,8 +8,6 @@ endif() add_library(harfbuzz INTERFACE IMPORTED GLOBAL) add_library(harfbuzz::harfbuzz ALIAS harfbuzz) -add_library(HARFBUZZ_LIBRARY ALIAS harfbuzz) -add_library(HARFBUZZ_LIBRARIES ALIAS harfbuzz) find_library(HARFBUZZ_LIBRARY_DEBUG NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) if(HARFBUZZ_LIBRARY_DEBUG) @@ -59,7 +57,13 @@ if ("icu" IN_LIST HARFBUZZ_FEATURES) endif() get_filename_component(_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) -target_include_directories(harfbuzz INTERFACE ${_INSTALL_DIR}/include/harfbuzz) -if(HARFBUZZ_LIBRARY_RELEASE) - set(HARFBUZZ_FOUND TRUE CACHE BOOL "" FORCE) +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") +set(HARFBUZZ_INCLUDE_DIRS "${_INSTALL_DIR}/include/harfbuzz") + +if(HARFBUZZ_LIBRARY_RELEASE AND HARFBUZZ_INCLUDE_DIR) + set(HARFBUZZ_FOUND TRUE PARENT_SCOPE) endif() diff --git a/ports/opencv4/0014-fix-freetype.patch b/ports/opencv4/0014-fix-freetype.patch new file mode 100644 index 00000000000000..0c1a766e388e44 --- /dev/null +++ b/ports/opencv4/0014-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 REQUIRED) + set(HAVE_FREETYPE TRUE) +- endif() + endif() + + if(WITH_PLAIDML) diff --git a/ports/opencv4/0015-fix-freetype-contrib.patch b/ports/opencv4/0015-fix-freetype-contrib.patch new file mode 100644 index 00000000000000..43bcff9bda9a50 --- /dev/null +++ b/ports/opencv4/0015-fix-freetype-contrib.patch @@ -0,0 +1,15 @@ +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 +3,8 @@ if(APPLE_FRAMEWORK) + ocv_module_disable(freetype) + endif() + +-ocv_check_modules(FREETYPE freetype2) +-ocv_check_modules(HARFBUZZ harfbuzz) ++find_package(Freetype) ++find_package(harfbuzz) + + if(OPENCV_INITIAL_PASS) + if(NOT FREETYPE_FOUND) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index db7591deb9e0c1..3da7c3afe5ba2c 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -28,6 +28,7 @@ vcpkg_from_github( 0011-remove-python2.patch 0012-fix-opengl.patch 0013-fix-gstreamer.patch + 0014-fix-freetype.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -217,6 +218,7 @@ if("contrib" IN_LIST FEATURES) HEAD_REF master PATCHES 0007-fix-hdf5.patch + 0015-fix-freetype-contrib.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") From f4bd5e6f1cf701092d2c900f56dbd7b90f13ed3e Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 31 Jan 2022 10:19:07 +0100 Subject: [PATCH 24/57] fix references --- versions/h-/harfbuzz.json | 2 +- versions/o-/opencv4.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index f93e5b0855adca..1cc966c9feec92 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4436e83d2fa7e5354338780a65bc5d31f5b03904", + "git-tree": "155138a85296036a9b499150a82817893caa1040", "version-semver": "3.2.0", "port-version": 1 }, diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 87a975f2aeee94..ba06752205b2d8 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9842aeee538c9cc536ea87d57e9729709124179d", + "git-tree": "817e7ee7f119b425f92e686de5b0fad3eff975e5", "version": "4.5.5", "port-version": 0 }, From dc7c66ff6a69555d4a34b594e90d2903c2a28339 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 31 Jan 2022 10:21:43 +0100 Subject: [PATCH 25/57] fix ogre references --- ports/ogre/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/ogre.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 3f652e26e1e089..1abf6edaca8bde 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,7 @@ { "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", diff --git a/versions/baseline.json b/versions/baseline.json index 84331095713fef..e0f508c8550230 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4898,7 +4898,7 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 6 + "port-version": 7 }, "ogre-next": { "baseline": "2019-10-20", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 186e758b50f26c..faa8af97d19715 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ecdbaa82bff52c0f0ca0998e6a2644b8558ca94", + "version": "1.12.9", + "port-version": 7 + }, { "git-tree": "64cee22caf52cb15e120895e0689281e8664f42a", "version": "1.12.9", From 87bde558a0b82a171699727c81fb525b062c437b Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 31 Jan 2022 10:30:23 +0100 Subject: [PATCH 26/57] fix references, again --- versions/o-/ogre.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index faa8af97d19715..a717a3e98d97b8 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1ecdbaa82bff52c0f0ca0998e6a2644b8558ca94", + "git-tree": "fd55a098294ab4f2f8b46bc67172e6a8be3c1df0", "version": "1.12.9", "port-version": 7 }, From c8b1002f67113223b54253bb500aca8dc6a58ae8 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 2 Feb 2022 11:04:06 +0100 Subject: [PATCH 27/57] python when building static windows opencv libraries is unsupported --- ports/harfbuzz/harfbuzzConfig.cmake.in | 4 +- ports/opencv4/portfile.cmake | 56 ++++++++++++++------------ 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index d8d387e7355214..2e5714169ce4e7 100644 --- a/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -61,8 +61,8 @@ 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") -set(HARFBUZZ_INCLUDE_DIRS "${_INSTALL_DIR}/include/harfbuzz") +set(HARFBUZZ_INCLUDE_DIR "${_INSTALL_DIR}/include/harfbuzz" PARENT_SCOPE) +set(HARFBUZZ_INCLUDE_DIRS "${_INSTALL_DIR}/include/harfbuzz" PARENT_SCOPE) if(HARFBUZZ_LIBRARY_RELEASE AND HARFBUZZ_INCLUDE_DIR) set(HARFBUZZ_FOUND TRUE PARENT_SCOPE) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 3da7c3afe5ba2c..f3df0151e4222a 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -132,13 +132,16 @@ endif() set(WITH_PYTHON OFF) set(BUILD_opencv_python3 OFF) if("python" IN_LIST FEATURES) - 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}") + 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 ) + function(vcpkg_get_python_package PYTHON_DIR ) cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") if(NOT _vgpp_PYTHON_EXECUTABLE) @@ -158,28 +161,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) - set(BUILD_opencv_python3 ON) - set(WITH_PYTHON ON) + 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) From 13c15a5698149c3b3ba6edefac7b4201ba3c2d5d Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 2 Feb 2022 11:04:24 +0100 Subject: [PATCH 28/57] fix references --- versions/h-/harfbuzz.json | 2 +- versions/o-/opencv4.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 1cc966c9feec92..a52199714ceddf 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "155138a85296036a9b499150a82817893caa1040", + "git-tree": "cb079ba29e1ac077ad18cf991d896ae2bda0506e", "version-semver": "3.2.0", "port-version": 1 }, diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index ba06752205b2d8..22c2bbdd9088d8 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "817e7ee7f119b425f92e686de5b0fad3eff975e5", + "git-tree": "eb1804126e096e32df2b74f079eb3191a3febbca", "version": "4.5.5", "port-version": 0 }, From 9c944f593fa0fb56dbe7a0318888c0a45138dc2e Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 2 Feb 2022 11:12:01 +0100 Subject: [PATCH 29/57] fix --- ports/harfbuzz/harfbuzzConfig.cmake.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index 2e5714169ce4e7..d4db3ea41c8948 100644 --- a/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -64,6 +64,8 @@ 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 AND HARFBUZZ_INCLUDE_DIR) +if(HARFBUZZ_LIBRARY_RELEASE) set(HARFBUZZ_FOUND TRUE PARENT_SCOPE) +else() + set(HARFBUZZ_FOUND FALSE PARENT_SCOPE) endif() From b8ddb0971ba1487f597df9624910a1e6b54f4372 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 2 Feb 2022 11:12:16 +0100 Subject: [PATCH 30/57] refs --- versions/h-/harfbuzz.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index a52199714ceddf..e8b32f499d3398 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cb079ba29e1ac077ad18cf991d896ae2bda0506e", + "git-tree": "b2c918c04e1ecf5b6a591911cea03f7093ab6933", "version-semver": "3.2.0", "port-version": 1 }, From ed4dfbb017a8b22ba17ffc1cf8c8e8b70c6cfa51 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 3 Feb 2022 10:21:56 +0100 Subject: [PATCH 31/57] use required when necessary --- ports/opencv4/0007-fix-hdf5.patch | 3 ++- ports/opencv4/0014-fix-freetype.patch | 2 +- ports/opencv4/0015-fix-freetype-contrib.patch | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/opencv4/0007-fix-hdf5.patch b/ports/opencv4/0007-fix-hdf5.patch index 8e7e154ad40671..15155689cb08f8 100644 --- a/ports/opencv4/0007-fix-hdf5.patch +++ b/ports/opencv4/0007-fix-hdf5.patch @@ -20,7 +20,8 @@ - endif() -else() if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package - find_package(HDF5) +- find_package(HDF5) ++ find_package(HDF5 CONFIG REQUIRED) endif() -endif() diff --git a/ports/opencv4/0014-fix-freetype.patch b/ports/opencv4/0014-fix-freetype.patch index 0c1a766e388e44..4c0095da037382 100644 --- a/ports/opencv4/0014-fix-freetype.patch +++ b/ports/opencv4/0014-fix-freetype.patch @@ -8,7 +8,7 @@ index 1c46432..43fb8ad 100644 if(WITH_FREETYPE) - ocv_check_modules(FREETYPE freetype2) - if (FREETYPE_FOUND) -+ find_package(Freetype REQUIRED) ++ find_package(Freetype CONFIG REQUIRED) set(HAVE_FREETYPE TRUE) - endif() endif() diff --git a/ports/opencv4/0015-fix-freetype-contrib.patch b/ports/opencv4/0015-fix-freetype-contrib.patch index 43bcff9bda9a50..7b5e45d8ffe951 100644 --- a/ports/opencv4/0015-fix-freetype-contrib.patch +++ b/ports/opencv4/0015-fix-freetype-contrib.patch @@ -8,8 +8,8 @@ index 6dd4aaf..e734e97 100644 -ocv_check_modules(FREETYPE freetype2) -ocv_check_modules(HARFBUZZ harfbuzz) -+find_package(Freetype) -+find_package(harfbuzz) ++find_package(Freetype CONFIG REQUIRED) ++find_package(harfbuzz CONFIG REQUIRED) if(OPENCV_INITIAL_PASS) if(NOT FREETYPE_FOUND) From 51014f46efe446f89e8d5fa05d58bcbb2beb25df Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 3 Feb 2022 10:27:08 +0100 Subject: [PATCH 32/57] fix references --- versions/o-/opencv4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 22c2bbdd9088d8..c2a3a4c0fe8c0f 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eb1804126e096e32df2b74f079eb3191a3febbca", + "git-tree": "65e33ab02eac03be944e0956bfe27734dee9028d", "version": "4.5.5", "port-version": 0 }, From 0fc913a7135dec814dc8b75c0e3dbb6d114093f6 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 3 Feb 2022 14:03:32 +0100 Subject: [PATCH 33/57] do not use config for hdf5, use internal module --- ports/opencv4/0007-fix-hdf5.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/opencv4/0007-fix-hdf5.patch b/ports/opencv4/0007-fix-hdf5.patch index 15155689cb08f8..e5a3e1030dadfc 100644 --- a/ports/opencv4/0007-fix-hdf5.patch +++ b/ports/opencv4/0007-fix-hdf5.patch @@ -21,7 +21,7 @@ -else() if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package - find_package(HDF5) -+ find_package(HDF5 CONFIG REQUIRED) ++ find_package(HDF5 REQUIRED) endif() -endif() From f43bb494bc55a9ba91b14e296a6dc488cbb70d7d Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 3 Feb 2022 14:03:47 +0100 Subject: [PATCH 34/57] fix references --- versions/o-/opencv4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index c2a3a4c0fe8c0f..9cdb2019886438 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "65e33ab02eac03be944e0956bfe27734dee9028d", + "git-tree": "741de1093e02dfb1051638f2d6141781a7d5914d", "version": "4.5.5", "port-version": 0 }, From 2290d8e7e88853de7fa71e7f2206ad1643186566 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 4 Feb 2022 11:16:33 +0100 Subject: [PATCH 35/57] use proper spelling for freetype config cmake --- ports/opencv4/0014-fix-freetype.patch | 2 +- ports/opencv4/0015-fix-freetype-contrib.patch | 2 +- ports/opencv4/portfile.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/opencv4/0014-fix-freetype.patch b/ports/opencv4/0014-fix-freetype.patch index 4c0095da037382..62c41f2f4f3bca 100644 --- a/ports/opencv4/0014-fix-freetype.patch +++ b/ports/opencv4/0014-fix-freetype.patch @@ -8,7 +8,7 @@ index 1c46432..43fb8ad 100644 if(WITH_FREETYPE) - ocv_check_modules(FREETYPE freetype2) - if (FREETYPE_FOUND) -+ find_package(Freetype CONFIG REQUIRED) ++ find_package(freetype CONFIG REQUIRED) set(HAVE_FREETYPE TRUE) - endif() endif() diff --git a/ports/opencv4/0015-fix-freetype-contrib.patch b/ports/opencv4/0015-fix-freetype-contrib.patch index 7b5e45d8ffe951..7749a8cb3db06f 100644 --- a/ports/opencv4/0015-fix-freetype-contrib.patch +++ b/ports/opencv4/0015-fix-freetype-contrib.patch @@ -8,7 +8,7 @@ index 6dd4aaf..e734e97 100644 -ocv_check_modules(FREETYPE freetype2) -ocv_check_modules(HARFBUZZ harfbuzz) -+find_package(Freetype CONFIG REQUIRED) ++find_package(freetype CONFIG REQUIRED) +find_package(harfbuzz CONFIG REQUIRED) if(OPENCV_INITIAL_PASS) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index f3df0151e4222a..7c7605473711ee 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -552,7 +552,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)") From b7be1eaa4cdf1f23d21d14e575450eee40ab0558 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 4 Feb 2022 11:16:45 +0100 Subject: [PATCH 36/57] fix references --- versions/o-/opencv4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 9cdb2019886438..48bd446785c6e9 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "741de1093e02dfb1051638f2d6141781a7d5914d", + "git-tree": "e0d90dee246172a8c3b8f5b9284ab5aa5ef6f15f", "version": "4.5.5", "port-version": 0 }, From af1257297876fc62335fffe9a0611667dfafd05c Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 7 Feb 2022 09:56:15 +0100 Subject: [PATCH 37/57] [OpenCV] restore versions after merge --- ports/opencv3/portfile.cmake | 1 + ports/opencv3/vcpkg.json | 2 +- ports/opencv4/vcpkg.json | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index f1b4315b7cd649..55990c506bfaa8 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -404,6 +404,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 804084d71d8780..530cc0ca7efa8d 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.16", - "port-version": 2, + "port-version": 3, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 9277a254860bed..4d3ec55d05e08b 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv4", - "version": "4.5.4", - "port-version": 3, + "version": "4.5.5", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", From 739f1670e792c49b48789a7ec6f3e1089b9d9b72 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 7 Feb 2022 09:56:26 +0100 Subject: [PATCH 38/57] fix references --- versions/baseline.json | 6 +++--- versions/o-/opencv3.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index c8c6faf9480042..e1720e01d69ce9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5002,11 +5002,11 @@ }, "opencv3": { "baseline": "3.4.16", - "port-version": 2 + "port-version": 3 }, "opencv4": { - "baseline": "4.5.4", - "port-version": 3 + "baseline": "4.5.5", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 98617f1fd01886..213d8f95b87d45 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57d6bb2522758c337c5f6c9a47dbe4eb4982b9a9", + "version": "3.4.16", + "port-version": 3 + }, { "git-tree": "a11dd583ecb7212732fedb0ab3e3308ea84f10d9", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 2add172495b63a..b24178f72fa3b8 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "538ea7d5d7ff08cde5f163bac549661552433d9c", + "version": "4.5.5", + "port-version": 0 + }, { "git-tree": "b170a087d34521462cd247a24f230627a272975e", "version": "4.5.4", From 865676142e9ccd39a10cec128adfc2854ac8769b Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 7 Feb 2022 16:53:34 +0100 Subject: [PATCH 39/57] [leptonica] fix building --- ports/leptonica/Modify-include-dir.patch | 13 ------ ports/leptonica/fix-cmakelists.patch | 51 ++++++++++++++++++------ ports/leptonica/fix-find-libwebp.patch | 27 ------------- ports/leptonica/fix-src-cmakelists.patch | 19 +++++++++ ports/leptonica/portfile.cmake | 3 +- ports/leptonica/vcpkg.json | 1 + 6 files changed, 60 insertions(+), 54 deletions(-) delete mode 100644 ports/leptonica/Modify-include-dir.patch delete mode 100644 ports/leptonica/fix-find-libwebp.patch create mode 100644 ports/leptonica/fix-src-cmakelists.patch 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": [ From 4e8b2aa1642cef8f65c7ce48e7c12ac8eedd2448 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 7 Feb 2022 16:54:01 +0100 Subject: [PATCH 40/57] fix references --- versions/baseline.json | 2 +- versions/l-/leptonica.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index e1720e01d69ce9..d904ba4130670c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3306,7 +3306,7 @@ }, "leptonica": { "baseline": "1.81.1", - "port-version": 0 + "port-version": 1 }, "lerc": { "baseline": "2.2", 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", From 26b770448ca49603ba2d3b4555c22cddb1f1ac6a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 9 Feb 2022 13:54:27 +0100 Subject: [PATCH 41/57] do not require package in optional features --- ports/opencv4/0007-fix-hdf5.patch | 3 +-- ports/opencv4/0015-fix-freetype-contrib.patch | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/opencv4/0007-fix-hdf5.patch b/ports/opencv4/0007-fix-hdf5.patch index e5a3e1030dadfc..8e7e154ad40671 100644 --- a/ports/opencv4/0007-fix-hdf5.patch +++ b/ports/opencv4/0007-fix-hdf5.patch @@ -20,8 +20,7 @@ - endif() -else() if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package -- find_package(HDF5) -+ find_package(HDF5 REQUIRED) + find_package(HDF5) endif() -endif() diff --git a/ports/opencv4/0015-fix-freetype-contrib.patch b/ports/opencv4/0015-fix-freetype-contrib.patch index 7749a8cb3db06f..4d0637fd1be548 100644 --- a/ports/opencv4/0015-fix-freetype-contrib.patch +++ b/ports/opencv4/0015-fix-freetype-contrib.patch @@ -2,14 +2,16 @@ 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 +3,8 @@ if(APPLE_FRAMEWORK) +@@ -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) From f122fa9bd77ad6364c4431a2b736c75b6430154f Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 9 Feb 2022 13:54:46 +0100 Subject: [PATCH 42/57] =?UTF-8?q?=C2=A3fix=20references?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- versions/o-/opencv4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index b24178f72fa3b8..46b63252dd2ebc 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "538ea7d5d7ff08cde5f163bac549661552433d9c", + "git-tree": "2021643b1dc5d59e3274597929b28abdda51dab3", "version": "4.5.5", "port-version": 0 }, From 3ab5bd24d784ca5fd6aac39fc67cd8a3599b85aa Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 16 Feb 2022 17:22:07 +0100 Subject: [PATCH 43/57] fix python feat --- scripts/test_ports/vcpkg-ci-opencv/vcpkg.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json index bfe26f543e96f4..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" @@ -61,6 +60,14 @@ "vtk" ], "platform": "!uwp & !(windows & (arm | arm64))" + }, + { + "name": "opencv", + "default-features": false, + "features": [ + "python" + ], + "platform": "!uwp" } ] } From abe9e933034c6c4e57247d7f9d28fb1cd78de5b0 Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Wed, 16 Feb 2022 23:25:25 -0800 Subject: [PATCH 44/57] update version --- ports/opencv3/vcpkg.json | 2 +- ports/opencv4/0013-fix-opengl.patch | 11 +++++++ ports/opencv4/0014-fix-gstreamer.patch | 29 +++++++++++++++++++ ports/opencv4/0015-fix-freetype.patch | 16 ++++++++++ ports/opencv4/0016-fix-freetype-contrib.patch | 17 +++++++++++ versions/baseline.json | 2 +- versions/o-/opencv3.json | 5 ++++ versions/o-/opencv4.json | 2 +- 8 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 ports/opencv4/0013-fix-opengl.patch create mode 100644 ports/opencv4/0014-fix-gstreamer.patch create mode 100644 ports/opencv4/0015-fix-freetype.patch create mode 100644 ports/opencv4/0016-fix-freetype-contrib.patch 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/versions/baseline.json b/versions/baseline.json index 90c50a4c481abe..84da3a50311549 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5002,7 +5002,7 @@ }, "opencv3": { "baseline": "3.4.16", - "port-version": 3 + "port-version": 4 }, "opencv4": { "baseline": "4.5.5", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 167793486cc7fd..f51f03d0d22970 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88bff980ef09d8b151acde4007f4ea113c44a45e", + "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 7dc217cd1efd24..46a4cef5e49975 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2021643b1dc5d59e3274597929b28abdda51dab3", + "git-tree": "5a3962dfec55a53c6ee7f3e7da63f44900edb7c0", "version": "4.5.5", "port-version": 0 }, From e3fe1cfe1e87d3f51a725194a7014b9355706c88 Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Wed, 16 Feb 2022 23:33:07 -0800 Subject: [PATCH 45/57] update version --- versions/o-/opencv3.json | 2 +- versions/o-/opencv4.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index f51f03d0d22970..9f39b0559ec81a 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "88bff980ef09d8b151acde4007f4ea113c44a45e", + "git-tree": "7060d481bf3045fdd24aa8ef0d83cf2db3b13a50", "version": "3.4.16", "port-version": 4 }, diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 46a4cef5e49975..aa1ddf5aed8d80 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5a3962dfec55a53c6ee7f3e7da63f44900edb7c0", + "git-tree": "afed148d21295bf99e8ac657fdb808ed82467871", "version": "4.5.5", "port-version": 0 }, From 73d388ec31437d637da853010da15a8fe055b724 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 17 Feb 2022 11:18:34 +0100 Subject: [PATCH 46/57] [ffmpeg] remove opengl feat on arm64-windows --- ports/ffmpeg/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 8f4db92cea9fb9..906e2fbf0b28ac 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." @@ -120,7 +120,7 @@ "features": [ "opengl" ], - "platform": "!uwp" + "platform": "!uwp & !(arm64 & windows)" }, { "name": "ffmpeg", From 72e204243366144fca069db5d0c7193faad1870a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 17 Feb 2022 11:19:24 +0100 Subject: [PATCH 47/57] format manifest --- ports/ffmpeg/vcpkg.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 906e2fbf0b28ac..c5ea757dd416f7 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -114,14 +114,6 @@ ], "platform": "!uwp" }, - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "opengl" - ], - "platform": "!uwp & !(arm64 & windows)" - }, { "name": "ffmpeg", "default-features": false, @@ -178,6 +170,14 @@ ], "platform": "(windows | linux) & !uwp" }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "opengl" + ], + "platform": "!uwp & !(arm64 & windows)" + }, { "name": "ffmpeg", "default-features": false, From 6c8cda1a84ce5ff0610b894bb43acbf1c71f745a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 17 Feb 2022 11:19:34 +0100 Subject: [PATCH 48/57] fix references --- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 84da3a50311549..642c19e445e6c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2154,7 +2154,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 8 + "port-version": 9 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 3132380518760c..b47081f23551d9 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac40292ad1c8094b03f102685a079603fc29275d", + "version": "4.4.1", + "port-version": 9 + }, { "git-tree": "03b7a2329bc927de9637d45738c23e607e4f4387", "version": "4.4.1", From 03d0cc2826adeb77e3ac9691247f318fbd2f535b Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 18 Feb 2022 06:32:39 +0100 Subject: [PATCH 49/57] fix cuda/nvidia features compatibility matrix --- ports/cuda/vcpkg.json | 5 +++-- ports/ffmpeg/vcpkg.json | 3 ++- ports/ffnvcodec/vcpkg.json | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) 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 c5ea757dd416f7..f82b3949826873 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -168,7 +168,7 @@ "features": [ "nvcodec" ], - "platform": "(windows | linux) & !uwp" + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" }, { "name": "ffmpeg", @@ -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..ea5d70111f14cd 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,7 +1,9 @@ { "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))" +" } From 1e9a1e56f99d3fd93c22619beec979995e2efc96 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 18 Feb 2022 06:34:02 +0100 Subject: [PATCH 50/57] fix manifest --- ports/ffmpeg/vcpkg.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index f82b3949826873..993703ce7532e3 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -166,25 +166,25 @@ "name": "ffmpeg", "default-features": false, "features": [ - "nvcodec" + "opengl" ], - "platform": "linux | (!osx & !uwp & !(arm64 & windows))" + "platform": "!uwp & !(arm64 & windows)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "opengl" + "tesseract" ], - "platform": "!uwp & !(arm64 & windows)" + "platform": "!(windows & arm) & !static & !uwp" }, { "name": "ffmpeg", "default-features": false, "features": [ - "tesseract" + "nvcodec" ], - "platform": "!(windows & arm) & !static & !uwp" + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" } ] }, From 1d65522b2845ca946b4846356e0bc3d48f3c7ec7 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 18 Feb 2022 06:35:09 +0100 Subject: [PATCH 51/57] fix --- ports/ffnvcodec/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index ea5d70111f14cd..db445611aa42ce 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffnvcodec", "version": "11.1.5.0", - "port-version": 1 + "port-version": 1, "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", "supports": "linux | (!osx & !uwp & !(arm64 & windows))" From 133e2ebd28a16cf2dde01fe85c2a754aa4110dd9 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 18 Feb 2022 06:35:49 +0100 Subject: [PATCH 52/57] fix --- ports/ffnvcodec/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index db445611aa42ce..47418dc0ce0063 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -5,5 +5,4 @@ "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", "supports": "linux | (!osx & !uwp & !(arm64 & windows))" -" } From 9e2249643a4c9e63da211e2f316ba98f5750d412 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 18 Feb 2022 06:36:18 +0100 Subject: [PATCH 53/57] fix references --- versions/baseline.json | 4 ++-- versions/c-/cuda.json | 5 +++++ versions/f-/ffmpeg.json | 2 +- versions/f-/ffnvcodec.json | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2dba870d9382df..f6316a2001c601 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", @@ -2158,7 +2158,7 @@ }, "ffnvcodec": { "baseline": "11.1.5.0", - "port-version": 0 + "port-version": 1 }, "fftw3": { "baseline": "3.3.10", 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 b47081f23551d9..c71cdf0555b701 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ac40292ad1c8094b03f102685a079603fc29275d", + "git-tree": "558575c9b18b2ff734d48fe175e61f5a11c02ce4", "version": "4.4.1", "port-version": 9 }, diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index c249b192e93062..553908015afaf2 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "020b299b2ef4a4000021b802a442e0d8b700a4ef", + "version": "11.1.5.0", + "port-version": 1 + }, { "git-tree": "b86f38b94c28605c5f3b2bc060b8e43e26e0ad42", "version": "11.1.5.0", From bca0f9929fc969d1e95c8463b7da84cdbf6ef2cf Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 18 Feb 2022 06:41:25 +0100 Subject: [PATCH 54/57] fix references, again --- versions/f-/ffnvcodec.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index 553908015afaf2..dc6a492f982925 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "020b299b2ef4a4000021b802a442e0d8b700a4ef", + "git-tree": "9f49e200522747c711e28db563004ce1f5a2f816", "version": "11.1.5.0", "port-version": 1 }, From 9d6b3f20a599227e93c350943a23b3112a2d33dd Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 18 Feb 2022 07:45:57 +0100 Subject: [PATCH 55/57] move CONTROL to manifest --- scripts/detect_compiler/CONTROL | 3 --- scripts/detect_compiler/vcpkg.json | 5 ++++ scripts/test_ports/llfio-run-tests/CONTROL | 5 ---- scripts/test_ports/llfio-run-tests/vcpkg.json | 22 ++++++++++++++++ scripts/test_ports/outcome-run-tests/CONTROL | 5 ---- .../test_ports/outcome-run-tests/vcpkg.json | 15 +++++++++++ .../vcpkg-acquire-msys-test/CONTROL | 4 --- .../vcpkg-acquire-msys-test/vcpkg.json | 7 +++++ scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL | 5 ---- scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 15 +++++++++++ scripts/test_ports/vcpkg-ci-paraview/CONTROL | 6 ----- .../test_ports/vcpkg-ci-paraview/vcpkg.json | 26 +++++++++++++++++++ .../vcpkg-find-acquire-program/CONTROL | 4 --- .../vcpkg-find-acquire-program/vcpkg.json | 7 +++++ 14 files changed, 97 insertions(+), 32 deletions(-) delete mode 100644 scripts/detect_compiler/CONTROL create mode 100644 scripts/detect_compiler/vcpkg.json delete mode 100644 scripts/test_ports/llfio-run-tests/CONTROL create mode 100644 scripts/test_ports/llfio-run-tests/vcpkg.json delete mode 100644 scripts/test_ports/outcome-run-tests/CONTROL create mode 100644 scripts/test_ports/outcome-run-tests/vcpkg.json delete mode 100644 scripts/test_ports/vcpkg-acquire-msys-test/CONTROL create mode 100644 scripts/test_ports/vcpkg-acquire-msys-test/vcpkg.json delete mode 100644 scripts/test_ports/vcpkg-ci-ffmpeg/CONTROL create mode 100644 scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json delete mode 100644 scripts/test_ports/vcpkg-ci-paraview/CONTROL create mode 100644 scripts/test_ports/vcpkg-ci-paraview/vcpkg.json delete mode 100644 scripts/test_ports/vcpkg-find-acquire-program/CONTROL create mode 100644 scripts/test_ports/vcpkg-find-acquire-program/vcpkg.json 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-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" +} From ac78ec8852283c224d1ab0b7f60a5d3145631c64 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 23 Feb 2022 09:35:38 +0100 Subject: [PATCH 56/57] [gstreamer] bump versions --- ports/gstreamer/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From a25c71e287688d5394630b874abe6e4779dfd1a2 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 23 Feb 2022 09:35:54 +0100 Subject: [PATCH 57/57] fix references --- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 4463a08d16f722..823d6889348c2f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2618,7 +2618,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 4 + "port-version": 5 }, "gtest": { "baseline": "1.11.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",