Accepting request 207348 from KDE:Extra

Update to 2.4.7 OBS-URL: https://build.opensuse.org/request/show/207348 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=46
2013-11-18 12:09:08 +00:00 · 2013-11-18 12:09:08 +00:00 · ceb3478124
commit ceb3478124
parent 6ca799f387
7 changed files with 88 additions and 47 deletions
--- a/improve-sphinx-search.diff
+++ b/improve-sphinx-search.diff
@ -0,0 +1,17 @@
+diff -Naur opencv-2.4.7.orig/cmake/OpenCVDetectPython.cmake opencv-2.4.7/cmake/OpenCVDetectPython.cmake
+--- cmake/OpenCVDetectPython.cmake	2013-11-06 15:26:39.000000000 +0100
+++ cmake/OpenCVDetectPython.cmake	2013-11-13 00:36:28.693235793 +0100
+@@ -109,11 +109,11 @@
+                         OUTPUT_QUIET
+                         ERROR_VARIABLE SPHINX_OUTPUT
+                         OUTPUT_STRIP_TRAILING_WHITESPACE)
+-        if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)")
+        if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9]*[^ \n]*)")
+           set(SPHINX_VERSION "${CMAKE_MATCH_1}")
+           set(HAVE_SPHINX 1)
+           message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}")
+-        endif()
+        endif()
+     endif()
+   endif(BUILD_DOCS)
+ endif(PYTHON_EXECUTABLE)
--- a/opencv-2.4.6.1.tar.gz
+++ b/opencv-2.4.6.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae7cfd859476b6cc05246949ddcb165fb284eaf9a6d814b2976dc21088778aa0
-size 80762052
--- a/opencv-2.4.7.tar.gz
+++ b/opencv-2.4.7.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c48d6c735bfa40c76cadcc0106051e095d8b492b05ac7d2cc9647be807dd2a43
+size 85587316
--- a/opencv-samples.patch
+++ b/opencv-samples.patch
@ -1,7 +1,7 @@
-diff -urN OpenCV-2.4.4-orig/CMakeLists.txt OpenCV-2.4.4/CMakeLists.txt
--- OpenCV-2.4.4-orig/CMakeLists.txt	2013-03-01 17:48:03.000000000 +0200
-+++ OpenCV-2.4.4/CMakeLists.txt	2013-03-05 15:05:43.155239930 +0200
-@@ -457,7 +457,7 @@
+diff -Naur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
+--- opencv-2.4.7.orig/CMakeLists.txt	2013-11-06 15:26:39.000000000 +0100
+++ opencv-2.4.7/CMakeLists.txt	2013-11-12 23:58:52.378443609 +0100
+@@ -504,7 +504,7 @@
 endif()
 
 # examples
@ -10,10 +10,10 @@ diff -urN OpenCV-2.4.4-orig/CMakeLists.txt OpenCV-2.4.4/CMakeLists.txt
   add_subdirectory(samples)
 endif()
 
-diff -urN OpenCV-2.4.4-orig/samples/CMakeLists.txt OpenCV-2.4.4/samples/CMakeLists.txt
--- OpenCV-2.4.4-orig/samples/CMakeLists.txt	2013-01-28 01:00:48.000000000 +0200
-+++ OpenCV-2.4.4/samples/CMakeLists.txt	2013-03-05 15:05:43.156239810 +0200
-@@ -3,6 +3,7 @@
+diff -Naur opencv-2.4.7.orig/samples/CMakeLists.txt opencv-2.4.7/samples/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/CMakeLists.txt	2013-11-06 15:26:39.000000000 +0100
+++ opencv-2.4.7/samples/CMakeLists.txt	2013-11-13 00:01:39.970348422 +0100
+@@ -10,6 +10,7 @@
 #
 # ----------------------------------------------------------------------------
 
@ -21,20 +21,23 @@ diff -urN OpenCV-2.4.4-orig/samples/CMakeLists.txt OpenCV-2.4.4/samples/CMakeLis
 add_subdirectory(c)
 add_subdirectory(cpp)
 add_subdirectory(gpu)
-@@ -11,3 +12,9 @@
+@@ -18,7 +19,12 @@
 if(ANDROID AND BUILD_ANDROID_EXAMPLES)
   add_subdirectory(android)
 endif()
 +endif()
-+
+ 
 +if(INSTALL_PYTHON_EXAMPLES)
 +add_subdirectory(python)
 +add_subdirectory(python2)
 +endif()
-diff -urN OpenCV-2.4.4-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.4/samples/gpu/CMakeLists.txt
--- OpenCV-2.4.4-orig/samples/gpu/CMakeLists.txt	2013-01-28 01:00:49.000000000 +0200
-+++ OpenCV-2.4.4/samples/gpu/CMakeLists.txt	2013-03-05 15:05:43.156239810 +0200
-@@ -64,7 +64,7 @@
+ 
+ #
+ # END OF BUILD CASE 1: Build samples with library sources
+diff -Naur opencv-2.4.7.orig/samples/gpu/CMakeLists.txt opencv-2.4.7/samples/gpu/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/gpu/CMakeLists.txt	2013-11-06 15:26:39.000000000 +0100
+++ opencv-2.4.7/samples/gpu/CMakeLists.txt	2013-11-13 00:02:21.474829545 +0100
+@@ -83,6 +83,6 @@
 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}
@ -42,22 +45,9 @@ diff -urN OpenCV-2.4.4-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.4/samples/gpu/
 +          DESTINATION share/OpenCV/samples/gpu
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 endif()
- 
-diff -urN OpenCV-2.4.4-orig/samples/ocl/CMakeLists.txt OpenCV-2.4.4/samples/ocl/CMakeLists.txt
--- OpenCV-2.4.4-orig/samples/ocl/CMakeLists.txt	2013-01-28 01:00:49.000000000 +0200
-+++ OpenCV-2.4.4/samples/ocl/CMakeLists.txt	2013-03-05 15:05:43.156239810 +0200
-@@ -58,7 +58,7 @@
- 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/ocl
-           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
- endif()
- 
-diff -urN OpenCV-2.4.4-orig/samples/python/CMakeLists.txt OpenCV-2.4.4/samples/python/CMakeLists.txt
--- OpenCV-2.4.4-orig/samples/python/CMakeLists.txt	1970-01-01 02:00:00.000000000 +0200
-+++ OpenCV-2.4.4/samples/python/CMakeLists.txt	2013-03-05 15:05:43.157239687 +0200
+diff -Naur opencv-2.4.7.orig/samples/python/CMakeLists.txt opencv-2.4.7/samples/python/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/python/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
+++ opencv-2.4.7/samples/python/CMakeLists.txt	2013-11-13 00:03:21.049084764 +0100
@@ -0,0 +1,12 @@
 +# -------------------------------------------------------------------------
 +#  CMake file for Python samples. See root CMakeLists.txt
@ -70,10 +60,10 @@ diff -urN OpenCV-2.4.4-orig/samples/python/CMakeLists.txt OpenCV-2.4.4/samples/p
 +        PERMISSIONS OWNER_READ OWNER_EXECUTE
 +                    GROUP_READ GROUP_EXECUTE
 +                    WORLD_READ WORLD_EXECUTE)
-+endif()
-diff -urN OpenCV-2.4.4-orig/samples/python2/CMakeLists.txt OpenCV-2.4.4/samples/python2/CMakeLists.txt
--- OpenCV-2.4.4-orig/samples/python2/CMakeLists.txt	1970-01-01 02:00:00.000000000 +0200
-+++ OpenCV-2.4.4/samples/python2/CMakeLists.txt	2013-03-05 15:05:43.157239687 +0200
+endif() 
+diff -Naur opencv-2.4.7.orig/samples/python2/CMakeLists.txt opencv-2.4.7/samples/python2/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/python2/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
+++ opencv-2.4.7/samples/python2/CMakeLists.txt	2013-11-13 00:03:51.490704191 +0100
@@ -0,0 +1,12 @@
 +# -------------------------------------------------------------------------
 +#  CMake file for Python samples. See root CMakeLists.txt
@ -86,4 +76,4 @@ diff -urN OpenCV-2.4.4-orig/samples/python2/CMakeLists.txt OpenCV-2.4.4/samples/
 +        PERMISSIONS OWNER_READ OWNER_EXECUTE
 +                    GROUP_READ GROUP_EXECUTE
 +                    WORLD_READ WORLD_EXECUTE)
-+endif()
+endif() 
--- a/opencv-underlinking.patch
+++ b/opencv-underlinking.patch
@ -1,11 +1,11 @@
-diff -urN OpenCV-2.4.4-orig/cmake/OpenCVFindLibsVideo.cmake OpenCV-2.4.4/cmake/OpenCVFindLibsVideo.cmake
--- OpenCV-2.4.4-orig/cmake/OpenCVFindLibsVideo.cmake	2013-01-30 00:55:13.000000000 +0200
-+++ OpenCV-2.4.4/cmake/OpenCVFindLibsVideo.cmake	2013-03-05 15:14:30.268631569 +0200
-@@ -88,6 +88,7 @@
- ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2 HAVE_VIDEOIO)
+diff -Naur opencv-2.4.7.orig/cmake/OpenCVFindLibsVideo.cmake opencv-2.4.7/cmake/OpenCVFindLibsVideo.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVFindLibsVideo.cmake	2013-11-06 15:26:39.000000000 +0100
+++ opencv-2.4.7/cmake/OpenCVFindLibsVideo.cmake	2013-11-13 00:06:18.901861298 +0100
+@@ -127,6 +127,7 @@
 if(WITH_V4L)
-   CHECK_MODULE(libv4l1 HAVE_LIBV4L)
-+  CHECK_MODULE(libv4l2 HAVE_LIBV4L2)
+   if(WITH_LIBV4L)
+     CHECK_MODULE(libv4l1 HAVE_LIBV4L)
+    CHECK_MODULE(libv4l2 HAVE_LIBV4L2)
+   endif()
   CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
   CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
-   CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO)
--- a/opencv.changes
+++ b/opencv.changes
@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Tue Nov 12 23:07:23 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Update to OpenCV 2.4.7
+  More info at:
+  http://opencv.org/opencv-2-4-7-is-out.html
+  The brief list of changes:
+  * dynamic OpenCL runtime loading, setting default OpenCL device 
+    via env var, many bug-fixes and some new optimization with OpenCL
+  * bug-fixes and new optimizations in CUDA stuff
+  * latest NDK and Android OS support, Native Android Camera tuning
+  * minor fixes, XAML sample and MS Certification compatibility 
+    in WinRT stuff
+  * 382 pull requests have been merged
+  * 54 reported bugs have been fixed
+- Added pkgconfig(glu) Requires to devel package, as per .pc file
+- Make devel package provides also devel-static one
+- Drop assume-Sphinx-is-there.diff, and add improve-sphinx-search.diff,
+  for properly finding sphinx with alphabetic chars in version
+
+-------------------------------------------------------------------
+Sun Nov 10 09:42:16 UTC 2013 - tittiatcoke@gmail.com
+
+- Add patch assume-Sphinx-is-there.diff to fix building with 
+  Sphinx versions that have alphanumeric characters in the version
+  (Only for factory builds at the moment)
+
 -------------------------------------------------------------------
 Sun Jul 14 16:54:56 UTC 2013 - asterios.dramis@gmail.com

--- a/opencv.spec
+++ b/opencv.spec
@ -22,7 +22,7 @@
 %define soname 2_4

 Name:           opencv
-Version:        2.4.6.1
+Version:        2.4.7
 Release:        0
 Summary:        Collection of algorithms for computer vision
 License:        BSD-3-Clause
@ -33,6 +33,8 @@ 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 improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version
+Patch3:         improve-sphinx-search.diff
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gstreamer-0_10-plugins-base-devel
@ -83,8 +85,11 @@ utilizes Intel Integrated Performance Primitives for better performance.
 %package devel
 Summary:        Development files for using the OpenCV library
 Group:          Development/Libraries/C and C++
+# Since 2.4.7
+Provides:       %{name}-devel-static = %{version}
 Requires:       %{libname}%{soname} = %{version}
 Requires:       %{name} = %{version}
+Requires:       pkgconfig(glu)

 %description devel
 This package contains the OpenCV C/C++ library and header files, as well as
@ -114,6 +119,7 @@ This package contains the documentation and examples for the OpenCV library.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0

 # Remove Windows specific files
 rm -f doc/packaging.txt
@ -177,6 +183,7 @@ chmod 644 %{buildroot}%{_docdir}/%{name}-doc/examples/python2/*.py
 %defattr(-,root,root,-)
 %{_includedir}/opencv/
 %{_includedir}/opencv2/
+%{_libdir}/libopencv_ts.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/OpenCV/OpenCVConfig*.cmake