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

opencv: Update to 3.1.0

Browse Source
This commit is contained in:
Alexey Pavlov
2016-01-19 11:06:35 +03:00
parent 9f80136fdf
commit 48b3f83fee
3 changed files with 10 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mingw-w64-opencv/PKGBUILD
View File

@@ -3,8 +3,8 @@
_realname=opencv
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.0.0
pkgrel=3
pkgver=3.1.0
pkgrel=1
pkgdesc="Open Source Computer Vision Library (mingw-w64)"
arch=('any')
url="http://opencv.org/"
@@ -37,14 +37,12 @@ source=("${_realname}-${pkgver}.tar.gz"::https://github.com/Itseez/opencv/archiv
'mingw-w64-cmake.patch'
'solve_deg3-underflow.patch'
'issue-4107.patch'
'remove-bindings-generation-DetectionBasedTracker.patch'
'generate-proper-pkg-config-file.patch'
'opencv-support-python-3.5.patch')
md5sums=('e6c72f54f7127161b371ef798f34d5c9'
'8ff3af2593c9c92f48c2e9f59adaaa3d'
md5sums=('70e1dd07f0aa06606f1bc0e3fa15abd3'
'5fd254735bd342e49fdc23179d1614e7'
'ae03a59cf1202d5eafa94c2aac419ae6'
'49b6e0d5a376300238a769074cd5d32c'
'232993e4a053e1014b513c39b789188a'
'e3102a8339b25bffabd47e46c33807e4'
'f1bac1d090f0812dd05e14a4adf56b94')
@@ -54,7 +52,6 @@ prepare() {
patch -Np1 -i "${srcdir}/mingw-w64-cmake.patch"
patch -Np1 -i "${srcdir}/solve_deg3-underflow.patch"
patch -Np1 -i "${srcdir}/issue-4107.patch"
patch -Np1 -i "${srcdir}/remove-bindings-generation-DetectionBasedTracker.patch"
patch -Np1 -i "${srcdir}/generate-proper-pkg-config-file.patch"
patch -Np1 -i "${srcdir}/opencv-support-python-3.5.patch"
}
@@ -75,12 +72,12 @@ build() {
_ffmpeg_plugin='opencv_ffmpeg_64.dll'
}
pushd ${srcdir}/${_realname}-${pkgver}/3rdparty/ffmpeg > /dev/null
rm -f ./*.dll
gcc -Wall -shared -o ${_ffmpeg_plugin} ${CXXFLAGS} -x c++ \
-I../include -I../../modules/highgui/src -I../../modules/videoio/src ffopencv.c \
-lavformat -lavcodec -lavdevice -lswscale -lavutil -lws2_32
popd > /dev/null
# pushd ${srcdir}/${_realname}-${pkgver}/3rdparty/ffmpeg > /dev/null
# rm -f ./*.dll
# gcc -Wall -shared -o ${_ffmpeg_plugin} ${CXXFLAGS} -x c++ \
# -I../include -I../../modules/highgui/src -I../../modules/videoio/src ffopencv.c \
# -lavformat -lavcodec -lavdevice -lswscale -lavutil -lws2_32
# popd > /dev/null
[[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}

9
mingw-w64-opencv/mingw-w64-cmake.patch
View File

@@ -104,15 +104,6 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
# ----------------------------------------------------------------------------
# OpenCV cmake options
# ----------------------------------------------------------------------------
@@ -156,7 +156,7 @@
OCV_OPTION(WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)" OFF )
OCV_OPTION(WITH_GTK "Include GTK support" ON IF (UNIX AND NOT APPLE AND NOT ANDROID) )
OCV_OPTION(WITH_GTK_2_X "Use GTK version 2" OFF IF (UNIX AND NOT APPLE AND NOT ANDROID) )
-OCV_OPTION(WITH_IPP "Include Intel IPP support" ON IF (X86_64 OR X86) AND NOT WINRT)
+OCV_OPTION(WITH_IPP "Include Intel IPP support" ON IF (X86_64 OR X86) AND NOT WINRT AND NOT MINGW)
OCV_OPTION(WITH_JASPER "Include JPEG2K support" ON IF (NOT IOS) )
OCV_OPTION(WITH_JPEG "Include JPEG support" ON)
OCV_OPTION(WITH_WEBP "Include WebP support" ON IF (NOT IOS AND NOT WINRT) )
@@ -191,12 +177,12 @@
OCV_OPTION(BUILD_CUDA_STUBS "Build CUDA modules stubs when no CUDA SDK" OFF IF (NOT IOS) )

34
mingw-w64-opencv/remove-bindings-generation-DetectionBasedTracker.patch
View File

@@ -1,34 +0,0 @@
From caaf60ba008bb7b61e2a791aab31dafe5267ab33 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Tue, 9 Jun 2015 16:58:58 +0300
Subject: [PATCH] remove bindings generation for DetectionBasedTracker
---
modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp | 1 +
modules/python/common.cmake | 1 +
2 files changed, 2 insertions(+)
diff --git a/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp b/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
index 54117fd..1f5f1d3 100644
--- a/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
+++ b/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp
@@ -44,6 +44,7 @@
#ifndef __OPENCV_OBJDETECT_DBT_HPP__
#define __OPENCV_OBJDETECT_DBT_HPP__
+// After this condition removal update blacklist for bindings: modules/python/common.cmake
#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \
(defined(__cplusplus) && __cplusplus > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700)
diff --git a/modules/python/common.cmake b/modules/python/common.cmake
index 5743980..2444b77 100644
--- a/modules/python/common.cmake
+++ b/modules/python/common.cmake
@@ -28,6 +28,7 @@ endforeach(m)
ocv_list_filterout(opencv_hdrs ".h$")
ocv_list_filterout(opencv_hdrs "cuda")
ocv_list_filterout(opencv_hdrs "cudev")
+ocv_list_filterout(opencv_hdrs "detection_based_tracker.hpp") # Conditional compilation
set(cv2_generated_hdrs
"${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_include.h"