Accepting request 55843 from KDE:Distro:Factory

Accepted submit request 55843 from user wstephenson

OBS-URL: https://build.opensuse.org/request/show/55843
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=12

opencv-gcc-46.diff

@@ -1,4 +1,4 @@
---- include/opencv/cxcore.hpp
+--- include/opencv/cxcore.hpp.orig
 +++ include/opencv/cxcore.hpp
 @@ -51,6 +51,7 @@
  #include <algorithm>
@@ -8,3 +8,43 @@
  #include <map>
  #include <new>
  #include <string>
+--- 3rdparty/CMakeLists.txt.orig
++++ 3rdparty/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ add_subdirectory(flann)
+ add_subdirectory(lapack)
+-add_subdirectory(zlib)
+ if(WITH_JASPER AND NOT JASPER_FOUND)
+ 	add_subdirectory(libjasper)
+ endif()
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -840,7 +840,7 @@ IF(NOT BUILD_SHARED_LIBS)
+         set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
+     endif()
+ 
+-    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack)
++    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann z opencv_lapack)
+ endif()
+ 
+ 
+--- src/cxcore/CMakeLists.txt.orig
++++ src/cxcore/CMakeLists.txt
+@@ -53,7 +53,7 @@ set_target_properties(${the_target} PROP
+     )
+ 
+ # Add the required libraries for linking:
+-target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} opencv_lapack zlib flann)
++target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} opencv_lapack z flann)
+ 
+ # Linker flag needed for Windows Mobile 5 and 6 SDKs
+ if(MSVC)
+@@ -67,7 +67,7 @@ if(MSVC)
+         )
+ endif()
+ 
+-add_dependencies(${the_target} opencv_lapack zlib)
++add_dependencies(${the_target} opencv_lapack)
+ 
+ install(TARGETS ${the_target}
+     RUNTIME DESTINATION bin COMPONENT main

opencv.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Dec 12 13:39:48 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- Use system zlib, oh, and do not export ZLIB symbols to
+  other applications, clashes ensued. 
+
 -------------------------------------------------------------------
 Thu Nov 11 15:50:25 CET 2010 - dmueller@suse.de
 

opencv.spec

@@ -46,7 +46,6 @@ BuildRequires:  cmake gcc-c++ libpng-devel python-devel swig zlib-devel
 %if %{with ffmpeg}
 BuildRequires:  libffmpeg-devel
 %endif
-
 %description
 OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C
 functions and a few C++ classes that implement some popular Image Processing and