Accepting request 37978 from KDE:KDE4:Factory:Desktop
Copy from KDE:KDE4:Factory:Desktop/opencv based on submit request 37978 from user dirkmueller OBS-URL: https://build.opensuse.org/request/show/37978 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=5
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
dc75279b36
commit
96f028ba96
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022
|
||||
size 12779856
|
||||
3
OpenCV-2.1.0.tar.bz2
Normal file
3
OpenCV-2.1.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
|
||||
size 14459566
|
||||
@ -1,8 +1,21 @@
|
||||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -405,8 +405,8 @@ if(BUILD_SWIG_PYTHON_SUPPORT OR BUILD_NE
|
||||
diff -urN OpenCV-2.1.0-orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/3rdparty/flann/CMakeLists.txt 2010-04-06 04:24:34.000000000 +0300
|
||||
+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-04-13 17:05:44.000000000 +0300
|
||||
@@ -89,8 +89,8 @@
|
||||
INSTALL (
|
||||
TARGETS flann # flann_s
|
||||
RUNTIME DESTINATION bin
|
||||
- LIBRARY DESTINATION lib
|
||||
- ARCHIVE DESTINATION lib
|
||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
||||
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
||||
)
|
||||
|
||||
# INSTALL (
|
||||
diff -urN OpenCV-2.1.0-orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300
|
||||
+++ OpenCV-2.1.0/CMakeLists.txt 2010-04-13 17:05:45.000000000 +0300
|
||||
@@ -467,8 +467,8 @@
|
||||
|
||||
string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
|
||||
if(UNIX)
|
||||
@ -13,7 +26,7 @@ Index: CMakeLists.txt
|
||||
endif()
|
||||
if(WIN32)
|
||||
get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
|
||||
@@ -731,7 +731,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_D
|
||||
@@ -932,7 +932,7 @@
|
||||
# Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:
|
||||
|
||||
set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv")
|
||||
@ -22,7 +35,7 @@ Index: CMakeLists.txt
|
||||
|
||||
#exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/unix-install/\"")
|
||||
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"")
|
||||
@@ -764,19 +764,19 @@ endif()
|
||||
@@ -965,19 +965,19 @@
|
||||
# Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"
|
||||
# prefix=/usr
|
||||
# exec_prefix=${prefix}
|
||||
@ -30,11 +43,11 @@ Index: CMakeLists.txt
|
||||
+# libdir=${exec_prefix}/lib${LIB_SUFFIX}
|
||||
# includedir=${prefix}/include/opencv
|
||||
# -------------------------------------------------------------------------------------------
|
||||
set(prefix ${CMAKE_INSTALL_PREFIX})
|
||||
set(exec_prefix "\${prefix}")
|
||||
-set(libdir "\${exec_prefix}/lib")
|
||||
+set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
|
||||
set(includedir "\${prefix}/include")
|
||||
set(prefix ${CMAKE_INSTALL_PREFIX})
|
||||
set(exec_prefix "\${prefix}")
|
||||
-set(libdir "\${exec_prefix}/lib")
|
||||
+set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
|
||||
set(includedir "\${prefix}/include")
|
||||
set(VERSION ${OPENCV_VERSION})
|
||||
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
|
||||
@ -45,52 +58,36 @@ Index: CMakeLists.txt
|
||||
endif()
|
||||
|
||||
|
||||
Index: 3rdparty/flann/CMakeLists.txt
|
||||
===================================================================
|
||||
--- 3rdparty/flann/CMakeLists.txt.orig
|
||||
+++ 3rdparty/flann/CMakeLists.txt
|
||||
@@ -86,8 +86,8 @@ ENDIF(WIN32)
|
||||
INSTALL (
|
||||
TARGETS flann flann_s
|
||||
RUNTIME DESTINATION bin
|
||||
- LIBRARY DESTINATION lib
|
||||
- ARCHIVE DESTINATION lib
|
||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
||||
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
||||
)
|
||||
|
||||
# INSTALL (
|
||||
Index: interfaces/ffopencv/CMakeLists.txt
|
||||
===================================================================
|
||||
--- interfaces/ffopencv/CMakeLists.txt.orig
|
||||
+++ interfaces/ffopencv/CMakeLists.txt
|
||||
@@ -33,5 +33,5 @@ set_target_properties(${the_target} PROP
|
||||
diff -urN OpenCV-2.1.0-orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/interfaces/ffopencv/CMakeLists.txt 2010-04-06 04:24:40.000000000 +0300
|
||||
+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-04-13 17:06:05.000000000 +0300
|
||||
@@ -40,6 +40,6 @@
|
||||
|
||||
install(TARGETS ${the_target}
|
||||
RUNTIME DESTINATION bin COMPONENT main
|
||||
- ARCHIVE DESTINATION lib COMPONENT main
|
||||
- LIBRARY DESTINATION lib COMPONENT main
|
||||
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
||||
)
|
||||
Index: src/cv/CMakeLists.txt
|
||||
===================================================================
|
||||
--- src/cv/CMakeLists.txt.orig
|
||||
+++ src/cv/CMakeLists.txt
|
||||
@@ -66,8 +66,8 @@ add_dependencies(${the_target} cxcore)
|
||||
diff -urN OpenCV-2.1.0-orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/src/cv/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300
|
||||
+++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-04-13 17:07:32.000000000 +0300
|
||||
@@ -71,8 +71,8 @@
|
||||
|
||||
install(TARGETS ${the_target}
|
||||
RUNTIME DESTINATION bin COMPONENT main
|
||||
- LIBRARY DESTINATION lib COMPONENT main
|
||||
- ARCHIVE DESTINATION lib COMPONENT main)
|
||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
||||
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
|
||||
RUNTIME DESTINATION bin COMPONENT main
|
||||
- LIBRARY DESTINATION lib COMPONENT main
|
||||
- ARCHIVE DESTINATION lib COMPONENT main)
|
||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
||||
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
|
||||
|
||||
install(FILES ${lib_hdrs}
|
||||
DESTINATION include/opencv
|
||||
Index: src/cvaux/CMakeLists.txt
|
||||
===================================================================
|
||||
--- src/cvaux/CMakeLists.txt.orig
|
||||
+++ src/cvaux/CMakeLists.txt
|
||||
@@ -76,8 +76,8 @@ add_dependencies(${the_target} cxcore cv
|
||||
diff -urN OpenCV-2.1.0-orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/src/cvaux/CMakeLists.txt 2010-04-06 04:24:43.000000000 +0300
|
||||
+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-04-13 17:07:31.000000000 +0300
|
||||
@@ -76,8 +76,8 @@
|
||||
|
||||
install(TARGETS ${the_target}
|
||||
RUNTIME DESTINATION bin COMPONENT main
|
||||
@ -101,37 +98,24 @@ Index: src/cvaux/CMakeLists.txt
|
||||
|
||||
install(FILES ${aux_hdrs_ext}
|
||||
DESTINATION include/opencv
|
||||
Index: src/cxcore/CMakeLists.txt
|
||||
===================================================================
|
||||
--- src/cxcore/CMakeLists.txt.orig
|
||||
+++ src/cxcore/CMakeLists.txt
|
||||
@@ -66,8 +66,8 @@ add_dependencies(${the_target} opencv_la
|
||||
diff -urN OpenCV-2.1.0-orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/src/cxcore/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
|
||||
+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-04-13 17:07:30.000000000 +0300
|
||||
@@ -71,8 +71,8 @@
|
||||
|
||||
install(TARGETS ${the_target}
|
||||
RUNTIME DESTINATION bin COMPONENT main
|
||||
- LIBRARY DESTINATION lib COMPONENT main
|
||||
- ARCHIVE DESTINATION lib COMPONENT main)
|
||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
||||
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
|
||||
- LIBRARY DESTINATION lib COMPONENT main
|
||||
- ARCHIVE DESTINATION lib COMPONENT main)
|
||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
||||
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
|
||||
|
||||
# install each module headers separately
|
||||
install(FILES ${lib_hdrs}
|
||||
Index: src/highgui/CMakeLists.txt
|
||||
===================================================================
|
||||
--- src/highgui/CMakeLists.txt.orig
|
||||
+++ src/highgui/CMakeLists.txt
|
||||
@@ -191,8 +191,8 @@ endif()
|
||||
if(WIN32)
|
||||
target_link_libraries(${the_target} comctl32 gdi32 ole32)
|
||||
|
||||
- if (MSVC)
|
||||
- target_link_libraries(${the_target} vfw32)
|
||||
+ if (MSVC)
|
||||
+ target_link_libraries(${the_target} vfw32)
|
||||
endif()
|
||||
|
||||
if(MINGW)
|
||||
@@ -206,8 +206,8 @@ endif()
|
||||
diff -urN OpenCV-2.1.0-orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/src/highgui/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300
|
||||
+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-04-13 17:07:28.000000000 +0300
|
||||
@@ -282,8 +282,8 @@
|
||||
|
||||
install(TARGETS ${the_target}
|
||||
RUNTIME DESTINATION bin COMPONENT main
|
||||
@ -142,11 +126,10 @@ Index: src/highgui/CMakeLists.txt
|
||||
|
||||
install(FILES ${highgui_ext_hdrs}
|
||||
DESTINATION include/opencv
|
||||
Index: src/ml/CMakeLists.txt
|
||||
===================================================================
|
||||
--- src/ml/CMakeLists.txt.orig
|
||||
+++ src/ml/CMakeLists.txt
|
||||
@@ -61,8 +61,8 @@ add_dependencies(${the_target} cxcore)
|
||||
diff -urN OpenCV-2.1.0-orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/src/ml/CMakeLists.txt 2010-04-06 04:24:45.000000000 +0300
|
||||
+++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-04-13 17:07:20.000000000 +0300
|
||||
@@ -61,8 +61,8 @@
|
||||
|
||||
install(TARGETS ${the_target}
|
||||
RUNTIME DESTINATION bin COMPONENT main
|
||||
@ -157,11 +140,10 @@ Index: src/ml/CMakeLists.txt
|
||||
|
||||
install(FILES ${lib_hdrs}
|
||||
DESTINATION include/opencv
|
||||
Index: tests/cxts/CMakeLists.txt
|
||||
===================================================================
|
||||
--- tests/cxts/CMakeLists.txt.orig
|
||||
+++ tests/cxts/CMakeLists.txt
|
||||
@@ -63,6 +63,6 @@ target_link_libraries(${the_target} ${OP
|
||||
diff -urN OpenCV-2.1.0-orig/tests/cxts/CMakeLists.txt OpenCV-2.1.0/tests/cxts/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/tests/cxts/CMakeLists.txt 2010-04-06 04:24:46.000000000 +0300
|
||||
+++ OpenCV-2.1.0/tests/cxts/CMakeLists.txt 2010-04-13 17:07:11.000000000 +0300
|
||||
@@ -63,6 +63,6 @@
|
||||
if(WIN32)
|
||||
install(TARGETS ${the_target}
|
||||
RUNTIME DESTINATION bin COMPONENT main
|
||||
@ -1,8 +1,7 @@
|
||||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -866,7 +866,7 @@ endif()
|
||||
diff -urN OpenCV-2.1.0-orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300
|
||||
+++ OpenCV-2.1.0/CMakeLists.txt 2010-04-13 17:17:47.000000000 +0300
|
||||
@@ -1067,7 +1067,7 @@
|
||||
add_subdirectory(doc)
|
||||
add_subdirectory(data)
|
||||
|
||||
@ -11,10 +10,9 @@ Index: CMakeLists.txt
|
||||
add_subdirectory(samples)
|
||||
endif()
|
||||
|
||||
Index: samples/CMakeLists.txt
|
||||
===================================================================
|
||||
--- samples/CMakeLists.txt.orig
|
||||
+++ samples/CMakeLists.txt
|
||||
diff -urN OpenCV-2.1.0-orig/samples/CMakeLists.txt OpenCV-2.1.0/samples/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/samples/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300
|
||||
+++ OpenCV-2.1.0/samples/CMakeLists.txt 2010-04-13 17:17:46.000000000 +0300
|
||||
@@ -3,6 +3,15 @@
|
||||
#
|
||||
# ----------------------------------------------------------------------------
|
||||
@ -31,10 +29,9 @@ Index: samples/CMakeLists.txt
|
||||
+if(INSTALL_OCTAVE_EXAMPLES)
|
||||
add_subdirectory(octave)
|
||||
+endif()
|
||||
Index: samples/python/CMakeLists.txt
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ samples/python/CMakeLists.txt
|
||||
diff -urN OpenCV-2.1.0-orig/samples/python/CMakeLists.txt OpenCV-2.1.0/samples/python/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
|
||||
+++ OpenCV-2.1.0/samples/python/CMakeLists.txt 2010-04-13 17:18:08.000000000 +0300
|
||||
@@ -0,0 +1,13 @@
|
||||
+# -------------------------------------------------------------------------
|
||||
+# CMake file for Python samples. See root CMakeLists.txt
|
||||
@ -49,10 +46,9 @@ Index: samples/python/CMakeLists.txt
|
||||
+ WORLD_READ WORLD_EXECUTE)
|
||||
+endif()
|
||||
+
|
||||
Index: samples/swig_python/CMakeLists.txt
|
||||
===================================================================
|
||||
--- samples/swig_python/CMakeLists.txt.orig
|
||||
+++ samples/swig_python/CMakeLists.txt
|
||||
diff -urN OpenCV-2.1.0-orig/samples/swig_python/CMakeLists.txt OpenCV-2.1.0/samples/swig_python/CMakeLists.txt
|
||||
--- OpenCV-2.1.0-orig/samples/swig_python/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300
|
||||
+++ OpenCV-2.1.0/samples/swig_python/CMakeLists.txt 2010-04-13 17:17:44.000000000 +0300
|
||||
@@ -5,7 +5,7 @@
|
||||
file(GLOB PYTHON_SAMPLES *.py)
|
||||
if(NOT WIN32)
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 13 19:54:42 EEST 2010 - koprok@nand.bg
|
||||
|
||||
- Update to OpenCV 2.1.0:
|
||||
* The whole OpenCV is now using exceptions instead of the old
|
||||
libc-style mechanism
|
||||
* Experimental "static" OpenCV configuration in CMake was
|
||||
contributed by Jose Luis Blanco.
|
||||
Pass "BUILD_SHARED_LIBS=OFF" to CMake to build OpenCV statically.
|
||||
* new improved version of one-way descriptor is added
|
||||
* User can now control the image areas visible after the stereo
|
||||
rectification
|
||||
* Fullscreen has been added (thanks to Yannick Verdie).
|
||||
* Further info at:
|
||||
http://opencv.willowgarage.com/wiki/OpenCV%20Change%20Logs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 7 14:12:03 UTC 2010 - coolo@novell.com
|
||||
|
||||
|
||||
17
opencv.spec
17
opencv.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package opencv (Version 2.0.0)
|
||||
# spec file for package opencv (Version 2.1.0)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -21,15 +21,15 @@
|
||||
Name: opencv
|
||||
%define libname lib%{name}
|
||||
%define soname 2
|
||||
Version: 2.0.0
|
||||
Release: 3
|
||||
Version: 2.1.0
|
||||
Release: 1
|
||||
Summary: Collection of algorithms for computer vision
|
||||
Group: Development/Libraries
|
||||
License: BSD3c
|
||||
Url: http://%{name}.willowgarage.com/wiki/
|
||||
Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/2.0/OpenCV-%{version}.tar.bz2
|
||||
Patch0: %{libname}-libdir.patch
|
||||
Patch1: %{libname}-samples.patch
|
||||
Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/2.1/OpenCV-%{version}.tar.bz2
|
||||
Patch0: %{name}-2.1-libdir.patch
|
||||
Patch1: %{name}-2.1-samples.patch
|
||||
Patch2: libpng14.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: gstreamer-0_10-devel libdc1394-devel libv4l-devel libxine-devel
|
||||
@ -101,8 +101,8 @@ This package contains the documentation and examples for the OpenCV library.
|
||||
|
||||
%prep
|
||||
%setup -qn OpenCV-%{version}
|
||||
%patch0
|
||||
%patch1
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
# Windows specific and with wrong end of line
|
||||
%{__rm} -f doc/packaging.txt
|
||||
@ -149,7 +149,6 @@ rm -rf %{buildroot}
|
||||
|
||||
%files -n %{name}
|
||||
%defattr(0644, root, root, 0755)
|
||||
%doc AUTHORS COPYING THANKS TODO
|
||||
%attr(0755, root, root) %{_bindir}/%{name}_*
|
||||
%{_datadir}/%{name}
|
||||
%exclude %{_datadir}/%{name}/OpenCVConfig.cmake
|
||||
|
||||
Loading…
Reference in New Issue
Block a user