pool/opencv
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 121110 from KDE:Distro:Factory

Browse Source 
Update to OpenCV 2.4.0 (forwarded request 121099 from koprok)

OBS-URL: https://build.opensuse.org/request/show/121110
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=31
This commit is contained in:
Stephan Kulow 2012-05-16 19:08:46 +00:00 committed by Git OBS Bridge
parent 6d2b25a59f
commit 3a8c3635ad
9 changed files with 73 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenCV-2.3.1a.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a9a2f529101c04eb2b606eee8c80f3ad93190b36f91ac09ee0ec5aa1eed1450c
size 32669613

3
OpenCV-2.4.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b5fedb2fc6ad0aa1509676468f571ba21456679e7d48a8242a096d62e2c6ac9
size 47156770

22
opencv-clang.patch
View File

@ -1,22 +0,0 @@
--- opencv/modules/flann/include/opencv2/flann/any.h (revision 6809)
+++ opencv/modules/flann/include/opencv2/flann/any.h (revision 6881)
@@ -31,4 +31,10 @@
};
+inline std::ostream& operator <<(std::ostream& out, const empty_any&)
+{
+ out << "[empty_any]";
+ return out;
+}
+
struct base_any_policy
{
--- opencv/modules/flann/include/opencv2/flann/lsh_index.h (revision 6724)
+++ opencv/modules/flann/include/opencv2/flann/lsh_index.h (revision 6881)
@@ -57,5 +57,5 @@
struct LshIndexParams : public IndexParams
{
- LshIndexParams(unsigned int table_number, unsigned int key_size, unsigned int multi_probe_level)
+ LshIndexParams(unsigned int table_number = 12, unsigned int key_size = 20, unsigned int multi_probe_level = 2)
{
(* this)["algorithm"] = FLANN_INDEX_LSH;

47
opencv-datadir.patch
View File

@ -1,8 +1,20 @@
diff -urN OpenCV-2.3.1-orig/CMakeLists.txt OpenCV-2.3.1/CMakeLists.txt
--- OpenCV-2.3.1-orig/CMakeLists.txt 2011-08-17 22:42:55.000000000 +0300
+++ OpenCV-2.3.1/CMakeLists.txt 2011-08-19 15:14:51.227242178 +0300
@@ -125,7 +125,7 @@
elseif(OPENCV_MANGLED_INSTALL_PATHS)
diff -urN OpenCV-2.4.0-orig/cmake/OpenCVGenConfig.cmake OpenCV-2.4.0/cmake/OpenCVGenConfig.cmake
--- OpenCV-2.4.0-orig/cmake/OpenCVGenConfig.cmake 2012-04-01 13:08:51.000000000 +0300
+++ OpenCV-2.4.0/cmake/OpenCVGenConfig.cmake 2012-05-15 14:00:58.331996688 +0300
@@ -135,7 +135,7 @@
if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
set(OPENCV_CONFIG_INSTALL_PREFIX lib${LIB_SUFFIX}/cmake/opencv)
else()
- set(OPENCV_CONFIG_INSTALL_PREFIX share/OpenCV)
+ set(OPENCV_CONFIG_INSTALL_PREFIX share/opencv)
endif()
if(INSTALL_TO_MANGLED_PATHS)
diff -urN OpenCV-2.4.0-orig/CMakeLists.txt OpenCV-2.4.0/CMakeLists.txt
--- OpenCV-2.4.0-orig/CMakeLists.txt 2012-04-30 22:40:29.000000000 +0300
+++ OpenCV-2.4.0/CMakeLists.txt 2012-05-15 13:58:51.100802230 +0300
@@ -199,7 +199,7 @@
elseif(INSTALL_TO_MANGLED_PATHS)
set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
else()
- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
@ -10,26 +22,15 @@ diff -urN OpenCV-2.3.1-orig/CMakeLists.txt OpenCV-2.3.1/CMakeLists.txt
endif()
if(ANDROID)
@@ -1370,8 +1370,8 @@
install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
else()
- install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/)
- install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/)
+ install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/)
+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/)
endif()
endif()
diff -urN OpenCV-2.3.1-orig/data/CMakeLists.txt OpenCV-2.3.1/data/CMakeLists.txt
--- OpenCV-2.3.1-orig/data/CMakeLists.txt 2011-08-02 15:48:41.000000000 +0300
+++ OpenCV-2.3.1/data/CMakeLists.txt 2011-08-19 15:13:34.349553000 +0300
diff -urN OpenCV-2.4.0-orig/data/CMakeLists.txt OpenCV-2.4.0/data/CMakeLists.txt
--- OpenCV-2.4.0-orig/data/CMakeLists.txt 2012-04-01 13:10:59.000000000 +0300
+++ OpenCV-2.4.0/data/CMakeLists.txt 2012-05-15 14:02:40.939237558 +0300
@@ -2,6 +2,6 @@
file(GLOB LBP_CASCADES lbpcascades/*.xml)
if(NOT WIN32)
-install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
-install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
+install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
+install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
- install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
- install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
+ install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
+ install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
endif()

13
opencv-gcc47.patch
View File

@ -1,13 +0,0 @@
Index: OpenCV-2.3.1/modules/highgui/src/window_QT.cpp
===================================================================
--- OpenCV-2.3.1.orig/modules/highgui/src/window_QT.cpp
+++ OpenCV-2.3.1/modules/highgui/src/window_QT.cpp
@@ -46,6 +46,8 @@
#ifdef _WIN32
#include <windows.h>
#define usleep Sleep
+#else
+#include <unistd.h> //for usleep
#endif
#ifndef M_PI

15
opencv-libdir.patch
View File

@ -1,15 +0,0 @@
diff -urN OpenCV-2.3.1-orig/CMakeLists.txt OpenCV-2.3.1/CMakeLists.txt
--- OpenCV-2.3.1-orig/CMakeLists.txt 2011-08-17 22:42:55.000000000 +0300
+++ OpenCV-2.3.1/CMakeLists.txt 2011-08-19 13:40:08.785540389 +0300
@@ -665,9 +665,9 @@
OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE)
if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
else() #debian based assumed, install to the dist-packages.
- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
endif()
endif()
if(CMAKE_HOST_WIN32)

66
opencv-samples.patch
View File

@ -1,53 +1,51 @@
diff -urN OpenCV-2.3.1-orig/CMakeLists.txt OpenCV-2.3.1/CMakeLists.txt
--- OpenCV-2.3.1-orig/CMakeLists.txt 2011-08-17 22:42:55.000000000 +0300
+++ OpenCV-2.3.1/CMakeLists.txt 2011-08-19 14:29:28.889802927 +0300
@@ -1539,7 +1539,7 @@
add_subdirectory(data)
add_subdirectory(3rdparty)
diff -urN OpenCV-2.4.0-orig/CMakeLists.txt OpenCV-2.4.0/CMakeLists.txt
--- OpenCV-2.4.0-orig/CMakeLists.txt 2012-04-30 22:40:29.000000000 +0300
+++ OpenCV-2.4.0/CMakeLists.txt 2012-05-15 13:49:52.764937081 +0300
@@ -626,7 +626,7 @@
add_subdirectory(apps)
# examples
-if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
add_subdirectory(samples)
add_subdirectory(samples)
endif()
diff -urN OpenCV-2.3.1-orig/samples/CMakeLists.txt OpenCV-2.3.1/samples/CMakeLists.txt
--- OpenCV-2.3.1-orig/samples/CMakeLists.txt 2011-08-02 15:48:16.000000000 +0300
+++ OpenCV-2.3.1/samples/CMakeLists.txt 2011-08-19 14:29:28.890802914 +0300
@@ -3,12 +3,19 @@
diff -urN OpenCV-2.4.0-orig/samples/CMakeLists.txt OpenCV-2.4.0/samples/CMakeLists.txt
--- OpenCV-2.4.0-orig/samples/CMakeLists.txt 2012-04-01 13:09:19.000000000 +0300
+++ OpenCV-2.4.0/samples/CMakeLists.txt 2012-05-15 13:53:07.883629268 +0300
@@ -3,6 +3,7 @@
#
# ----------------------------------------------------------------------------
+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES)
add_subdirectory(c)
add_subdirectory(cpp)
if(NOT ANDROID)
add_subdirectory(gpu)
add_subdirectory(gpu)
@@ -10,3 +11,9 @@
if(ANDROID AND BUILD_ANDROID_EXAMPLES)
add_subdirectory(android)
endif()
+endif()
+
+if(INSTALL_PYTHON_EXAMPLES AND BUILD_NEW_PYTHON_SUPPORT)
+if(INSTALL_PYTHON_EXAMPLES)
+add_subdirectory(python)
+add_subdirectory(python2)
+endif()
if(BUILD_ANDROID_EXAMPLES)
add_subdirectory(android)
diff -urN OpenCV-2.3.1-orig/samples/gpu/CMakeLists.txt OpenCV-2.3.1/samples/gpu/CMakeLists.txt
--- OpenCV-2.3.1-orig/samples/gpu/CMakeLists.txt 2011-08-12 00:17:05.000000000 +0300
+++ OpenCV-2.3.1/samples/gpu/CMakeLists.txt 2011-08-19 14:39:59.379420799 +0300
@@ -71,7 +71,7 @@
diff -urN OpenCV-2.4.0-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.0/samples/gpu/CMakeLists.txt
--- OpenCV-2.4.0-orig/samples/gpu/CMakeLists.txt 2012-04-09 02:47:22.000000000 +0300
+++ OpenCV-2.4.0/samples/gpu/CMakeLists.txt 2012-05-15 13:53:54.084528733 +0300
@@ -64,7 +64,7 @@
if (NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${install_list}
- DESTINATION share/opencv/samples/${project}
+ DESTINATION share/opencv/samples/gpu
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif ()
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${install_list}
- DESTINATION share/opencv/samples/${project}
+ DESTINATION share/opencv/samples/gpu
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif()
diff -urN OpenCV-2.3.1-orig/samples/python/CMakeLists.txt OpenCV-2.3.1/samples/python/CMakeLists.txt
--- OpenCV-2.3.1-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.3.1/samples/python/CMakeLists.txt 2011-08-19 14:40:20.072343997 +0300
diff -urN OpenCV-2.4.0-orig/samples/python/CMakeLists.txt OpenCV-2.4.0/samples/python/CMakeLists.txt
--- OpenCV-2.4.0-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.4.0/samples/python/CMakeLists.txt 2012-05-15 13:56:12.291362167 +0300
@@ -0,0 +1,12 @@
+# -------------------------------------------------------------------------
+# CMake file for Python samples. See root CMakeLists.txt
@ -61,9 +59,9 @@ diff -urN OpenCV-2.3.1-orig/samples/python/CMakeLists.txt OpenCV-2.3.1/samples/p
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE)
+endif()
diff -urN OpenCV-2.3.1-orig/samples/python2/CMakeLists.txt OpenCV-2.3.1/samples/python2/CMakeLists.txt
--- OpenCV-2.3.1-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.3.1/samples/python2/CMakeLists.txt 2011-08-19 14:40:31.182302811 +0300
diff -urN OpenCV-2.4.0-orig/samples/python2/CMakeLists.txt OpenCV-2.4.0/samples/python2/CMakeLists.txt
--- OpenCV-2.4.0-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.4.0/samples/python2/CMakeLists.txt 2012-05-15 13:56:39.387583437 +0300
@@ -0,0 +1,12 @@
+# -------------------------------------------------------------------------
+# CMake file for Python samples. See root CMakeLists.txt

7
opencv.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 15 14:24:05 EEST 2012 - koprok@nand.bg
- Update to OpenCV 2.4.0
More info at:
http://code.opencv.org/projects/opencv/wiki/ChangeLog
-------------------------------------------------------------------
Sat Mar 17 12:01:52 UTC 2012 - dimstar@opensuse.org

27
opencv.spec
View File

@ -20,27 +20,20 @@
Name: opencv
%define libname lib%{name}
%define soname 2_3
Version: 2.3.1a
%define soname 2_4
Version: 2.4.0
Release: 0
%define dirver 2.3.1
Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
Group: Development/Libraries/C and C++
Url: http://%{name}.willowgarage.com/wiki/
Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{dirver}/OpenCV-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM opencv-libdir.patch koprok@nand.bg -- Add an option to install libraries and python packages in lib64.
Patch0: %{name}-libdir.patch
Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{version}/OpenCV-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation.
Patch1: %{name}-samples.patch
# PATCH-FIX-UPSTREAM opencv-2.3-underlinking.patch reddwarf@opensuse.org -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there.
Patch2: %{name}-2.3-underlinking.patch
# PATCH-FIX-OPENSUSE opencv-datadir.patch koprok@nand.bg -- Install data files in share/opencv instead of share/OpenCV.
Patch3: %{name}-datadir.patch
# PATCH-FIX-UPSTREAM opencv-clang.patch idoenmez@suse.de -- Upstream r6881 to fix clang compatibility
Patch4: %{name}-clang.patch
# PATCH-FIX-UPSTREAM opencv-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7.
Patch5: opencv-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenEXR-devel
BuildRequires: cmake
@ -57,16 +50,13 @@ BuildRequires: libilmbase-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: libxine-devel
BuildRequires: python-devel
BuildRequires: python-numpy-devel
BuildRequires: zlib-devel
%if %{with ffmpeg}
BuildRequires: libffmpeg-devel
%endif
%if 0%{?suse_version} < 1210
BuildRequires: libv4l-devel
%else
BuildRequires: libv4l-devel >= 0.8.4
%endif
%description
OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C
@ -113,13 +103,10 @@ Recommends: %{name}-devel
This package contains the documentation and examples for the OpenCV library.
%prep
%setup -qn OpenCV-%{dirver}
%patch0 -p1
%setup -qn OpenCV-%{version}
%patch1 -p1
%patch2
%patch3 -p1
%patch4 -p1
%patch5 -p1
# Windows specific and with wrong end of line
rm -f doc/packaging.txt
@ -141,9 +128,9 @@ cmake -DCMAKE_BUILD_TYPE=Release \
-DINSTALL_C_EXAMPLES=ON \
-DINSTALL_PYTHON_EXAMPLES=ON \
-DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \
-DUSE_OMIT_FRAME_POINTER=OFF \
-DENABLE_OMIT_FRAME_POINTER=OFF \
-DWITH_QT=ON \
-DWITH_QT_OPENGL=ON \
-DWITH_OPENGL=ON \
-DWITH_UNICAP=ON \
-DWITH_XINE=ON \
..