Update to lastest update Not built yet as this package still need works
This commit is contained in:
parent
83f1587798
commit
73057187ea
@ -1 +1 @@
|
|||||||
OpenCV-2.0.0.tar.bz2
|
OpenCV-2.1.0.tar.bz2
|
||||||
|
1
import.log
Normal file
1
import.log
Normal file
@ -0,0 +1 @@
|
|||||||
|
opencv-2_1_0-1_fc11:HEAD:opencv-2.1.0-1.fc11.src.rpm:1273158513
|
@ -1,11 +0,0 @@
|
|||||||
--- trunk/opencv/src/cxcore/cxrand.cpp 2009/11/13 13:53:03 2281
|
|
||||||
+++ trunk/opencv/src/cxcore/cxrand.cpp 2009/11/13 14:55:04 2282
|
|
||||||
@@ -303,7 +303,7 @@
|
|
||||||
{
|
|
||||||
const float r = 3.442620f; // The start of the right tail
|
|
||||||
const float rng_flt = 2.3283064365386962890625e-10f; // 2^-32
|
|
||||||
- static unsigned kn[127];
|
|
||||||
+ static unsigned kn[128];
|
|
||||||
static float wn[128], fn[128];
|
|
||||||
uint64 temp = *state;
|
|
||||||
static bool initialized=false;
|
|
129
opencv-cmake-libdir-2.1.0.patch
Normal file
129
opencv-cmake-libdir-2.1.0.patch
Normal file
@ -0,0 +1,129 @@
|
|||||||
|
diff -up OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt.orig OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
|
||||||
|
diff -up OpenCV-2.1.0/CMakeLists.txt.orig OpenCV-2.1.0/CMakeLists.txt
|
||||||
|
--- OpenCV-2.1.0/CMakeLists.txt.orig 2010-04-06 03:24:37.000000000 +0200
|
||||||
|
+++ OpenCV-2.1.0/CMakeLists.txt 2010-04-19 11:46:37.372528366 +0200
|
||||||
|
@@ -467,8 +467,8 @@ if(BUILD_SWIG_PYTHON_SUPPORT OR BUILD_NE
|
||||||
|
|
||||||
|
string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
|
||||||
|
if(UNIX)
|
||||||
|
- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
|
||||||
|
- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
|
||||||
|
+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
|
||||||
|
+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
|
||||||
|
endif()
|
||||||
|
if(WIN32)
|
||||||
|
get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
|
||||||
|
@@ -932,7 +932,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_D
|
||||||
|
# Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:
|
||||||
|
|
||||||
|
set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv")
|
||||||
|
-set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib")
|
||||||
|
+set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
|
||||||
|
|
||||||
|
#exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/unix-install/\"")
|
||||||
|
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"")
|
||||||
|
@@ -965,19 +965,19 @@ endif()
|
||||||
|
# Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"
|
||||||
|
# prefix=/usr
|
||||||
|
# exec_prefix=${prefix}
|
||||||
|
-# libdir=${exec_prefix}/lib
|
||||||
|
+# 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(VERSION ${OPENCV_VERSION})
|
||||||
|
|
||||||
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
|
||||||
|
|
||||||
|
if(UNIX)
|
||||||
|
- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)
|
||||||
|
+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
diff -up OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt.orig OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
|
||||||
|
--- OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt.orig 2010-04-06 03:24:40.000000000 +0200
|
||||||
|
+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-04-19 11:48:35.488528706 +0200
|
||||||
|
@@ -40,6 +40,6 @@ set_target_properties(${the_target} PROP
|
||||||
|
|
||||||
|
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
|
||||||
|
)
|
||||||
|
diff -up OpenCV-2.1.0/src/cv/CMakeLists.txt.orig OpenCV-2.1.0/src/cv/CMakeLists.txt
|
||||||
|
--- OpenCV-2.1.0/src/cv/CMakeLists.txt.orig 2010-04-06 03:24:42.000000000 +0200
|
||||||
|
+++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-04-19 11:48:18.834529206 +0200
|
||||||
|
@@ -71,8 +71,8 @@ add_dependencies(${the_target} cxcore)
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
install(FILES ${lib_hdrs}
|
||||||
|
DESTINATION include/opencv
|
||||||
|
diff -up OpenCV-2.1.0/src/cxcore/CMakeLists.txt.orig OpenCV-2.1.0/src/cxcore/CMakeLists.txt
|
||||||
|
--- OpenCV-2.1.0/src/cxcore/CMakeLists.txt.orig 2010-04-06 03:24:44.000000000 +0200
|
||||||
|
+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-04-19 11:47:53.671528574 +0200
|
||||||
|
@@ -71,8 +71,8 @@ add_dependencies(${the_target} opencv_la
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
# install each module headers separately
|
||||||
|
install(FILES ${lib_hdrs}
|
||||||
|
diff -up OpenCV-2.1.0/src/cvaux/CMakeLists.txt.orig OpenCV-2.1.0/src/cvaux/CMakeLists.txt
|
||||||
|
--- OpenCV-2.1.0/src/cvaux/CMakeLists.txt.orig 2010-04-06 03:24:43.000000000 +0200
|
||||||
|
+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-04-23 12:24:39.197547832 +0200
|
||||||
|
@@ -76,8 +76,8 @@ add_dependencies(${the_target} cxcore cv
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
install(FILES ${aux_hdrs_ext}
|
||||||
|
DESTINATION include/opencv
|
||||||
|
diff -up OpenCV-2.1.0/src/highgui/CMakeLists.txt.orig OpenCV-2.1.0/src/highgui/CMakeLists.txt
|
||||||
|
--- OpenCV-2.1.0/src/highgui/CMakeLists.txt.orig 2010-04-06 03:24:44.000000000 +0200
|
||||||
|
+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-04-23 12:26:02.813546985 +0200
|
||||||
|
@@ -282,8 +282,8 @@ endif()
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
install(FILES ${highgui_ext_hdrs}
|
||||||
|
DESTINATION include/opencv
|
||||||
|
diff -up OpenCV-2.1.0/src/ml/CMakeLists.txt.orig OpenCV-2.1.0/src/ml/CMakeLists.txt
|
||||||
|
--- OpenCV-2.1.0/src/ml/CMakeLists.txt.orig 2010-04-06 03:24:45.000000000 +0200
|
||||||
|
+++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-04-23 12:25:06.485567884 +0200
|
||||||
|
@@ -61,8 +61,8 @@ add_dependencies(${the_target} cxcore)
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
install(FILES ${lib_hdrs}
|
||||||
|
DESTINATION include/opencv
|
@ -1,163 +0,0 @@
|
|||||||
diff -Naur OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt
|
|
||||||
--- OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt 2009-10-01 01:21:00.000000000 +0100
|
|
||||||
+++ OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt 2010-02-25 23:10:44.000000000 +0100
|
|
||||||
@@ -86,8 +86,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 -Naur OpenCV-2.0.0.orig/CMakeLists.txt OpenCV-2.0.0/CMakeLists.txt
|
|
||||||
--- OpenCV-2.0.0.orig/CMakeLists.txt 2009-10-01 01:21:05.000000000 +0100
|
|
||||||
+++ OpenCV-2.0.0/CMakeLists.txt 2010-02-25 23:10:44.000000000 +0100
|
|
||||||
@@ -405,8 +405,8 @@
|
|
||||||
|
|
||||||
string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
|
|
||||||
if(UNIX)
|
|
||||||
- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
|
|
||||||
- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
|
|
||||||
+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
|
|
||||||
+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
|
|
||||||
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 @@
|
|
||||||
# Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:
|
|
||||||
|
|
||||||
set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv")
|
|
||||||
-set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib")
|
|
||||||
+set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
|
|
||||||
|
|
||||||
#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 @@
|
|
||||||
# Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"
|
|
||||||
# prefix=/usr
|
|
||||||
# exec_prefix=${prefix}
|
|
||||||
-# libdir=${exec_prefix}/lib
|
|
||||||
+# 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(VERSION ${OPENCV_VERSION})
|
|
||||||
|
|
||||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
|
|
||||||
|
|
||||||
if(UNIX)
|
|
||||||
- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)
|
|
||||||
+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
diff -Naur OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt
|
|
||||||
--- OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt 2009-10-01 01:20:57.000000000 +0100
|
|
||||||
+++ OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt 2010-02-25 23:10:44.000000000 +0100
|
|
||||||
@@ -33,5 +33,5 @@
|
|
||||||
|
|
||||||
install(TARGETS ${the_target}
|
|
||||||
RUNTIME DESTINATION bin COMPONENT main
|
|
||||||
- LIBRARY DESTINATION lib COMPONENT main
|
|
||||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
|
||||||
)
|
|
||||||
diff -Naur OpenCV-2.0.0.orig/src/cv/CMakeLists.txt OpenCV-2.0.0/src/cv/CMakeLists.txt
|
|
||||||
--- OpenCV-2.0.0.orig/src/cv/CMakeLists.txt 2009-10-01 01:20:58.000000000 +0100
|
|
||||||
+++ OpenCV-2.0.0/src/cv/CMakeLists.txt 2010-02-25 23:10:44.000000000 +0100
|
|
||||||
@@ -66,8 +66,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)
|
|
||||||
|
|
||||||
install(FILES ${lib_hdrs}
|
|
||||||
DESTINATION include/opencv
|
|
||||||
diff -Naur OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.0.0/src/cvaux/CMakeLists.txt
|
|
||||||
--- OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt 2009-10-01 01:20:59.000000000 +0100
|
|
||||||
+++ OpenCV-2.0.0/src/cvaux/CMakeLists.txt 2010-02-25 23:10:44.000000000 +0100
|
|
||||||
@@ -76,8 +76,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)
|
|
||||||
|
|
||||||
install(FILES ${aux_hdrs_ext}
|
|
||||||
DESTINATION include/opencv
|
|
||||||
diff -Naur OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.0.0/src/cxcore/CMakeLists.txt
|
|
||||||
--- OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt 2009-10-01 01:20:59.000000000 +0100
|
|
||||||
+++ OpenCV-2.0.0/src/cxcore/CMakeLists.txt 2010-02-25 23:10:44.000000000 +0100
|
|
||||||
@@ -66,8 +66,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)
|
|
||||||
|
|
||||||
# install each module headers separately
|
|
||||||
install(FILES ${lib_hdrs}
|
|
||||||
diff -Naur OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt OpenCV-2.0.0/src/highgui/CMakeLists.txt
|
|
||||||
--- OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt 2009-10-01 01:20:58.000000000 +0100
|
|
||||||
+++ OpenCV-2.0.0/src/highgui/CMakeLists.txt 2010-02-25 23:10:44.000000000 +0100
|
|
||||||
@@ -191,8 +191,8 @@
|
|
||||||
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 @@
|
|
||||||
|
|
||||||
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)
|
|
||||||
|
|
||||||
install(FILES ${highgui_ext_hdrs}
|
|
||||||
DESTINATION include/opencv
|
|
||||||
diff -Naur OpenCV-2.0.0.orig/src/ml/CMakeLists.txt OpenCV-2.0.0/src/ml/CMakeLists.txt
|
|
||||||
--- OpenCV-2.0.0.orig/src/ml/CMakeLists.txt 2009-10-01 01:20:59.000000000 +0100
|
|
||||||
+++ OpenCV-2.0.0/src/ml/CMakeLists.txt 2010-02-25 23:10:44.000000000 +0100
|
|
||||||
@@ -61,8 +61,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)
|
|
||||||
|
|
||||||
install(FILES ${lib_hdrs}
|
|
||||||
DESTINATION include/opencv
|
|
||||||
diff -Naur OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt OpenCV-2.0.0/tests/cxts/CMakeLists.txt
|
|
||||||
--- OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt 2009-10-01 01:20:56.000000000 +0100
|
|
||||||
+++ OpenCV-2.0.0/tests/cxts/CMakeLists.txt 2010-02-25 23:10:44.000000000 +0100
|
|
||||||
@@ -63,6 +63,6 @@
|
|
||||||
if(WIN32)
|
|
||||||
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)
|
|
||||||
endif()
|
|
46
opencv.spec
46
opencv.spec
@ -3,8 +3,8 @@
|
|||||||
%global tar_name OpenCV
|
%global tar_name OpenCV
|
||||||
|
|
||||||
Name: opencv
|
Name: opencv
|
||||||
Version: 2.0.0
|
Version: 2.1.0
|
||||||
Release: 10%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Collection of algorithms for computer vision
|
Summary: Collection of algorithms for computer vision
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -14,16 +14,14 @@ URL: http://opencv.willowgarage.com/wiki/
|
|||||||
Source0: http://prdownloads.sourceforge.net/opencvlibrary/%{tar_name}-%{version}.tar.bz2
|
Source0: http://prdownloads.sourceforge.net/opencvlibrary/%{tar_name}-%{version}.tar.bz2
|
||||||
Source1: opencv-samples-Makefile
|
Source1: opencv-samples-Makefile
|
||||||
# Fedora cmake macros define -DLIB_SUFFIX=64 on 64 bits platforms
|
# Fedora cmake macros define -DLIB_SUFFIX=64 on 64 bits platforms
|
||||||
Patch0: opencv-cmake-libdir.patch
|
Patch0: opencv-cmake-libdir-2.1.0.patch
|
||||||
# Fixes memory corruption in the gaussian random number generator.
|
|
||||||
# Fixed in the revision 2282 of the upstream svn repository.
|
|
||||||
Patch1: opencv-2.0.0-gaussianrng.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: cmake >= 2.4
|
BuildRequires: cmake >= 2.4
|
||||||
|
|
||||||
BuildRequires: gtk2-devel
|
BuildRequires: gtk2-devel
|
||||||
|
BuildRequires: imlib2-devel
|
||||||
BuildRequires: libucil-devel
|
BuildRequires: libucil-devel
|
||||||
BuildRequires: libtheora-devel
|
BuildRequires: libtheora-devel
|
||||||
BuildRequires: libvorbis-devel
|
BuildRequires: libvorbis-devel
|
||||||
@ -32,6 +30,7 @@ BuildRequires: libraw1394-devel
|
|||||||
BuildRequires: libdc1394-devel
|
BuildRequires: libdc1394-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: jasper-devel
|
BuildRequires: jasper-devel
|
||||||
|
BuildRequires: lapack-devel
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libtiff-devel
|
BuildRequires: libtiff-devel
|
||||||
@ -40,7 +39,7 @@ BuildRequires: zlib-devel, pkgconfig
|
|||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: python-imaging, numpy, swig >= 1.3.24
|
BuildRequires: python-imaging, numpy, swig >= 1.3.24
|
||||||
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9}
|
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9}
|
||||||
%{!?_without_gstreamer:BuildRequires: gstreamer-devel}
|
%{!?_without_gstreamer:BuildRequires: gstreamer-devel gstreamer-plugins-base-devel}
|
||||||
%{?_with_xine:BuildRequires: xine-lib-devel}
|
%{?_with_xine:BuildRequires: xine-lib-devel}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -85,10 +84,9 @@ This package contains Python bindings for the OpenCV library.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{tar_name}-%{version}
|
%setup -q -n %{tar_name}-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p2 -b .gaussianrng
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
%ifarch i386
|
%ifarch i386
|
||||||
export CXXFLAGS="%{__global_cflags} -m32 -fasynchronous-unwind-tables"
|
export CXXFLAGS="%{__global_cflags} -m32 -fasynchronous-unwind-tables"
|
||||||
%endif
|
%endif
|
||||||
@ -110,7 +108,7 @@ make VERBOSE=1 %{?_smp_mflags}
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT __devel-doc
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
|
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
|
||||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||||
|
|
||||||
@ -135,6 +133,17 @@ chmod 0755 $RPM_BUILD_ROOT%{_datadir}/opencv/samples/python/*.py
|
|||||||
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/cv.so
|
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/cv.so
|
||||||
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/opencv/*.so
|
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/opencv/*.so
|
||||||
|
|
||||||
|
#Remove uneeded README.txt (howto install related)
|
||||||
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/opencv-%{version}/
|
||||||
|
#Use appropriate _docdir
|
||||||
|
mkdir -p __devel-doc
|
||||||
|
cp -apR $RPM_BUILD_ROOT%{_datadir}/doc/opencv-doc-%{version}/ __devel-doc
|
||||||
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/opencv-doc-%{version}/
|
||||||
|
|
||||||
|
#This file is wrong - not redistributed
|
||||||
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/opencv/OpenCVConfig.cmake
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
# Check fails since we don't support most video
|
# Check fails since we don't support most video
|
||||||
@ -155,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc AUTHORS ChangeLog COPYING THANKS TODO
|
%doc doc/README.txt
|
||||||
%{_bindir}/opencv_*
|
%{_bindir}/opencv_*
|
||||||
%{_libdir}/lib*.so.*
|
%{_libdir}/lib*.so.*
|
||||||
%dir %{_datadir}/opencv
|
%dir %{_datadir}/opencv
|
||||||
@ -168,17 +177,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_includedir}/opencv
|
%{_includedir}/opencv
|
||||||
%{_libdir}/lib*.so
|
%{_libdir}/lib*.so
|
||||||
%{_libdir}/pkgconfig/opencv.pc
|
%{_libdir}/pkgconfig/opencv.pc
|
||||||
%{_datadir}/opencv/OpenCVConfig.cmake
|
|
||||||
|
|
||||||
%files devel-docs
|
%files devel-docs
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc %{_datadir}/doc/opencv-2.0.0/
|
%doc __devel-doc/*
|
||||||
%doc %dir %{_datadir}/opencv/samples
|
%{_datadir}/opencv/samples
|
||||||
%doc %{_datadir}/opencv/samples/c
|
|
||||||
%doc %{_docdir}/%{name}-doc-%{version}/%{name}.pdf
|
|
||||||
%doc %{_docdir}/%{name}-doc-%{version}/*.htm
|
|
||||||
%doc %{_docdir}/%{name}-doc-%{version}/%{name}.jpg
|
|
||||||
%doc %{_docdir}/%{name}-doc-%{version}/%{name}-logo*.png
|
|
||||||
|
|
||||||
%files python
|
%files python
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
@ -190,6 +194,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 23 2010 Nicolas Chauvet <kwizart@fedoraproject.org> - 2.1.0-1
|
||||||
|
- Update to 2.1.0
|
||||||
|
- Update libdir patch
|
||||||
|
|
||||||
* Tue Apr 13 2010 Karel Klic <kklic@redhat.com> - 2.0.0-10
|
* Tue Apr 13 2010 Karel Klic <kklic@redhat.com> - 2.0.0-10
|
||||||
- Fix nonstandard executable permissions
|
- Fix nonstandard executable permissions
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user