Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

opencv: Fix generating cmake files, fix samples location. Move makedependencies to dependencies to be able use python module

Browse Source
This commit is contained in:
Alexey Pavlov
2019-11-02 18:15:02 +03:00
parent ead1773078
commit c68bb2dab1
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mingw-w64-opencv/0001-mingw-w64-cmake.patch
View File

@@ -125,3 +125,16 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
--- opencv-4.1.2/samples/samples_utils.cmake.orig 2019-11-02 13:09:03.731067500 +0300
+++ opencv-4.1.2/samples/samples_utils.cmake 2019-11-02 13:09:50.784758800 +0300
@@ -15,7 +15,9 @@
if(WIN32 AND MSVC AND NOT BUILD_SHARED_LIBS)
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
endif()
- if(WIN32)
+ if(MINGW)
+ install(TARGETS ${the_target} RUNTIME DESTINATION "share/OpenCV/samples/${sub}" COMPONENT samples)
+ else()
install(TARGETS ${the_target} RUNTIME DESTINATION "samples/${sub}" COMPONENT samples)
endif()
# Add single target to build all samples in the group: 'make opencv_samples_cpp'

29
mingw-w64-opencv/PKGBUILD
View File

@@ -4,23 +4,29 @@ _realname=opencv
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=4.1.2
pkgrel=1
pkgrel=2
pkgdesc="Open Source Computer Vision Library (mingw-w64)"
arch=('any')
url="https://opencv.org/"
license=("BSD")
depends=(#"${MINGW_PACKAGE_PREFIX}-gst-plugins-base
"${MINGW_PACKAGE_PREFIX}-ceres-solver"
"${MINGW_PACKAGE_PREFIX}-intel-tbb"
"${MINGW_PACKAGE_PREFIX}-jasper"
"${MINGW_PACKAGE_PREFIX}-freetype"
"${MINGW_PACKAGE_PREFIX}-gflags"
"${MINGW_PACKAGE_PREFIX}-glog"
"${MINGW_PACKAGE_PREFIX}-harfbuzz"
"${MINGW_PACKAGE_PREFIX}-hdf5"
"${MINGW_PACKAGE_PREFIX}-libjpeg"
"${MINGW_PACKAGE_PREFIX}-libpng"
"${MINGW_PACKAGE_PREFIX}-libtiff"
"${MINGW_PACKAGE_PREFIX}-libwebp"
"${MINGW_PACKAGE_PREFIX}-ogre3d"
"${MINGW_PACKAGE_PREFIX}-openblas"
"${MINGW_PACKAGE_PREFIX}-openexr"
"${MINGW_PACKAGE_PREFIX}-protobuf"
"${MINGW_PACKAGE_PREFIX}-tesseract-ocr"
"${MINGW_PACKAGE_PREFIX}-zlib"
#"${MINGW_PACKAGE_PREFIX}-qt5"
#"${MINGW_PACKAGE_PREFIX}-gtkglext"
@@ -28,32 +34,26 @@ depends=(#"${MINGW_PACKAGE_PREFIX}-gst-plugins-base
)
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
#"${MINGW_PACKAGE_PREFIX}-qt5"
"${MINGW_PACKAGE_PREFIX}-ceres-solver"
"${MINGW_PACKAGE_PREFIX}-ffmpeg"
"${MINGW_PACKAGE_PREFIX}-gflags"
"${MINGW_PACKAGE_PREFIX}-glog"
"${MINGW_PACKAGE_PREFIX}-ogre3d"
"${MINGW_PACKAGE_PREFIX}-python2-numpy"
"${MINGW_PACKAGE_PREFIX}-python3-numpy"
"${MINGW_PACKAGE_PREFIX}-python2-flake8"
"${MINGW_PACKAGE_PREFIX}-python3-flake8"
"${MINGW_PACKAGE_PREFIX}-python2-pylint"
"${MINGW_PACKAGE_PREFIX}-python3-pylint"
"${MINGW_PACKAGE_PREFIX}-tesseract-ocr"
"${MINGW_PACKAGE_PREFIX}-tiny-dnn"
"${MINGW_PACKAGE_PREFIX}-hdf5"
#"${MINGW_PACKAGE_PREFIX}-vtk"
"${MINGW_PACKAGE_PREFIX}-cereal"
)
optdepends=("${MINGW_PACKAGE_PREFIX}-ceres-solver: SFM module"
"${MINGW_PACKAGE_PREFIX}-gflags: SFM module"
"${MINGW_PACKAGE_PREFIX}-glog: SFM module"
optdepends=(#"${MINGW_PACKAGE_PREFIX}-ceres-solver: SFM module"
#"${MINGW_PACKAGE_PREFIX}-gflags: SFM module"
#"${MINGW_PACKAGE_PREFIX}-glog: SFM module"
"${MINGW_PACKAGE_PREFIX}-ffmpeg: support to read and write video files"
"${MINGW_PACKAGE_PREFIX}-python2-numpy: Python 2.x interface"
"${MINGW_PACKAGE_PREFIX}-python3-numpy: Python 3.x interface"
"${MINGW_PACKAGE_PREFIX}-hdf5: opencv_hdf module"
"${MINGW_PACKAGE_PREFIX}-tesseract-ocr: opencv_text module"
"${MINGW_PACKAGE_PREFIX}-ogre3d: ovis module"
#"${MINGW_PACKAGE_PREFIX}-hdf5: opencv_hdf module"
#"${MINGW_PACKAGE_PREFIX}-tesseract-ocr: opencv_text module"
#"${MINGW_PACKAGE_PREFIX}-ogre3d: ovis module"
#"${MINGW_PACKAGE_PREFIX}-vtk: opencv_viz module"
)
source=("${_realname}-${pkgver}.tar.gz"::https://github.com/opencv/opencv/archive/${pkgver}.tar.gz
@@ -72,7 +72,7 @@ source=("${_realname}-${pkgver}.tar.gz"::https://github.com/opencv/opencv/archiv
'0103-sfm-module-linking.patch')
sha256sums=('385dd0a9c25e67ef0dd60e022d2a2d7b17e2f36819cf3cb46aa8cdff5c5282c9'
'0f6c3d30baa39e3e7611afb481ee86dea45dafb182cac87d570c95dccd83eb8b'
'a9bb52feeea5fe79dc3566b5ef0dde97a7ab5e11f3f8507a4bd9be11c37a6672'
'f9736ad2f441a12f963eae1e2a5c891a744202ac0e7e2af02b64bf3c1dde5e92'
'fd4e095c3c879413184fc6b91a7b0a77dbb128612341a8be2c99d804a203e362'
'52ebc8875b9ef3ea70897f34509228daeff73d0cab0aa9eb8b931be6a7d32d7f'
'aaf2a1952b04c9be3a133b08b0a06f536b4e9ba5f312a03f41301dba61a3fc94'
@@ -175,6 +175,7 @@ build() {
-DBUILD_opencv_bioinspired=OFF \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_PYTHON_INSTALL_PATH=lib \
-DOPENCV_SKIP_CMAKE_ROOT_CONFIG=ON \
../${_realname}-${pkgver}
make