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

Accepting request 127826 from KDE:Distro:Factory

Browse Source 
Update to OpenCV 2.4.2 (forwarded request 127177 from koprok)

OBS-URL: https://build.opensuse.org/request/show/127826
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=34
This commit is contained in:
Stephan Kulow 2012-07-22 13:17:05 +00:00 committed by Git OBS Bridge
parent 400d48dd10
commit ca3e92bd56
6 changed files with 38 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenCV-2.4.1.tar.bz2
View File

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

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

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

36
opencv-datadir.patch
View File

@ -1,36 +0,0 @@
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)
+ set(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
endif()
if(ANDROID)
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)
endif()

42
opencv-samples.patch
View File

@ -1,7 +1,7 @@
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 @@
diff -urN OpenCV-2.4.2-orig/CMakeLists.txt OpenCV-2.4.2/CMakeLists.txt
--- OpenCV-2.4.2-orig/CMakeLists.txt 2012-06-29 01:56:14.000000000 +0300
+++ OpenCV-2.4.2/CMakeLists.txt 2012-07-05 11:43:12.211958988 +0300
@@ -423,7 +423,7 @@
add_subdirectory(apps)
# examples
@ -10,9 +10,9 @@ diff -urN OpenCV-2.4.0-orig/CMakeLists.txt OpenCV-2.4.0/CMakeLists.txt
add_subdirectory(samples)
endif()
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
diff -urN OpenCV-2.4.2-orig/samples/CMakeLists.txt OpenCV-2.4.2/samples/CMakeLists.txt
--- OpenCV-2.4.2-orig/samples/CMakeLists.txt 2012-06-29 01:55:28.000000000 +0300
+++ OpenCV-2.4.2/samples/CMakeLists.txt 2012-07-05 11:43:12.212959015 +0300
@@ -3,6 +3,7 @@
#
# ----------------------------------------------------------------------------
@ -31,21 +31,21 @@ diff -urN OpenCV-2.4.0-orig/samples/CMakeLists.txt OpenCV-2.4.0/samples/CMakeLis
+add_subdirectory(python)
+add_subdirectory(python2)
+endif()
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
diff -urN OpenCV-2.4.2-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.2/samples/gpu/CMakeLists.txt
--- OpenCV-2.4.2-orig/samples/gpu/CMakeLists.txt 2012-06-29 01:55:28.000000000 +0300
+++ OpenCV-2.4.2/samples/gpu/CMakeLists.txt 2012-07-05 11:43:12.212959015 +0300
@@ -64,7 +64,7 @@
if (NOT WIN32)
if (INSTALL_C_EXAMPLES AND 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
- DESTINATION share/OpenCV/samples/${project}
+ DESTINATION share/OpenCV/samples/gpu
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif()
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
diff -urN OpenCV-2.4.2-orig/samples/python/CMakeLists.txt OpenCV-2.4.2/samples/python/CMakeLists.txt
--- OpenCV-2.4.2-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.4.2/samples/python/CMakeLists.txt 2012-07-05 11:43:25.429310480 +0300
@@ -0,0 +1,12 @@
+# -------------------------------------------------------------------------
+# CMake file for Python samples. See root CMakeLists.txt
@ -54,14 +54,14 @@ diff -urN OpenCV-2.4.0-orig/samples/python/CMakeLists.txt OpenCV-2.4.0/samples/p
+file(GLOB PYTHON_SAMPLES *.py)
+if(NOT WIN32)
+install(FILES ${PYTHON_SAMPLES}
+ DESTINATION share/opencv/samples/python
+ DESTINATION share/OpenCV/samples/python
+ PERMISSIONS OWNER_READ OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE)
+endif()
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
diff -urN OpenCV-2.4.2-orig/samples/python2/CMakeLists.txt OpenCV-2.4.2/samples/python2/CMakeLists.txt
--- OpenCV-2.4.2-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ OpenCV-2.4.2/samples/python2/CMakeLists.txt 2012-07-05 11:43:39.461679267 +0300
@@ -0,0 +1,12 @@
+# -------------------------------------------------------------------------
+# CMake file for Python samples. See root CMakeLists.txt
@ -70,7 +70,7 @@ diff -urN OpenCV-2.4.0-orig/samples/python2/CMakeLists.txt OpenCV-2.4.0/samples/
+file(GLOB PYTHON_SAMPLES *.py)
+if(NOT WIN32)
+install(FILES ${PYTHON_SAMPLES}
+ DESTINATION share/opencv/samples/python2
+ DESTINATION share/OpenCV/samples/python2
+ PERMISSIONS OWNER_READ OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE)

8
opencv.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 5 11:17:21 EEST 2012 - koprok@nand.bg
- Update to OpenCV 2.4.2
More info at:
http://code.opencv.org/projects/opencv/wiki/ChangeLog
- Drop opencv-datadir.patch to comply with upstream directory layout
-------------------------------------------------------------------
Fri Jun 8 11:07:47 EEST 2012 - koprok@nand.bg

15
opencv.spec
View File

@ -21,7 +21,7 @@
Name: opencv
%define libname lib%{name}
%define soname 2_4
Version: 2.4.1
Version: 2.4.2
Release: 0
Summary: Collection of algorithms for computer vision
License: BSD-3-Clause
@ -32,8 +32,6 @@ Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-
Patch1: %{name}-samples.patch
# PATCH-FIX-UPSTREAM opencv-underlinking.patch koprok@nand.bg -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there.
Patch2: %{name}-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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenEXR-devel
BuildRequires: cmake
@ -106,7 +104,6 @@ This package contains the documentation and examples for the OpenCV library.
%setup -qn OpenCV-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Windows specific and with wrong end of line
rm -f doc/packaging.txt
@ -140,8 +137,8 @@ make %{?_smp_mflags} VERBOSE=1
cd build
make DESTDIR=%{?buildroot:%{buildroot}} install/fast
mkdir -p %{buildroot}%{_docdir}
mv %{buildroot}%{_datadir}/%{name}/doc %{buildroot}%{_docdir}/%{name}-doc
mv %{buildroot}%{_datadir}/%{name}/samples %{buildroot}%{_docdir}/%{name}-doc/examples
mv %{buildroot}%{_datadir}/OpenCV/doc %{buildroot}%{_docdir}/%{name}-doc
mv %{buildroot}%{_datadir}/OpenCV/samples %{buildroot}%{_docdir}/%{name}-doc/examples
dos2unix %{buildroot}%{_docdir}/%{name}-doc/examples/python*/*.py
dos2unix %{buildroot}%{_docdir}/%{name}-doc/examples/gpu/*.cpp
%fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples
@ -160,8 +157,8 @@ rm -rf %{buildroot}
%files -n %{name}
%defattr(0644, root, root, 0755)
%attr(0755, root, root) %{_bindir}/%{name}_*
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/OpenCVConfig*.cmake
%{_datadir}/OpenCV
%exclude %{_datadir}/OpenCV/OpenCVConfig*.cmake
%files devel
%defattr(0644, root, root, 0755)
@ -169,7 +166,7 @@ rm -rf %{buildroot}
%{_includedir}/opencv2
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/%{name}/OpenCVConfig*.cmake
%{_datadir}/OpenCV/OpenCVConfig*.cmake
%files -n python-%{name}
%defattr(0644, root, root, 0755)