diff --git a/libs/_autotools/mlt/mlt.py b/libs/_autotools/mlt/mlt.py index cc65e754..35bafad4 100644 --- a/libs/_autotools/mlt/mlt.py +++ b/libs/_autotools/mlt/mlt.py @@ -1,51 +1,52 @@ import info class subinfo(info.infoclass): def setTargets( self ): self.description = "Open source multimedia framework" self.webpage = "https://www.mltframework.org" for ver in ['6.16.0', '6.18.0', '6.20.0']: self.targets[ ver ] = f"https://github.com/mltframework/mlt/archive/v{ver}.tar.gz" self.targetInstSrc[ ver ] = "mlt-" + ver self.targetDigests['6.16.0'] = (['9c28e54cd3ae1d43f8d0d4a24f9cee4f4b161255a3cd2aa29061fce5d46158e6'], CraftHash.HashAlgorithm.SHA256) self.targetDigests['6.18.0'] = (['9ea6775300b9f997460f5d6adde1ea41e525ecfd30a70b987e13800e4c387ddb'], CraftHash.HashAlgorithm.SHA256) self.targetDigests['6.20.0'] = (['ab211e27c06c0688f9cbe2d74dc0623624ef75ea4f94eea915cdc313196be2dd'], CraftHash.HashAlgorithm.SHA256) self.svnTargets["master"] = "https://github.com/mltframework/mlt.git" - self.patchLevel['master'] = 20200410 + self.patchLevel['master'] = 20200430 self.defaultTarget = "master" def setDependencies( self ): self.buildDependencies["dev-utils/pkg-config"] = None self.runtimeDependencies["libs/libxml2"] = None self.runtimeDependencies["libs/ffmpeg"] = None self.runtimeDependencies["libs/qt5/qtsvg"] = None self.runtimeDependencies["libs/libfftw"] = None self.runtimeDependencies["libs/libsamplerate"] = None # self.runtimeDependencies["libs/exiv2"] = None if OsUtils.isWin(): self.runtimeDependencies["libs/dlfcn-win32"] = None self.runtimeDependencies["libs/frei0r-plugins"] = None self.runtimeDependencies["libs/libsdl2"] = None self.runtimeDependencies["libs/vidstab"] = None self.runtimeDependencies["libs/rubberband"] = None + self.runtimeDependencies["libs/opencv"] = None # self.runtimeDependencies["libs/jack"] = None # self.runtimeDependencies["libs/ladspa-sdk"] = None # self.runtimeDependencies["libs/ladspa-cmt"] = None from Package.AutoToolsPackageBase import * class Package(AutoToolsPackageBase): def __init__( self, **args ): AutoToolsPackageBase.__init__( self ) self.platform = "" self.subinfo.options.configure.noDataRootDir = True self.subinfo.options.useShadowBuild = False - self.subinfo.options.configure.args = " --enable-gpl --enable-gpl3 --enable-sdl2 --disable-sdl --disable-rtaudio --disable-decklink --disable-gtk2" + self.subinfo.options.configure.args = " --enable-gpl --enable-gpl3 --enable-opencv --enable-sdl2 --disable-sdl --disable-rtaudio --disable-decklink --disable-gtk2" if CraftCore.compiler.isWindows: prefix = OsUtils.toUnixPath(CraftCore.standardDirs.craftRoot()) includedir = prefix+'/include/qt5' libdir = prefix+'/lib' self.subinfo.options.configure.args += \ f" --target-os=MinGW --qt-libdir='{libdir}' --qt-includedir='{includedir}' --disable-windeploy " diff --git a/libs/opencv/OpenCV-2.3.0-20110817.diff b/libs/opencv/OpenCV-2.3.0-20110817.diff deleted file mode 100644 index 5ad53155..00000000 --- a/libs/opencv/OpenCV-2.3.0-20110817.diff +++ /dev/null @@ -1,182 +0,0 @@ -diff -Nru OpenCV-2.3.0.orig/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt ---- OpenCV-2.3.0.orig/CMakeLists.txt 2012-08-19 06:32:50.560461300 +0100 -+++ OpenCV-2.3.0/CMakeLists.txt 2012-08-19 06:30:52.873854500 +0100 -@@ -246,7 +246,7 @@ - execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine - OUTPUT_VARIABLE CMAKE_OPENCV_GCC_TARGET_MACHINE - OUTPUT_STRIP_TRAILING_WHITESPACE) -- if(CMAKE_OPENCV_GCC_TARGET_MACHINE MATCHES "64") -+ if(CMAKE_OPENCV_GCC_TARGET_MACHINE MATCHES "x86_64") - set(MINGW64 1) - endif() - endif() -@@ -633,7 +633,7 @@ - endif() - - # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy --execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]" -+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(numpy.distutils.misc_util.get_numpy_include_dirs()[0])" - RESULT_VARIABLE PYTHON_NUMPY_PROCESS - OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIRS - OUTPUT_STRIP_TRAILING_WHITESPACE) -@@ -647,7 +647,7 @@ - set(PYTHON_USE_NUMPY 0) - endif() - --execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sphinx; print sphinx.__version__" -+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sphinx; print(sphinx.__version__)" - RESULT_VARIABLE SPHINX_PROCESS - OUTPUT_VARIABLE SPHINX_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) -@@ -892,7 +892,7 @@ - if(MINGW64) - set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} msvfw32 avifil32 avicap32 winmm) - else() -- set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} vfw32 winmm) -+ set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} msvfw32 avifil32 avicap32 winmm) - endif() - endif() - endif() -@@ -1265,7 +1265,7 @@ - exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY) - # Install the OpenCVConfig.cmake file which has the right paths pointing to the install directory -- install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/") -+ install(FILES "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/OpenCV") - - # Add the OpenCV configuration header to the install path - # Useful for instance if a client application checks against the features OpenCV has been compiled with -@@ -1357,7 +1357,14 @@ - set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command") - - if(BUILD_PACKAGE) -- -+ if(MSVC) -+ string(TOLOWER ${CMAKE_BUILD_TYPE} bt) -+ if("${bt}" STREQUAL "debug") -+ set(CMAKE_INSTALL_DEBUG_LIBRARIES 1) -+ else("${bt}" STREQUAL "debug") -+ set(CMAKE_INSTALL_DEBUG_LIBRARIES 0) -+ endif("${bt}" STREQUAL "debug") -+ endif(MSVC) - configure_file( - Package.cmake.in - ${CMAKE_BINARY_DIR}/.cpack/Package.cmake -@@ -1378,32 +1385,33 @@ - install(FILES ${root_files} - DESTINATION "." - COMPONENT main) -- install(FILES ${root_src_files} -- DESTINATION "." -- COMPONENT src) -+# install(FILES ${root_src_files} -+# DESTINATION "." -+# COMPONENT src) - # Add the "win-install/OpenCVConfig.cmake" file to the "main" install component - install(FILES - "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" -- DESTINATION "." -+ DESTINATION "share/apps/cmake/modules" - COMPONENT main - ) -- install(FILES -- "include/CMakeLists.txt" -- DESTINATION "include/" -- COMPONENT src -- ) -+# install(FILES -+# "include/CMakeLists.txt" -+# DESTINATION "include/" -+# COMPONENT src -+# ) - - if(CMAKE_INSTALL_DEBUG_LIBRARIES) -- foreach(m calib3d core contrib features2d ffmpeg flann gpu highgui imgproc legacy ml objdetect video) -- install(FILES ${EXECUTABLE_OUTPUT_PATH}/Debug/opencv_${m}${OPENCV_DLLVERSION}d.dll -+ # ffmpeg -+ foreach(m calib3d core contrib features2d flann gpu highgui imgproc legacy ml objdetect video) -+ install(FILES ${EXECUTABLE_OUTPUT_PATH}/opencv_${m}${OPENCV_DLLVERSION}d.dll - DESTINATION bin COMPONENT main) -- install(FILES ${LIBRARY_OUTPUT_PATH}/Debug/opencv_${m}${OPENCV_DLLVERSION}d.lib -+ install(FILES ${LIBRARY_OUTPUT_PATH}/opencv_${m}${OPENCV_DLLVERSION}d.lib - DESTINATION lib COMPONENT main) - endforeach() - endif() - - install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE) -- install(DIRECTORY 3rdparty android modules doc DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE) -+# install(DIRECTORY 3rdparty android modules doc DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE) - #install(DIRECTORY doc DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.rst" "*.tex") - #install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE) - #install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE) -diff -Nru OpenCV-2.3.0.orig/modules/core/include/opencv2/core/core.hpp OpenCV-2.3.0/modules/core/include/opencv2/core/core.hpp ---- OpenCV-2.3.0.orig/modules/core/include/opencv2/core/core.hpp 2012-08-19 06:32:51.434062800 +0100 -+++ OpenCV-2.3.0/modules/core/include/opencv2/core/core.hpp 2012-08-19 06:00:53.082093300 +0100 -@@ -2904,7 +2904,8 @@ - { - public: - typedef _Tp value_type; -- enum { buffer_padding = (int)((16 + sizeof(_Tp) - 1)/sizeof(_Tp)) }; -+ enum { buffer_padding = (int)((16 + sizeof(_Tp) - 1)/sizeof(_Tp)), -+ buffer_size = buffer_padding + fixed_size }; - - //! the default contructor - AutoBuffer(); -@@ -2928,7 +2929,7 @@ - //! size of the real buffer - size_t size; - //! pre-allocated buffer -- _Tp buf[fixed_size+buffer_padding]; -+ _Tp buf[buffer_size]; - }; - - /////////////////////////// multi-dimensional dense matrix ////////////////////////// -diff -Nru OpenCV-2.3.0.orig/modules/highgui/CMakeLists.txt OpenCV-2.3.0/modules/highgui/CMakeLists.txt ---- OpenCV-2.3.0.orig/modules/highgui/CMakeLists.txt 2012-08-19 06:32:51.746063300 +0100 -+++ OpenCV-2.3.0/modules/highgui/CMakeLists.txt 2012-08-19 06:00:53.097693400 +0100 -@@ -69,7 +69,7 @@ - endif() - - if(MSVC) -- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libcmt.lib") -+# set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libcmt.lib") - endif() - - file(GLOB grfmt_hdrs src/grfmt*.hpp) -diff -Nru OpenCV-2.3.0.orig/modules/python/CMakeLists.txt OpenCV-2.3.0/modules/python/CMakeLists.txt ---- OpenCV-2.3.0.orig/modules/python/CMakeLists.txt 2012-08-19 06:32:52.323264400 +0100 -+++ OpenCV-2.3.0/modules/python/CMakeLists.txt 2012-08-19 06:31:51.529957600 +0100 -@@ -53,7 +53,7 @@ - set_target_properties(${cv_target} PROPERTIES PREFIX "") - set_target_properties(${cv_target} PROPERTIES OUTPUT_NAME "cv") - --execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('SO')" -+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('SO'))" - RESULT_VARIABLE PYTHON_CVPY_PROCESS - OUTPUT_VARIABLE CVPY_SUFFIX - OUTPUT_STRIP_TRAILING_WHITESPACE) -diff -Nru OpenCV-2.3.0.orig/OpenCVConfig.cmake.in OpenCV-2.3.0/OpenCVConfig.cmake.in ---- OpenCV-2.3.0.orig/OpenCVConfig.cmake.in 2012-08-19 06:32:52.463664600 +0100 -+++ OpenCV-2.3.0/OpenCVConfig.cmake.in 2012-08-19 06:00:53.097693400 +0100 -@@ -31,6 +31,8 @@ - # Extract the directory where *this* file has been installed (determined at cmake run-time) - # This variable may or may not be used below, depending on the parsing of OpenCVConfig.cmake - get_filename_component(THIS_OPENCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH) -+get_filename_component(THIS_OPENCV_CONFIG_PATH "${THIS_OPENCV_CONFIG_PATH}/../../.." REALPATH) -+get_filename_component(THIS_OPENCV_CONFIG_PATH "${THIS_OPENCV_CONFIG_PATH}/.." PATH) - - # ====================================================== - # Include directories to add to the user project: -diff -Nru OpenCV-2.3.0.orig/Package.cmake.in OpenCV-2.3.0/Package.cmake.in ---- OpenCV-2.3.0.orig/Package.cmake.in 2012-08-19 06:32:52.463664600 +0100 -+++ OpenCV-2.3.0/Package.cmake.in 2012-08-19 06:00:53.097693400 +0100 -@@ -4,9 +4,6 @@ - # (c) Copyrights 2008 Hartmut Seichter, HIT Lab NZ - # - --if(MSVC) -- set(CMAKE_INSTALL_DEBUG_LIBRARIES 1) --endif() - #if(ENABLE_OPENMP) - # set(CMAKE_INSTALL_OPENMP_LIBRARIES 1) - #endif() diff --git a/libs/opencv/opencv.py b/libs/opencv/opencv.py deleted file mode 100644 index 6ee5c1dc..00000000 --- a/libs/opencv/opencv.py +++ /dev/null @@ -1,33 +0,0 @@ -import info -from Package.CMakePackageBase import * - - -class subinfo(info.infoclass): - def setTargets(self): - self.description = 'a library for real time computer vision' - - # 4.1.2 and later are all on Github - for ver in ['4.1.2', "4.2.0"]: - self.targets[ver] = 'https://github.com/opencv/opencv/archive/' + ver + '.tar.gz' - self.targetInstSrc[ver] = 'opencv-' + ver - - self.targetDigests['4.1.2'] = (['385dd0a9c25e67ef0dd60e022d2a2d7b17e2f36819cf3cb46aa8cdff5c5282c9'], CraftHash.HashAlgorithm.SHA256) - self.targetDigests['4.2.0'] = (['9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec'], CraftHash.HashAlgorithm.SHA256) - self.defaultTarget = '4.2.0' - - self.options.configure.args = "-DBUILD_NEW_PYTHON_SUPPORT=OFF -DBUILD_ZLIB=OFF -DBUILD_TIFF=OFF -DBUILD_JPEG=OFF -DBUILD_PNG=OFF -DBUILD_WEBP=OFF -DBUILD_JASPER=OFF -DWITH_JASPER=OFF -DBUILD_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=ON -DWITH_QT=5" - - def setDependencies(self): - self.runtimeDependencies["virtual/base"] = None - self.runtimeDependencies["libs/zlib"] = None - self.runtimeDependencies["libs/tiff"] = None - self.runtimeDependencies["libs/libjpeg-turbo"] = None - self.runtimeDependencies["libs/libpng"] = None - self.runtimeDependencies["libs/webp"] = None - self.runtimeDependencies["libs/protobuf"] = None - self.runtimeDependencies["libs/ffmpeg"] = None - self.runtimeDependencies["libs/qt5/qtbase"] = None - -class Package(CMakePackageBase): - def __init__(self, **args): - CMakePackageBase.__init__(self) diff --git a/libs/opencv/opencv/OpenCVInstallLayout.cmake.patch b/libs/opencv/opencv/OpenCVInstallLayout.cmake.patch new file mode 100644 index 00000000..109faaaf --- /dev/null +++ b/libs/opencv/opencv/OpenCVInstallLayout.cmake.patch @@ -0,0 +1,11 @@ +--- cmake/OpenCVInstallLayout.cmake.orig 2020-05-10 15:47:49.719729300 -0700 ++++ cmake/OpenCVInstallLayout.cmake 2020-05-10 15:48:31.079254100 -0700 +@@ -20,7 +20,7 @@ + ocv_update(OPENCV_JNI_INSTALL_PATH "${OPENCV_LIB_INSTALL_PATH}") + ocv_update(OPENCV_JNI_BIN_INSTALL_PATH "${OPENCV_JNI_INSTALL_PATH}") + +-elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) ++elseif(FALSE) + + if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH) + ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") diff --git a/libs/opencv/opencv/opencv-pkgconfig-win-install.patch b/libs/opencv/opencv/opencv-pkgconfig-win-install.patch new file mode 100644 index 00000000..ca255db3 --- /dev/null +++ b/libs/opencv/opencv/opencv-pkgconfig-win-install.patch @@ -0,0 +1,11 @@ +--- a/cmake/OpenCVGenPkgconfig.cmake 2020-05-01 12:35:26.761330100 -0700 ++++ b/cmake/OpenCVGenPkgconfig.cmake 2020-05-01 12:36:24.592119400 -0700 +@@ -103,7 +103,7 @@ + add_dependencies(developer_scripts gen-pkgconfig) + + +-if(UNIX AND NOT ANDROID) ++if(NOT ANDROID) + install(FILES ${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME} DESTINATION ${OPENCV_LIB_INSTALL_PATH}/pkgconfig COMPONENT dev) + endif() + diff --git a/libs/opencv/opencv/opencv.py b/libs/opencv/opencv/opencv.py new file mode 100644 index 00000000..1dcaa349 --- /dev/null +++ b/libs/opencv/opencv/opencv.py @@ -0,0 +1,78 @@ +import info +from Package.CMakePackageBase import * + + +class subinfo(info.infoclass): + def setTargets(self): + self.versionInfo.setDefaultValues() + self.description = 'a library for real time computer vision' + + self.patchToApply['4.3.0'] = [ + ('opencv-pkgconfig-win-install.patch', 1), + ('OpenCVInstallLayout.cmake.patch', 0)] + + self.targetDigests['4.1.2'] = (['385dd0a9c25e67ef0dd60e022d2a2d7b17e2f36819cf3cb46aa8cdff5c5282c9'], CraftHash.HashAlgorithm.SHA256) + self.targetDigests['4.2.0'] = (['9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec'], CraftHash.HashAlgorithm.SHA256) + self.targetDigests['4.3.0'] = (['68bc40cbf47fdb8ee73dfaf0d9c6494cd095cf6294d99de445ab64cf853d278a'], CraftHash.HashAlgorithm.SHA256) + + self.options.configure.args = ( + # build only modules needed by digikam & kdenlive + ' -DBUILD_LIST=core,objdetect,imgproc,imgcodecs,dnn,flann,tracking' + ' -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_DOCS=OFF -DBUILD_PERF_TESTS=OFF' + ' -DINSTALL_C_EXAMPLES=OFF -DINSTALL_PYTHON_EXAMPLES=OFF' + # fix build failures (cmake failing tests in craft - linux or mingw) + ' -DWITH_LAPACK=OFF -DWITH_V4L=OFF -DOPENCV_ENABLE_ALLOCATOR_STATS=OFF' + # don't rebuild dependencies, use the ones we distribute + ' -DOPENCV_BUILD_3RDPARTY_LIBS=OFF' + ' -DBUILD_NEW_PYTHON_SUPPORT=OFF' + ' -DBUILD_ZLIB=OFF -DBUILD_PROTOBUF=OFF' + # disabled below ' -DBUILD_TIFF=OFF -DBUILD_JPEG=OFF -DBUILD_WEBP=OFF' + # minimal dependencies (kdenlive) + ' -DWITH_JASPER=OFF -DWITH_PNG=OFF -DWITH_OPENEXR=OFF' + ' -DPROTOBUF_UPDATE_FILES=ON' + # minimal dependencies (digikam) + ' -DWITH_1394=OFF' + ' -DWITH_CUBLAS=OFF -DWITH_CUDA=OFF -DWITH_CUFFT=OFF' + ' -DWITH_DIRECTX=OFF -DWITH_DSHOW=OFF' + ' -DWITH_EIGEN=OFF' + ' -DWITH_FFMPEG=OFF -DWITH_GPHOTO2=OFF -DWITH_GSTREAMER=OFF -DWITH_GTK=OFF' + ' -DWITH_IMGCODEC_HDR=OFF -DWITH_IMGCODEC_PXM=OFF -DWITH_IMGCODEC_SUNRASTER=OFF' + ' -DWITH_IPP=OFF -DWITH_JPEG=OFF' + ' -DWITH_MATLAB=OFF -DWITH_NVCUVID=OFF' + ' -DWITH_OPENCL_SVM=OFF -DWITH_OPENCL=OFF -DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENCLAMDFFT=OFF' + ' -DWITH_OPENMP=OFF -DWITH_OPENNI=OFF' + ' -DWITH_PVAPI=OFF' + ' -DWITH_QT_OPENGL=OFF -DWITH_QT=OFF' + ' -DWITH_QUICKTIME=OFF -DWITH_TBB=OFF -DWITH_TIFF=OFF -DWITH_UNICAP=OFF' + ' -DWITH_VA_INTEL=OFF -DWITH_VFW=OFF -DWITH_VIDEOINPUT=OFF' + ' -DWITH_VTK=OFF -DWITH_WEBP=OFF -DWITH_WIN32UI=OFF -DWITH_XINE=OFF' + # find OpenCV through cmake or pkg-config + ' -DOPENCV_GENERATE_PKGCONFIG=ON' + ' -DOPENCV_SKIP_CMAKE_ROOT_CONFIG=ON' + # Work on old machines + ' -DCPU_BASELINE=SSE2 -DCPU_DISPATCH=SSE2' + ) + + def setDependencies(self): + self.runtimeDependencies["virtual/base"] = None + self.runtimeDependencies["libs/protobuf"] = None + self.runtimeDependencies["libs/zlib"] = None + # self.runtimeDependencies["libs/tiff"] = None + # self.runtimeDependencies["libs/libjpeg-turbo"] = None + # self.runtimeDependencies["libs/webp"] = None + # self.runtimeDependencies["libs/ffmpeg"] = None + # self.runtimeDependencies["libs/qt5/qtbase"] = None + # self.runtimeDependencies["libs/lapack"] = None + +class Package(CMakePackageBase): + def __init__(self, **args): + CMakePackageBase.__init__(self) + self.contrib = CraftPackageObject.get('libs/opencv/opencv_contrib').instance + self.subinfo.options.configure.args += ' -DOPENCV_EXTRA_MODULES_PATH="' \ + + OsUtils.toUnixPath(self.contrib.sourceDir()) + '/modules"' + + def fetch(self): + return CMakePackageBase.fetch(self) and self.contrib.fetch(noop=False) + + def unpack(self): + return CMakePackageBase.unpack(self) and self.contrib.unpack(noop=False) diff --git a/libs/opencv/opencv_contrib/opencv_contrib.py b/libs/opencv/opencv_contrib/opencv_contrib.py new file mode 100644 index 00000000..731d0eeb --- /dev/null +++ b/libs/opencv/opencv_contrib/opencv_contrib.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +import info + + +class subinfo(info.infoclass): + def setTargets(self): + self.versionInfo.setDefaultValues() + self.description = 'OpenCV extra modules' + + self.targetDigests['4.2.0'] = (['8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020'], CraftHash.HashAlgorithm.SHA256) + self.targetDigests['4.3.0'] = (['acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55'], CraftHash.HashAlgorithm.SHA256) + + def setDependencies(self): + self.runtimeDependencies["virtual/base"] = None + self.runtimeDependencies["libs/opencv"] = None + + +from Package.VirtualPackageBase import * + + +class Package(SourceComponentPackageBase): + def __init__(self, **args): + SourceComponentPackageBase.__init__(self) diff --git a/libs/opencv/version.ini b/libs/opencv/version.ini new file mode 100644 index 00000000..80932398 --- /dev/null +++ b/libs/opencv/version.ini @@ -0,0 +1,7 @@ +[General] +name = OpenCV +tarballs = 4.1.2;4.2.0;4.3.0 +defaulttarget = 4.3.0 +tarballUrl = https://github.com/opencv/${PACKAGE_NAME}/archive/${VERSION}.tar.gz +tarballInstallSrc=${PACKAGE_NAME}-${VERSION} +gitUrl = https://github.com/opencv/${PACKAGE_NAME}