mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[quirc, opencv4] Build fixes from 2021-01-18 build (#15788)
* [quirc, opencv4] Use a cmake package for quirc and devendor quirc from opencv4.
* Build fixes from 2020-01-18 build
https://dev.azure.com/vcpkg/public/_build/results?buildId=48065
> PASSING, REMOVE FROM FAIL LIST: chartdir:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: cmark:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: cppcms:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: cudnn:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: devicenameresolver:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: dxut:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: epsilon:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: fann:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: getopt-win32:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: glib:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: graphqlparser:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: halide:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: hpx:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: jemalloc:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libepoxy:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libhsplasma:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libmodman:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libpcap:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libplist:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: milerius-sfml-imgui:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: monkeys-audio:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: moos-core:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: msix:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: ngspice:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: openni2:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: openvr:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: pmdk:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: pngpp:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: qpid-proton:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: qt5-tools:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: sciter:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: scylla-wrapper:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: soundtouch:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: spirv-tools:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: torch-th:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: treehopper:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: unrar:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: urdfdom:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: xalan-c:x64-windows-static-md (.\scripts\ci.baseline.txt)
These look like they have always passed since we turned on x64-windows-static-md in nightly CI.
>PASSING, REMOVE FROM FAIL LIST: osgearth:x64-windows (.\scripts\ci.baseline.txt)
>PASSING, REMOVE FROM FAIL LIST: osgearth:x86-windows (.\scripts\ci.baseline.txt)
Maybe addressed by https://github.com/microsoft/vcpkg/pull/15777
>REGRESSION: gettext:arm-uwp. If expected, add gettext:arm-uwp=fail to .\scripts\ci.baseline.txt.
>REGRESSION: gettext:arm64-windows. If expected, add gettext:arm64-windows=fail to .\scripts\ci.baseline.txt.
Probably fixed by https://github.com/microsoft/vcpkg/pull/15740
> PASSING, REMOVE FROM FAIL LIST: directxmesh:x64-linux (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: uvatlas:x64-linux (.\scripts\ci.baseline.txt)
Probably an error in the authoring of https://github.com/microsoft/vcpkg/pull/15554/
> REGRESSION: dcmtk:x86-windows. If expected, add dcmtk:x86-windows=fail to .\scripts\ci.baseline.txt.
>
> "C:\PROGRA~2\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x86\cl.exe" /TP -DDCMTK_BUILD_IN_PROGRESS -DNOMINMAX -DUSE_NULL_SAFE_OFSTRING -D_CRT_FAR_MAPPINGS_NO_DEPRECATE -D_CRT_IS_WCTYPE_NO_DEPRECATE -D_CRT_MANAGED_FP_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE_GLOBALS -D_CRT_SETERRORMODE_BEEP_SLEEP_NO_DEPRECATE -D_CRT_TIME_FUNCTIONS_NO_DEPRECATE -D_CRT_VCCLRIT_NO_DEPRECATE -D_REENTRANT -D_SCL_SECURE_NO_DEPRECATE -Dofstd_EXPORTS -ID:\installed\x86-windows\include -Iconfig\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\ofstd\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\oflog\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmdata\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmimgle\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmimage\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmjpeg\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmjpls\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmtls\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmnet\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmsr\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmsign\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmwlm\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmqrdb\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmpstat\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmrt\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmiod\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmfg\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmseg\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmtract\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmpmap\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmect\include /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 -DDEBUG /showIncludes /Foofstd\libsrc\CMakeFiles\ofstd.dir\offilsys.cc.obj /Fdofstd\libsrc\CMakeFiles\ofstd.dir\ofstd.pdb /FS -c D:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\ofstd\libsrc\offilsys.cc
> D:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\ofstd\libsrc\offilsys.cc(376): error C2039: 'DIR': is not a member of '`global namespace''
>
> REGRESSION: tesseract:x64-windows-static-md. If expected, add tesseract:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: tesseract:x64-windows-static. If expected, add tesseract:x64-windows-static=fail to .\scripts\ci.baseline.txt.
> REGRESSION: tesseract:x64-windows. If expected, add tesseract:x64-windows=fail to .\scripts\ci.baseline.txt.
> REGRESSION: tesseract:x86-windows. If expected, add tesseract:x86-windows=fail to .\scripts\ci.baseline.txt.
> [2/241] "C:\PROGRA~2\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x86\cl.exe" /TP -DHAVE_CONFIG_H -DTESS_EXPORTS -D_CRT_SECURE_NO_WARNINGS -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1 -D__AVX2__ -D__AVX__ -D__BMI2__ -D__FMA__ -D__SSE2__ -D__SSE3__ -D__SSE4A__ -D__SSE4_1__ -D__SSE4_2__ -D__SSSE3__ -Dlibtesseract_EXPORTS -ID:\installed\x86-windows\share\leptonica\..\..\include -ID:\installed\x86-windows\share\leptonica\..\..\include\leptonica -I. -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\api -Iapi -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\arch -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccmain -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccstruct -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\cutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\dict -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\lstm -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\opencl -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\textord -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\viewer -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\wordrec -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\training -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\vs2010\tesseract -ID:\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /utf-8 /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /W4 /bigobj -std:c++17 /showIncludes /FoCMakeFiles\libtesseract.dir\src\classify\shapetable.cpp.obj /FdCMakeFiles\libtesseract.dir\ /FS -c D:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify\shapetable.cpp
> FAILED: CMakeFiles/libtesseract.dir/src/classify/shapetable.cpp.obj
> "C:\PROGRA~2\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x86\cl.exe" /TP -DHAVE_CONFIG_H -DTESS_EXPORTS -D_CRT_SECURE_NO_WARNINGS -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1 -D__AVX2__ -D__AVX__ -D__BMI2__ -D__FMA__ -D__SSE2__ -D__SSE3__ -D__SSE4A__ -D__SSE4_1__ -D__SSE4_2__ -D__SSSE3__ -Dlibtesseract_EXPORTS -ID:\installed\x86-windows\share\leptonica\..\..\include -ID:\installed\x86-windows\share\leptonica\..\..\include\leptonica -I. -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\api -Iapi -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\arch -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccmain -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccstruct -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\cutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\dict -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\lstm -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\opencl -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\textord -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\viewer -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\wordrec -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\training -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\vs2010\tesseract -ID:\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /utf-8 /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /W4 /bigobj -std:c++17 /showIncludes /FoCMakeFiles\libtesseract.dir\src\classify\shapetable.cpp.obj /FdCMakeFiles\libtesseract.dir\ /FS -c D:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify\shapetable.cpp
> cl : Command line warning D9025 : overriding '/W3' with '/W4'
> D:\installed\x86-windows\include\params.h(36): error C2143: syntax error: missing ';' before '*'
https://github.com/microsoft/vcpkg/pull/15785
> REGRESSION: fluidsynth:x64-windows-static-md. If expected, add fluidsynth:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
Was previously a cascaded failure from glib.
REGRESSION: libevent:x86-windows. If expected, add libevent:x86-windows=fail to .\scripts\ci.baseline.txt.
> REGRESSION: ideviceinstaller:x64-windows-static-md. If expected, add ideviceinstaller:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: libcrafter:x64-windows-static-md. If expected, add libcrafter:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: libirecovery:x64-windows-static-md. If expected, add libirecovery:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: moos-essential:x64-windows-static-md. If expected, add moos-essential:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: openmama:x64-windows-static-md. If expected, add openmama:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: sdformat10:x64-windows-static-md. If expected, add sdformat10:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: sdformat6:x64-windows-static-md. If expected, add sdformat6:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: sdformat9:x64-windows-static-md. If expected, add sdformat9:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
I'm going to assume these were cascaded failures for now.
> REGRESSION: mesa:x64-windows-static-md. If expected, add mesa:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: mesa:x64-windows. If expected, add mesa:x64-windows=fail to .\scripts\ci.baseline.txt.
> REGRESSION: mesa:x86-windows. If expected, add mesa:x86-windows=fail to .\scripts\ci.baseline.txt.
Nancy is working on this https://github.com/microsoft/vcpkg/pull/15729
> REGRESSION: quirc:x64-linux. If expected, add quirc:x64-linux=fail to .\scripts\ci.baseline.txt.
> REGRESSION: quirc:x64-osx. If expected, add quirc:x64-osx=fail to .\scripts\ci.baseline.txt.
> Starting package 1166/1442: quirc:x64-linux
> Building package quirc[core]:x64-linux...
> -- Downloading 7e7ab596e4.tar.gz -> dlbeer-quirc-7e7ab596e4d0988faf1c12ae89c354b114181c40.tar.gz...
> -- Extracting source /mnt/vcpkg-ci/downloads/dlbeer-quirc-7e7ab596e4d0988faf1c12ae89c354b114181c40.tar.gz
> -- Using source at /mnt/vcpkg-ci/buildtrees/quirc/src/b114181c40-f1e71e0d5b.clean
> -- Configuring x64-linux-dbg
> -- Configuring x64-linux-rel
> -- Building x64-linux-dbg
> -- Building x64-linux-rel
> -- Installing: /mnt/vcpkg-ci/packages/quirc_x64-linux/share/quirc/copyright/LICENSE
> -- Performing post-build validation
> -- Performing post-build validation done
> Uploaded binaries to 1 HTTP remotes.
> Building package quirc[core]:x64-linux... done
> Installing package quirc[core]:x64-linux...
> The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with quirc:x64-linux
>
> Installed by opencv4:x64-linux
> lib/libquirc.a
>
> Elapsed time for package quirc:x64-linux: 2.531 s
Probably broken by https://github.com/microsoft/vcpkg/pull/15089, fix here
> REGRESSION: spatialite-tools:x64-linux. If expected, add spatialite-tools:x64-linux=fail to .\scripts\ci.baseline.txt.
> REGRESSION: spatialite-tools:x64-osx. If expected, add spatialite-tools:x64-osx=fail to .\scripts\ci.baseline.txt.
These are spewing linker errors, probably triggered by https://github.com/microsoft/vcpkg/pull/15768/ although that PR removed them from ci.baseline.txt?
* Fixup spurious / and format-manifest.
* x-add-version
* Add missing =fails.
* Update opencv4 devendor patch for 4.5
* Transform quirc into a feature.
* Repeat changes for opencv3.
* Repeat for opencv. Also fix version for "opencv".
* [dxut] Use vcpkg_from_github, correct "supports",
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "DXUT only supports dynamic CRT linkage")
endif()
* [epsilon] Skip in ci.baseline.txt for now because it has "vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)" but also checks against the CRT linkage making the right fix unclear.
* Fix flipped supports:
* Update ports/opencv3/portfile.cmake
* x-add-version
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
This commit is contained in:
Billy O'Neal
GitHub
parent
b759049a36
commit
80d52af7c8
@ -1,4 +0,0 @@
|
||||
Source: dxut
|
||||
Version: 11.14-3
|
||||
Homepage: https://github.com/Microsoft/DXUT
|
||||
Description: A "GLUT"-like framework for Direct3D 11.x Win32 desktop applications
|
||||
@ -1,18 +1,11 @@
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
|
||||
vcpkg_fail_port_install(ON_ARCH arm)
|
||||
|
||||
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
|
||||
message(FATAL_ERROR "DXUT only supports dynamic CRT linkage")
|
||||
endif()
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://github.com/Microsoft/DXUT/archive/sept2016.tar.gz"
|
||||
FILENAME "DXUT-sept2016.tar.gz"
|
||||
SHA512 190006c194284a1f5d614477896b0469a59ece05dff37477dadbe98808a5c33e274c0c1bb1390f22d1b5e06c9f534f4b50d6002157b2a391e01c2192b8e08869
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO microsoft/DXUT
|
||||
REF d6e8ef60b35b8d3b97684bd6b3cee88f8ba81a3f
|
||||
SHA512 2ac1ac4416dbf7ae0e8a9e1e95fbd8bede126ac6dc4e919f4bd1131d10f3a01e007aff2f770ace9cbf48093ff76d8b89c4b78b734658028be62e1412f44078ae
|
||||
)
|
||||
|
||||
IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
|
||||
@ -22,31 +15,29 @@ ELSE()
|
||||
ENDIF()
|
||||
|
||||
vcpkg_build_msbuild(
|
||||
PROJECT_PATH ${SOURCE_PATH}/DXUT_2015.sln
|
||||
PLATFORM ${BUILD_ARCH}
|
||||
PROJECT_PATH "${SOURCE_PATH}/DXUT_2015.sln"
|
||||
PLATFORM "${BUILD_ARCH}"
|
||||
)
|
||||
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/Core/
|
||||
${SOURCE_PATH}/Optional/
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/include
|
||||
"${SOURCE_PATH}/Core/"
|
||||
"${SOURCE_PATH}/Optional/"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/include"
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
)
|
||||
file(REMOVE_RECURSE
|
||||
${CURRENT_PACKAGES_DIR}/include/Bin)
|
||||
"${CURRENT_PACKAGES_DIR}/include/Bin")
|
||||
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUT.lib
|
||||
${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUTOpt.lib
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
||||
"${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUT.lib"
|
||||
"${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUTOpt.lib"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
||||
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUT.lib
|
||||
${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUTOpt.lib
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
||||
"${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUT.lib"
|
||||
"${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUTOpt.lib"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dxut RENAME copyright)
|
||||
|
||||
message(STATUS "Installing done")
|
||||
file(INSTALL "${SOURCE_PATH}/MIT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
8
ports/dxut/vcpkg.json
Normal file
8
ports/dxut/vcpkg.json
Normal file
@ -0,0 +1,8 @@
|
||||
{
|
||||
"name": "dxut",
|
||||
"version-string": "11.14",
|
||||
"port-version": 4,
|
||||
"description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications",
|
||||
"homepage": "https://github.com/Microsoft/DXUT",
|
||||
"supports": "!staticcrt & windows & !arm"
|
||||
}
|
||||
@ -1,107 +0,0 @@
|
||||
Source: opencv
|
||||
Version: 4.3.0
|
||||
Port-Version: 1
|
||||
Homepage: https://github.com/opencv/opencv
|
||||
Description: Computer vision library
|
||||
Build-Depends: opencv4[core]
|
||||
Default-Features: dnn, jpeg, png, tiff, webp
|
||||
|
||||
Feature: nonfree
|
||||
Build-Depends: opencv4[core,nonfree]
|
||||
Description: opencv nonfree module
|
||||
|
||||
Feature: ade
|
||||
Build-Depends: opencv4[core,ade]
|
||||
Description: graph api
|
||||
|
||||
Feature: contrib
|
||||
Build-Depends: opencv4[core,contrib]
|
||||
Description: opencv_contrib module
|
||||
|
||||
Feature: cuda
|
||||
Build-Depends: opencv4[core,cuda]
|
||||
Description: CUDA support for opencv
|
||||
|
||||
Feature: dnn
|
||||
Build-Depends: opencv4[core,dnn]
|
||||
Description: Enable dnn module
|
||||
|
||||
Feature: eigen
|
||||
Build-Depends: opencv4[core,eigen]
|
||||
Description: Eigen support for opencv
|
||||
|
||||
Feature: ffmpeg
|
||||
Build-Depends: opencv4[core,ffmpeg]
|
||||
Description: ffmpeg support for opencv
|
||||
|
||||
Feature: gdcm
|
||||
Build-Depends: opencv4[core,gdcm]
|
||||
Description: GDCM support for opencv
|
||||
|
||||
Feature: halide
|
||||
Build-Depends: opencv4[core,halide]
|
||||
Description: Halide support for opencv
|
||||
|
||||
Feature: ipp
|
||||
Build-Depends: opencv4[core,ipp]
|
||||
Description: Enable Intel Integrated Performance Primitives
|
||||
|
||||
Feature: jasper
|
||||
Build-Depends: opencv4[core,jasper]
|
||||
Description: JPEG 2000 support for opencv
|
||||
|
||||
Feature: jpeg
|
||||
Build-Depends: opencv4[core,jpeg]
|
||||
Description: JPEG support for opencv
|
||||
|
||||
Feature: lapack
|
||||
Build-Depends: opencv4[core,lapack]
|
||||
Description: LAPACK support for opencv
|
||||
|
||||
Feature: openexr
|
||||
Build-Depends: opencv4[core,openexr]
|
||||
Description: OpenEXR support for opencv
|
||||
|
||||
Feature: opengl
|
||||
Build-Depends: opencv4[core,opengl]
|
||||
Description: opengl support for opencv
|
||||
|
||||
Feature: openmp
|
||||
Build-Depends: opencv4[core,openmp]
|
||||
Description: Enable openmp support for opencv
|
||||
|
||||
Feature: ovis
|
||||
Build-Depends: opencv4[core,ovis]
|
||||
Description: opencv_ovis module
|
||||
|
||||
Feature: png
|
||||
Build-Depends: opencv4[core,png]
|
||||
Description: PNG support for opencv
|
||||
|
||||
Feature: qt
|
||||
Build-Depends: opencv4[core,qt]
|
||||
Description: Qt GUI support for opencv
|
||||
|
||||
Feature: sfm
|
||||
Build-Depends: opencv4[core,sfm]
|
||||
Description: opencv_sfm module
|
||||
|
||||
Feature: tbb
|
||||
Build-Depends: opencv4[core,tbb]
|
||||
Description: Enable Intel Threading Building Blocks
|
||||
|
||||
Feature: tiff
|
||||
Build-Depends: opencv4[core,tiff]
|
||||
Description: TIFF support for opencv
|
||||
|
||||
Feature: vtk
|
||||
Build-Depends: opencv4[core,vtk]
|
||||
Description: vtk support for opencv
|
||||
|
||||
Feature: webp
|
||||
Build-Depends: opencv4[core,webp]
|
||||
Description: WebP support for opencv
|
||||
|
||||
Feature: world
|
||||
Build-Depends: opencv4[core,world]
|
||||
Description: Compile to a single package support for opencv
|
||||
333
ports/opencv/vcpkg.json
Normal file
333
ports/opencv/vcpkg.json
Normal file
@ -0,0 +1,333 @@
|
||||
{
|
||||
"name": "opencv",
|
||||
"version": "4.5.0",
|
||||
"description": "Computer vision library",
|
||||
"homepage": "https://github.com/opencv/opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false
|
||||
}
|
||||
],
|
||||
"default-features": [
|
||||
"dnn",
|
||||
"jpeg",
|
||||
"png",
|
||||
"tiff",
|
||||
"webp"
|
||||
],
|
||||
"features": {
|
||||
"ade": {
|
||||
"description": "graph api",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"ade"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"contrib": {
|
||||
"description": "opencv_contrib module",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"contrib"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"cuda": {
|
||||
"description": "CUDA support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"cuda"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"dnn": {
|
||||
"description": "Enable dnn module",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"dnn"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"eigen": {
|
||||
"description": "Eigen support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"eigen"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"ffmpeg": {
|
||||
"description": "ffmpeg support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"ffmpeg"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"gdcm": {
|
||||
"description": "GDCM support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"gdcm"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"halide": {
|
||||
"description": "Halide support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"halide"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"ipp": {
|
||||
"description": "Enable Intel Integrated Performance Primitives",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"ipp"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"jasper": {
|
||||
"description": "JPEG 2000 support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"jasper"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"jpeg": {
|
||||
"description": "JPEG support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"jpeg"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"lapack": {
|
||||
"description": "LAPACK support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"lapack"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"nonfree": {
|
||||
"description": "opencv nonfree module",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"nonfree"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"openexr": {
|
||||
"description": "OpenEXR support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"openexr"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"opengl": {
|
||||
"description": "opengl support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"opengl"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"openmp": {
|
||||
"description": "Enable openmp support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"openmp"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"ovis": {
|
||||
"description": "opencv_ovis module",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"ovis"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"png": {
|
||||
"description": "PNG support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"png"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"qt": {
|
||||
"description": "Qt GUI support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"qt"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"quirc": {
|
||||
"description": "Enable QR code module",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"quirc"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"sfm": {
|
||||
"description": "opencv_sfm module",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"sfm"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"tbb": {
|
||||
"description": "Enable Intel Threading Building Blocks",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"tbb"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"tiff": {
|
||||
"description": "TIFF support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"tiff"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"vtk": {
|
||||
"description": "vtk support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"vtk"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"webp": {
|
||||
"description": "WebP support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"webp"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"world": {
|
||||
"description": "Compile to a single package support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"world"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
26
ports/opencv3/0010-devendor-quirc.patch
Normal file
26
ports/opencv3/0010-devendor-quirc.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 15eb053..58a9585 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -766,7 +766,7 @@ if(WITH_OPENVX)
|
||||
endif()
|
||||
|
||||
if(WITH_QUIRC)
|
||||
- add_subdirectory(3rdparty/quirc)
|
||||
+ find_package(quirc CONFIG REQUIRED)
|
||||
set(HAVE_QUIRC TRUE)
|
||||
endif()
|
||||
# ----------------------------------------------------------------------------
|
||||
diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt
|
||||
index 414e578..4f26d75 100644
|
||||
--- a/modules/objdetect/CMakeLists.txt
|
||||
+++ b/modules/objdetect/CMakeLists.txt
|
||||
@@ -2,7 +2,5 @@ set(the_description "Object Detection")
|
||||
ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js)
|
||||
|
||||
if(HAVE_QUIRC)
|
||||
- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR)
|
||||
- ocv_include_directories(${QUIRC_INCLUDE})
|
||||
- ocv_target_link_libraries(${the_module} quirc)
|
||||
+ ocv_target_link_libraries(${the_module} quirc::quirc)
|
||||
endif()
|
||||
@ -1,99 +0,0 @@
|
||||
Source: opencv3
|
||||
Version: 3.4.12
|
||||
Build-Depends: zlib
|
||||
Homepage: https://github.com/opencv/opencv
|
||||
Description: computer vision library
|
||||
Default-Features: dnn, jpeg, png, tiff, webp
|
||||
|
||||
Feature: nonfree
|
||||
Description: allow nonfree and unredistributable libraries
|
||||
|
||||
Feature: flann
|
||||
Build-Depends: protobuf
|
||||
Description: opencv_flann module
|
||||
|
||||
Feature: contrib
|
||||
Build-Depends: opencv3[dnn], hdf5 (!uwp&!(windows&(arm|arm64))), tesseract (!uwp&!(windows&(arm|arm64)))
|
||||
Description: opencv_contrib module
|
||||
|
||||
Feature: cuda
|
||||
Build-Depends: opencv3[contrib], cuda, cudnn
|
||||
Description: CUDA support for opencv
|
||||
|
||||
Feature: dnn
|
||||
Build-Depends: opencv3[flann]
|
||||
Description: Enable dnn module
|
||||
|
||||
Feature: eigen
|
||||
Build-Depends: eigen3
|
||||
Description: Eigen support for opencv
|
||||
|
||||
Feature: ffmpeg
|
||||
Build-Depends: ffmpeg
|
||||
Description: ffmpeg support for opencv
|
||||
|
||||
Feature: gdcm
|
||||
Build-Depends: gdcm
|
||||
Description: GDCM support for opencv
|
||||
|
||||
Feature: halide
|
||||
Build-Depends: halide, opencv3[core], opencv3[dnn]
|
||||
Description: Halide support for opencv
|
||||
|
||||
Feature: ipp
|
||||
Description: Enable Intel Integrated Performance Primitives
|
||||
|
||||
Feature: jasper
|
||||
Build-Depends: jasper
|
||||
Description: JPEG 2000 support for opencv
|
||||
|
||||
Feature: jpeg
|
||||
Build-Depends: libjpeg-turbo
|
||||
Description: JPEG support for opencv
|
||||
|
||||
Feature: lapack
|
||||
Build-Depends: blas, lapack
|
||||
Description: LAPACK support for opencv
|
||||
|
||||
Feature: openexr
|
||||
Build-Depends: openexr
|
||||
Description: OpenEXR support for opencv
|
||||
|
||||
Feature: opengl
|
||||
Build-Depends: opengl
|
||||
Description: opengl support for opencv
|
||||
|
||||
Feature: ovis
|
||||
Build-Depends: opencv3[contrib], ogre
|
||||
Description: opencv_ovis module
|
||||
|
||||
Feature: png
|
||||
Build-Depends: libpng
|
||||
Description: PNG support for opencv
|
||||
|
||||
Feature: qt
|
||||
Build-Depends: qt5-base[core]
|
||||
Description: Qt GUI support for opencv
|
||||
|
||||
Feature: sfm
|
||||
Build-Depends: opencv3[contrib], eigen3, glog, gflags, ceres
|
||||
Description: opencv_sfm module
|
||||
|
||||
Feature: tbb
|
||||
Build-Depends: tbb
|
||||
Description: Enable Intel Threading Building Blocks
|
||||
|
||||
Feature: tiff
|
||||
Build-Depends: tiff
|
||||
Description: TIFF support for opencv
|
||||
|
||||
Feature: vtk
|
||||
Build-Depends: vtk
|
||||
Description: vtk support for opencv
|
||||
|
||||
Feature: webp
|
||||
Build-Depends: libwebp
|
||||
Description: WebP support for opencv
|
||||
|
||||
Feature: world
|
||||
Description: Compile to a single package support for opencv
|
||||
@ -20,6 +20,7 @@ vcpkg_from_github(
|
||||
0003-force-package-requirements.patch
|
||||
0005-fix-vtk9.patch
|
||||
0009-fix-uwp.patch
|
||||
0010-devendor-quirc.patch
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
@ -38,8 +39,8 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
"contrib" WITH_CONTRIB
|
||||
"cuda" WITH_CUDA
|
||||
"cuda" WITH_CUBLAS
|
||||
"cuda" WITH_CUDA
|
||||
"dnn" BUILD_opencv_dnn
|
||||
"eigen" WITH_EIGEN
|
||||
"ffmpeg" WITH_FFMPEG
|
||||
@ -54,6 +55,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
"opengl" WITH_OPENGL
|
||||
"png" WITH_PNG
|
||||
"qt" WITH_QT
|
||||
"quirc" WITH_QUIRC
|
||||
"sfm" BUILD_opencv_sfm
|
||||
"tiff" WITH_TIFF
|
||||
"vtk" WITH_VTK
|
||||
@ -401,6 +403,9 @@ find_dependency(Tesseract)")
|
||||
if(BUILD_opencv_ovis)
|
||||
string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)")
|
||||
endif()
|
||||
if("quirc" IN_LIST FEATURES)
|
||||
string(APPEND DEPS_STRING "\nfind_dependency(quirc)")
|
||||
endif()
|
||||
if("qt" IN_LIST FEATURES)
|
||||
string(APPEND DEPS_STRING "
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
214
ports/opencv3/vcpkg.json
Normal file
214
ports/opencv3/vcpkg.json
Normal file
@ -0,0 +1,214 @@
|
||||
{
|
||||
"name": "opencv3",
|
||||
"version": "3.4.12",
|
||||
"port-version": 1,
|
||||
"description": "computer vision library",
|
||||
"homepage": "https://github.com/opencv/opencv",
|
||||
"dependencies": [
|
||||
"zlib"
|
||||
],
|
||||
"default-features": [
|
||||
"dnn",
|
||||
"jpeg",
|
||||
"png",
|
||||
"tiff",
|
||||
"webp"
|
||||
],
|
||||
"features": {
|
||||
"contrib": {
|
||||
"description": "opencv_contrib module",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "hdf5",
|
||||
"platform": "!uwp & !(windows & (arm | arm64))"
|
||||
},
|
||||
{
|
||||
"name": "opencv3",
|
||||
"features": [
|
||||
"dnn"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "tesseract",
|
||||
"platform": "!uwp & !(windows & (arm | arm64))"
|
||||
}
|
||||
]
|
||||
},
|
||||
"cuda": {
|
||||
"description": "CUDA support for opencv",
|
||||
"dependencies": [
|
||||
"cuda",
|
||||
"cudnn",
|
||||
{
|
||||
"name": "opencv3",
|
||||
"features": [
|
||||
"contrib"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"dnn": {
|
||||
"description": "Enable dnn module",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv3",
|
||||
"features": [
|
||||
"flann"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"eigen": {
|
||||
"description": "Eigen support for opencv",
|
||||
"dependencies": [
|
||||
"eigen3"
|
||||
]
|
||||
},
|
||||
"ffmpeg": {
|
||||
"description": "ffmpeg support for opencv",
|
||||
"dependencies": [
|
||||
"ffmpeg"
|
||||
]
|
||||
},
|
||||
"flann": {
|
||||
"description": "opencv_flann module",
|
||||
"dependencies": [
|
||||
"protobuf"
|
||||
]
|
||||
},
|
||||
"gdcm": {
|
||||
"description": "GDCM support for opencv",
|
||||
"dependencies": [
|
||||
"gdcm"
|
||||
]
|
||||
},
|
||||
"halide": {
|
||||
"description": "Halide support for opencv",
|
||||
"dependencies": [
|
||||
"halide",
|
||||
{
|
||||
"name": "opencv3",
|
||||
"default-features": false
|
||||
},
|
||||
{
|
||||
"name": "opencv3",
|
||||
"features": [
|
||||
"dnn"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"ipp": {
|
||||
"description": "Enable Intel Integrated Performance Primitives"
|
||||
},
|
||||
"jasper": {
|
||||
"description": "JPEG 2000 support for opencv",
|
||||
"dependencies": [
|
||||
"jasper"
|
||||
]
|
||||
},
|
||||
"jpeg": {
|
||||
"description": "JPEG support for opencv",
|
||||
"dependencies": [
|
||||
"libjpeg-turbo"
|
||||
]
|
||||
},
|
||||
"lapack": {
|
||||
"description": "LAPACK support for opencv",
|
||||
"dependencies": [
|
||||
"blas",
|
||||
"lapack"
|
||||
]
|
||||
},
|
||||
"nonfree": {
|
||||
"description": "allow nonfree and unredistributable libraries"
|
||||
},
|
||||
"openexr": {
|
||||
"description": "OpenEXR support for opencv",
|
||||
"dependencies": [
|
||||
"openexr"
|
||||
]
|
||||
},
|
||||
"opengl": {
|
||||
"description": "opengl support for opencv",
|
||||
"dependencies": [
|
||||
"opengl"
|
||||
]
|
||||
},
|
||||
"ovis": {
|
||||
"description": "opencv_ovis module",
|
||||
"dependencies": [
|
||||
"ogre",
|
||||
{
|
||||
"name": "opencv3",
|
||||
"features": [
|
||||
"contrib"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"png": {
|
||||
"description": "PNG support for opencv",
|
||||
"dependencies": [
|
||||
"libpng"
|
||||
]
|
||||
},
|
||||
"qt": {
|
||||
"description": "Qt GUI support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qt5-base",
|
||||
"default-features": false
|
||||
}
|
||||
]
|
||||
},
|
||||
"quirc": {
|
||||
"description": "Enable QR code module",
|
||||
"dependencies": [
|
||||
"quirc"
|
||||
]
|
||||
},
|
||||
"sfm": {
|
||||
"description": "opencv_sfm module",
|
||||
"dependencies": [
|
||||
"ceres",
|
||||
"eigen3",
|
||||
"gflags",
|
||||
"glog",
|
||||
{
|
||||
"name": "opencv3",
|
||||
"features": [
|
||||
"contrib"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"tbb": {
|
||||
"description": "Enable Intel Threading Building Blocks",
|
||||
"dependencies": [
|
||||
"tbb"
|
||||
]
|
||||
},
|
||||
"tiff": {
|
||||
"description": "TIFF support for opencv",
|
||||
"dependencies": [
|
||||
"tiff"
|
||||
]
|
||||
},
|
||||
"vtk": {
|
||||
"description": "vtk support for opencv",
|
||||
"dependencies": [
|
||||
"vtk"
|
||||
]
|
||||
},
|
||||
"webp": {
|
||||
"description": "WebP support for opencv",
|
||||
"dependencies": [
|
||||
"libwebp"
|
||||
]
|
||||
},
|
||||
"world": {
|
||||
"description": "Compile to a single package support for opencv"
|
||||
}
|
||||
}
|
||||
}
|
||||
26
ports/opencv4/0011-devendor-quirc.patch
Normal file
26
ports/opencv4/0011-devendor-quirc.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 89521b1..5ff0f01 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -772,7 +772,7 @@ if(WITH_OPENVX)
|
||||
endif()
|
||||
|
||||
if(WITH_QUIRC)
|
||||
- add_subdirectory(3rdparty/quirc)
|
||||
+ find_package(quirc CONFIG REQUIRED)
|
||||
set(HAVE_QUIRC TRUE)
|
||||
endif()
|
||||
# ----------------------------------------------------------------------------
|
||||
diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt
|
||||
index 3fa0c5d..f4c0ad6 100644
|
||||
--- a/modules/objdetect/CMakeLists.txt
|
||||
+++ b/modules/objdetect/CMakeLists.txt
|
||||
@@ -2,7 +2,5 @@ set(the_description "Object Detection")
|
||||
ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java objc python js)
|
||||
|
||||
if(HAVE_QUIRC)
|
||||
- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR)
|
||||
- ocv_include_directories(${QUIRC_INCLUDE})
|
||||
- ocv_target_link_libraries(${the_module} quirc)
|
||||
+ ocv_target_link_libraries(${the_module} quirc::quirc)
|
||||
endif()
|
||||
@ -1,102 +0,0 @@
|
||||
Source: opencv4
|
||||
Version: 4.5.0
|
||||
Build-Depends: zlib
|
||||
Homepage: https://github.com/opencv/opencv
|
||||
Description: computer vision library
|
||||
Default-Features: dnn, jpeg, png, tiff, webp
|
||||
|
||||
Feature: nonfree
|
||||
Description: allow nonfree and unredistributable libraries
|
||||
|
||||
Feature: ade
|
||||
Build-Depends: ade
|
||||
Description: graph api
|
||||
|
||||
Feature: contrib
|
||||
Build-Depends: hdf5 (!uwp&!(windows&(arm|arm64))), tesseract (!uwp&!(windows&(arm|arm64)))
|
||||
Description: opencv_contrib module
|
||||
|
||||
Feature: cuda
|
||||
Build-Depends: opencv4[core,contrib], cuda, cudnn
|
||||
Description: CUDA support for opencv
|
||||
|
||||
Feature: dnn
|
||||
Build-Depends: protobuf
|
||||
Description: Enable dnn module
|
||||
|
||||
Feature: eigen
|
||||
Build-Depends: eigen3
|
||||
Description: Eigen support for opencv
|
||||
|
||||
Feature: ffmpeg
|
||||
Build-Depends: ffmpeg
|
||||
Description: ffmpeg support for opencv
|
||||
|
||||
Feature: gdcm
|
||||
Build-Depends: gdcm
|
||||
Description: GDCM support for opencv
|
||||
|
||||
Feature: halide
|
||||
Build-Depends: halide, opencv4[core], opencv4[dnn]
|
||||
Description: Halide support for opencv
|
||||
|
||||
Feature: ipp
|
||||
Description: Enable Intel Integrated Performance Primitives
|
||||
|
||||
Feature: jasper
|
||||
Build-Depends: jasper
|
||||
Description: JPEG 2000 support for opencv
|
||||
|
||||
Feature: jpeg
|
||||
Build-Depends: libjpeg-turbo
|
||||
Description: JPEG support for opencv
|
||||
|
||||
Feature: lapack
|
||||
Build-Depends: blas, lapack
|
||||
Description: LAPACK support for opencv
|
||||
|
||||
Feature: openexr
|
||||
Build-Depends: openexr
|
||||
Description: OpenEXR support for opencv
|
||||
|
||||
Feature: opengl
|
||||
Build-Depends: opengl
|
||||
Description: opengl support for opencv
|
||||
|
||||
Feature: openmp
|
||||
Description: Enable openmp support for opencv
|
||||
|
||||
Feature: ovis
|
||||
Build-Depends: opencv4[core,contrib], ogre
|
||||
Description: opencv_ovis module
|
||||
|
||||
Feature: png
|
||||
Build-Depends: libpng
|
||||
Description: PNG support for opencv
|
||||
|
||||
Feature: qt
|
||||
Build-Depends: qt5-base[core]
|
||||
Description: Qt GUI support for opencv
|
||||
|
||||
Feature: sfm
|
||||
Build-Depends: opencv4[core,contrib], opencv4[core,eigen], glog, gflags, ceres
|
||||
Description: opencv_sfm module
|
||||
|
||||
Feature: tbb
|
||||
Build-Depends: tbb
|
||||
Description: Enable Intel Threading Building Blocks
|
||||
|
||||
Feature: tiff
|
||||
Build-Depends: tiff
|
||||
Description: TIFF support for opencv
|
||||
|
||||
Feature: vtk
|
||||
Build-Depends: opencv4[contrib], vtk
|
||||
Description: vtk support for opencv
|
||||
|
||||
Feature: webp
|
||||
Build-Depends: libwebp
|
||||
Description: WebP support for opencv
|
||||
|
||||
Feature: world
|
||||
Description: Compile to a single package support for opencv
|
||||
@ -21,6 +21,7 @@ vcpkg_from_github(
|
||||
0004-fix-policy-CMP0057.patch
|
||||
0009-fix-uwp.patch
|
||||
0010-fix-interface_link_libraries.patch # Remove this patch when the next update
|
||||
0011-devendor-quirc.patch
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
@ -42,8 +43,8 @@ set(ADE_DIR ${CURRENT_INSTALLED_DIR}/share/ade CACHE PATH "Path to existing ADE
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
"ade" WITH_ADE
|
||||
"contrib" WITH_CONTRIB
|
||||
"cuda" WITH_CUDA
|
||||
"cuda" WITH_CUBLAS
|
||||
"cuda" WITH_CUDA
|
||||
"eigen" WITH_EIGEN
|
||||
"ffmpeg" WITH_FFMPEG
|
||||
"gdcm" WITH_GDCM
|
||||
@ -56,6 +57,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
"opengl" WITH_OPENGL
|
||||
"png" WITH_PNG
|
||||
"qt" WITH_QT
|
||||
"quirc" WITH_QUIRC
|
||||
"sfm" BUILD_opencv_sfm
|
||||
"tiff" WITH_TIFF
|
||||
"vtk" WITH_VTK
|
||||
@ -442,6 +444,9 @@ find_dependency(Tesseract)")
|
||||
if(BUILD_opencv_ovis)
|
||||
string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)")
|
||||
endif()
|
||||
if("quirc" IN_LIST FEATURES)
|
||||
string(APPEND DEPS_STRING "\nfind_dependency(quirc CONFIG)")
|
||||
endif()
|
||||
if("qt" IN_LIST FEATURES)
|
||||
string(APPEND DEPS_STRING "
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
222
ports/opencv4/vcpkg.json
Normal file
222
ports/opencv4/vcpkg.json
Normal file
@ -0,0 +1,222 @@
|
||||
{
|
||||
"name": "opencv4",
|
||||
"version": "4.5.0",
|
||||
"port-version": 1,
|
||||
"description": "computer vision library",
|
||||
"homepage": "https://github.com/opencv/opencv",
|
||||
"dependencies": [
|
||||
"zlib"
|
||||
],
|
||||
"default-features": [
|
||||
"dnn",
|
||||
"jpeg",
|
||||
"png",
|
||||
"quirc",
|
||||
"tiff",
|
||||
"webp"
|
||||
],
|
||||
"features": {
|
||||
"ade": {
|
||||
"description": "graph api",
|
||||
"dependencies": [
|
||||
"ade"
|
||||
]
|
||||
},
|
||||
"contrib": {
|
||||
"description": "opencv_contrib module",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "hdf5",
|
||||
"platform": "!uwp & !(windows & (arm | arm64))"
|
||||
},
|
||||
{
|
||||
"name": "tesseract",
|
||||
"platform": "!uwp & !(windows & (arm | arm64))"
|
||||
}
|
||||
]
|
||||
},
|
||||
"cuda": {
|
||||
"description": "CUDA support for opencv",
|
||||
"dependencies": [
|
||||
"cuda",
|
||||
"cudnn",
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"contrib"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"dnn": {
|
||||
"description": "Enable dnn module",
|
||||
"dependencies": [
|
||||
"protobuf"
|
||||
]
|
||||
},
|
||||
"eigen": {
|
||||
"description": "Eigen support for opencv",
|
||||
"dependencies": [
|
||||
"eigen3"
|
||||
]
|
||||
},
|
||||
"ffmpeg": {
|
||||
"description": "ffmpeg support for opencv",
|
||||
"dependencies": [
|
||||
"ffmpeg"
|
||||
]
|
||||
},
|
||||
"gdcm": {
|
||||
"description": "GDCM support for opencv",
|
||||
"dependencies": [
|
||||
"gdcm"
|
||||
]
|
||||
},
|
||||
"halide": {
|
||||
"description": "Halide support for opencv",
|
||||
"dependencies": [
|
||||
"halide",
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false
|
||||
},
|
||||
{
|
||||
"name": "opencv4",
|
||||
"features": [
|
||||
"dnn"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"ipp": {
|
||||
"description": "Enable Intel Integrated Performance Primitives"
|
||||
},
|
||||
"jasper": {
|
||||
"description": "JPEG 2000 support for opencv",
|
||||
"dependencies": [
|
||||
"jasper"
|
||||
]
|
||||
},
|
||||
"jpeg": {
|
||||
"description": "JPEG support for opencv",
|
||||
"dependencies": [
|
||||
"libjpeg-turbo"
|
||||
]
|
||||
},
|
||||
"lapack": {
|
||||
"description": "LAPACK support for opencv",
|
||||
"dependencies": [
|
||||
"blas",
|
||||
"lapack"
|
||||
]
|
||||
},
|
||||
"nonfree": {
|
||||
"description": "allow nonfree and unredistributable libraries"
|
||||
},
|
||||
"openexr": {
|
||||
"description": "OpenEXR support for opencv",
|
||||
"dependencies": [
|
||||
"openexr"
|
||||
]
|
||||
},
|
||||
"opengl": {
|
||||
"description": "opengl support for opencv",
|
||||
"dependencies": [
|
||||
"opengl"
|
||||
]
|
||||
},
|
||||
"openmp": {
|
||||
"description": "Enable openmp support for opencv"
|
||||
},
|
||||
"ovis": {
|
||||
"description": "opencv_ovis module",
|
||||
"dependencies": [
|
||||
"ogre",
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"contrib"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"png": {
|
||||
"description": "PNG support for opencv",
|
||||
"dependencies": [
|
||||
"libpng"
|
||||
]
|
||||
},
|
||||
"qt": {
|
||||
"description": "Qt GUI support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "qt5-base",
|
||||
"default-features": false
|
||||
}
|
||||
]
|
||||
},
|
||||
"quirc": {
|
||||
"description": "Enable QR code module",
|
||||
"dependencies": [
|
||||
"quirc"
|
||||
]
|
||||
},
|
||||
"sfm": {
|
||||
"description": "opencv_sfm module",
|
||||
"dependencies": [
|
||||
"ceres",
|
||||
"gflags",
|
||||
"glog",
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"contrib"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "opencv4",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"eigen"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"tbb": {
|
||||
"description": "Enable Intel Threading Building Blocks",
|
||||
"dependencies": [
|
||||
"tbb"
|
||||
]
|
||||
},
|
||||
"tiff": {
|
||||
"description": "TIFF support for opencv",
|
||||
"dependencies": [
|
||||
"tiff"
|
||||
]
|
||||
},
|
||||
"vtk": {
|
||||
"description": "vtk support for opencv",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "opencv4",
|
||||
"features": [
|
||||
"contrib"
|
||||
]
|
||||
},
|
||||
"vtk"
|
||||
]
|
||||
},
|
||||
"webp": {
|
||||
"description": "WebP support for opencv",
|
||||
"dependencies": [
|
||||
"libwebp"
|
||||
]
|
||||
},
|
||||
"world": {
|
||||
"description": "Compile to a single package support for opencv"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,17 +1,27 @@
|
||||
cmake_minimum_required(VERSION 2.8)
|
||||
cmake_minimum_required(VERSION 3.19)
|
||||
|
||||
project(quirc C)
|
||||
|
||||
add_library(quirc
|
||||
lib/decode.c
|
||||
lib/identify.c
|
||||
lib/quirc.c
|
||||
lib/version_db.c
|
||||
lib/decode.c
|
||||
lib/identify.c
|
||||
lib/quirc.c
|
||||
lib/version_db.c
|
||||
lib/quirc.h
|
||||
)
|
||||
|
||||
install(TARGETS quirc
|
||||
RUNTIME DESTINATION bin
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib)
|
||||
target_include_directories(quirc INTERFACE $<INSTALL_INTERFACE:include>)
|
||||
|
||||
install(FILES ${PROJECT_SOURCE_DIR}/lib/quirc.h DESTINATION include)
|
||||
install(TARGETS quirc
|
||||
EXPORT quirc-targets
|
||||
RUNTIME DESTINATION bin
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib)
|
||||
|
||||
install(FILES lib/quirc.h DESTINATION include)
|
||||
|
||||
install(EXPORT quirc-targets
|
||||
FILE quirc-config.cmake
|
||||
NAMESPACE quirc::
|
||||
DESTINATION share/quirc
|
||||
)
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
Source: quirc
|
||||
Version: 1.1
|
||||
Port-Version: 1
|
||||
Description: quirc is one of the C library available for scanning QR Codes
|
||||
@ -19,6 +19,8 @@ vcpkg_install_cmake()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_fixup_cmake_targets()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc/copyright)
|
||||
|
||||
6
ports/quirc/vcpkg.json
Normal file
6
ports/quirc/vcpkg.json
Normal file
@ -0,0 +1,6 @@
|
||||
{
|
||||
"name": "quirc",
|
||||
"version": "1.1",
|
||||
"port-version": 2,
|
||||
"description": "quirc is one of the C library available for scanning QR Codes"
|
||||
}
|
||||
@ -95,7 +95,6 @@ chartdir:arm64-windows=fail
|
||||
chartdir:arm-uwp=fail
|
||||
chartdir:x64-uwp=fail
|
||||
chartdir:x64-windows-static=fail
|
||||
chartdir:x64-windows-static-md=fail
|
||||
chmlib:arm-uwp=fail
|
||||
chmlib:x64-uwp=fail
|
||||
# Chromium Base requires a recent version of Clang to be installed.
|
||||
@ -110,7 +109,6 @@ clblast:x64-windows-static-md=fail
|
||||
clockutils:x64-linux=fail
|
||||
clockutils:x64-osx=fail
|
||||
cmark:x64-windows-static=fail
|
||||
cmark:x64-windows-static-md=fail
|
||||
cmcstl2:arm64-windows = skip
|
||||
cmcstl2:arm-uwp = skip
|
||||
cmcstl2:x64-linux = skip
|
||||
@ -138,7 +136,6 @@ corrade:x64-uwp=fail
|
||||
cppcms:x64-linux=fail
|
||||
cppcms:x64-osx=fail
|
||||
cppcms:x64-windows-static=fail
|
||||
cppcms:x64-windows-static-md=fail
|
||||
cppfs:arm-uwp=fail
|
||||
cppfs:x64-uwp=fail
|
||||
cppmicroservices:arm64-windows=fail
|
||||
@ -165,7 +162,6 @@ cudnn:arm64-windows=fail
|
||||
cudnn:arm-uwp=fail
|
||||
cudnn:x64-uwp=fail
|
||||
cudnn:x64-windows-static=fail
|
||||
cudnn:x64-windows-static-md=fail
|
||||
cudnn:x86-windows=fail
|
||||
# Since pipeline cannot automatically install dbghelp dependency, skip this detection
|
||||
dbghelp:arm-uwp=skip
|
||||
@ -187,13 +183,11 @@ devicenameresolver:x64-linux=fail
|
||||
devicenameresolver:x64-osx=fail
|
||||
devicenameresolver:x64-uwp=fail
|
||||
devicenameresolver:x64-windows-static=fail
|
||||
devicenameresolver:x64-windows-static-md=fail
|
||||
dimcli:arm-uwp=fail
|
||||
dimcli:x64-osx=fail
|
||||
dimcli:x64-uwp=fail
|
||||
# directxtex, directxmesh requires GCC 9 or later for linux support
|
||||
# directxtex requires GCC 9 or later for linux support
|
||||
directxtex:x64-linux=fail
|
||||
directxmesh:x64-linux=fail
|
||||
discord-game-sdk:x64-windows-static=fail
|
||||
discord-game-sdk:x64-windows-static-md=fail
|
||||
discord-rpc:arm-uwp=fail
|
||||
@ -231,12 +225,6 @@ duilib:x64-uwp=fail
|
||||
# python2 EOL yay!
|
||||
duktape:x64-osx=skip
|
||||
|
||||
dxut:arm64-windows=fail
|
||||
dxut:arm-uwp=fail
|
||||
dxut:x64-linux=fail
|
||||
dxut:x64-osx=fail
|
||||
dxut:x64-windows-static=fail
|
||||
dxut:x64-windows-static-md=fail
|
||||
eastl:arm-uwp=fail
|
||||
easyhook:arm64-windows=fail
|
||||
easyhook:arm-uwp=fail
|
||||
@ -275,12 +263,11 @@ embree2:x64-windows-static=fail
|
||||
embree2:x64-windows-static-md=fail
|
||||
enet:arm-uwp=fail
|
||||
enet:x64-uwp=fail
|
||||
epsilon:x64-windows-static=fail
|
||||
epsilon:x64-windows-static-md=fail
|
||||
epsilon:arm-uwp=fail
|
||||
epsilon:x64-linux=fail
|
||||
epsilon:x64-osx=fail
|
||||
epsilon:x64-uwp=fail
|
||||
epsilon:x64-windows-static=fail
|
||||
faad2:x64-linux=fail
|
||||
faad2:x64-osx=fail
|
||||
fann:arm-uwp=fail
|
||||
@ -288,7 +275,6 @@ fann:x64-linux=fail
|
||||
fann:x64-osx=fail
|
||||
fann:x64-uwp=fail
|
||||
fann:x64-windows-static=fail
|
||||
fann:x64-windows-static-md=fail
|
||||
farmhash:arm64-windows=fail
|
||||
farmhash:arm-uwp=fail
|
||||
farmhash:x64-uwp=fail
|
||||
@ -313,6 +299,7 @@ flint:x64-osx=fail
|
||||
fltk:arm-uwp=fail
|
||||
fltk:x64-uwp=fail
|
||||
fluidsynth:x64-osx=fail
|
||||
fluidsynth:x64-windows-static-md=fail
|
||||
# fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because
|
||||
# fluidlite has no dependencies and thus is less likely to be broken by another package.
|
||||
fluidlite:arm-uwp=skip
|
||||
@ -379,7 +366,6 @@ getopt-win32:x64-linux=fail
|
||||
getopt-win32:x64-osx=fail
|
||||
getopt-win32:x64-uwp=fail
|
||||
getopt-win32:x64-windows-static=fail
|
||||
getopt-win32:x64-windows-static-md=fail
|
||||
gflags:arm-uwp=fail
|
||||
gflags:x64-uwp=fail
|
||||
|
||||
@ -401,7 +387,6 @@ glfw3:arm-uwp=fail
|
||||
glfw3:x64-uwp=fail
|
||||
glib:x64-uwp=fail
|
||||
glib:x64-windows-static=fail
|
||||
glib:x64-windows-static-md=fail
|
||||
glib:x64-osx=fail
|
||||
gmmlib:arm64-windows=fail
|
||||
gmmlib:arm-uwp=fail
|
||||
@ -435,7 +420,6 @@ h3:arm64-windows=fail
|
||||
h3:arm-uwp=fail
|
||||
h3:x64-uwp=fail
|
||||
halide:x64-windows-static=fail
|
||||
halide:x64-windows-static-md=fail
|
||||
hdf5:arm64-windows=fail
|
||||
hdf5:arm-uwp=fail
|
||||
hdf5:x64-uwp=fail
|
||||
@ -455,12 +439,11 @@ hidapi:x64-uwp=fail
|
||||
hiredis:arm-uwp=fail
|
||||
hiredis:x64-uwp=fail
|
||||
hpx:x64-windows-static=fail
|
||||
hpx:x64-windows-static-md=fail
|
||||
hpx:x64-linux=fail
|
||||
libhsplasma:x64-windows-static=fail
|
||||
libhsplasma:x64-windows-static-md=fail
|
||||
icu:arm-uwp=fail
|
||||
icu:x64-uwp=fail
|
||||
ideviceinstaller:x64-windows-static-md=fail
|
||||
idevicerestore:x64-linux=fail
|
||||
idevicerestore:x64-osx=fail
|
||||
ignition-common1:x64-linux=fail
|
||||
@ -521,7 +504,6 @@ jemalloc:x64-linux=fail
|
||||
jemalloc:x64-osx=fail
|
||||
jemalloc:x64-uwp=fail
|
||||
jemalloc:x64-windows-static=fail
|
||||
jemalloc:x64-windows-static-md=fail
|
||||
jinja2cpplight:arm-uwp=fail
|
||||
jinja2cpplight:x64-uwp=fail
|
||||
keystone:arm-uwp=fail
|
||||
@ -564,6 +546,7 @@ libcopp:arm64-windows=fail
|
||||
libcopp:arm-uwp=fail
|
||||
libcrafter:x86-windows=fail
|
||||
libcrafter:x64-windows=fail
|
||||
libcrafter:x64-windows-static-md=fail
|
||||
cpuid:arm-uwp=fail
|
||||
cpuid:x64-uwp=fail
|
||||
cpuid:arm64-windows=fail
|
||||
@ -578,7 +561,6 @@ libdshowcapture:x64-uwp=fail
|
||||
libepoxy:arm-uwp=fail
|
||||
libepoxy:x64-uwp=fail
|
||||
libepoxy:x64-windows-static=fail
|
||||
libepoxy:x64-windows-static-md=fail
|
||||
libevent:arm-uwp=fail
|
||||
libevent:x64-uwp=fail
|
||||
libevhtp:x86-windows=fail
|
||||
@ -627,6 +609,7 @@ libics:x64-uwp=fail
|
||||
libigl:arm64-windows=fail
|
||||
libigl:arm-uwp=fail
|
||||
libigl:x64-uwp=fail
|
||||
libirecovery:x64-windows-static-md=fail
|
||||
liblemon:arm-uwp=fail
|
||||
liblemon:x64-uwp=fail
|
||||
liblo:arm-uwp=fail
|
||||
@ -669,7 +652,6 @@ libmesh:x64-linux=skip
|
||||
libmodman:arm-uwp=fail
|
||||
libmodman:x64-uwp=fail
|
||||
libmodman:x64-windows-static=fail
|
||||
libmodman:x64-windows-static-md=fail
|
||||
libmodplug:arm-uwp=fail
|
||||
libmodplug:x64-uwp=fail
|
||||
libmpeg2:arm-uwp=fail
|
||||
@ -696,7 +678,6 @@ libpcap:arm-uwp=fail
|
||||
libpcap:x64-osx=fail
|
||||
libpcap:x64-uwp=fail
|
||||
libpcap:x64-windows-static=fail
|
||||
libpcap:x64-windows-static-md=fail
|
||||
libpff:arm-uwp=fail
|
||||
libpff:x64-linux=fail
|
||||
libpff:x64-osx=fail
|
||||
@ -704,7 +685,6 @@ libpff:x64-uwp=fail
|
||||
libpff:x64-windows-static=fail
|
||||
libpff:x64-windows-static-md=fail
|
||||
libplist:x64-windows-static=fail
|
||||
libplist:x64-windows-static-md=fail
|
||||
libpng-apng:arm64-windows = skip
|
||||
libpng-apng:arm-uwp = skip
|
||||
libpng-apng:x64-linux = skip
|
||||
@ -912,7 +892,6 @@ mhook:x64-osx=fail
|
||||
mhook:x64-uwp=fail
|
||||
milerius-sfml-imgui:x64-osx=fail
|
||||
milerius-sfml-imgui:x64-windows-static=fail
|
||||
milerius-sfml-imgui:x64-windows-static-md=fail
|
||||
minhook:arm64-windows=fail
|
||||
minhook:arm-uwp=fail
|
||||
minhook:x64-linux=fail
|
||||
@ -965,12 +944,11 @@ monkeys-audio:x64-linux=fail
|
||||
monkeys-audio:x64-osx=fail
|
||||
monkeys-audio:x64-uwp=fail
|
||||
monkeys-audio:x64-windows-static=fail
|
||||
monkeys-audio:x64-windows-static-md=fail
|
||||
moos-core:arm-uwp=fail
|
||||
moos-core:x64-uwp=fail
|
||||
moos-core:x64-windows-static=fail
|
||||
moos-core:x64-windows-static-md=fail
|
||||
moos-essential:arm64-windows=fail
|
||||
moos-essential:x64-windows-static-md=fail
|
||||
moos-essential:x64-windows=fail
|
||||
moos-essential:x86-windows=fail
|
||||
# Conflicts with libjpeg-turbo
|
||||
@ -995,7 +973,6 @@ mpir:x64-linux=skip
|
||||
msix:x64-linux=fail
|
||||
msix:x64-osx=fail
|
||||
msix:x64-windows-static=fail
|
||||
msix:x64-windows-static-md=fail
|
||||
msmpi:arm64-windows=fail
|
||||
msmpi:arm-uwp=fail
|
||||
msmpi:x64-linux=fail
|
||||
@ -1033,7 +1010,6 @@ nettle:x64-windows-static=skip
|
||||
nettle:x64-windows-static-md=skip
|
||||
nettle:x64-windows=skip
|
||||
ngspice:x64-windows-static=fail
|
||||
ngspice:x64-windows-static-md=fail
|
||||
nng:arm-uwp=fail
|
||||
nng:x64-uwp=fail
|
||||
nrf-ble-driver:arm-uwp=fail
|
||||
@ -1140,6 +1116,7 @@ openexr:arm-uwp=fail
|
||||
openexr:x64-uwp=fail
|
||||
opengl:arm64-windows=fail
|
||||
opengl:arm-uwp=fail
|
||||
openmama:x64-windows-static-md=fail
|
||||
openmesh:arm64-windows=fail
|
||||
openmesh:arm-uwp=fail
|
||||
openmesh:x64-uwp=fail
|
||||
@ -1152,7 +1129,6 @@ openmpi:x64-windows-static-md=fail
|
||||
openmpi:x86-windows=fail
|
||||
openni2:x64-uwp=fail
|
||||
openni2:x64-windows-static=fail
|
||||
openni2:x64-windows-static-md=fail
|
||||
openscap:x64-linux=fail
|
||||
openssl-unix:arm64-windows=fail
|
||||
openssl-unix:arm-uwp=fail
|
||||
@ -1176,7 +1152,6 @@ openvr:arm-uwp=fail
|
||||
openvr:x64-osx=fail
|
||||
openvr:x64-uwp=fail
|
||||
openvr:x64-windows-static=fail
|
||||
openvr:x64-windows-static-md=fail
|
||||
openxr-loader:arm64-windows=fail
|
||||
openxr-loader:arm-uwp=fail
|
||||
openxr-loader:x64-osx=fail
|
||||
@ -1252,7 +1227,6 @@ pmdk:x64-linux=fail
|
||||
pmdk:x64-osx=fail
|
||||
pmdk:x64-uwp=fail
|
||||
pmdk:x64-windows-static=fail
|
||||
pmdk:x64-windows-static-md=fail
|
||||
pmdk:x86-windows=fail
|
||||
pngwriter:arm-uwp=fail
|
||||
pngwriter:x64-uwp=fail
|
||||
@ -1282,7 +1256,6 @@ qhull:arm-uwp=fail
|
||||
qpid-proton:arm-uwp=fail
|
||||
qpid-proton:x64-uwp=fail
|
||||
qpid-proton:x64-windows-static=fail
|
||||
qpid-proton:x64-windows-static-md=fail
|
||||
qt5-activeqt:x64-linux=fail
|
||||
qt5-activeqt:x64-osx=fail
|
||||
# Skip deprecated Qt module
|
||||
@ -1413,7 +1386,6 @@ sciter:arm64-windows=fail
|
||||
sciter:arm-uwp=fail
|
||||
sciter:x64-uwp=fail
|
||||
sciter:x64-windows-static=fail
|
||||
sciter:x64-windows-static-md=fail
|
||||
scnlib:arm-uwp=fail
|
||||
scnlib:x64-uwp=fail
|
||||
scylla-wrapper:arm-uwp=fail
|
||||
@ -1421,13 +1393,15 @@ scylla-wrapper:x64-linux=fail
|
||||
scylla-wrapper:x64-osx=fail
|
||||
scylla-wrapper:x64-uwp=fail
|
||||
scylla-wrapper:x64-windows-static=fail
|
||||
scylla-wrapper:x64-windows-static-md=fail
|
||||
sdformat6:arm64-windows=fail
|
||||
sdformat10:x64-windows-static-md=fail
|
||||
sdformat6:arm-uwp=fail
|
||||
sdformat6:arm64-windows=fail
|
||||
sdformat6:x64-uwp=fail
|
||||
sdformat9:x64-linux=fail
|
||||
sdformat6:x64-windows-static-md=fail
|
||||
sdformat9:arm-uwp=fail
|
||||
sdformat9:x64-linux=fail
|
||||
sdformat9:x64-uwp=fail
|
||||
sdformat9:x64-windows-static-md=fail
|
||||
sdl1:arm-uwp=fail
|
||||
sdl1:x64-uwp=fail
|
||||
sdl1:x64-osx=fail
|
||||
@ -1501,7 +1475,6 @@ soqt:x64-uwp=fail
|
||||
soundtouch:arm-uwp=fail
|
||||
soundtouch:x64-uwp=fail
|
||||
soundtouch:x64-windows-static=fail
|
||||
soundtouch:x64-windows-static-md=fail
|
||||
spaceland:arm64-windows=fail
|
||||
spaceland:arm-uwp=fail
|
||||
spaceland:x64-uwp=fail
|
||||
@ -1592,10 +1565,8 @@ torch-th:arm64-windows=fail
|
||||
torch-th:arm-uwp=fail
|
||||
torch-th:x64-uwp=fail
|
||||
torch-th:x64-windows-static=fail
|
||||
torch-th:x64-windows-static-md=fail
|
||||
tre:x64-osx=fail
|
||||
treehopper:x64-windows-static=fail
|
||||
treehopper:x64-windows-static-md=fail
|
||||
treehopper:x64-linux=fail
|
||||
turbobase64:arm64-windows=fail
|
||||
turbobase64:arm-uwp=fail
|
||||
@ -1627,14 +1598,10 @@ unrar:x64-linux=fail
|
||||
unrar:x64-osx=fail
|
||||
unrar:x64-uwp=fail
|
||||
unrar:x64-windows-static=fail
|
||||
unrar:x64-windows-static-md=fail
|
||||
urdfdom:x64-windows-static=fail
|
||||
urdfdom:x64-windows-static-md=fail
|
||||
usd:x86-windows=fail
|
||||
uthenticode:arm-uwp=fail
|
||||
uthenticode:x64-uwp=fail
|
||||
# uvatlas requires GCC 9 or later for linux support
|
||||
uvatlas:x64-linux=fail
|
||||
v8:arm64-windows=fail
|
||||
v8:arm-uwp=fail
|
||||
v8:x64-osx=fail
|
||||
@ -1699,7 +1666,6 @@ x265:arm64-windows=fail
|
||||
x265:arm-uwp=fail
|
||||
x265:x64-uwp=fail
|
||||
xalan-c:x64-windows-static=fail
|
||||
xalan-c:x64-windows-static-md=fail
|
||||
xalan-c:arm64-windows=fail
|
||||
xbyak:arm64-windows=fail
|
||||
xbyak:arm-uwp=fail
|
||||
@ -1782,7 +1748,6 @@ chromium-base:x64-windows-static-md=fail
|
||||
clockutils:x64-windows-static-md=fail
|
||||
fastcgi:x64-windows-static-md=fail
|
||||
gmp:x64-windows-static-md=fail
|
||||
graphqlparser:x64-windows-static-md=fail
|
||||
ijg-libjpeg:x64-windows-static-md=fail
|
||||
keystone:x64-windows-static-md=fail
|
||||
libcerf:x64-windows-static-md=fail
|
||||
@ -1794,13 +1759,11 @@ mmloader:x64-windows-static-md=fail
|
||||
mpg123:x64-windows-static-md=fail
|
||||
netcdf-cxx4:x64-windows-static-md=fail
|
||||
open62541:x64-windows-static-md=fail
|
||||
pngpp:x64-windows-static-md=fail
|
||||
portmidi:x64-windows-static-md=fail
|
||||
pthreads:x64-windows-static-md=fail
|
||||
quantlib:x64-windows-static-md=fail
|
||||
readosm:x64-windows-static-md=fail
|
||||
sentencepiece:x64-windows-static-md=fail
|
||||
spirv-tools:x64-windows-static-md=fail
|
||||
symengine:x64-windows-static-md=fail
|
||||
teemo:x64-windows-static-md=fail
|
||||
unicorn:x64-windows-static-md=fail
|
||||
|
||||
@ -1689,8 +1689,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"dxut": {
|
||||
"baseline": "11.14-3",
|
||||
"port-version": 0
|
||||
"baseline": "11.14",
|
||||
"port-version": 4
|
||||
},
|
||||
"eabase": {
|
||||
"baseline": "2.09.12-1",
|
||||
@ -4225,8 +4225,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"opencv": {
|
||||
"baseline": "4.3.0",
|
||||
"port-version": 1
|
||||
"baseline": "4.5.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"opencv2": {
|
||||
"baseline": "2.4.13.7",
|
||||
@ -4234,11 +4234,11 @@
|
||||
},
|
||||
"opencv3": {
|
||||
"baseline": "3.4.12",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"opencv4": {
|
||||
"baseline": "4.5.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"opendnp3": {
|
||||
"baseline": "3.1.0",
|
||||
@ -4946,7 +4946,7 @@
|
||||
},
|
||||
"quirc": {
|
||||
"baseline": "1.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"qwt": {
|
||||
"baseline": "6.1.5",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "6171a1c44bd4c11d7db922b56ef55c9366fe60af",
|
||||
"version-string": "11.14",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "27f3d4fe979fbc45d132894a80c6712d27be4c49",
|
||||
"version-string": "11.14-3",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "457db123c6f787763d2bbe056e51caecd8c37464",
|
||||
"version": "4.5.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "6732874b9a119e4de4e9afdc72469c967348b21b",
|
||||
"version-string": "4.3.0",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "ffd8270ed4798f25f3bd882a6089c72e86803466",
|
||||
"version": "3.4.12",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "a0dfe03c4db4fb9532b888399deee675750eef61",
|
||||
"version-string": "3.4.12",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a0522dbbb44877b9d4618bfe31a376e07e49bc72",
|
||||
"version": "4.5.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "cdf704950d37ce677508db67c081f9aeda18b9cd",
|
||||
"version-string": "4.5.0",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "15bad29ef4d2466b236311ce7af075dbb9507ed9",
|
||||
"version": "1.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "c4c19ac884d1a66e0ac073ff5bd99c2db1460015",
|
||||
"version-string": "1.1",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user