From: Elan Ruusamäe <glen@delfi.ee>
Date: Tue, 19 May 2015 11:44:51 +0000 (+0300)
Subject: up to 2.4.11
X-Git-Tag: auto/th/opencv-2.4.11-0.1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopencv.git;a=commitdiff_plain;h=a4b83c36ce50d5ebee16962990e8261ebf9f7665;hp=012751f79e2285bbf69a733610e75eaa39b4d8f5

up to 2.4.11

- is x86 patch obsolete?

- does not build with current cmake?
CMake Error at samples/gpu/CMakeLists.txt:109 (list_filterout):
  Unknown CMake command "list_filterout".
---

diff --git a/opencv-cflags.patch b/opencv-cflags.patch
index afc1009..1ae4215 100644
--- a/opencv-cflags.patch
+++ b/opencv-cflags.patch
@@ -1,6 +1,5 @@
-diff -ur OpenCV-2.4.2.orig//cmake/OpenCVCompilerOptions.cmake OpenCV-2.4.2/cmake/OpenCVCompilerOptions.cmake
---- OpenCV-2.4.2.orig//cmake/OpenCVCompilerOptions.cmake	2012-07-09 23:40:12.980147858 +0000
-+++ OpenCV-2.4.2/cmake/OpenCVCompilerOptions.cmake	2012-07-09 23:46:59.773180868 +0000
+--- opencv-2.4.11/cmake/OpenCVCompilerOptions.cmake~	2015-05-19 11:39:16.000000000 +0300
++++ opencv-2.4.11/cmake/OpenCVCompilerOptions.cmake	2015-05-19 11:47:57.851517663 +0300
 @@ -47,6 +47,8 @@
    endif()
  endmacro()
@@ -10,7 +9,7 @@ diff -ur OpenCV-2.4.2.orig//cmake/OpenCVCompilerOptions.cmake OpenCV-2.4.2/cmake
  if(MINGW)
    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40838
    # here we are trying to workaround the problem
-@@ -105,10 +107,6 @@
+@@ -110,10 +110,6 @@
      add_extra_compiler_option(-Werror)
    endif()
  
@@ -18,6 +17,6 @@ diff -ur OpenCV-2.4.2.orig//cmake/OpenCVCompilerOptions.cmake OpenCV-2.4.2/cmake
 -    add_extra_compiler_option(-march=i686)
 -  endif()
 -
-   # Other optimizations
-   if(ENABLE_OMIT_FRAME_POINTER)
-     add_extra_compiler_option(-fomit-frame-pointer)
+   if(APPLE)
+     add_extra_compiler_option(-Wno-semicolon-before-method-body)
+   endif()
diff --git a/opencv.spec b/opencv.spec
index af879b3..ec13368 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -43,8 +43,8 @@
 Summary:	A library of programming functions mainly aimed at real time computer vision
 Summary(pl.UTF-8):	Biblioteka funkcji do grafiki komputerowej w czasie rzeczywistym
 Name:		opencv
-Version:	2.4.10.1
-Release:	2
+Version:	2.4.11
+Release:	0.1
 Epoch:		1
 %if %{with unicap} || %{with xine}
 License:	GPL (enforced by used libraries), BSD (opencv itself)
@@ -53,7 +53,7 @@ License:	BSD
 %endif
 Group:		Libraries
 Source0:	https://github.com/Itseez/opencv/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	f84af999f45edc829bfda60a13fedbaa
+# Source0-md5:	fa06384719cb0be48183b4de972f0b2a
 Patch0:		%{name}-cflags.patch
 Patch1:		%{name}-x86.patch
 Patch2:		%{name}-unicap-c++.patch
@@ -269,7 +269,7 @@ Wiązania Pythona do OpenCV.
 %undos modules/gpu/CMakeLists.txt
 
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1 needs checking
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1