From 4f6d29716a9a20249f11bf82cbbc443a8d493735 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 17 Dec 2019 11:45:42 +0300 Subject: [PATCH] opencv: Drop building python2 module, disable examples --- mingw-w64-opencv/PKGBUILD | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD index 74d9481c7e..50f997b71e 100644 --- a/mingw-w64-opencv/PKGBUILD +++ b/mingw-w64-opencv/PKGBUILD @@ -4,7 +4,7 @@ _realname=opencv pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') url="https://opencv.org/" @@ -35,11 +35,8 @@ depends=(#"${MINGW_PACKAGE_PREFIX}-gst-plugins-base makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" #"${MINGW_PACKAGE_PREFIX}-qt5" "${MINGW_PACKAGE_PREFIX}-ffmpeg" - "${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}-tiny-dnn" #"${MINGW_PACKAGE_PREFIX}-vtk" @@ -49,7 +46,6 @@ 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" @@ -149,7 +145,7 @@ build() { -DBUILD_PERF_TESTS=OFF \ -DBUILD_PROTOBUF=OFF \ -DPROTOBUF_UPDATE_FILES=ON \ - -DBUILD_EXAMPLES=ON \ + -DBUILD_EXAMPLES=OFF \ -DINSTALL_C_EXAMPLES=OFF \ -DINSTALL_PYTHON_EXAMPLES=OFF \ -DWITH_GTK=OFF \ @@ -165,13 +161,12 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DOPENCV_EXTRA_MODULES_PATH=../${_realname}_contrib-${pkgver}/modules \ - -DBUILD_opencv_python2=ON \ + -DBUILD_opencv_python2=OFF \ -DBUILD_opencv_python3=ON \ - -DPYTHON2_EXECUTABLE=${MINGW_PREFIX}/bin/python2 \ + -DPYTHON_DEFAULT_EXECUTABLE=${MINGW_PREFIX}/bin/python3 \ -DPYTHON3_EXECUTABLE=${MINGW_PREFIX}/bin/python3 \ - -DOPENCV_PYTHON3_VERSION=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") \ - -DPYTHON2_PACKAGES_PATH=$(cygpath -u $(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")) \ -DPYTHON3_PACKAGES_PATH=$(cygpath -u $(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")) \ + -DOPENCV_PYTHON3_VERSION=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") \ -DBUILD_opencv_bioinspired=OFF \ -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_PYTHON_INSTALL_PATH=lib \