3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[opencv4] update to v4.3 (#11130)

Browse Source 
* [opencv4] draft update to v4.3

* restore uwp patch

* fix qt and ipp features

* fix libepoxy and meson on osx

* fix baseline, trigger a full rebuild due to meson tool changes

* remove jpeg feature on windows due to a bug with MSVC

* minor fixes for some features

* ffmpeg x11 lib not required anymore on apple for downstream projects

* small fixes for ogre and qt5

* remove a broken module

* fix installation path

* fix openexr which was broken and regressed opencv downstream projects

* first round of ci passes

* improve compatibility with android toolchain

* [openexr] upgrade to v2.5.0 to fix regressions, might require fixes in dependent projects and might deserve its own PR

* fix OpenEXR link for downstream projects

* do not install unrequested features

* fix compatibility with newer OpenEXR

* [OpenCV3] update to v3.4.10

* fix openexr on windows, was creating symlinks that broke vcpkg

* fix openexr wrapper

* [openexr] cmake config files are installed into a lowered-case folder

* remove mangled paths trying to fix android setup

* disable dnn on android, fix mangled cmake config paths again

* fix downstream CUDA dependency

* fix compatibility with vs16.6

* remove from baseline ports now passing tests

* [alembic] fixes for new openexr

* fix baseline

* [field3d] fixes for new openexr

* [field3d] improve fixes, windows still unsupported despite what is said upstream

* apply fixes required from review

* add missing field3d patch

* [field3d] disable mpi integration

* [opencv2] remove cublas integration

* [vtk] do not create libharu::libharu target if already existing

* Update ports/opencv4/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Update ports/opencv3/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* improve compatibility with newer CUDNN

* [OpenCV3, OpenCV4] improve compatibility with CUDA 11

* [OpenCV2] improve compatibility with CUDA 11

* [field3d] regenerate patch ignoring space at eol

* [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (#11999)

* [field3d] regenerate patch ignoring space at eol

* [field3d] regenerate patch, again

* [field3d] fixes for windows

* [libass] fix regression

* ci.baseline.txt update

* [CUDA11] use FindCUDA from CMake 3.18 to ease transition later

* re-bump vtk and ffmpeg, which were lost with merges from master

* [OpenCV4] Halide feature is not broken anymore

* [field3d] regenerate hdf5 patch

* [OpenCV4] remove GTK features: it can be built only on *nix but GTK on vcpkg cannot be built on *nix systems...

* merge ci.baseline.txt from master and fix field3d patch

* remove rebuilding

* restore vtk CONTROL file

* update CONTROL files

* Trigger rebuild

* Update ports/freeimage/CONTROL

* Update ports/freeimage/CONTROL

* [opencv3/4] avoid tesseract dependency on uwp builds

* [opencv] add missing module search

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
This commit is contained in:
Stefano Sinigardi 2020-07-28 02:43:23 +02:00 committed by GitHub
parent 458c20e94b
commit f1e7a3f167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
52 changed files with 7104 additions and 1171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/alembic/CONTROL
View File

@ -1,5 +1,6 @@
Source: alembic Source: alembic
Version: 1.7.12-1 Version: 1.7.12
Port-Version: 2
Build-Depends: ilmbase, hdf5 Build-Depends: ilmbase, hdf5
Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
Homepage: https://alembic.io/ Homepage: https://alembic.io/

49
ports/alembic/fix-C1083.patch
View File

@ -1,49 +0,0 @@
diff --git a/lib/Alembic/Abc/Foundation.h b/lib/Alembic/Abc/Foundation.h
index 9760c49..fbab6a0 100644
--- a/lib/Alembic/Abc/Foundation.h
+++ b/lib/Alembic/Abc/Foundation.h
@@ -40,11 +40,11 @@
#include <Alembic/AbcCoreAbstract/All.h>
#include <Alembic/Util/All.h>
-#include <ImathVec.h>
-#include <ImathBox.h>
-#include <ImathMatrix.h>
-#include <ImathQuat.h>
-#include <ImathColor.h>
+#include <OpenEXR/ImathVec.h>
+#include <OpenEXR/ImathBox.h>
+#include <OpenEXR/ImathMatrix.h>
+#include <OpenEXR/ImathQuat.h>
+#include <OpenEXR/ImathColor.h>
#include <iostream>
#include <string>
diff --git a/lib/Alembic/AbcGeom/Foundation.h b/lib/Alembic/AbcGeom/Foundation.h
index 301efc3..2bb0f6b 100644
--- a/lib/Alembic/AbcGeom/Foundation.h
+++ b/lib/Alembic/AbcGeom/Foundation.h
@@ -39,8 +39,8 @@
#include <Alembic/Abc/All.h>
-#include <ImathMatrixAlgo.h>
-#include <ImathEuler.h>
+#include <OpenEXR/ImathMatrixAlgo.h>
+#include <OpenEXR/ImathEuler.h>
namespace Alembic {
diff --git a/lib/Alembic/Util/Foundation.h b/lib/Alembic/Util/Foundation.h
index d7f40dd..a41bb97 100644
--- a/lib/Alembic/Util/Foundation.h
+++ b/lib/Alembic/Util/Foundation.h
@@ -63,7 +63,7 @@
#include <memory>
-#include <half.h>
+#include <OpenEXR/half.h>
#include <iomanip>
#include <iostream>

351
ports/alembic/fix-find-openexr-ilmbase.patch
View File

@ -2,7 +2,7 @@ diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake
index cd00d70..0e50512 100644 index cd00d70..0e50512 100644
--- a/cmake/AlembicIlmBase.cmake --- a/cmake/AlembicIlmBase.cmake
+++ b/cmake/AlembicIlmBase.cmake +++ b/cmake/AlembicIlmBase.cmake
@@ -33,11 +33,25 @@ @@ -33,11 +33,17 @@
## ##
##-***************************************************************************** ##-*****************************************************************************
@ -16,17 +16,9 @@ index cd00d70..0e50512 100644
+ set(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${OpenEXR_INCLUDE_DIRS}/OpenEXR) + set(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${OpenEXR_INCLUDE_DIRS}/OpenEXR)
+ set(ALEMBIC_ILMBASE_HALF_LIB ${OPENEXR_HALF_LIBRARY}) + set(ALEMBIC_ILMBASE_HALF_LIB ${OPENEXR_HALF_LIBRARY})
+ set(ALEMBIC_ILMBASE_IEX_LIB ${OPENEXR_IEX_LIBRARY}) + set(ALEMBIC_ILMBASE_IEX_LIB ${OPENEXR_IEX_LIBRARY})
+ set(ALEMBIC_ILMBASE_IEXMATH_LIB ${OpenEXR_IEXMATH_LIBRARY}) + set(ALEMBIC_ILMBASE_IEXMATH_LIB ${OPENEXR_IEXMATH_LIBRARY} ${OPENEXR_IMATH_LIBRARY})
+ set(ALEMBIC_ILMBASE_ILMTHREAD_LIB ${OPENEXR_ILMTHREAD_LIBRARY}) + set(ALEMBIC_ILMBASE_ILMTHREAD_LIB ${OPENEXR_ILMTHREAD_LIBRARY})
+ set(ALEMBIC_ILMBASE_IMATH_LIB ${OPENEXR_IMATH_LIBRARY}) + set(ALEMBIC_ILMBASE_IMATH_LIB ${OPENEXR_IMATH_LIBRARY})
+
+ MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
+ MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
+ MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" )
+ MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" )
+ MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" )
+ MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" )
+
SET(ALEMBIC_ILMBASE_LIBS SET(ALEMBIC_ILMBASE_LIBS
${ALEMBIC_ILMBASE_IMATH_LIB} ${ALEMBIC_ILMBASE_IMATH_LIB}
${ALEMBIC_ILMBASE_ILMTHREAD_LIB} ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}
@ -46,348 +38,13 @@ diff --git a/cmake/AlembicOpenEXR.cmake b/cmake/AlembicOpenEXR.cmake
index 0833b32..a9180cd 100644 index 0833b32..a9180cd 100644
--- a/cmake/AlembicOpenEXR.cmake --- a/cmake/AlembicOpenEXR.cmake
+++ b/cmake/AlembicOpenEXR.cmake +++ b/cmake/AlembicOpenEXR.cmake
@@ -38,8 +38,12 @@ @@ -38,8 +38,8 @@
FIND_PACKAGE( OpenEXR ) FIND_PACKAGE( OpenEXR )
IF( OPENEXR_FOUND ) IF( OPENEXR_FOUND )
- SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS} ) - SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS} )
+ SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS}/OpenEXR ) + SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS}/OpenEXR )
SET( ALEMBIC_OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} ) SET( ALEMBIC_OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} )
+
+ MESSAGE( STATUS "OPENEXR INCLUDE PATH: ${ALEMBIC_OPENEXR_INCLUDE_PATH}" )
+ MESSAGE( STATUS "OPENEXR LIB: ${ALEMBIC_OPENEXR_LIBRARIES}" )
+
# SET( ALEMBIC_OPENEXR_DEFINITIONS ${OPENEXR_DEFINITIONS} ) # SET( ALEMBIC_OPENEXR_DEFINITIONS ${OPENEXR_DEFINITIONS} )
SET( ALEMBIC_OPENEXR_FOUND 1 CACHE STRING "Set to 1 if OpenEXR is found, 0 otherwise" ) SET( ALEMBIC_OPENEXR_FOUND 1 CACHE STRING "Set to 1 if OpenEXR is found, 0 otherwise" )
diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
deleted file mode 100644
index 679a02f..0000000
--- a/cmake/Modules/FindIlmBase.cmake
+++ /dev/null
@@ -1,190 +0,0 @@
-##-*****************************************************************************
-##
-## Copyright (c) 2009-2016,
-## Sony Pictures Imageworks Inc. and
-## Industrial Light & Magic, a division of Lucasfilm Entertainment Company Ltd.
-##
-## All rights reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions are
-## met:
-## * Redistributions of source code must retain the above copyright
-## notice, this list of conditions and the following disclaimer.
-## * Redistributions in binary form must reproduce the above
-## copyright notice, this list of conditions and the following disclaimer
-## in the documentation and/or other materials provided with the
-## distribution.
-## * Neither the name of Industrial Light & Magic nor the names of
-## its contributors may be used to endorse or promote products derived
-## from this software without specific prior written permission.
-##
-## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-##
-##-*****************************************************************************
-
-#-******************************************************************************
-#-******************************************************************************
-# FIRST, ILMBASE STUFF
-#-******************************************************************************
-#-******************************************************************************
-
-# If ILMBASE_ROOT was defined in the environment, use it.
-IF(NOT ILMBASE_ROOT AND NOT $ENV{ILMBASE_ROOT} STREQUAL "")
- SET(ILMBASE_ROOT $ENV{ILMBASE_ROOT})
-ENDIF()
-
-IF(NOT DEFINED ILMBASE_ROOT)
- MESSAGE(STATUS "ILMBASE_ROOT is undefined" )
- IF ( ${CMAKE_HOST_UNIX} )
- IF( ${DARWIN} )
- # TODO: set to default install path when shipping out
- SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
- ELSE()
- # TODO: set to default install path when shipping out
- SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
- ENDIF()
- ELSE()
- IF ( ${WINDOWS} )
- # TODO: set to 32-bit or 64-bit path
- SET( ALEMBIC_ILMBASE_ROOT "C:/Program Files (x86)/ilmbase-1.0.1/" )
- ELSE()
- SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
- ENDIF()
- ENDIF()
-ELSE()
- SET( ALEMBIC_ILMBASE_ROOT ${ILMBASE_ROOT} )
-ENDIF()
-
-SET(_ilmbase_FIND_COMPONENTS
- Half
- Iex
- IexMath
- IlmThread
- Imath
-)
-
-SET(_ilmbase_SEARCH_DIRS
- ${ALEMBIC_ILMBASE_ROOT}
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local
- /usr
- /sw
- /opt/local
- /opt/csw
- /opt
- /usr/freeware
-)
-
-FIND_PATH(ILMBASE_INCLUDE_DIR
- NAMES
- IlmBaseConfig.h
- HINTS
- ${_ilmbase_SEARCH_DIRS}
- PATH_SUFFIXES
- include
- include/OpenEXR
-)
-
-# If the headers were found, get the version from config file, if not already set.
-IF(ILMBASE_INCLUDE_DIR)
- SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${ILMBASE_INCLUDE_DIR})
- IF(NOT ILMBASE_VERSION)
-
- FIND_FILE(_ilmbase_CONFIG
- NAMES
- IlmBaseConfig.h
- PATHS
- "${ILMBASE_INCLUDE_DIR}"
- "${ILMBASE_INCLUDE_DIR}/OpenEXR"
- )
-
- IF(_ilmbase_CONFIG)
- FILE(STRINGS "${_ilmbase_CONFIG}" ILMBASE_BUILD_SPECIFICATION
- REGEX "^[ \t]*#define[ \t]+(ILMBASE_VERSION_STRING|VERSION)[ \t]+\"[.0-9]+\".*$")
- ELSE()
- MESSAGE(WARNING "Could not find \"OpenEXRConfig.h\" in \"${ILMBASE_INCLUDE_DIR}\"")
- ENDIF()
-
- IF(ILMBASE_BUILD_SPECIFICATION)
- STRING(REGEX REPLACE ".*#define[ \t]+(ILMBASE_VERSION_STRING|VERSION)[ \t]+\"([.0-9]+)\".*"
- "\\2" _ilmbase_libs_ver_init ${ILMBASE_BUILD_SPECIFICATION})
- ELSE()
- MESSAGE(WARNING "Could not determine ILMBase library version, assuming ${_ilmbase_libs_ver_init}.")
- ENDIF()
-
- UNSET(_ilmbase_CONFIG CACHE)
-
- ENDIF()
-
- SET("ILMBASE_VERSION" ${_ilmbase_libs_ver_init} CACHE STRING "Version of OpenEXR lib")
- UNSET(_ilmbase_libs_ver_init)
-
- STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
-ENDIF()
-
-
-SET(_ilmbase_LIBRARIES)
-FOREACH(COMPONENT ${_ilmbase_FIND_COMPONENTS})
- STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
- FIND_LIBRARY(ALEMBIC_ILMBASE_${UPPERCOMPONENT}_LIB
- NAMES
- ${COMPONENT}-${_ilmbase_libs_ver} ${COMPONENT}
- HINTS
- ${_ilmbase_SEARCH_DIRS}
- PATH_SUFFIXES
- lib64 lib
- )
- LIST(APPEND _ilmbase_LIBRARIES "${ILMBASE_${UPPERCOMPONENT}_LIBRARY}")
-ENDFOREACH()
-
-UNSET(_ilmbase_libs_ver)
-
-IF ( ${ALEMBIC_ILMBASE_HALF_LIB} STREQUAL "ALEMBIC_ILMBASE_HALF_LIB-NOTFOUND" )
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
-ENDIF()
-
-IF ( ${ALEMBIC_ILMBASE_IEX_LIB} STREQUAL "ALEMBIC_ILMBASE_IEX_LIB-NOTFOUND" )
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
-ENDIF()
-
-IF ( DEFINED USE_IEXMATH AND USE_IEXMATH )
- IF ( ${ALEMBIC_ILMBASE_IEXMATH_LIB} STREQUAL
- "ALEMBIC_ILMBASE_IEXMATH_LIB-NOTFOUND" )
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IexMath, IlmThread, Imath) not found, required" )
- ENDIF()
-ENDIF()
-
-IF ( ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} STREQUAL "ALEMBIC_ILMBASE_ILMTHREAD_LIB-NOTFOUND" )
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
-ENDIF()
-
-IF ( ${ALEMBIC_ILMBASE_IMATH_LIB} STREQUAL "ALEMBIC_ILMBASE_IMATH_LIB-NOTFOUND" )
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
-ENDIF()
-
-IF ( ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY} STREQUAL "ALEMBIC_ILMBASE_INCLUDE_DIRECTORY-NOTFOUND" )
- MESSAGE( FATAL_ERROR "ilmbase header files not found, required: ALEMBIC_ILMBASE_ROOT: ${ALEMBIC_ILMBASE_ROOT}" )
-ENDIF()
-
-
-MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
-MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
-MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" )
-MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" )
-MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" )
-MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" )
-
-SET( ILMBASE_FOUND TRUE )
diff --git a/cmake/Modules/FindOpenEXR.cmake b/cmake/Modules/FindOpenEXR.cmake
deleted file mode 100644
index 935fe6f..0000000
--- a/cmake/Modules/FindOpenEXR.cmake
+++ /dev/null
@@ -1,129 +0,0 @@
-##-*****************************************************************************
-##
-## Copyright (c) 2009-2011,
-## Sony Pictures Imageworks Inc. and
-## Industrial Light & Magic, a division of Lucasfilm Entertainment Company Ltd.
-##
-## All rights reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions are
-## met:
-## * Redistributions of source code must retain the above copyright
-## notice, this list of conditions and the following disclaimer.
-## * Redistributions in binary form must reproduce the above
-## copyright notice, this list of conditions and the following disclaimer
-## in the documentation and/or other materials provided with the
-## distribution.
-## * Neither the name of Industrial Light & Magic nor the names of
-## its contributors may be used to endorse or promote products derived
-## from this software without specific prior written permission.
-##
-## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-##
-##-*****************************************************************************
-
-
-# We shall worry about windowsification later.
-
-#-******************************************************************************
-#-******************************************************************************
-# NOW, OPENEXR STUFF. EXR IS OPTIONAL, WHERASE ILMBASE IS NOT
-#-******************************************************************************
-#-******************************************************************************
-
-IF(NOT DEFINED OPENEXR_ROOT)
- IF ( ${CMAKE_HOST_UNIX} )
- IF( ${DARWIN} )
- # TODO: set to default install path when shipping out
- SET( ALEMBIC_OPENEXR_ROOT NOTFOUND )
- ELSE()
- # TODO: set to default install path when shipping out
- SET( ALEMBIC_OPENEXR_ROOT "/usr/local/openexr-1.6.1/" )
- ENDIF()
- ELSE()
- IF ( ${WINDOWS} )
- # TODO: set to 32-bit or 64-bit path
- SET( ALEMBIC_OPENEXR_ROOT NOTFOUND )
- ELSE()
- SET( ALEMBIC_OPENEXR_ROOT NOTFOUND )
- ENDIF()
- ENDIF()
-ELSE()
- SET( ALEMBIC_OPENEXR_ROOT ${OPENEXR_ROOT} )
-ENDIF()
-
-IF(NOT $ENV{OPENEXR_ROOT}x STREQUAL "x")
- SET( ALEMBIC_OPENEXR_ROOT $ENV{OPENEXR_ROOT})
-ELSE()
- SET( ENV{OPENEXR_ROOT} ${OPENEXR_ROOT} )
-ENDIF()
-
-
-SET(LIBRARY_PATHS
- ${ALEMBIC_OPENEXR_ROOT}/lib
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
- /usr/freeware/lib64
-)
-
-SET(INCLUDE_PATHS
- ${ALEMBIC_OPENEXR_ROOT}/include/OpenEXR/
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local/include/OpenEXR/
- /usr/local/include
- /usr/include
- /sw/include # Fink
- /opt/local/include # DarwinPorts
- /opt/csw/include # Blastwave
- /opt/include
- /usr/freeware/include
-)
-
-FIND_PATH( ALEMBIC_OPENEXR_INCLUDE_PATH ImfRgba.h
- PATHS
- ${INCLUDE_PATHS}
- DOC "The directory where ImfRgba.h resides" )
-
-FIND_LIBRARY( ALEMBIC_OPENEXR_ILMIMF_LIB IlmImf
- PATHS
- ${LIBRARY_PATHS}
- DOC "The IlmImf library" )
-
-
-SET( OPENEXR_FOUND TRUE )
-
-IF ( ${ALEMBIC_OPENEXR_INCLUDE_PATH} STREQUAL "ALEMBIC_OPENEXR_INCLUDE_PATH-NOTFOUND" )
- MESSAGE( STATUS "OpenEXR include path not found, disabling" )
- SET( OPENEXR_FOUND FALSE )
-ENDIF()
-
-IF ( ${ALEMBIC_OPENEXR_ILMIMF_LIB} STREQUAL "ALEMBIC_OPENEXR_ILMIMF_LIB-NOTFOUND" )
- MESSAGE( STATUS "OpenEXR libraries not found, disabling" )
- SET( OPENEXR_FOUND FALSE )
- SET( ALEMBIC_OPENEXR_LIBS NOTFOUND )
-ENDIF()
-
-IF (OPENEXR_FOUND)
- MESSAGE( STATUS "OPENEXR INCLUDE PATH: ${ALEMBIC_OPENEXR_INCLUDE_PATH}" )
- SET( ALEMBIC_OPENEXR_LIBS ${ALEMBIC_OPENEXR_ILMIMF_LIB} )
-ENDIF()
-
-

16
ports/alembic/portfile.cmake
View File

@ -9,10 +9,12 @@ vcpkg_from_github(
SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-C1083.patch
fix-find-openexr-ilmbase.patch fix-find-openexr-ilmbase.patch
) )
file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindIlmBase.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindOpenEXR.cmake)
if(NOT VCPKG_TARGET_IS_WINDOWS) if(NOT VCPKG_TARGET_IS_WINDOWS)
# In debug mode with g++, alembic defines -Werror # In debug mode with g++, alembic defines -Werror
# so we need to disable some warnings to avoid build errors # so we need to disable some warnings to avoid build errors
@ -49,20 +51,20 @@ if(VCPKG_TARGET_IS_WINDOWS)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/bin/Alembic.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/bin/Alembic.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/Alembic.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/Alembic.dll)
file(READ ${CURRENT_PACKAGES_DIR}/share/alembic/AlembicTargets-debug.cmake DEBUG_CONFIG) file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake DEBUG_CONFIG)
string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/Alembic.dll" string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/Alembic.dll"
"\${_IMPORT_PREFIX}/debug/bin/Alembic.dll" DEBUG_CONFIG "${DEBUG_CONFIG}") "\${_IMPORT_PREFIX}/debug/bin/Alembic.dll" DEBUG_CONFIG "${DEBUG_CONFIG}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/alembic/AlembicTargets-debug.cmake "${DEBUG_CONFIG}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake "${DEBUG_CONFIG}")
file(READ ${CURRENT_PACKAGES_DIR}/share/alembic/AlembicTargets-release.cmake RELEASE_CONFIG) file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake RELEASE_CONFIG)
string(REPLACE "\${_IMPORT_PREFIX}/lib/Alembic.dll" string(REPLACE "\${_IMPORT_PREFIX}/lib/Alembic.dll"
"\${_IMPORT_PREFIX}/bin/Alembic.dll" RELEASE_CONFIG "${RELEASE_CONFIG}") "\${_IMPORT_PREFIX}/bin/Alembic.dll" RELEASE_CONFIG "${RELEASE_CONFIG}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/alembic/AlembicTargets-release.cmake "${RELEASE_CONFIG}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake "${RELEASE_CONFIG}")
else() else()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
endif() endif()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alembic) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/alembic RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

1
ports/cudnn/CONTROL
View File

@ -1,5 +1,6 @@
Source: cudnn Source: cudnn
Version: 7.6 Version: 7.6
Port-Version: 1
Description: NVIDIA's cuDNN deep neural network acceleration library Description: NVIDIA's cuDNN deep neural network acceleration library
Build-Depends: cuda Build-Depends: cuda
Supports: (windows|linux)&x64 Supports: (windows|linux)&x64

5
ports/cudnn/FindCUDNN.cmake
View File

@ -38,6 +38,11 @@ endif()
if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h")
file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS) file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS)
if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version.h")
file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version.h" CUDNN_VERSION_H_CONTENTS)
string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}")
unset(CUDNN_VERSION_H_CONTENTS)
endif()
string(REGEX MATCH "define CUDNN_MAJOR * +([0-9]+)" string(REGEX MATCH "define CUDNN_MAJOR * +([0-9]+)"
CUDNN_VERSION_MAJOR "${CUDNN_HEADER_CONTENTS}") CUDNN_VERSION_MAJOR "${CUDNN_HEADER_CONTENTS}")
string(REGEX REPLACE "define CUDNN_MAJOR * +([0-9]+)" "\\1" string(REGEX REPLACE "define CUDNN_MAJOR * +([0-9]+)" "\\1"

3
ports/ffmpeg/CONTROL
View File

@ -1,5 +1,6 @@
Source: ffmpeg Source: ffmpeg
Version: 4.2-13 Version: 4.2
Port-Version: 14
Build-Depends: zlib Build-Depends: zlib
Homepage: https://ffmpeg.org Homepage: https://ffmpeg.org
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.

8
ports/ffmpeg/FindFFMPEG.cmake.in
View File

@ -33,7 +33,11 @@ set(FFMPEG_VERSION "4.2")
find_dependency(Threads) find_dependency(Threads)
if(UNIX) if(UNIX)
list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -pthread -lX11) list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -pthread)
endif()
if(UNIX AND NOT APPLE)
list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -lX11)
endif() endif()
if(@ENABLE_BZIP2@) if(@ENABLE_BZIP2@)
@ -160,7 +164,7 @@ if (FFMPEG_libavcodec_FOUND AND FFMPEG_libavdevice_FOUND AND FFMPEG_libavfilter_
${FFMPEG_libavcodec_LIBRARY} ${FFMPEG_libavcodec_LIBRARY}
${FFMPEG_libswresample_LIBRARY} ${FFMPEG_libswresample_LIBRARY}
${FFMPEG_libavresample_LIBRARY} ${FFMPEG_libavresample_LIBRARY}
${FFMPEG_libavutil_LIBRARY} ${FFMPEG_libavutil_LIBRARY}
${FFMPEG_libzlib_LIBRARY} ${FFMPEG_libzlib_LIBRARY}
${FFMPEG_PLATFORM_DEPENDENT_LIBS} ${FFMPEG_PLATFORM_DEPENDENT_LIBS}
) )

148
ports/field3d/0001_fix_build_errors.patch Normal file
View File

@ -0,0 +1,148 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1610c2e..b012008 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,25 +31,17 @@
# Author : Nicholas Yue yue.nicholas@gmail.com
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED( VERSION 3.17 )
PROJECT ( field3d )
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake )
FIND_PACKAGE (Doxygen)
-FIND_PACKAGE (HDF5 COMPONENTS C)
-IF ( CMAKE_HOST_WIN32 )
-# f3dinfo relies on program_options but don't include it, since
-# for some reason, unlike all the other boost components, a link is
-# forced via a pragma.
-FIND_PACKAGE (Boost COMPONENTS regex thread)
-ELSE ()
-FIND_PACKAGE (Boost COMPONENTS regex thread program_options system)
-FIND_PACKAGE (MPI)
-ENDIF ()
+FIND_PACKAGE (HDF5 COMPONENTS C REQUIRED)
+FIND_PACKAGE (Boost COMPONENTS regex thread program_options system REQUIRED)
-FIND_PACKAGE (ILMBase)
+FIND_PACKAGE (OpenEXR REQUIRED)
# Allow the developer to select if Dynamic or Static libraries are built
OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
@@ -79,26 +71,14 @@ IF ( CMAKE_HOST_UNIX )
ENDIF ( )
IF ( CMAKE_HOST_WIN32 )
ADD_DEFINITIONS (
- -D_HAS_ITERATOR_DEBUGGING=0
-D_CRT_SECURE_NO_WARNINGS=1
)
ENDIF ( )
SET ( LIB_TYPE SHARED )
IF ( NOT BUILD_SHARED_LIBS )
- IF ( CMAKE_HOST_WIN32 )
- # User wants to build static libraries, so change the LIB_TYPE variable to CMake keyword 'STATIC'
SET ( LIB_TYPE STATIC )
ADD_DEFINITIONS( -DFIELD3D_STATIC )
- ENDIF()
-ELSE ()
- IF ( CMAKE_HOST_WIN32 )
- ADD_DEFINITIONS (
- -DOPENEXR_DLL
- -D_HDF5USEDLL_
- -DHDF5CPP_USEDLL
- )
- ENDIF()
ENDIF ( NOT BUILD_SHARED_LIBS )
ADD_LIBRARY ( Field3D ${LIB_TYPE}
@@ -147,24 +128,22 @@ IF ( CMAKE_HOST_UNIX )
${MPI_LIBRARIES} )
ENDIF ( MPI_FOUND )
LIST ( APPEND Field3D_Libraries_Shared
- Iex Half IlmThread Imath
pthread dl z )
SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
${Boost_LIBRARIES} )
ENDIF ( )
IF ( CMAKE_HOST_WIN32 )
- # Add OpenEXR and zlib release/debug
- FOREACH ( lib Iex Half IlmThread Imath zdll )
+ FOREACH ( lib zlib )
LIST ( APPEND Field3D_Libraries_Shared
optimized ${lib}
- debug ${lib}_d )
+ debug ${lib}d )
ENDFOREACH()
SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} Shlwapi.lib)
SET ( Field3D_BIN_Libraries Field3D ${Boost_LIBRARIES} )
ENDIF ()
-TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES})
+TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES} OpenEXR::IlmImf)
# Parase version and soversion from export/ns.h
@@ -214,33 +193,7 @@ ADD_EXECUTABLE ( f3dinfo
TARGET_LINK_LIBRARIES ( f3dinfo ${Field3D_BIN_Libraries} )
-# field3d - sparse_field_io
-ADD_EXECUTABLE ( sparse_field_io
- apps/sample_code/sparse_field_io/main.cpp
- )
-
-TARGET_LINK_LIBRARIES ( sparse_field_io ${Field3D_BIN_Libraries} )
-
-# field3d - read
-ADD_EXECUTABLE ( read
- apps/sample_code/read/main.cpp
- )
-TARGET_LINK_LIBRARIES ( read ${Field3D_BIN_Libraries} )
-
-# field3d - mixed_types
-ADD_EXECUTABLE ( mixed_types
- apps/sample_code/mixed_types/main.cpp
- )
-
-TARGET_LINK_LIBRARIES ( mixed_types ${Field3D_BIN_Libraries} )
-
-# field3d - create_and_write
-ADD_EXECUTABLE ( create_and_write
- apps/sample_code/create_and_write/main.cpp
- )
-
-TARGET_LINK_LIBRARIES ( create_and_write ${Field3D_BIN_Libraries} )
IF (DOXYGEN_FOUND)
ADD_CUSTOM_TARGET ( doc
@@ -249,7 +202,7 @@ IF (DOXYGEN_FOUND)
WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}
)
IF (INSTALL_DOCS)
- INSTALL (DIRECTORY
+ INSTALL (DIRECTORY
${CMAKE_HOME_DIRECTORY}/docs
DESTINATION ${CMAKE_INSTALL_PREFIX}
)
@@ -263,12 +216,11 @@ INSTALL ( TARGETS
FILE(GLOB Field3d_Includes "${CMAKE_CURRENT_SOURCE_DIR}/export/*.h")
-INSTALL ( FILES
- ${Field3d_Includes}
+INSTALL ( FILES
+ ${Field3d_Includes}
DESTINATION include/Field3D
)
-INSTALL ( TARGETS f3dinfo
+INSTALL ( TARGETS f3dinfo
RUNTIME DESTINATION bin
)
-

43
ports/field3d/0002_improve_win_compatibility.patch Normal file
View File

@ -0,0 +1,43 @@
diff --git a/include/UtilFoundation.h b/include/UtilFoundation.h
index 2eb6290..a449b5b 100644
--- a/include/UtilFoundation.h
+++ b/include/UtilFoundation.h
@@ -90,6 +90,9 @@
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
// needed for mutex stuff
#include <Windows.h>
diff --git a/src/FieldMapping.cpp b/src/FieldMapping.cpp
index b1f1a1f..90612b1 100644
--- a/src/FieldMapping.cpp
+++ b/src/FieldMapping.cpp
@@ -49,9 +49,6 @@
#include "FieldMapping.h"
#include "Types.h"
-#ifdef WIN32
-#define isnan(__x__) _isnan(__x__)
-#endif
//----------------------------------------------------------------------------//
diff --git a/src/Log.cpp b/src/Log.cpp
index f78229c..d095a50 100644
--- a/src/Log.cpp
+++ b/src/Log.cpp
@@ -40,8 +40,9 @@
*/
//----------------------------------------------------------------------------//
-
+#ifndef _WIN32
#include <unistd.h>
+#endif
#include <ios>
#include <fstream>

9
ports/field3d/hdf5.api.patch → ports/field3d/0003_hdf5_api.patch
View File

@ -1,12 +1,11 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e608b3ec..5ff2c3c31 100644 index b57057f..e809880 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -34,7 +34,8 @@ @@ -35,6 +35,8 @@ CMAKE_MINIMUM_REQUIRED( VERSION 3.17 )
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
PROJECT ( field3d ) PROJECT ( field3d )
-
+add_definitions(-UH5_USE_112_API_DEFAULT) +add_definitions(-UH5_USE_112_API_DEFAULT)
+add_definitions(-DH5_USE_110_API_DEFAULT) +add_definitions(-DH5_USE_110_API_DEFAULT)
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake ) set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake )

5
ports/field3d/CONTROL
View File

@ -1,6 +1,7 @@
Source: field3d Source: field3d
Version: 1.7.3 Version: 1.7.3
Port-Version: 1
Homepage: https://github.com/imageworks/Field3D Homepage: https://github.com/imageworks/Field3D
Description: An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk. Description: An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk.
Build-Depends: hdf5[core], boost-regex, boost-thread, boost-program-options, boost-system, openexr, boost-foreach, boost-test, boost-timer, boost-format Build-Depends: hdf5, boost-regex, boost-thread, boost-program-options, boost-system, openexr, boost-foreach, boost-test, boost-timer, boost-format
Supports: !(windows|arm|uwp) Supports: !(uwp)

13
ports/field3d/fix-build_error.patch
View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9ad44f..45f3fad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,7 +147,7 @@ IF ( CMAKE_HOST_UNIX )
${MPI_LIBRARIES} )
ENDIF ( MPI_FOUND )
LIST ( APPEND Field3D_Libraries_Shared
- Iex Half IlmThread Imath
+ Iex-2_3 Half-2_3 IlmThread-2_3 Imath-2_3
pthread dl z )
SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}

22
ports/field3d/portfile.cmake
View File

@ -1,21 +1,23 @@
vcpkg_fail_port_install(ON_TARGET "UWP")
if (TRIPLET_SYSTEM_ARCH MATCHES "arm") if(VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "ARM is currently not supported.") vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
message(FATAL_ERROR "Error: UWP builds are currently not supported.")
endif() endif()
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO imageworks/Field3D REPO imageworks/Field3D
REF v1.7.3 REF 0cf75ad982917e0919f59e5cb3d483517d06d7da
SHA512 de3f10ff120420925de67064b2169f2a30c9180e308acc9090d70567b45be5423f4b1f7eb32bb376c887cea1364803cf7b2db66c2bc49f8a39a1037bbf0e5f39 SHA512 e6f137013dd7b64b51b2ec3cc3ed8f4dbfadb85858946f08393653d78136cf8f93ae124716db11358e325c5e64ba04802afd4b89ca36ad65a14dd3db17f3072c
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-build_error.patch 0001_fix_build_errors.patch
hdf5.api.patch # Switches the HDF5 default API for this port to 1.10 0002_improve_win_compatibility.patch
0003_hdf5_api.patch # Switches the HDF5 default API for this port to 1.10
) )
file(REMOVE ${SOURCE_PATH}/cmake/FindILMBase.cmake)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
@ -30,6 +32,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
endif() endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

7
ports/freeimage/CMakeLists.txt
View File

@ -9,10 +9,6 @@ if(MSVC)
set(CMAKE_CXX_FLAGS "/wd4828 ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "/wd4828 ${CMAKE_CXX_FLAGS}")
endif() endif()
if(BUILD_SHARED_LIBS)
add_definitions("-DOPENEXR_DLL")
endif()
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
find_package(JPEG REQUIRED) find_package(JPEG REQUIRED)
@ -100,7 +96,6 @@ target_include_directories(FreeImage PRIVATE ${REAL_SOURCE_DIR}
${WEBP_INCLUDE_DIRS} ${WEBP_INCLUDE_DIRS}
${JXR_INCLUDE_DIRS} ${JXR_INCLUDE_DIRS}
${LibRaw_INCLUDE_DIRS} ${LibRaw_INCLUDE_DIRS}
${OpenEXR_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}) ${CMAKE_CURRENT_BINARY_DIR})
@ -112,7 +107,7 @@ target_link_libraries(FreeImage ${ZLIB_LIBRARIES}
${WEBP_LIBRARIES} ${WEBP_LIBRARIES}
${JXR_LIBRARIES} ${JXR_LIBRARIES}
${LibRaw_LIBRARIES} ${LibRaw_LIBRARIES}
${OpenEXR_LIBRARIES}) OpenEXR::IlmImf)
target_compile_definitions(FreeImage PRIVATE ${PNG_DEFINITIONS}) target_compile_definitions(FreeImage PRIVATE ${PNG_DEFINITIONS})

3
ports/freeimage/CONTROL
View File

@ -1,5 +1,6 @@
Source: freeimage Source: freeimage
Version: 3.18.0-12 Version: 3.18.0
Port-Version: 13
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr
Homepage: https://sourceforge.net/projects/freeimage/ Homepage: https://sourceforge.net/projects/freeimage/
Description: Support library for graphics image formats Description: Support library for graphics image formats

34
ports/libass/CMakeLists.txt
View File

@ -7,18 +7,30 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
# This is Windows-specific. Other acceptable values on different platforms should be if(WIN32)
# macOS - CONFIG_CORETEXT add_compile_definitions(CONFIG_DIRECTWRITE)
# linux - CONFIG_FONTCONFIG elseif(APPLE)
add_compile_definitions(CONFIG_DIRECTWRITE) add_compile_definitions(CONFIG_CORETEXT)
else()
add_compile_definitions(CONFIG_FONTCONFIG)
endif()
add_compile_definitions(CONFIG_FREETYPE) add_compile_definitions(CONFIG_FREETYPE)
add_compile_definitions(CONFIG_FRIBIDI) add_compile_definitions(CONFIG_FRIBIDI)
add_compile_definitions(CONFIG_HARFBUZZ) add_compile_definitions(CONFIG_HARFBUZZ)
file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c)
list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") if(WIN32)
list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
elseif(APPLE)
list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")
list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$")
else()
list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$")
list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$")
endif()
find_package(Freetype REQUIRED) find_package(Freetype REQUIRED)
@ -35,13 +47,13 @@ find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def) add_library(ass ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/libass.def)
target_include_directories(ass PRIVATE target_include_directories(ass PRIVATE
${FRIBIDI_INCLUDE_DIR} ${FRIBIDI_INCLUDE_DIR}
${HARFBUZZ_INCLUDE_DIR}) ${HARFBUZZ_INCLUDE_DIR})
target_link_libraries(ass PRIVATE target_link_libraries(ass PRIVATE
Freetype::Freetype Freetype::Freetype
${FRIBIDI_LIBRARY} ${FRIBIDI_LIBRARY}
${HARFBUZZ_LIBRARY}) ${HARFBUZZ_LIBRARY})
install(TARGETS ass install(TARGETS ass

1
ports/libass/CONTROL
View File

@ -1,4 +1,5 @@
Source: libass Source: libass
Version: 0.14.0 Version: 0.14.0
Port-Version: 1
Build-Depends: freetype, fribidi, harfbuzz, dirent (windows) Build-Depends: freetype, fribidi, harfbuzz, dirent (windows)
Description: libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format. Description: libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format.

1
ports/libepoxy/CONTROL
View File

@ -1,5 +1,6 @@
Source: libepoxy Source: libepoxy
Version: 1.5.4 Version: 1.5.4
Port-Version: 1
Homepage: https://github.com/anholt/libepoxy Homepage: https://github.com/anholt/libepoxy
Description: Epoxy is a library for handling OpenGL function pointer management for you Description: Epoxy is a library for handling OpenGL function pointer management for you
Build-Depends: tool-meson Build-Depends: tool-meson

19
ports/libepoxy/portfile.cmake
View File

@ -11,8 +11,7 @@ vcpkg_from_github(
libepoxy-1.5.4_Add_call_convention_to_mock_function.patch libepoxy-1.5.4_Add_call_convention_to_mock_function.patch
) )
if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX)
if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}
OPTIONS OPTIONS
-Denable-glx=no -Denable-glx=no
@ -24,7 +23,7 @@ else()
if (NOT autoreconf OR NOT EXISTS "/usr/share/doc/libgles2/copyright") if (NOT autoreconf OR NOT EXISTS "/usr/share/doc/libgles2/copyright")
message(FATAL_ERROR "autoreconf and libgles2-mesa-dev must be installed before libepoxy can build. Install them with \"apt-get install dh-autoreconf libgles2-mesa-dev\".") message(FATAL_ERROR "autoreconf and libgles2-mesa-dev must be installed before libepoxy can build. Install them with \"apt-get install dh-autoreconf libgles2-mesa-dev\".")
endif() endif()
find_program(MAKE make) find_program(MAKE make)
if (NOT MAKE) if (NOT MAKE)
message(FATAL_ERROR "MAKE not found") message(FATAL_ERROR "MAKE not found")
@ -32,34 +31,34 @@ else()
file(REMOVE_RECURSE ${SOURCE_PATH}/m4) file(REMOVE_RECURSE ${SOURCE_PATH}/m4)
file(MAKE_DIRECTORY ${SOURCE_PATH}/m4) file(MAKE_DIRECTORY ${SOURCE_PATH}/m4)
set(LIBEPOXY_CONFIG_ARGS "--enable-x11=yes --enable-glx=yes --enable-egl=yes") set(LIBEPOXY_CONFIG_ARGS "--enable-x11=yes --enable-glx=yes --enable-egl=yes")
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND "autoreconf" -v --install COMMAND "autoreconf" -v --install
WORKING_DIRECTORY ${SOURCE_PATH} WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME autoreconf-${TARGET_TRIPLET} LOGNAME autoreconf-${TARGET_TRIPLET}
) )
message(STATUS "Configuring ${TARGET_TRIPLET}") message(STATUS "Configuring ${TARGET_TRIPLET}")
set(OUT_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/make-build-${TARGET_TRIPLET}-release) set(OUT_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/make-build-${TARGET_TRIPLET}-release)
file(REMOVE_RECURSE ${OUT_PATH_RELEASE}) file(REMOVE_RECURSE ${OUT_PATH_RELEASE})
file(MAKE_DIRECTORY ${OUT_PATH_RELEASE}) file(MAKE_DIRECTORY ${OUT_PATH_RELEASE})
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND "./configure" --prefix=${OUT_PATH_RELEASE} "${LIBEPOXY_CONFIG_ARGS}" COMMAND "./configure" --prefix=${OUT_PATH_RELEASE} "${LIBEPOXY_CONFIG_ARGS}"
WORKING_DIRECTORY ${SOURCE_PATH} WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME config-${TARGET_TRIPLET} LOGNAME config-${TARGET_TRIPLET}
) )
message(STATUS "Building ${TARGET_TRIPLET}") message(STATUS "Building ${TARGET_TRIPLET}")
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND make COMMAND make
WORKING_DIRECTORY ${SOURCE_PATH} WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME build-${TARGET_TRIPLET}-release LOGNAME build-${TARGET_TRIPLET}-release
) )
message(STATUS "Installing ${TARGET_TRIPLET}") message(STATUS "Installing ${TARGET_TRIPLET}")
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND make install COMMAND make install

204
ports/opencv/CONTROL
View File

@ -1,102 +1,102 @@
Source: opencv Source: opencv
Version: 4.1.1-1 Version: 4.3.0
Homepage: https://github.com/opencv/opencv Homepage: https://github.com/opencv/opencv
Description: Computer vision library Description: Computer vision library
Build-Depends: opencv4[core] Build-Depends: opencv4[core]
Default-Features: dnn, jpeg, opengl, png, tiff, webp Default-Features: dnn, jpeg, opengl, png, tiff, webp
Feature: nonfree Feature: nonfree
Build-Depends: opencv4[nonfree] Build-Depends: opencv4[core,nonfree]
Description: opencv nonfree module Description: opencv nonfree module
Feature: ade Feature: ade
Build-Depends: opencv4[ade] Build-Depends: opencv4[core,ade]
Description: graph api Description: graph api
Feature: contrib Feature: contrib
Build-Depends: opencv4[contrib] Build-Depends: opencv4[core,contrib]
Description: opencv_contrib module Description: opencv_contrib module
Feature: cuda Feature: cuda
Build-Depends: opencv4[cuda] Build-Depends: opencv4[core,cuda]
Description: CUDA support for opencv Description: CUDA support for opencv
Feature: dnn Feature: dnn
Build-Depends: opencv4[dnn] Build-Depends: opencv4[core,dnn]
Description: Enable dnn module Description: Enable dnn module
Feature: eigen Feature: eigen
Build-Depends: opencv4[eigen] Build-Depends: opencv4[core,eigen]
Description: Eigen support for opencv Description: Eigen support for opencv
Feature: ffmpeg Feature: ffmpeg
Build-Depends: opencv4[ffmpeg] Build-Depends: opencv4[core,ffmpeg]
Description: ffmpeg support for opencv Description: ffmpeg support for opencv
Feature: gdcm Feature: gdcm
Build-Depends: opencv4[gdcm] Build-Depends: opencv4[core,gdcm]
Description: GDCM support for opencv Description: GDCM support for opencv
Feature: ipp Feature: halide
Build-Depends: opencv4[ipp] Build-Depends: opencv4[core,halide]
Description: Enable Intel Integrated Performance Primitives Description: Halide support for opencv
Feature: jasper Feature: ipp
Build-Depends: opencv4[jasper] Build-Depends: opencv4[core,ipp]
Description: JPEG 2000 support for opencv Description: Enable Intel Integrated Performance Primitives
Feature: jpeg Feature: jasper
Build-Depends: opencv4[jpeg] Build-Depends: opencv4[core,jasper]
Description: JPEG support for opencv Description: JPEG 2000 support for opencv
Feature: openexr Feature: jpeg
Build-Depends: opencv4[openexr] Build-Depends: opencv4[core,jpeg]
Description: OpenEXR support for opencv Description: JPEG support for opencv
Feature: opengl Feature: openexr
Build-Depends: opencv4[opengl] Build-Depends: opencv4[core,openexr]
Description: opengl support for opencv Description: OpenEXR support for opencv
Feature: openmp Feature: opengl
Build-Depends: opencv4[openmp] Build-Depends: opencv4[core,opengl]
Description: Enable openmp support for opencv Description: opengl support for opencv
Feature: ovis Feature: openmp
Build-Depends: opencv4[ovis] Build-Depends: opencv4[core,openmp]
Description: opencv_ovis module Description: Enable openmp support for opencv
Feature: png Feature: ovis
Build-Depends: opencv4[png] Build-Depends: opencv4[core,ovis]
Description: PNG support for opencv Description: opencv_ovis module
Feature: qt Feature: png
Build-Depends: opencv4[qt] Build-Depends: opencv4[core,png]
Description: Qt GUI support for opencv Description: PNG support for opencv
Feature: sfm Feature: qt
Build-Depends: opencv4[sfm] Build-Depends: opencv4[core,qt]
Description: opencv_sfm module Description: Qt GUI support for opencv
Feature: tbb Feature: sfm
Build-Depends: opencv4[tbb] Build-Depends: opencv4[core,sfm]
Description: Enable Intel Threading Building Blocks Description: opencv_sfm module
Feature: tiff Feature: tbb
Build-Depends: opencv4[tiff] Build-Depends: opencv4[core,tbb]
Description: TIFF support for opencv Description: Enable Intel Threading Building Blocks
Feature: vtk Feature: tiff
Build-Depends: opencv4[vtk] Build-Depends: opencv4[core,tiff]
Description: vtk support for opencv Description: TIFF support for opencv
Feature: webp Feature: vtk
Build-Depends: opencv4[webp] Build-Depends: opencv4[core,vtk]
Description: WebP support for opencv Description: vtk support for opencv
Feature: halide Feature: webp
Build-Depends: opencv4[halide] Build-Depends: opencv4[core,webp]
Description: Halide support for opencv Description: WebP support for opencv
Feature: world Feature: world
Build-Depends: opencv4[world] Build-Depends: opencv4[core,world]
Description: Compile to a single package support for opencv Description: Compile to a single package support for opencv

3
ports/opencv2/CONTROL
View File

@ -1,5 +1,6 @@
Source: opencv2 Source: opencv2
Version: 2.4.13.7-2 Version: 2.4.13.7
Port-Version: 2
Build-Depends: zlib Build-Depends: zlib
Description: computer vision library, version 2 Description: computer vision library, version 2
Default-Features: eigen, jpeg, opengl, png, tiff Default-Features: eigen, jpeg, opengl, png, tiff

2026
ports/opencv2/FindCUDA.cmake Normal file
View File

File diff suppressed because it is too large Load Diff

10
ports/opencv2/portfile.cmake
View File

@ -30,10 +30,10 @@ vcpkg_from_github(
file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake")
file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA") file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCUDA.cmake DESTINATION ${SOURCE_PATH}/cmake/) #contains fixes for CUDA 11 compat, remove when CMake has support for it
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"cuda" WITH_CUDA "cuda" WITH_CUDA
"cuda" WITH_CUBLAS
"eigen" WITH_EIGEN "eigen" WITH_EIGEN
"ffmpeg" WITH_FFMPEG "ffmpeg" WITH_FFMPEG
"jasper" WITH_JASPER "jasper" WITH_JASPER
@ -105,6 +105,7 @@ vcpkg_configure_cmake(
-DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENCLAMDBLAS=OFF
-DWITH_OPENMP=OFF -DWITH_OPENMP=OFF
-DWITH_ZLIB=ON -DWITH_ZLIB=ON
-DWITH_CUBLAS=OFF # newer libcublas cannot be found by the old cuda cmake script in opencv2, requires a fix
) )
vcpkg_install_cmake() vcpkg_install_cmake()
@ -115,7 +116,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES) file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES)
string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)"
"set(CMAKE_IMPORT_FILE_VERSION 1) "set(CMAKE_IMPORT_FILE_VERSION 1)
find_package(CUDA QUIET)
find_package(Threads QUIET)
find_package(PNG QUIET) find_package(PNG QUIET)
find_package(OpenEXR QUIET)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
find_package(Qt5 COMPONENTS OpenGL Concurrent Test QUIET)
find_package(TIFF QUIET)" OPENCV_MODULES "${OPENCV_MODULES}") find_package(TIFF QUIET)" OPENCV_MODULES "${OPENCV_MODULES}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}")

11
ports/opencv3/0001-disable-downloading.patch
View File

@ -1,13 +1,14 @@
diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
index cdc47ad..175aaf3 100644 index 63cf6d3..01e84a5 100644
--- a/cmake/OpenCVDownload.cmake --- a/cmake/OpenCVDownload.cmake
+++ b/cmake/OpenCVDownload.cmake +++ b/cmake/OpenCVDownload.cmake
@@ -154,6 +154,8 @@ function(ocv_download) @@ -157,6 +157,9 @@ function(ocv_download)
# Download # Download
if(NOT EXISTS "${CACHE_CANDIDATE}") if(NOT EXISTS "${CACHE_CANDIDATE}")
ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+ string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}") + string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}")
+ message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${DL_URL}\"\n FILENAME \"${CACHE_SUBPATH}\"\n SHA512 0\n )") + message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${DL_URL}\"\n FILENAME \"${CACHE_SUBPATH}\"\n SHA512 0\n )")
file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}" +
INACTIVITY_TIMEOUT 60 foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST})
TIMEOUT 600 ocv_download_log("#try ${try}")
file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"

134
ports/opencv3/0002-install-options.patch
View File

@ -1,69 +1,65 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ce583b..e9ea757 100644 index 614baa2..1e930a3 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -665,7 +665,7 @@ endif() @@ -601,7 +601,7 @@ endif()
ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS)
if(WIN32)
# Postfix of DLLs: # --- Python Support ---
- set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}") -if(NOT IOS)
+ set(OPENCV_DLLVERSION "") +if(0)
set(OPENCV_DEBUG_POSTFIX d) include(cmake/OpenCVDetectPython.cmake)
else() endif()
# Postfix of so's:
@@ -716,7 +716,7 @@ endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) index 476156f..4b27b6a 100644
--- a/cmake/OpenCVCompilerOptions.cmake
# --- Python Support --- +++ b/cmake/OpenCVCompilerOptions.cmake
-if(NOT IOS) @@ -261,7 +261,6 @@ if(MSVC)
+if(0) #endif()
include(cmake/OpenCVDetectPython.cmake)
endif() if(BUILD_WITH_DEBUG_INFO)
- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
index 0b9d669..142b21b 100644 set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
--- a/cmake/OpenCVCompilerOptions.cmake endif()
+++ b/cmake/OpenCVCompilerOptions.cmake diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
@@ -254,7 +254,6 @@ if(MSVC) index c7f9fc2..84bd302 100644
#endif() --- a/cmake/OpenCVGenConfig.cmake
+++ b/cmake/OpenCVGenConfig.cmake
if(BUILD_WITH_DEBUG_INFO) @@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") endif()
set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") endfunction()
set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
endif() -if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID)
diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake +if(TRUE)
index 2c7c42b..e7bc157 100644 ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
--- a/cmake/OpenCVGenConfig.cmake endif()
+++ b/cmake/OpenCVGenConfig.cmake
@@ -109,7 +109,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) -if(ANDROID)
endif() +if(FALSE)
endfunction() ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in")
install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev)
-if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) endif()
+if(NOT ANDROID) @@ -121,7 +121,7 @@ endif()
ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "") # --------------------------------------------------------------------------------------------
endif() # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages
# --------------------------------------------------------------------------------------------
@@ -121,7 +121,7 @@ endif() -if(WIN32)
# -------------------------------------------------------------------------------------------- +if(0)
# Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG)
# -------------------------------------------------------------------------------------------- ocv_gen_config("${CMAKE_BINARY_DIR}/win-install"
-if(WIN32) "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}"
+if(0) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) index 1f0d720..0bb1ff7 100644
if(BUILD_SHARED_LIBS) --- a/data/CMakeLists.txt
set(_lib_suffix "lib") +++ b/data/CMakeLists.txt
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt @@ -1,8 +1,6 @@
index 1f0d720..0bb1ff7 100644 file(GLOB HAAR_CASCADES haarcascades/*.xml)
--- a/data/CMakeLists.txt file(GLOB LBP_CASCADES lbpcascades/*.xml)
+++ b/data/CMakeLists.txt
@@ -1,8 +1,6 @@ -install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs)
file(GLOB HAAR_CASCADES haarcascades/*.xml) -install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs)
file(GLOB LBP_CASCADES lbpcascades/*.xml)
if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
-install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs) install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests")
-install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs)
if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests")

40
ports/opencv3/0003-force-package-requirements.patch
View File

@ -1,5 +1,5 @@
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index fcf716b..bda80e9 100644 index fcf716b..f3951e3 100644
--- a/cmake/OpenCVFindLibsGrfmt.cmake --- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
@ -70,7 +70,7 @@ index fcf716b..bda80e9 100644
# --- GDAL (optional) --- # --- GDAL (optional) ---
if(WITH_GDAL) if(WITH_GDAL)
- find_package(GDAL QUIET) - find_package(GDAL QUIET)
+ find_package(GDAL REQUIRED) + find_package(GDAL REQUIRED)
if(NOT GDAL_FOUND) if(NOT GDAL_FOUND)
set(HAVE_GDAL NO) set(HAVE_GDAL NO)
@ -83,3 +83,39 @@ index fcf716b..bda80e9 100644
if(NOT GDCM_FOUND) if(NOT GDCM_FOUND)
set(HAVE_GDCM NO) set(HAVE_GDCM NO)
ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
index b9b1a95..596c152 100644
--- a/cmake/OpenCVFindLibsPerf.cmake
+++ b/cmake/OpenCVFindLibsPerf.cmake
@@ -51,14 +51,9 @@ endif(WITH_CUDA)
# --- Eigen ---
if(WITH_EIGEN AND NOT HAVE_EIGEN)
- find_package(Eigen3 QUIET)
+ find_package(Eigen3 REQUIRED)
if(Eigen3_FOUND)
- if(TARGET Eigen3::Eigen)
- # Use Eigen3 imported target if possible
- list(APPEND OPENCV_LINKER_LIBS Eigen3::Eigen)
- set(HAVE_EIGEN 1)
- else()
if(DEFINED EIGEN3_INCLUDE_DIRS)
set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIRS})
set(HAVE_EIGEN 1)
@@ -66,7 +61,6 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIR})
set(HAVE_EIGEN 1)
endif()
- endif()
if(HAVE_EIGEN)
if(DEFINED EIGEN3_WORLD_VERSION) # CMake module
set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION})
@@ -77,6 +71,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR})
set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH})
endif()
+ ocv_include_directories(${EIGEN_INCLUDE_PATH})
endif()
endif()

12
ports/opencv3/0004-add-missing-stdexcept-include.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp
index fef3fea..68d1a80 100644
--- a/modules/cvv/src/util/observer_ptr.hpp
+++ b/modules/cvv/src/util/observer_ptr.hpp
@@ -11,6 +11,7 @@
#include <cstddef> //size_t
#include <cstdint> // [u]intXX_t
#include <algorithm> // since some people like to forget that one
+#include <stdexcept>
namespace cvv
{

72
ports/opencv3/0009-fix-uwp.patch
View File

@ -1,67 +1,13 @@
diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index c2fda8f..3f7dfdc 100644 index 634b5b2..07a96fb 100644
--- a/cmake/OpenCVModule.cmake --- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake
@@ -850,7 +850,7 @@ macro(ocv_create_module) @@ -1183,7 +1183,7 @@ function(ocv_add_perf_tests)
set(the_module_target ${the_module}) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance")
endif() endif()
- if(WINRT) - if(WINRT)
+ if(WINRT AND BUILD_TESTS) + if(WINRT AND BUILD_TESTS)
# removing APPCONTAINER from modules to run from console # removing APPCONTAINER from tests to run from console
# in case of usual starting of WinRT test apps output is missing # look for detailed description inside of ocv_create_module macro above
# so starting of console version w/o APPCONTAINER is required to get test results add_custom_command(TARGET "opencv_perf_${name}"
diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp
index f1107b0..c613ca2 100644
--- a/modules/core/src/utils/datafile.cpp
+++ b/modules/core/src/utils/datafile.cpp
@@ -108,7 +108,7 @@ static cv::String getModuleLocation(const void* addr)
CV_UNUSED(addr);
#ifdef _WIN32
HMODULE m = 0;
-#if _WIN32_WINNT >= 0x0501
+#if (_WIN32_WINNT >= 0x0501) && (!WINRT_STORE)
::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
reinterpret_cast<LPCTSTR>(addr),
&m);
diff --git a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp b/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp
index f4147f3..b92efdd 100644
--- a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp
+++ b/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp
@@ -24,6 +24,7 @@
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
+#include "opencv2/core/cvdef.h"
using namespace Windows::UI::Xaml::Controls;
namespace cv
diff --git a/modules/highgui/src/window_winrt_bridge.hpp b/modules/highgui/src/window_winrt_bridge.hpp
index 25f4aef..5429f0b 100644
--- a/modules/highgui/src/window_winrt_bridge.hpp
+++ b/modules/highgui/src/window_winrt_bridge.hpp
@@ -28,6 +28,7 @@
#include <map>
#include <opencv2\core.hpp>
+#include "opencv2/highgui/highgui_c.h"
using namespace Windows::UI::Xaml::Controls;
diff --git a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
index 236e227..e2417dc 100644
--- a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
+++ b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
@@ -94,10 +94,10 @@ Media::CaptureFrameGrabber::~CaptureFrameGrabber()
void Media::CaptureFrameGrabber::ShowCameraSettings()
{
-#if WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
+#if (WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP) && (WINAPI_FAMILY!=WINAPI_FAMILY_APP)
if (_state == State::Started)
{
- CameraOptionsUI::Show(_capture.Get());
+ CameraOptionsUI::Show(_capture.Get()); // TODO: Turn it on again in UWP mode by adding reference to UWP Desktop Extensions
}
#endif
}

14
ports/opencv3/CONTROL
View File

@ -1,5 +1,5 @@
Source: opencv3 Source: opencv3
Version: 3.4.7-4 Version: 3.4.10
Build-Depends: protobuf, zlib Build-Depends: protobuf, zlib
Homepage: https://github.com/opencv/opencv Homepage: https://github.com/opencv/opencv
Description: computer vision library Description: computer vision library
@ -12,11 +12,11 @@ Feature: flann
Description: opencv_flann module Description: opencv_flann module
Feature: contrib Feature: contrib
Build-Depends: opencv3[dnn], hdf5 (!uwp) Build-Depends: opencv3[dnn], hdf5 (!uwp), tesseract (!uwp)
Description: opencv_contrib module Description: opencv_contrib module
Feature: cuda Feature: cuda
Build-Depends: opencv3[contrib], cuda Build-Depends: opencv3[contrib], cuda, cudnn
Description: CUDA support for opencv Description: CUDA support for opencv
Feature: dnn Feature: dnn
@ -35,6 +35,10 @@ Feature: gdcm
Build-Depends: gdcm Build-Depends: gdcm
Description: GDCM support for opencv Description: GDCM support for opencv
Feature: halide
Build-Depends: halide, opencv3[core], opencv3[dnn]
Description: Halide support for opencv
Feature: ipp Feature: ipp
Description: Enable Intel Integrated Performance Primitives Description: Enable Intel Integrated Performance Primitives
@ -86,9 +90,5 @@ Feature: webp
Build-Depends: libwebp Build-Depends: libwebp
Description: WebP support for opencv Description: WebP support for opencv
Feature: halide
Build-Depends: halide, opencv3[core], opencv3[dnn]
Description: Halide support for opencv
Feature: world Feature: world
Description: Compile to a single package support for opencv Description: Compile to a single package support for opencv

2026
ports/opencv3/FindCUDA.cmake Normal file
View File

File diff suppressed because it is too large Load Diff

102
ports/opencv3/portfile.cmake
View File

@ -6,15 +6,13 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4")
message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4")
endif() endif()
include(vcpkg_common_functions) set(OPENCV_VERSION "3.4.10")
set(OPENCV_VERSION "3.4.7")
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO opencv/opencv REPO opencv/opencv
REF ${OPENCV_VERSION} REF ${OPENCV_VERSION}
SHA512 ba1336ad4e5208748aa09c99770392cc71ef72688560d0b03287ddafd36093ef30cbdf6422f87f8f878663ab8085cc0ff8a8c65fd1ff0ec6800855ea01309beb SHA512 7ccdc7fef26436b2f643cce2a13c9f9f77e56d3fd0340117419df3c1665ca12416277b626cce3c056fdc14899805bbe9ece391f11d28c6adea716d47ce8894bc
HEAD_REF master HEAD_REF master
PATCHES PATCHES
0001-disable-downloading.patch 0001-disable-downloading.patch
@ -23,6 +21,11 @@ vcpkg_from_github(
0009-fix-uwp.patch 0009-fix-uwp.patch
) )
file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake")
file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake")
file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCUDA.cmake DESTINATION ${SOURCE_PATH}/cmake/) # backported from CMake 3.18, remove when released
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -48,8 +51,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"world" BUILD_opencv_world "world" BUILD_opencv_world
) )
# Cannot use vcpkg_check_features() for "ipp", "ovis", "tbb", and "vtk". # Cannot use vcpkg_check_features() for "dnn", "ipp", ovis", "tbb", and "vtk".
# As the respective value of their variables can be unset conditionally. # As the respective value of their variables can be unset conditionally.
set(BUILD_opencv_dnn OFF)
if("dnn" IN_LIST FEATURES)
if(NOT VCPKG_TARGET_IS_ANDROID)
set(BUILD_opencv_dnn ON)
else()
message(WARNING "The dnn module cannot be enabled on Android")
endif()
endif()
set(WITH_IPP OFF) set(WITH_IPP OFF)
if("ipp" IN_LIST FEATURES) if("ipp" IN_LIST FEATURES)
set(WITH_IPP ON) set(WITH_IPP ON)
@ -94,11 +106,13 @@ if("contrib" IN_LIST FEATURES)
OUT_SOURCE_PATH CONTRIB_SOURCE_PATH OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
REPO opencv/opencv_contrib REPO opencv/opencv_contrib
REF ${OPENCV_VERSION} REF ${OPENCV_VERSION}
SHA512 922620f3e8754fc15dedf8993bdc1f00c06b623cbeeb72afb984ddaad6e0e04f46561a0ee4d20f5e260616c1f32c6dc0dd7248355d417873ae72bd03cb5d57fd SHA512 70b4ecfaf9881390ad826a2aba24cced8514a680965ec7151df9926082fff53364bbe6be36458bb9ff466fda6f6f6ca2174eeac94c10a6bada989f07ed1c4da1
HEAD_REF master HEAD_REF master
PATCHES
0004-add-missing-stdexcept-include.patch
) )
set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
# Used for opencv's face module
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat"
FILENAME "opencv-cache/data/7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat" FILENAME "opencv-cache/data/7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat"
@ -144,9 +158,9 @@ if(WITH_IPP)
if(VCPKG_TARGET_IS_OSX) if(VCPKG_TARGET_IS_OSX)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_mac_intel64_general_20180723.tgz" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_mac_intel64_20191018_general.tgz"
FILENAME "opencv-cache/ippicv/fe6b2bb75ae0e3f19ad3ae1a31dfa4a2-ippicv_2019_mac_intel64_general_20180723.tgz" FILENAME "opencv-cache/ippicv/1c3d675c2a2395d094d523024896e01b-ippicv_2020_mac_intel64_20191018_general.tgz"
SHA512 266fe3fecf8e95e1f51c09b65330a577743ef72b423b935d4d1fe8d87f1b4f258c282fe6a18fc805d489592f137ebed37c9f1d1b34026590d9f1ba107015132e SHA512 454dfaaa245e3a3b2f1ffb1aa8e27e280b03685009d66e147482b14e5796fdf2d332cac0f9b0822caedd5760fda4ee0ce2961889597456bbc18202f10bf727cd
) )
else() else()
message(WARNING "This target architecture is not supported IPPICV") message(WARNING "This target architecture is not supported IPPICV")
@ -155,15 +169,15 @@ if(WITH_IPP)
elseif(VCPKG_TARGET_IS_LINUX) elseif(VCPKG_TARGET_IS_LINUX)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_lnx_intel64_general_20180723.tgz" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz"
FILENAME "opencv-cache/ippicv/c0bd78adb4156bbf552c1dfe90599607-ippicv_2019_lnx_intel64_general_20180723.tgz" FILENAME "opencv-cache/ippicv/7421de0095c7a39162ae13a6098782f9-ippicv_2020_lnx_intel64_20191018_general.tgz"
SHA512 e4ec6b3b9fc03d7b3ae777c2a26f57913e83329fd2f7be26c259b07477ca2a641050b86979e0c96e25aa4c1f9f251b28727690358a77418e76dd910d0f4845c9 SHA512 de6d80695cd6deef359376476edc4ff85fdddcf94972b936e0017f8a48aaa5d18f55c4253ae37deb83bff2f71410f68408063c88b5f3bf4df3c416aa93ceca87
) )
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_lnx_ia32_general_20180723.tgz" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz"
FILENAME "opencv-cache/ippicv/4f38432c30bfd6423164b7a24bbc98a0-ippicv_2019_lnx_ia32_general_20180723.tgz" FILENAME "opencv-cache/ippicv/ad189a940fb60eb71f291321322fe3e8-ippicv_2020_lnx_ia32_20191018_general.tgz"
SHA512 d96d3989928ff11a18e631bf5ecfdedf88fd350162a23fa2c8f7dbc3bf878bf442aff7fb2a07dc56671d7268cc20682055891be75b9834e9694d20173e92b6a3 SHA512 5ca9dafc3a634e2a5f83f6a498611c990ef16d54358e9b44574b01694e9d64b118d46d6e2011506e40d37e5a9865f576f790e37ff96b7c8b503507633631a296
) )
else() else()
message(WARNING "This target architecture is not supported IPPICV") message(WARNING "This target architecture is not supported IPPICV")
@ -172,15 +186,15 @@ if(WITH_IPP)
elseif(VCPKG_TARGET_IS_WINDOWS) elseif(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_win_intel64_20180723_general.zip" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_intel64_20191018_general.zip"
FILENAME "opencv-cache/ippicv/1d222685246896fe089f88b8858e4b2f-ippicv_2019_win_intel64_20180723_general.zip" FILENAME "opencv-cache/ippicv/879741a7946b814455eee6c6ffde2984-ippicv_2020_win_intel64_20191018_general.zip"
SHA512 b6c4f2696e2004b8f5471efd9bdc6c684b77830e0533d8880310c0b665b450d6f78e10744c937f5592ab900e187c475e46cb49e98701bb4bcbbc7da77723011d SHA512 50c4af4b7fe2161d652264230389dad2330e8c95b734d04fb7565bffdab855c06d43085e480da554c56b04f8538087d49503538d5943221ee2a772ee7be4c93c
) )
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_win_ia32_20180723_general.zip" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_ia32_20191018_general.zip"
FILENAME "opencv-cache/ippicv/0157251a2eb9cd63a3ebc7eed0f3e59e-ippicv_2019_win_ia32_20180723_general.zip" FILENAME "opencv-cache/ippicv/cd39bdf0c2e1cac9a61101dad7a2413e-ippicv_2020_win_ia32_20191018_general.zip"
SHA512 c33fd4019c71b064b153e1b25e0307f9c7ada693af8ec910410edeab471c6f14df9b11bf9f5302ceb0fcd4282f5c0b6c92fb5df0e83eb50ed630c45820d1e184 SHA512 058d00775d9f16955c7a557d554b8c2976ab9dbad4ba3fdb9823c0f768809edbd835e4397f01dc090a9bc80d81de834375e7006614d2a898f42e8004de0e04bf
) )
else() else()
message(WARNING "This target architecture is not supported IPPICV") message(WARNING "This target architecture is not supported IPPICV")
@ -238,14 +252,20 @@ vcpkg_configure_cmake(
PREFER_NINJA PREFER_NINJA
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
OPTIONS OPTIONS
-DOPENCV_CUDA_FORCE_BUILTIN_CMAKE_MODULE=ON #to use custom module with fixes for CUDA 11 compat, waiting for CMake support
###### ocv_options ###### ocv_options
-DOpenCV_INSTALL_BINARIES_PREFIX= -DOpenCV_INSTALL_BINARIES_PREFIX=
-DOPENCV_BIN_INSTALL_PATH=bin
-DOPENCV_INCLUDE_INSTALL_PATH=include
-DOPENCV_LIB_INSTALL_PATH=lib -DOPENCV_LIB_INSTALL_PATH=lib
-DOPENCV_3P_LIB_INSTALL_PATH=lib -DOPENCV_3P_LIB_INSTALL_PATH=lib
-DOPENCV_CONFIG_INSTALL_PATH=share/opencv -DOPENCV_CONFIG_INSTALL_PATH=share/opencv
-DINSTALL_TO_MANGLED_PATHS=OFF
-DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG
-DCMAKE_DEBUG_POSTFIX=d -DCMAKE_DEBUG_POSTFIX=d
-DOpenCV_DISABLE_ARCH_PATH=ON -DOPENCV_DLLVERSION=
-DOPENCV_DEBUG_POSTFIX=d
-DOPENCV_GENERATE_SETUPVARS=OFF
# Do not build docs/examples # Do not build docs/examples
-DBUILD_DOCS=OFF -DBUILD_DOCS=OFF
-DBUILD_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF
@ -257,6 +277,9 @@ vcpkg_configure_cmake(
-DBUILD_TIFF=OFF -DBUILD_TIFF=OFF
-DBUILD_WEBP=OFF -DBUILD_WEBP=OFF
-DBUILD_ZLIB=OFF -DBUILD_ZLIB=OFF
-DBUILD_TBB=OFF
-DBUILD_IPP_IW=OFF
-DBUILD_ITT=OFF
###### Disable build 3rd party components ###### Disable build 3rd party components
-DBUILD_PROTOBUF=OFF -DBUILD_PROTOBUF=OFF
###### OpenCV Build components ###### OpenCV Build components
@ -264,14 +287,21 @@ vcpkg_configure_cmake(
-DBUILD_opencv_bgsegm=${BUILD_opencv_bgsegm} -DBUILD_opencv_bgsegm=${BUILD_opencv_bgsegm}
-DBUILD_opencv_line_descriptor=${BUILD_opencv_line_descriptor} -DBUILD_opencv_line_descriptor=${BUILD_opencv_line_descriptor}
-DBUILD_opencv_saliency=${BUILD_opencv_saliency} -DBUILD_opencv_saliency=${BUILD_opencv_saliency}
-DBUILD_ANDROID_PROJECT=OFF
-DBUILD_ANDROID_EXAMPLES=OFF
-DBUILD_PACKAGE=OFF -DBUILD_PACKAGE=OFF
-DBUILD_PERF_TESTS=OFF -DBUILD_PERF_TESTS=OFF
-DBUILD_TESTS=OFF -DBUILD_TESTS=OFF
-DBUILD_WITH_DEBUG_INFO=ON -DBUILD_WITH_DEBUG_INFO=ON
-DBUILD_WITH_STATIC_CRT=${BUILD_WITH_STATIC_CRT} -DBUILD_WITH_STATIC_CRT=${BUILD_WITH_STATIC_CRT}
-DBUILD_JAVA=OFF
-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}
###### PROTOBUF ###### PROTOBUF
-DPROTOBUF_UPDATE_FILES=ON -DPROTOBUF_UPDATE_FILES=ON
-DUPDATE_PROTO_FILES=ON -DUPDATE_PROTO_FILES=ON
###### PYLINT/FLAKE8
-DENABLE_PYLINT=OFF
-DENABLE_FLAKE8=OFF
# CMAKE # CMAKE
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON
@ -284,18 +314,23 @@ vcpkg_configure_cmake(
###### customized properties ###### customized properties
## Options from vcpkg_check_features() ## Options from vcpkg_check_features()
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
-DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON
-DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}
-DWITH_GTK=OFF
-DWITH_IPP=${WITH_IPP} -DWITH_IPP=${WITH_IPP}
-DWITH_MATLAB=OFF -DWITH_MATLAB=OFF
-DWITH_MSMF=${WITH_MSMF} -DWITH_MSMF=${WITH_MSMF}
-DWITH_OPENMP=OFF
-DWITH_PROTOBUF=ON -DWITH_PROTOBUF=ON
-DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENCLAMDBLAS=OFF
-DWITH_TBB=${WITH_TBB} -DWITH_TBB=${WITH_TBB}
-DWITH_VTK=${WITH_VTK} -DWITH_VTK=${WITH_VTK}
-DWITH_OPENJPEG=OFF
###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install ###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install
-DWITH_LAPACK=OFF -DWITH_LAPACK=OFF
###### BUILD_options (mainly modules which require additional libraries) ###### BUILD_options (mainly modules which require additional libraries)
-DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_ovis=${BUILD_opencv_ovis}
-DBUILD_opencv_dnn=${BUILD_opencv_dnn}
###### The following modules are disabled for UWP ###### The following modules are disabled for UWP
-DBUILD_opencv_quality=${BUILD_opencv_quality} -DBUILD_opencv_quality=${BUILD_opencv_quality}
###### Additional build flags ###### Additional build flags
@ -326,6 +361,8 @@ if(Protobuf_FOUND)
) )
endif() endif()
endif() endif()
find_package(CUDA QUIET)
find_package(Threads QUIET)
find_package(TIFF QUIET) find_package(TIFF QUIET)
find_package(HDF5 QUIET) find_package(HDF5 QUIET)
find_package(Freetype QUIET) find_package(Freetype QUIET)
@ -336,8 +373,19 @@ find_package(ade QUIET)
find_package(VTK QUIET) find_package(VTK QUIET)
find_package(OpenMP QUIET) find_package(OpenMP QUIET)
find_package(Tesseract QUIET) find_package(Tesseract QUIET)
find_package(OpenEXR QUIET)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
find_package(Qt5 COMPONENTS OpenGL Concurrent Test QUIET)
find_package(GDCM QUIET)" OPENCV_MODULES "${OPENCV_MODULES}") find_package(GDCM QUIET)" OPENCV_MODULES "${OPENCV_MODULES}")
if(BUILD_opencv_ovis)
string(REPLACE "OgreGLSupportStatic"
"OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
@ -345,8 +393,12 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE ${CURRENT_PACKAGES_DIR}/setup_vars_opencv3.cmd)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/setup_vars_opencv3.cmd)
file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)
if(VCPKG_TARGET_IS_ANDROID)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/README.android)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/README.android)
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

11
ports/opencv4/0001-disable-downloading.patch
View File

@ -1,11 +1,14 @@
diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
index 63cf6d3..01e84a5 100644
--- a/cmake/OpenCVDownload.cmake --- a/cmake/OpenCVDownload.cmake
+++ b/cmake/OpenCVDownload.cmake +++ b/cmake/OpenCVDownload.cmake
@@ -151,6 +151,8 @@ function(ocv_download) @@ -157,6 +157,9 @@ function(ocv_download)
# Download # Download
if(NOT EXISTS "${CACHE_CANDIDATE}") if(NOT EXISTS "${CACHE_CANDIDATE}")
ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+ string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}") + string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}")
+ message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${DL_URL}\"\n FILENAME \"${CACHE_SUBPATH}\"\n SHA512 0\n )") + message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${DL_URL}\"\n FILENAME \"${CACHE_SUBPATH}\"\n SHA512 0\n )")
file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}" +
INACTIVITY_TIMEOUT 60 foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST})
TIMEOUT 600 ocv_download_log("#try ${try}")
file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"

34
ports/opencv4/0002-install-options.patch
View File

@ -1,17 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8631bbc..e801558 100644 index 4c0b388..16c0ede 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -647,7 +647,7 @@ endif() @@ -594,7 +594,7 @@ endif()
if(WIN32)
# Postfix of DLLs:
- set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}")
+ set(OPENCV_DLLVERSION "")
set(OPENCV_DEBUG_POSTFIX d)
else()
# Postfix of so's:
@@ -698,7 +698,7 @@ endif()
ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS)
# --- Python Support --- # --- Python Support ---
@ -21,10 +12,10 @@ index 8631bbc..e801558 100644
endif() endif()
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
index e3ae62f..d866162 100644 index 87b2161..5192875 100644
--- a/cmake/OpenCVCompilerOptions.cmake --- a/cmake/OpenCVCompilerOptions.cmake
+++ b/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake
@@ -256,7 +256,6 @@ if(MSVC) @@ -263,7 +263,6 @@ if(MSVC)
#endif() #endif()
if(BUILD_WITH_DEBUG_INFO) if(BUILD_WITH_DEBUG_INFO)
@ -33,27 +24,32 @@ index e3ae62f..d866162 100644
set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
endif() endif()
diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
index cef9d0b..b6ddb81 100644 index 6991289..3a691c5 100644
--- a/cmake/OpenCVGenConfig.cmake --- a/cmake/OpenCVGenConfig.cmake
+++ b/cmake/OpenCVGenConfig.cmake +++ b/cmake/OpenCVGenConfig.cmake
@@ -109,7 +109,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) @@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
endif() endif()
endfunction() endfunction()
-if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) -if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID)
+if(NOT ANDROID) +if(TRUE)
ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "") ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
endif() endif()
-if(ANDROID)
+if(FALSE)
ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in")
install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev)
endif()
@@ -121,7 +121,7 @@ endif() @@ -121,7 +121,7 @@ endif()
# -------------------------------------------------------------------------------------------- # --------------------------------------------------------------------------------------------
# Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages
# -------------------------------------------------------------------------------------------- # --------------------------------------------------------------------------------------------
-if(WIN32) -if(WIN32)
+if(0) +if(0)
if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG)
if(BUILD_SHARED_LIBS) ocv_gen_config("${CMAKE_BINARY_DIR}/win-install"
set(_lib_suffix "lib") "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}"
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 1f0d720..0bb1ff7 100644 index 1f0d720..0bb1ff7 100644
--- a/data/CMakeLists.txt --- a/data/CMakeLists.txt

27
ports/opencv4/0003-force-package-requirements.patch
View File

@ -1,5 +1,5 @@
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index 227cfb2..7a97a19 100644 index 0beaf19..3ba1ebd 100644
--- a/cmake/OpenCVFindLibsGrfmt.cmake --- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
@ -38,7 +38,7 @@ index 227cfb2..7a97a19 100644
if(WEBP_FOUND) if(WEBP_FOUND)
set(HAVE_WEBP 1) set(HAVE_WEBP 1)
endif() endif()
@@ -158,7 +158,7 @@ if(WITH_JASPER) @@ -173,7 +173,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG)
if(BUILD_JASPER) if(BUILD_JASPER)
ocv_clear_vars(JASPER_FOUND) ocv_clear_vars(JASPER_FOUND)
else() else()
@ -47,7 +47,7 @@ index 227cfb2..7a97a19 100644
endif() endif()
if(NOT JASPER_FOUND) if(NOT JASPER_FOUND)
@@ -182,7 +182,7 @@ if(WITH_PNG) @@ -197,7 +197,7 @@ if(WITH_PNG)
if(BUILD_PNG) if(BUILD_PNG)
ocv_clear_vars(PNG_FOUND) ocv_clear_vars(PNG_FOUND)
else() else()
@ -56,7 +56,7 @@ index 227cfb2..7a97a19 100644
if(PNG_FOUND) if(PNG_FOUND)
include(CheckIncludeFile) include(CheckIncludeFile)
check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
@@ -213,7 +213,7 @@ endif() @@ -228,7 +228,7 @@ endif()
if(WITH_OPENEXR) if(WITH_OPENEXR)
ocv_clear_vars(HAVE_OPENEXR) ocv_clear_vars(HAVE_OPENEXR)
if(NOT BUILD_OPENEXR) if(NOT BUILD_OPENEXR)
@ -65,7 +65,7 @@ index 227cfb2..7a97a19 100644
endif() endif()
if(OPENEXR_FOUND) if(OPENEXR_FOUND)
@@ -231,7 +231,7 @@ endif() @@ -246,7 +246,7 @@ endif()
# --- GDAL (optional) --- # --- GDAL (optional) ---
if(WITH_GDAL) if(WITH_GDAL)
@ -74,7 +74,7 @@ index 227cfb2..7a97a19 100644
if(NOT GDAL_FOUND) if(NOT GDAL_FOUND)
set(HAVE_GDAL NO) set(HAVE_GDAL NO)
@@ -243,7 +243,7 @@ if(WITH_GDAL) @@ -258,7 +258,7 @@ if(WITH_GDAL)
endif() endif()
if (WITH_GDCM) if (WITH_GDCM)
@ -83,18 +83,11 @@ index 227cfb2..7a97a19 100644
if(NOT GDCM_FOUND) if(NOT GDCM_FOUND)
set(HAVE_GDCM NO) set(HAVE_GDCM NO)
ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
@@ -273,4 +273,4 @@ if(WITH_IMGCODEC_PFM)
set(HAVE_IMGCODEC_PFM ON)
elseif(DEFINED WITH_IMGCODEC_PFM)
set(HAVE_IMGCODEC_PFM OFF)
-endif()
\ No newline at end of file
+endif()
diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
index a658bf6..5c9411a 100644 index b9b1a95..596c152 100644
--- a/cmake/OpenCVFindLibsPerf.cmake --- a/cmake/OpenCVFindLibsPerf.cmake
+++ b/cmake/OpenCVFindLibsPerf.cmake +++ b/cmake/OpenCVFindLibsPerf.cmake
@@ -41,14 +41,9 @@ endif(WITH_CUDA) @@ -51,14 +51,9 @@ endif(WITH_CUDA)
# --- Eigen --- # --- Eigen ---
if(WITH_EIGEN AND NOT HAVE_EIGEN) if(WITH_EIGEN AND NOT HAVE_EIGEN)
@ -110,7 +103,7 @@ index a658bf6..5c9411a 100644
if(DEFINED EIGEN3_INCLUDE_DIRS) if(DEFINED EIGEN3_INCLUDE_DIRS)
set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIRS}) set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIRS})
set(HAVE_EIGEN 1) set(HAVE_EIGEN 1)
@@ -56,7 +51,6 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) @@ -66,7 +61,6 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIR}) set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIR})
set(HAVE_EIGEN 1) set(HAVE_EIGEN 1)
endif() endif()
@ -118,7 +111,7 @@ index a658bf6..5c9411a 100644
if(HAVE_EIGEN) if(HAVE_EIGEN)
if(DEFINED EIGEN3_WORLD_VERSION) # CMake module if(DEFINED EIGEN3_WORLD_VERSION) # CMake module
set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION}) set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION})
@@ -67,6 +61,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) @@ -77,6 +71,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR}) set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR})
set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH}) set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH})
endif() endif()

2
ports/opencv4/0004-fix-policy-CMP0057.patch
View File

@ -1,5 +1,5 @@
diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt
index 1608655..a394f04 100644 index c1c6754..360aa6b 100644
--- a/modules/videoio/CMakeLists.txt --- a/modules/videoio/CMakeLists.txt
+++ b/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@

12
ports/opencv4/0005-add-missing-stdexcept-include.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp
index fef3fea..68d1a80 100644
--- a/modules/cvv/src/util/observer_ptr.hpp
+++ b/modules/cvv/src/util/observer_ptr.hpp
@@ -11,6 +11,7 @@
#include <cstddef> //size_t
#include <cstdint> // [u]intXX_t
#include <algorithm> // since some people like to forget that one
+#include <stdexcept>
namespace cvv
{

48
ports/opencv4/0009-fix-uwp.patch
View File

@ -1,17 +1,8 @@
diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index 799592b..3f44173 100644 index 9053957..d2b6412 100644
--- a/cmake/OpenCVModule.cmake --- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake
@@ -852,7 +852,7 @@ macro(ocv_create_module) @@ -1196,7 +1196,7 @@ function(ocv_add_perf_tests)
set(the_module_target ${the_module})
endif()
- if(WINRT)
+ if(WINRT AND BUILD_TESTS)
# removing APPCONTAINER from modules to run from console
# in case of usual starting of WinRT test apps output is missing
# so starting of console version w/o APPCONTAINER is required to get test results
@@ -1175,7 +1175,7 @@ function(ocv_add_perf_tests)
set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") set_target_properties(${the_target} PROPERTIES FOLDER "tests performance")
endif() endif()
@ -20,38 +11,3 @@ index 799592b..3f44173 100644
# removing APPCONTAINER from tests to run from console # removing APPCONTAINER from tests to run from console
# look for detailed description inside of ocv_create_module macro above # look for detailed description inside of ocv_create_module macro above
add_custom_command(TARGET "opencv_perf_${name}" add_custom_command(TARGET "opencv_perf_${name}"
diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp
index aafbfdf..10543ae 100644
--- a/modules/core/src/utils/datafile.cpp
+++ b/modules/core/src/utils/datafile.cpp
@@ -108,7 +108,7 @@ static cv::String getModuleLocation(const void* addr)
CV_UNUSED(addr);
#ifdef _WIN32
HMODULE m = 0;
-#if _WIN32_WINNT >= 0x0501
+#if _WIN32_WINNT >= 0x0501 && (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
reinterpret_cast<LPCTSTR>(addr),
&m);
@@ -155,7 +155,7 @@ bool getBinLocation(std::wstring& dst)
{
void* addr = (void*)getModuleLocation; // using code address, doesn't work with static linkage!
HMODULE m = 0;
-#if _WIN32_WINNT >= 0x0501
+#if _WIN32_WINNT >= 0x0501 && (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
reinterpret_cast<LPCTSTR>(addr),
&m);
diff --git a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
index 236e227..eccf97e 100644
--- a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
+++ b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
@@ -94,7 +94,7 @@ Media::CaptureFrameGrabber::~CaptureFrameGrabber()
void Media::CaptureFrameGrabber::ShowCameraSettings()
{
-#if WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
+#if (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) && (WINAPI_FAMILY != WINAPI_FAMILY_PC_APP)
if (_state == State::Started)
{
CameraOptionsUI::Show(_capture.Get());

18
ports/opencv4/CONTROL
View File

@ -1,5 +1,5 @@
Source: opencv4 Source: opencv4
Version: 4.1.1-6 Version: 4.3.0
Build-Depends: protobuf, zlib Build-Depends: protobuf, zlib
Homepage: https://github.com/opencv/opencv Homepage: https://github.com/opencv/opencv
Description: computer vision library Description: computer vision library
@ -13,11 +13,11 @@ Build-Depends: ade
Description: graph api Description: graph api
Feature: contrib Feature: contrib
Build-Depends: hdf5 (!uwp) Build-Depends: hdf5 (!uwp), tesseract (!uwp)
Description: opencv_contrib module Description: opencv_contrib module
Feature: cuda Feature: cuda
Build-Depends: opencv4[contrib], cuda Build-Depends: opencv4[contrib], cuda, cudnn
Description: CUDA support for opencv Description: CUDA support for opencv
Feature: dnn Feature: dnn
@ -35,6 +35,10 @@ Feature: gdcm
Build-Depends: gdcm Build-Depends: gdcm
Description: GDCM support for opencv Description: GDCM support for opencv
Feature: halide
Build-Depends: halide, opencv4[core], opencv4[dnn]
Description: Halide support for opencv
Feature: ipp Feature: ipp
Description: Enable Intel Integrated Performance Primitives Description: Enable Intel Integrated Performance Primitives
@ -89,13 +93,5 @@ Feature: webp
Build-Depends: libwebp Build-Depends: libwebp
Description: WebP support for opencv Description: WebP support for opencv
Feature: halide
Build-Depends: halide, opencv4[core], opencv4[dnn]
Description: Halide support for opencv
Feature: world Feature: world
Description: Compile to a single package support for opencv Description: Compile to a single package support for opencv
Feature: gtk
Build-Depends: gtk
Description: gtk support for opencv

2026
ports/opencv4/FindCUDA.cmake Normal file
View File

File diff suppressed because it is too large Load Diff

102
ports/opencv4/portfile.cmake
View File

@ -6,15 +6,13 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3")
message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3")
endif() endif()
include(vcpkg_common_functions) set(OPENCV_VERSION "4.3.0")
set(OPENCV_VERSION "4.1.1")
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO opencv/opencv REPO opencv/opencv
REF ${OPENCV_VERSION} REF ${OPENCV_VERSION}
SHA512 80fa48d992ca06a2a4ab6740df6d8c21f4926165486b393969da2c5bbe2f3a0b799fb76dee5e3654e90c743e49bbd2b5b02ad59a4766896bbf4cd5b4e3251e0f SHA512 ac22b41fffa3e3138701fa0df0d19900b3ce72e168f4478ecdc593c5c9fd004b4b1b26612d62c25b681db99a8720db7a11b5b224e576e595624965fa79b0f383
HEAD_REF master HEAD_REF master
PATCHES PATCHES
0001-disable-downloading.patch 0001-disable-downloading.patch
@ -24,6 +22,11 @@ vcpkg_from_github(
0009-fix-uwp.patch 0009-fix-uwp.patch
) )
file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake")
file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake")
file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCUDA.cmake DESTINATION ${SOURCE_PATH}/cmake/) # backported from CMake 3.18, remove when released
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
set(ADE_DIR ${CURRENT_INSTALLED_DIR}/share/ade CACHE PATH "Path to existing ADE CMake Config file") set(ADE_DIR ${CURRENT_INSTALLED_DIR}/share/ade CACHE PATH "Path to existing ADE CMake Config file")
@ -33,7 +36,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"contrib" WITH_CONTRIB "contrib" WITH_CONTRIB
"cuda" WITH_CUDA "cuda" WITH_CUDA
"cuda" WITH_CUBLAS "cuda" WITH_CUBLAS
"dnn" BUILD_opencv_dnn
"eigen" WITH_EIGEN "eigen" WITH_EIGEN
"ffmpeg" WITH_FFMPEG "ffmpeg" WITH_FFMPEG
"gdcm" WITH_GDCM "gdcm" WITH_GDCM
@ -43,23 +45,39 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"nonfree" OPENCV_ENABLE_NONFREE "nonfree" OPENCV_ENABLE_NONFREE
"openexr" WITH_OPENEXR "openexr" WITH_OPENEXR
"opengl" WITH_OPENGL "opengl" WITH_OPENGL
"openmp" WITH_OPENMP
"png" WITH_PNG "png" WITH_PNG
"qt" WITH_QT "qt" WITH_QT
"sfm" BUILD_opencv_sfm "sfm" BUILD_opencv_sfm
"tiff" WITH_TIFF "tiff" WITH_TIFF
"webp" WITH_WEBP "webp" WITH_WEBP
"world" BUILD_opencv_world "world" BUILD_opencv_world
"gtk" WITH_GTK
) )
# Cannot use vcpkg_check_features() for "ipp", "ovis", "tbb", and "vtk". # Cannot use vcpkg_check_features() for "dnn", ipp", "openmp", "ovis", "tbb", and "vtk".
# As the respective value of their variables can be unset conditionally. # As the respective value of their variables can be unset conditionally.
set(BUILD_opencv_dnn OFF)
if("dnn" IN_LIST FEATURES)
if(NOT VCPKG_TARGET_IS_ANDROID)
set(BUILD_opencv_dnn ON)
else()
message(WARNING "The dnn module cannot be enabled on Android")
endif()
endif()
set(WITH_IPP OFF) set(WITH_IPP OFF)
if("ipp" IN_LIST FEATURES) if("ipp" IN_LIST FEATURES)
set(WITH_IPP ON) set(WITH_IPP ON)
endif() endif()
set(WITH_OPENMP OFF)
if("openmp" IN_LIST FEATURES)
if(NOT VCPKG_TARGET_IS_OSX)
set(WITH_OPENMP ON)
else()
message(WARNING "The OpenMP feature is not supported on macOS")
endif()
endif()
set(BUILD_opencv_ovis OFF) set(BUILD_opencv_ovis OFF)
if("ovis" IN_LIST FEATURES) if("ovis" IN_LIST FEATURES)
set(BUILD_opencv_ovis ON) set(BUILD_opencv_ovis ON)
@ -107,8 +125,10 @@ if("contrib" IN_LIST FEATURES)
OUT_SOURCE_PATH CONTRIB_SOURCE_PATH OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
REPO opencv/opencv_contrib REPO opencv/opencv_contrib
REF ${OPENCV_VERSION} REF ${OPENCV_VERSION}
SHA512 8af13f0a5f350360316662c1ce5e58c21d906a58591acfbd575a8dacde19b6f3bbd694c3c199feb35c33549cf8c37e3fb4c494b586a00ad29fe3b4aeeb2d22ab SHA512 cfeda06a9f86ccaedbca9521c35bf685c3d8d3a182fb943f9378a7ecd1949d6e2e9df1673f0e3e9686840ca4c9e5a8e8cf2ac962a33b6e1f88f8278abd8c37e5
HEAD_REF master HEAD_REF master
PATCHES
0005-add-missing-stdexcept-include.patch
) )
set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
@ -178,9 +198,9 @@ if(WITH_IPP)
if(VCPKG_TARGET_IS_OSX) if(VCPKG_TARGET_IS_OSX)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_mac_intel64_general_20180723.tgz" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_mac_intel64_20191018_general.tgz"
FILENAME "opencv-cache/ippicv/fe6b2bb75ae0e3f19ad3ae1a31dfa4a2-ippicv_2019_mac_intel64_general_20180723.tgz" FILENAME "opencv-cache/ippicv/1c3d675c2a2395d094d523024896e01b-ippicv_2020_mac_intel64_20191018_general.tgz"
SHA512 266fe3fecf8e95e1f51c09b65330a577743ef72b423b935d4d1fe8d87f1b4f258c282fe6a18fc805d489592f137ebed37c9f1d1b34026590d9f1ba107015132e SHA512 454dfaaa245e3a3b2f1ffb1aa8e27e280b03685009d66e147482b14e5796fdf2d332cac0f9b0822caedd5760fda4ee0ce2961889597456bbc18202f10bf727cd
) )
else() else()
message(WARNING "This target architecture is not supported IPPICV") message(WARNING "This target architecture is not supported IPPICV")
@ -189,15 +209,15 @@ if(WITH_IPP)
elseif(VCPKG_TARGET_IS_LINUX) elseif(VCPKG_TARGET_IS_LINUX)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_lnx_intel64_general_20180723.tgz" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz"
FILENAME "opencv-cache/ippicv/c0bd78adb4156bbf552c1dfe90599607-ippicv_2019_lnx_intel64_general_20180723.tgz" FILENAME "opencv-cache/ippicv/7421de0095c7a39162ae13a6098782f9-ippicv_2020_lnx_intel64_20191018_general.tgz"
SHA512 e4ec6b3b9fc03d7b3ae777c2a26f57913e83329fd2f7be26c259b07477ca2a641050b86979e0c96e25aa4c1f9f251b28727690358a77418e76dd910d0f4845c9 SHA512 de6d80695cd6deef359376476edc4ff85fdddcf94972b936e0017f8a48aaa5d18f55c4253ae37deb83bff2f71410f68408063c88b5f3bf4df3c416aa93ceca87
) )
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_lnx_ia32_general_20180723.tgz" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz"
FILENAME "opencv-cache/ippicv/4f38432c30bfd6423164b7a24bbc98a0-ippicv_2019_lnx_ia32_general_20180723.tgz" FILENAME "opencv-cache/ippicv/ad189a940fb60eb71f291321322fe3e8-ippicv_2020_lnx_ia32_20191018_general.tgz"
SHA512 d96d3989928ff11a18e631bf5ecfdedf88fd350162a23fa2c8f7dbc3bf878bf442aff7fb2a07dc56671d7268cc20682055891be75b9834e9694d20173e92b6a3 SHA512 5ca9dafc3a634e2a5f83f6a498611c990ef16d54358e9b44574b01694e9d64b118d46d6e2011506e40d37e5a9865f576f790e37ff96b7c8b503507633631a296
) )
else() else()
message(WARNING "This target architecture is not supported IPPICV") message(WARNING "This target architecture is not supported IPPICV")
@ -206,15 +226,15 @@ if(WITH_IPP)
elseif(VCPKG_TARGET_IS_WINDOWS) elseif(VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_win_intel64_20180723_general.zip" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_intel64_20191018_general.zip"
FILENAME "opencv-cache/ippicv/1d222685246896fe089f88b8858e4b2f-ippicv_2019_win_intel64_20180723_general.zip" FILENAME "opencv-cache/ippicv/879741a7946b814455eee6c6ffde2984-ippicv_2020_win_intel64_20191018_general.zip"
SHA512 b6c4f2696e2004b8f5471efd9bdc6c684b77830e0533d8880310c0b665b450d6f78e10744c937f5592ab900e187c475e46cb49e98701bb4bcbbc7da77723011d SHA512 50c4af4b7fe2161d652264230389dad2330e8c95b734d04fb7565bffdab855c06d43085e480da554c56b04f8538087d49503538d5943221ee2a772ee7be4c93c
) )
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
vcpkg_download_distfile(OCV_DOWNLOAD vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/32e315a5b106a7b89dbed51c28f8120a48b368b4/ippicv/ippicv_2019_win_ia32_20180723_general.zip" URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_ia32_20191018_general.zip"
FILENAME "opencv-cache/ippicv/0157251a2eb9cd63a3ebc7eed0f3e59e-ippicv_2019_win_ia32_20180723_general.zip" FILENAME "opencv-cache/ippicv/cd39bdf0c2e1cac9a61101dad7a2413e-ippicv_2020_win_ia32_20191018_general.zip"
SHA512 c33fd4019c71b064b153e1b25e0307f9c7ada693af8ec910410edeab471c6f14df9b11bf9f5302ceb0fcd4282f5c0b6c92fb5df0e83eb50ed630c45820d1e184 SHA512 058d00775d9f16955c7a557d554b8c2976ab9dbad4ba3fdb9823c0f768809edbd835e4397f01dc090a9bc80d81de834375e7006614d2a898f42e8004de0e04bf
) )
else() else()
message(WARNING "This target architecture is not supported IPPICV") message(WARNING "This target architecture is not supported IPPICV")
@ -263,13 +283,20 @@ vcpkg_configure_cmake(
PREFER_NINJA PREFER_NINJA
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
OPTIONS OPTIONS
-DOPENCV_CUDA_FORCE_BUILTIN_CMAKE_MODULE=ON #to use custom module with fixes for CUDA 11 compat, waiting for CMake support
###### ocv_options ###### ocv_options
-DOpenCV_INSTALL_BINARIES_PREFIX= -DOpenCV_INSTALL_BINARIES_PREFIX=
-DOPENCV_BIN_INSTALL_PATH=bin
-DOPENCV_INCLUDE_INSTALL_PATH=include
-DOPENCV_LIB_INSTALL_PATH=lib -DOPENCV_LIB_INSTALL_PATH=lib
-DOPENCV_3P_LIB_INSTALL_PATH=lib -DOPENCV_3P_LIB_INSTALL_PATH=lib
-DOPENCV_CONFIG_INSTALL_PATH=share/opencv -DOPENCV_CONFIG_INSTALL_PATH=share/opencv
-DINSTALL_TO_MANGLED_PATHS=OFF
-DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG
-DCMAKE_DEBUG_POSTFIX=d -DCMAKE_DEBUG_POSTFIX=d
-DOPENCV_DLLVERSION=
-DOPENCV_DEBUG_POSTFIX=d
-DOPENCV_GENERATE_SETUPVARS=OFF
# Do not build docs/examples # Do not build docs/examples
-DBUILD_DOCS=OFF -DBUILD_DOCS=OFF
-DBUILD_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF
@ -320,17 +347,23 @@ vcpkg_configure_cmake(
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
-DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}
-DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON
-DWITH_GTK=OFF
-DWITH_IPP=${WITH_IPP} -DWITH_IPP=${WITH_IPP}
-DWITH_MSMF=${WITH_MSMF} -DWITH_MSMF=${WITH_MSMF}
-DWITH_OPENMP=${WITH_OPENMP}
-DWITH_PROTOBUF=ON -DWITH_PROTOBUF=ON
-DWITH_TBB=${WITH_TBB} -DWITH_TBB=${WITH_TBB}
-DWITH_VTK=${WITH_VTK} -DWITH_VTK=${WITH_VTK}
-DWITH_OPENJPEG=OFF
###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install ###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install
-DWITH_LAPACK=OFF -DWITH_LAPACK=OFF
###### BUILD_options (mainly modules which require additional libraries) ###### BUILD_options (mainly modules which require additional libraries)
-DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_ovis=${BUILD_opencv_ovis}
-DBUILD_opencv_dnn=${BUILD_opencv_dnn}
###### The following modules are disabled for UWP ###### The following modules are disabled for UWP
-DBUILD_opencv_quality=${BUILD_opencv_quality} -DBUILD_opencv_quality=${BUILD_opencv_quality}
###### The following module is disabled because it's broken #https://github.com/opencv/opencv_contrib/issues/2307
-DBUILD_opencv_rgbd=OFF
###### Additional build flags ###### Additional build flags
${ADDITIONAL_BUILD_FLAGS} ${ADDITIONAL_BUILD_FLAGS}
) )
@ -359,6 +392,8 @@ if(Protobuf_FOUND)
) )
endif() endif()
endif() endif()
find_package(CUDA QUIET)
find_package(Threads QUIET)
find_package(TIFF QUIET) find_package(TIFF QUIET)
find_package(HDF5 QUIET) find_package(HDF5 QUIET)
find_package(Freetype QUIET) find_package(Freetype QUIET)
@ -369,15 +404,25 @@ find_package(ade QUIET)
find_package(VTK QUIET) find_package(VTK QUIET)
find_package(OpenMP QUIET) find_package(OpenMP QUIET)
find_package(Tesseract QUIET) find_package(Tesseract QUIET)
find_package(OpenEXR QUIET)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
find_package(Qt5 COMPONENTS OpenGL Concurrent Test QUIET)
find_package(GDCM QUIET)" OPENCV_MODULES "${OPENCV_MODULES}") find_package(GDCM QUIET)" OPENCV_MODULES "${OPENCV_MODULES}")
if("openmp" IN_LIST FEATURES) if(WITH_OPENMP)
string(REPLACE "set_target_properties(opencv_core PROPERTIES string(REPLACE "set_target_properties(opencv_core PROPERTIES
INTERFACE_LINK_LIBRARIES \"" INTERFACE_LINK_LIBRARIES \""
"set_target_properties(opencv_core PROPERTIES "set_target_properties(opencv_core PROPERTIES
INTERFACE_LINK_LIBRARIES \"\$<LINK_ONLY:OpenMP::OpenMP_CXX>;" OPENCV_MODULES "${OPENCV_MODULES}") INTERFACE_LINK_LIBRARIES \"\$<LINK_ONLY:OpenMP::OpenMP_CXX>;" OPENCV_MODULES "${OPENCV_MODULES}")
endif() endif()
if(BUILD_opencv_ovis)
string(REPLACE "OgreGLSupportStatic"
"OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
@ -385,9 +430,12 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE ${CURRENT_PACKAGES_DIR}/setup_vars_opencv4.cmd)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/setup_vars_opencv4.cmd)
file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)
if(VCPKG_TARGET_IS_ANDROID)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/README.android)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/README.android)
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

6
ports/openexr/CONTROL
View File

@ -1,6 +1,6 @@
Source: openexr Source: openexr
Version: 2.3.0-5 Version: 2.5.0
Homepage: https://www.openexr.com/ Homepage: https://www.openexr.com/
Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications
Build-Depends: zlib Build-Depends: zlib, python3
Supports: !uwp Supports: !uwp

94
ports/openexr/FindOpenEXR.cmake
View File

@ -1,94 +0,0 @@
include(FindPackageHandleStandardArgs)
find_path(OpenEXR_INCLUDE_DIRS OpenEXR/OpenEXRConfig.h)
find_path(OPENEXR_INCLUDE_PATHS NAMES ImfRgbaFile.h PATH_SUFFIXES OpenEXR)
file(STRINGS "${OpenEXR_INCLUDE_DIRS}/OpenEXR/OpenEXRConfig.h" OPENEXR_CONFIG_H)
string(REGEX REPLACE "^.*define OPENEXR_VERSION_MAJOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MAJOR "${OPENEXR_CONFIG_H}")
string(REGEX REPLACE "^.*define OPENEXR_VERSION_MINOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MINOR "${OPENEXR_CONFIG_H}")
set(OpenEXR_LIB_SUFFIX "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}")
include(SelectLibraryConfigurations)
if(NOT OpenEXR_BASE_LIBRARY)
find_library(OpenEXR_BASE_LIBRARY_RELEASE NAMES IlmImf-${OpenEXR_LIB_SUFFIX})
find_library(OpenEXR_BASE_LIBRARY_DEBUG NAMES IlmImf-${OpenEXR_LIB_SUFFIX}_d)
select_library_configurations(OpenEXR_BASE)
endif()
if(NOT OpenEXR_UTIL_LIBRARY)
find_library(OpenEXR_UTIL_LIBRARY_RELEASE NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX})
find_library(OpenEXR_UTIL_LIBRARY_DEBUG NAMES IlmImfUtil-${OpenEXR_LIB_SUFFIX}_d)
select_library_configurations(OpenEXR_UTIL)
endif()
if(NOT OpenEXR_HALF_LIBRARY)
find_library(OpenEXR_HALF_LIBRARY_RELEASE NAMES Half-${OpenEXR_LIB_SUFFIX})
find_library(OpenEXR_HALF_LIBRARY_DEBUG NAMES Half-${OpenEXR_LIB_SUFFIX}_d)
select_library_configurations(OpenEXR_HALF)
endif()
if(NOT OpenEXR_IEX_LIBRARY)
find_library(OpenEXR_IEX_LIBRARY_RELEASE NAMES Iex-${OpenEXR_LIB_SUFFIX})
find_library(OpenEXR_IEX_LIBRARY_DEBUG NAMES Iex-${OpenEXR_LIB_SUFFIX}_d)
select_library_configurations(OpenEXR_IEX)
endif()
if(NOT OpenEXR_MATH_LIBRARY)
find_library(OpenEXR_MATH_LIBRARY_RELEASE NAMES Imath-${OpenEXR_LIB_SUFFIX})
find_library(OpenEXR_MATH_LIBRARY_DEBUG NAMES Imath-${OpenEXR_LIB_SUFFIX}_d)
select_library_configurations(OpenEXR_MATH)
endif()
if(NOT OpenEXR_THREAD_LIBRARY)
find_library(OpenEXR_THREAD_LIBRARY_RELEASE NAMES IlmThread-${OpenEXR_LIB_SUFFIX})
find_library(OpenEXR_THREAD_LIBRARY_DEBUG NAMES IlmThread-${OpenEXR_LIB_SUFFIX}_d)
select_library_configurations(OpenEXR_THREAD)
endif()
if(NOT OpenEXR_IEXMATH_LIBRARY)
find_library(OpenEXR_IEXMATH_LIBRARY_RELEASE NAMES IexMath-${OpenEXR_LIB_SUFFIX})
find_library(OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES IexMath-${OpenEXR_LIB_SUFFIX}_d)
select_library_configurations(OpenEXR_IEXMATH)
endif()
set(OPENEXR_HALF_LIBRARY "${OpenEXR_HALF_LIBRARY}")
set(OPENEXR_Half_LIBRARY "${OpenEXR_HALF_LIBRARY}")
set(OPENEXR_IEX_LIBRARY "${OpenEXR_IEX_LIBRARY}")
set(OPENEXR_Iex_LIBRARY "${OpenEXR_IEX_LIBRARY}")
set(OPENEXR_IMATH_LIBRARY "${OpenEXR_MATH_LIBRARY}")
set(OPENEXR_ILMIMF_LIBRARY "${OpenEXR_BASE_LIBRARY}")
set(OPENEXR_IlmImf_LIBRARY "${OpenEXR_BASE_LIBRARY}")
set(OPENEXR_ILMIMFUTIL_LIBRARY "${OpenEXR_UTIL_LIBRARY}")
set(OPENEXR_ILMTHREAD_LIBRARY "${OpenEXR_THREAD_LIBRARY}")
set(OpenEXR_LIBRARY "${OpenEXR_BASE_LIBRARY}")
set(OpenEXR_LIBRARIES
${OpenEXR_LIBRARY}
${OpenEXR_MATH_LIBRARY}
${OpenEXR_IEXMATH_LIBRARY}
${OpenEXR_UTIL_LIBRARY}
${OpenEXR_HALF_LIBRARY}
${OpenEXR_IEX_LIBRARY}
${OpenEXR_THREAD_LIBRARY}
)
set(OPENEXR_LIBRARIES
${OPENEXR_HALF_LIBRARY}
${OPENEXR_IEX_LIBRARY}
${OPENEXR_IMATH_LIBRARY}
${OPENEXR_ILMIMF_LIBRARY}
${OPENEXR_ILMTHREAD_LIBRARY}
)
set(OpenEXR_INCLUDE_DIR ${OpenEXR_INCLUDE_DIRS})
set(OPENEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIRS})
set(OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATHS})
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS)
if(OpenEXR_FOUND)
set(OPENEXR_FOUND 1)
endif()

13
ports/openexr/fix_clang_not_setting_modern_cplusplus.patch
View File

@ -1,13 +0,0 @@
diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt
index e13c768..95942c8 100644
--- a/IlmBase/CMakeLists.txt
+++ b/IlmBase/CMakeLists.txt
@@ -110,7 +110,7 @@ ENDIF ()
IF (OPENEXR_FORCE_CXX03)
FILE ( APPEND ${ILMBASE_TMP_CONFIG} "#define ILMBASE_FORCE_CXX03 1\n" )
-ELSEIF (NOT WIN32)
+ELSEIF (NOT WIN32 AND NOT APPLE)
# really only care about c++11 right now for the threading bits, but this can be changed to 14
# when needed...
# Note that the __cplusplus check is not valid under MSVC

19
ports/openexr/fix_install_ilmimf.patch
View File

@ -1,19 +0,0 @@
diff --git a/OpenEXR/IlmImf/CMakeLists.txt b/OpenEXR/IlmImf/CMakeLists.txt
index e1a8740..d31cf68 100644
--- a/OpenEXR/IlmImf/CMakeLists.txt
+++ b/OpenEXR/IlmImf/CMakeLists.txt
@@ -2,14 +2,6 @@
SET(CMAKE_INCLUDE_CURRENT_DIR 1)
-IF (WIN32)
- SET(RUNTIME_DIR ${OPENEXR_PACKAGE_PREFIX}/bin)
- SET(WORKING_DIR ${RUNTIME_DIR})
-ELSE ()
- SET(RUNTIME_DIR ${OPENEXR_PACKAGE_PREFIX}/lib)
- SET(WORKING_DIR .)
-ENDIF ()
-
SET(BUILD_B44EXPLOGTABLE OFF)
IF (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h")
SET(BUILD_B44EXPLOGTABLE ON)

109
ports/openexr/fix_linux_static_library_names.patch
View File

@ -1,109 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b06d97e..ad360f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,10 +53,13 @@ endif()
if (WIN32 AND OPENEXR_BUILD_ILMBASE AND OPENEXR_BUILD_OPENEXR AND OPENEXR_BUILD_SHARED)
# necessary for building dwa lookup tables, and b44log tables on windows
set(BUILD_ILMBASE_STATIC ON)
+ set(OPENEXR_STATIC_SUFFIX "_s")
elseif (OPENEXR_BUILD_ILMBASE AND OPENEXR_BUILD_STATIC)
set(BUILD_ILMBASE_STATIC ON)
+ set(OPENEXR_STATIC_SUFFIX "")
else()
set(BUILD_ILMBASE_STATIC OFF)
+ set(OPENEXR_STATIC_SUFFIX "")
endif()
if (NOT OPENEXR_BUILD_SHARED)
diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
index 3d24cd7..d92aa67 100644
--- a/IlmBase/Half/CMakeLists.txt
+++ b/IlmBase/Half/CMakeLists.txt
@@ -60,7 +60,7 @@ IF (BUILD_ILMBASE_STATIC)
SET_TARGET_PROPERTIES ( Half_static
PROPERTIES
VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
- OUTPUT_NAME "Half${ILMBASE_LIBSUFFIX}_s"
+ OUTPUT_NAME "Half${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
)
ADD_DEPENDENCIES ( Half_static toFloat eLut )
diff --git a/IlmBase/Iex/CMakeLists.txt b/IlmBase/Iex/CMakeLists.txt
index 847518c..9425430 100644
--- a/IlmBase/Iex/CMakeLists.txt
+++ b/IlmBase/Iex/CMakeLists.txt
@@ -34,7 +34,7 @@ IF (BUILD_ILMBASE_STATIC)
SET_TARGET_PROPERTIES ( Iex_static
PROPERTIES
VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
- OUTPUT_NAME "Iex${ILMBASE_LIBSUFFIX}_s"
+ OUTPUT_NAME "Iex${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
)
ENDIF()
diff --git a/IlmBase/IexMath/CMakeLists.txt b/IlmBase/IexMath/CMakeLists.txt
index 472fd33..1427fa8 100644
--- a/IlmBase/IexMath/CMakeLists.txt
+++ b/IlmBase/IexMath/CMakeLists.txt
@@ -36,7 +36,7 @@ IF (BUILD_ILMBASE_STATIC)
SET_TARGET_PROPERTIES ( IexMath_static
PROPERTIES
VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
- OUTPUT_NAME "IexMath${ILMBASE_LIBSUFFIX}_s"
+ OUTPUT_NAME "IexMath${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
)
ENDIF( )
diff --git a/IlmBase/IlmThread/CMakeLists.txt b/IlmBase/IlmThread/CMakeLists.txt
index 3a24823..b281916 100644
--- a/IlmBase/IlmThread/CMakeLists.txt
+++ b/IlmBase/IlmThread/CMakeLists.txt
@@ -49,7 +49,7 @@ IF (BUILD_ILMBASE_STATIC)
SET_TARGET_PROPERTIES ( IlmThread_static
PROPERTIES
VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
- OUTPUT_NAME "IlmThread${ILMBASE_LIBSUFFIX}_s"
+ OUTPUT_NAME "IlmThread${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
)
ENDIF ()
diff --git a/IlmBase/Imath/CMakeLists.txt b/IlmBase/Imath/CMakeLists.txt
index 8faa97a..bf29000 100644
--- a/IlmBase/Imath/CMakeLists.txt
+++ b/IlmBase/Imath/CMakeLists.txt
@@ -37,7 +37,7 @@ IF (BUILD_ILMBASE_STATIC)
SET_TARGET_PROPERTIES ( Imath_static
PROPERTIES
VERSION ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH}
- OUTPUT_NAME "Imath${ILMBASE_LIBSUFFIX}_s"
+ OUTPUT_NAME "Imath${ILMBASE_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
)
ENDIF ()
diff --git a/OpenEXR/IlmImf/CMakeLists.txt b/OpenEXR/IlmImf/CMakeLists.txt
index d31cf68..52c2b6e 100644
--- a/OpenEXR/IlmImf/CMakeLists.txt
+++ b/OpenEXR/IlmImf/CMakeLists.txt
@@ -226,7 +226,7 @@ IF (OPENEXR_BUILD_STATIC)
SET_TARGET_PROPERTIES ( IlmImf_static
PROPERTIES
VERSION ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}
- OUTPUT_NAME "IlmImf${OPENEXR_LIBSUFFIX}_s"
+ OUTPUT_NAME "IlmImf${OPENEXR_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
)
SET_ILMBASE_INCLUDE_DIRS(IlmImf_static)
diff --git a/OpenEXR/IlmImfUtil/CMakeLists.txt b/OpenEXR/IlmImfUtil/CMakeLists.txt
index 4cc53de..26df90e 100644
--- a/OpenEXR/IlmImfUtil/CMakeLists.txt
+++ b/OpenEXR/IlmImfUtil/CMakeLists.txt
@@ -60,7 +60,7 @@ IF ( OPENEXR_BUILD_STATIC )
PROPERTIES
VERSION ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}
SOVERSION ${OPENEXR_SOVERSION}
- OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}_s"
+ OUTPUT_NAME "IlmImfUtil${OPENEXR_LIBSUFFIX}${OPENEXR_STATIC_SUFFIX}"
)
ENDIF()

78
ports/openexr/fixup_cmake_exports_path.patch Normal file
View File

@ -0,0 +1,78 @@
diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt
index d9c5ae4..45ee6cc 100644
--- a/IlmBase/config/CMakeLists.txt
+++ b/IlmBase/config/CMakeLists.txt
@@ -105,7 +105,7 @@ endif()
include(CMakePackageConfigHelpers)
configure_package_config_file(IlmBaseConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ INSTALL_DESTINATION share/ilmbase
)
write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
VERSION ${ILMBASE_VERSION}
@@ -113,10 +113,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION share/ilmbase
)
install(EXPORT ${PROJECT_NAME}
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION share/ilmbase
FILE ${PROJECT_NAME}Targets.cmake
NAMESPACE ${PROJECT_NAME}::
EXPORT_LINK_INTERFACE_LIBRARIES
diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt
index b52ad0d..3dc6d22 100644
--- a/OpenEXR/config/CMakeLists.txt
+++ b/OpenEXR/config/CMakeLists.txt
@@ -19,7 +19,7 @@ int main()
sysconf(_SC_NPROCESSORS_ONLN);
}
" OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN
-)
+)
check_cxx_source_compiles(
"
@@ -100,7 +100,7 @@ endif()
include(CMakePackageConfigHelpers)
configure_package_config_file(OpenEXRConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ INSTALL_DESTINATION share/openexr
)
write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
VERSION ${OPENEXR_VERSION}
@@ -108,10 +108,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION share/openexr
)
install(EXPORT ${PROJECT_NAME}
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION share/openexr
FILE ${PROJECT_NAME}Targets.cmake
NAMESPACE ${PROJECT_NAME}::
EXPORT_LINK_INTERFACE_LIBRARIES
diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt
index 1872c89..bc61f43 100644
--- a/PyIlmBase/config/CMakeLists.txt
+++ b/PyIlmBase/config/CMakeLists.txt
@@ -39,10 +39,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
COMPATIBILITY SameMajorVersion
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION share/pyilmbase
)
install(EXPORT ${PROJECT_NAME}
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION share/pyilmbase
FILE ${PROJECT_NAME}Config.cmake
NAMESPACE ${PROJECT_NAME}::
EXPORT_LINK_INTERFACE_LIBRARIES

78
ports/openexr/portfile.cmake
View File

@ -1,65 +1,49 @@
include(vcpkg_common_functions)
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "UWP build not supported") message(FATAL_ERROR "UWP build not supported")
endif() endif()
set(OPENEXR_VERSION 2.3.0)
set(OPENEXR_HASH 268ae64b40d21d662f405fba97c307dad1456b7d996a447aadafd41b640ca736d4851d9544b4741a94e7b7c335fe6e9d3b16180e710671abfc0c8b2740b147b2)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO openexr/openexr REPO openexr/openexr
REF v${OPENEXR_VERSION} REF ed64d5467dee9763f28baf300f7699e6288b9f5f
SHA512 ${OPENEXR_HASH} SHA512 549d37ed1ef4d1ff7e732d583f7213ee15c7f92625aea9fd65345e4c5b854902c02e5940d0692b1af5ae0a02abf46aaefea2662db2389d1b2fb4264a373baac2
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix_clang_not_setting_modern_cplusplus.patch remove_find_package_macro.patch
fix_install_ilmimf.patch fixup_cmake_exports_path.patch
fix_linux_static_library_names.patch remove_symlinks.patch
) )
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OPENEXR_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPENEXR_BUILD_SHARED)
vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
OPTIONS OPTIONS
-DOPENEXR_BUILD_PYTHON_LIBS:BOOL=FALSE -DCMAKE_DEBUG_POSTFIX=_d
-DOPENEXR_BUILD_STATIC=${OPENEXR_BUILD_STATIC} -DPYILMBASE_ENABLE=FALSE
-DOPENEXR_BUILD_SHARED=${OPENEXR_BUILD_SHARED} )
OPTIONS_DEBUG
-DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR}/debug
OPTIONS_RELEASE
-DILMBASE_PACKAGE_PREFIX=${CURRENT_INSTALLED_DIR})
vcpkg_install_cmake() vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets(CONFIG_PATH share/ilmbase TARGET_PATH share/ilmbase)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_fixup_cmake_targets()
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX})
# NOTE: Only use ".exe" extension on Windows executables.
# Is there a cleaner way to do this?
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(EXECUTABLE_SUFFIX ".exe")
else()
set(EXECUTABLE_SUFFIX "")
endif()
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmakepreview${EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmaketiled${EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultipart${EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultiview${EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrstdattr${EXECUTABLE_SUFFIX})
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openexr/) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openexr/)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrenvmap${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrenvmap${EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrheader${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrheader${EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmakepreview${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmakepreview${EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmaketiled${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmaketiled${EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultipart${EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX})
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX})
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openexr) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openexr)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
@ -68,6 +52,8 @@ if (VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif() endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindOpenEXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

87
ports/openexr/remove_find_package_macro.patch Normal file
View File

@ -0,0 +1,87 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 111a603..109394f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,22 +25,12 @@ endif()
project(OpenEXRMetaProject)
-# An "official" way to make this a super-project
-# basically overrides the find_package to not find anything
-# for stuff we're including locally
-set(as_subproject IlmBase OpenEXR)
-macro(find_package)
- if(NOT "${ARGV0}" IN_LIST as_subproject)
- _find_package(${ARGV})
- endif()
-endmacro()
-
# If you want to use ctest to configure, build and
# upload the results, cmake has builtin support for
# submitting to CDash, or any server who speaks the
# same protocol
-#
+#
# These settings will need to be set for your environment,
# and then a script such as the example in
#
@@ -51,7 +41,7 @@ endmacro()
# cmake -S cmake/SampleCTestScript.cmake
#
# [or whatever you name the file you edit]
-#
+#
#set(CTEST_PROJECT_NAME "OpenEXR")
#set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC")
#set(CTEST_DROP_METHOD "http") # there are others...
diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt
index 390b27f..87b2d01 100644
--- a/OpenEXR/CMakeLists.txt
+++ b/OpenEXR/CMakeLists.txt
@@ -35,7 +35,6 @@ include(config/OpenEXRSetup.cmake)
# Everyone depends on IlmBase, and we currently rely on
# the version matched with our release
-find_package(IlmBase ${OPENEXR_VERSION} EXACT REQUIRED CONFIG)
# generates config headers, package config files
add_subdirectory(config)
diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake
index 5116726..34c7c87 100644
--- a/OpenEXR/config/OpenEXRSetup.cmake
+++ b/OpenEXR/config/OpenEXRSetup.cmake
@@ -33,7 +33,7 @@ endif()
# Whether to build & install the various command line utility programs
option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON)
-# This is a variable here for use in controlling where include files are
+# This is a variable here for use in controlling where include files are
# installed. Care must be taken when changing this, as many things
# probably assume this is OpenEXR
set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install")
diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt
index 5efa353..5246fa7 100644
--- a/OpenEXR_Viewers/CMakeLists.txt
+++ b/OpenEXR_Viewers/CMakeLists.txt
@@ -24,8 +24,6 @@ project(OpenEXR_Viewers VERSION ${OPENEXR_VIEWERS_VERSION})
#######################################
include(config/OpenEXRViewersSetup.cmake)
-find_package(IlmBase ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG)
-find_package(OpenEXR ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG)
# This is for newer cmake versions who know about vendor versions
set(OpenGL_GL_PREFERENCE GLVND)
diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt
index 291b96e..7d5074f 100644
--- a/PyIlmBase/CMakeLists.txt
+++ b/PyIlmBase/CMakeLists.txt
@@ -27,7 +27,6 @@ project(PyIlmBase VERSION ${PYILMBASE_VERSION} LANGUAGES C CXX)
include(config/PyIlmBaseSetup.cmake)
# we have a strong dependence on IlmBase being an exact match
-find_package(IlmBase ${PYILMBASE_VERSION} EXACT REQUIRED CONFIG)
# we are building a python extension, so of course we depend on
# python as well. Except we don't know which version...

40
ports/openexr/remove_symlinks.patch Normal file
View File

@ -0,0 +1,40 @@
diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake
index 44254a7..1f5d2a6 100644
--- a/IlmBase/config/LibraryDefine.cmake
+++ b/IlmBase/config/LibraryDefine.cmake
@@ -101,15 +101,6 @@ function(ILMBASE_DEFINE_LIBRARY libname)
if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL ""))
set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX})
- if(WIN32)
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
- else()
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
- endif()
- set(verlibname)
- set(baselibname)
endif()
if(ILMBASE_BUILD_BOTH_STATIC_SHARED)
diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake
index a9561dc..42853af 100644
--- a/OpenEXR/config/LibraryDefine.cmake
+++ b/OpenEXR/config/LibraryDefine.cmake
@@ -95,15 +95,6 @@ function(OPENEXR_DEFINE_LIBRARY libname)
if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL ""))
set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX})
- if(WIN32)
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
- else()
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")")
- endif()
- set(verlibname)
- set(baselibname)
endif()
if(OPENEXR_BUILD_BOTH_STATIC_SHARED)

40
ports/openexr/vcpkg-cmake-wrapper.cmake
View File

@ -1,8 +1,38 @@
set(OPENEXR_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) _find_package(${ARGS})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
if(NOT OpenEXR_LIBRARIES OR OPENEXR_LIBRARIES) if(TARGET OpenEXR::IlmImf AND NOT OPENEXR_LIBRARIES AND NOT OPENEXR_FOUND)
_find_package(${ARGS}) set(OPENEXR_FOUND TRUE CACHE BOOL "")
set(OpenEXR_FOUND TRUE CACHE BOOL "")
set(OPENEXR_VERSION "2.5.0" CACHE STRING "")
set(OpenEXR_VERSION "2.5.0" CACHE STRING "")
get_target_property(OpenEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(OPENEXR_INCLUDE_PATHS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(OPENEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES)
set(OpenEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIRS} CACHE STRING "")
set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATHS} CACHE STRING "")
set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIRS} CACHE STRING "")
set(OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_DIR} CACHE STRING "")
set(OPENEXR_ILMIMF_LIBRARY "OpenEXR::IlmImf" CACHE STRING "")
set(OPENEXR_ILMIMFUTIL_LIBRARY "OpenEXR::IlmImfUtil" CACHE STRING "")
set(OPENEXR_LIBRARIES ${OPENEXR_ILMIMFUTIL_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} CACHE STRING "")
endif() endif()
set(CMAKE_MODULE_PATH ${OPENEXR_PREV_MODULE_PATH}) if(TARGET IlmBase::Half AND NOT ILMBASE_LIBRARIES AND NOT ILMBASE_FOUND)
set(ILMBASE_FOUND TRUE CACHE BOOL "")
set(IlmBASE_FOUND TRUE CACHE BOOL "")
set(ILMBASE_VERSION "2.5.0" CACHE STRING "")
set(IlmBASE_VERSION "2.5.0" CACHE STRING "")
get_target_property(ILMBASE_INCLUDE_DIR IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(ILMBASE_INCLUDE_DIRS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(ILMBASE_INCLUDE_PATHS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES)
set(ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_DIR} CACHE STRING "")
set(ILMBASE_INCLUDE_DIRS ${ILMBASE_INCLUDE_DIRS} CACHE STRING "")
set(ILMBASE_INCLUDE_PATHS ${ILMBASE_INCLUDE_PATHS} CACHE STRING "")
set(OPENEXR_HALF_LIBRARY "IlmBase::Half" CACHE STRING "")
set(OPENEXR_IEX_LIBRARY "IlmBase::Iex" CACHE STRING "")
set(OPENEXR_IEXMATH_LIBRARY "IlmBase::IexMath" CACHE STRING "")
set(OPENEXR_ILMTHREAD_LIBRARY "IlmBase::IlmThread" CACHE STRING "")
set(OPENEXR_IMATH_LIBRARY "IlmBase::Imath" CACHE STRING "")
set(ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IEXMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "")
endif()

36
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -101,7 +101,7 @@ function(vcpkg_find_acquire_program VAR)
set(URL "https://github.com/git-for-windows/git/releases/download/v2.26.2.windows.1/PortableGit-2.26.2-32-bit.7z.exe") set(URL "https://github.com/git-for-windows/git/releases/download/v2.26.2.windows.1/PortableGit-2.26.2-32-bit.7z.exe")
set(ARCHIVE "PortableGit-2.26.2-32-bit.7z.exe") set(ARCHIVE "PortableGit-2.26.2-32-bit.7z.exe")
set(HASH d3cb60d62ca7b5d05ab7fbed0fa7567bec951984568a6c1646842a798c4aaff74bf534cf79414a6275c1927081a11b541d09931c017bf304579746e24fe57b36) set(HASH d3cb60d62ca7b5d05ab7fbed0fa7567bec951984568a6c1646842a798c4aaff74bf534cf79414a6275c1927081a11b541d09931c017bf304579746e24fe57b36)
set(PATHS set(PATHS
"${DOWNLOADS}/tools/${SUBDIR}/mingw32/bin" "${DOWNLOADS}/tools/${SUBDIR}/mingw32/bin"
"${DOWNLOADS}/tools/git/${SUBDIR}/mingw32/bin") "${DOWNLOADS}/tools/git/${SUBDIR}/mingw32/bin")
else() else()
@ -190,8 +190,8 @@ function(vcpkg_find_acquire_program VAR)
set(PROGNAME jom) set(PROGNAME jom)
set(SUBDIR "jom-1.1.3") set(SUBDIR "jom-1.1.3")
set(PATHS ${DOWNLOADS}/tools/jom/${SUBDIR}) set(PATHS ${DOWNLOADS}/tools/jom/${SUBDIR})
set(URL set(URL
"http://download.qt.io/official_releases/jom/jom_1_1_3.zip" "http://download.qt.io/official_releases/jom/jom_1_1_3.zip"
"http://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip" "http://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip"
) )
set(ARCHIVE "jom_1_1_3.zip") set(ARCHIVE "jom_1_1_3.zip")
@ -231,19 +231,23 @@ function(vcpkg_find_acquire_program VAR)
set(NOEXTRACT ON) set(NOEXTRACT ON)
set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619) set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619)
elseif(VAR MATCHES "MESON") elseif(VAR MATCHES "MESON")
set(PROGNAME meson) if(NOT CMAKE_HOST_APPLE)
set(REQUIRED_INTERPRETER PYTHON3) set(PROGNAME meson)
set(BREW_PACKAGE_NAME "meson") set(REQUIRED_INTERPRETER PYTHON3)
set(APT_PACKAGE_NAME "meson") set(APT_PACKAGE_NAME "meson")
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(SCRIPTNAME meson.py) set(SCRIPTNAME meson.py)
else()
set(SCRIPTNAME meson)
endif()
set(PATHS ${DOWNLOADS}/tools/meson/meson-0.54.2)
set(URL "https://github.com/mesonbuild/meson/archive/0.54.2.zip")
set(ARCHIVE "meson-0.54.2.zip")
set(HASH 8d19110bad3e6a223d1d169e833b746b884ece9cd23d2539ec02dccb5cd0c56542414b7afc0f7f2adcec9d957e4120d31f41734397aa0a7ee7f9c29ebdc9eb4c)
else() else()
set(SCRIPTNAME meson) set(PROGNAME meson)
set(BREW_PACKAGE_NAME "meson")
endif() endif()
set(PATHS ${DOWNLOADS}/tools/meson/meson-0.54.2)
set(URL "https://github.com/mesonbuild/meson/archive/0.54.2.zip")
set(ARCHIVE "meson-0.54.2.zip")
set(HASH 8d19110bad3e6a223d1d169e833b746b884ece9cd23d2539ec02dccb5cd0c56542414b7afc0f7f2adcec9d957e4120d31f41734397aa0a7ee7f9c29ebdc9eb4c)
elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON") elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON")
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(SOURCEFORGE_ARGS set(SOURCEFORGE_ARGS
@ -329,12 +333,12 @@ function(vcpkg_find_acquire_program VAR)
set(HASH db4a583cf2996aeb29fd008261b12fe39a4a5faf0fbf96f7124e6d3ffeccf6d9655d391378e68dd0915bc91c9e146a51fd9661963743857ca25179547feceab1) set(HASH db4a583cf2996aeb29fd008261b12fe39a4a5faf0fbf96f7124e6d3ffeccf6d9655d391378e68dd0915bc91c9e146a51fd9661963743857ca25179547feceab1)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
set(_vfa_SUPPORTED ON) set(_vfa_SUPPORTED ON)
set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-darwin-x86_64") set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-darwin-x86_64")
set(ARCHIVE "bazel-${BAZEL_VERSION}-darwin-x86_64") set(ARCHIVE "bazel-${BAZEL_VERSION}-darwin-x86_64")
set(NOEXTRACT ON) set(NOEXTRACT ON)
set(HASH 420a37081e6ee76441b0d92ff26d1715ce647737ce888877980d0665197b5a619d6afe6102f2e7edfb5062c9b40630a10b2539585e35479b780074ada978d23c) set(HASH 420a37081e6ee76441b0d92ff26d1715ce647737ce888877980d0665197b5a619d6afe6102f2e7edfb5062c9b40630a10b2539585e35479b780074ada978d23c)
else() else()
set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.zip") set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.zip")
set(ARCHIVE "bazel-${BAZEL_VERSION}-windows-x86_64.zip") set(ARCHIVE "bazel-${BAZEL_VERSION}-windows-x86_64.zip")
set(HASH 6482f99a0896f55ef65739e7b53452fd9c0adf597b599d0022a5e0c5fa4374f4a958d46f98e8ba25af4b065adacc578bfedced483d8c169ea5cb1777a99eea53) set(HASH 6482f99a0896f55ef65739e7b53452fd9c0adf597b599d0022a5e0c5fa4374f4a958d46f98e8ba25af4b065adacc578bfedced483d8c169ea5cb1777a99eea53)
endif() endif()