opencv: Update to 2.4.11

mingw-w64-opencv/PKGBUILD

@@ -2,18 +2,18 @@
 
 _realname=opencv
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.4.10
-pkgrel=2
+pkgver=2.4.11
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library (mingw-w64)"
 arch=('any')
 url="http://opencv.org/"
 depends=(#"${MINGW_PACKAGE_PREFIX}-gst-plugins-base0.10"
+        "${MINGW_PACKAGE_PREFIX}-intel-tbb"
+        "${MINGW_PACKAGE_PREFIX}-jasper"
         "${MINGW_PACKAGE_PREFIX}-libjpeg"
         "${MINGW_PACKAGE_PREFIX}-libpng"
         "${MINGW_PACKAGE_PREFIX}-libtiff"
-        "${MINGW_PACKAGE_PREFIX}-jasper"
         "${MINGW_PACKAGE_PREFIX}-openexr"
-        "${MINGW_PACKAGE_PREFIX}-intel-tbb"
         "${MINGW_PACKAGE_PREFIX}-zlib"
         #"${MINGW_PACKAGE_PREFIX}-qt5"
         #"${MINGW_PACKAGE_PREFIX}-gtkglext"
@@ -34,13 +34,11 @@ source=(#"http://downloads.sourceforge.net/opencvlibrary/${_realname}-$pkgver.zi
         https://github.com/Itseez/opencv/archive/$pkgver.tar.gz
         'mingw-w64-cmake.patch'
         'free-tls-keys-on-dll-unload.patch'
-        'solve_deg3-underflow.patch'
-        'upstream-40efd17.patch')
-md5sums=('3346a59310d788d3845f4fd6043a108a'
-         '94672506dd30d8113904cd0514047da7'
+        'solve_deg3-underflow.patch')
+md5sums=('fa06384719cb0be48183b4de972f0b2a'
+         '7d1bcc9f01753cf2c38fbe45b0c7cb82'
          '91fcecdc23a870cafad6f51c2a45e647'
-         'ae03a59cf1202d5eafa94c2aac419ae6'
-         '4099f3949fc7215d34e5ef09d6bbe36c')
+         'ae03a59cf1202d5eafa94c2aac419ae6')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -48,7 +46,6 @@ prepare() {
   patch -Np1 -i "$srcdir/mingw-w64-cmake.patch"
   patch -Np1 -i "$srcdir/free-tls-keys-on-dll-unload.patch"
   patch -Np1 -i "$srcdir/solve_deg3-underflow.patch"
-  patch -Np1 -i "$srcdir/upstream-40efd17.patch"
 }
 
 build() {

mingw-w64-opencv/mingw-w64-cmake.patch

@@ -46,39 +46,6 @@ diff -Naur a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
 diff -Naur a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
 --- a/cmake/OpenCVGenPkgconfig.cmake	2014-10-01 14:33:36.000000000 +0700
 +++ b/cmake/OpenCVGenPkgconfig.cmake	2014-10-02 23:18:25.505210700 +0700
-@@ -10,7 +10,7 @@
- # -------------------------------------------------------------------------------------------
- set(prefix      "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
-+set(libdir      "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
- set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
- 
- if(CMAKE_BUILD_TYPE MATCHES "Release")
-@@ -35,10 +35,11 @@
- ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
- 
- #build the list of components
--set(OpenCV_LIB_COMPONENTS_ "")
-+set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
- foreach(CVLib ${OpenCV_LIB_COMPONENTS})
-   get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
-   get_filename_component(libname "${libpath}" NAME)
-+  get_filename_component(lname "${libpath}" NAME_WE)
- 
-   if(INSTALL_TO_MANGLED_PATHS)
-     set(libname "${libname}.${OPENCV_VERSION}")
-@@ -51,7 +52,9 @@
-     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
-   endif()
- 
--  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
-+  string(REPLACE "libopencv" "-lopencv" lname "${lname}")
-+  string(REPLACE "${OPENCV_DLLVERSION}" "" lname "${lname}")
-+  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
- endforeach()
- 
- # add extra dependencies required for OpenCV
 @@ -80,6 +83,6 @@
                 "${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME}"
                 @ONLY)

mingw-w64-opencv/upstream-40efd17.patch

@@ -1,25 +0,0 @@
-From 0f2b7fbc451a34c9eba34616e726985b7a0d14b1 Mon Sep 17 00:00:00 2001
-From: Anatoly Baksheev <no@email>
-Date: Sat, 18 Oct 2014 18:12:36 +0400
-Subject: [PATCH] viz: fixed memory leak, issue 3961
-
----
- modules/viz/src/vtk/vtkImageMatSource.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/viz/src/vtk/vtkImageMatSource.cpp b/modules/viz/src/vtk/vtkImageMatSource.cpp
-index 58a5642..6586175 100644
---- a/modules/viz/src/vtk/vtkImageMatSource.cpp
-+++ b/modules/viz/src/vtk/vtkImageMatSource.cpp
-@@ -52,7 +52,7 @@ namespace cv { namespace viz
- cv::viz::vtkImageMatSource::vtkImageMatSource()
- {
-     this->SetNumberOfInputPorts(0);
--    this->ImageData = vtkImageData::New();
-+    this->ImageData = vtkSmartPointer<vtkImageData>::New();
- }
- 
- int cv::viz::vtkImageMatSource::RequestInformation(vtkInformation *, vtkInformationVector**, vtkInformationVector *outputVector)
--- 
-1.8.3.msysgit.0
-