From 47aa691da920e1c3fcd3c7294fe2ce9579097768a6e70974ae50e35a8f7a1f28 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 6 Mar 2013 06:22:17 +0000 Subject: [PATCH] Accepting request 157414 from KDE:Distro:Factory Update to OpenCV 2.4.4 (forwarded request 157413 from koprok) OBS-URL: https://build.opensuse.org/request/show/157414 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=39 --- OpenCV-2.4.3.tar.bz2 | 3 --- OpenCV-2.4.4.tar.bz2 | 3 +++ opencv-samples.patch | 42 +++++++++++++++++++-------------------- opencv-underlinking.patch | 12 +++++------ opencv.changes | 22 ++++++++++++++++++++ opencv.spec | 5 +++-- 6 files changed, 55 insertions(+), 32 deletions(-) delete mode 100644 OpenCV-2.4.3.tar.bz2 create mode 100644 OpenCV-2.4.4.tar.bz2 diff --git a/OpenCV-2.4.3.tar.bz2 b/OpenCV-2.4.3.tar.bz2 deleted file mode 100644 index 6045a8a..0000000 --- a/OpenCV-2.4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b -size 67240491 diff --git a/OpenCV-2.4.4.tar.bz2 b/OpenCV-2.4.4.tar.bz2 new file mode 100644 index 0000000..ca92058 --- /dev/null +++ b/OpenCV-2.4.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e43a98ebf7d25691a5b5a6c7f11cb6c1ca2cf2d42a2dfae0b605d4b4bc6d770 +size 58528727 diff --git a/opencv-samples.patch b/opencv-samples.patch index 5e80cc8..ebc36ec 100644 --- a/opencv-samples.patch +++ b/opencv-samples.patch @@ -1,8 +1,8 @@ -diff -urN OpenCV-2.4.3-orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt ---- OpenCV-2.4.3-orig/CMakeLists.txt 2012-11-02 17:04:07.000000000 +0200 -+++ OpenCV-2.4.3/CMakeLists.txt 2012-11-28 12:01:07.942804657 +0200 -@@ -455,7 +455,7 @@ - add_subdirectory(apps) +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 @@ + endif() # examples -if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES) @@ -10,9 +10,9 @@ diff -urN OpenCV-2.4.3-orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt add_subdirectory(samples) endif() -diff -urN OpenCV-2.4.3-orig/samples/CMakeLists.txt OpenCV-2.4.3/samples/CMakeLists.txt ---- OpenCV-2.4.3-orig/samples/CMakeLists.txt 2012-08-09 01:55:05.000000000 +0300 -+++ OpenCV-2.4.3/samples/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 +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 @@ # # ---------------------------------------------------------------------------- @@ -31,9 +31,9 @@ diff -urN OpenCV-2.4.3-orig/samples/CMakeLists.txt OpenCV-2.4.3/samples/CMakeLis +add_subdirectory(python) +add_subdirectory(python2) +endif() -diff -urN OpenCV-2.4.3-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt ---- OpenCV-2.4.3-orig/samples/gpu/CMakeLists.txt 2012-10-18 01:55:38.000000000 +0300 -+++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 +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 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32) file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) @@ -43,11 +43,11 @@ diff -urN OpenCV-2.4.3-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() -diff -urN OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt OpenCV-2.4.3/samples/ocl/CMakeLists.txt ---- OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt 2012-10-18 01:55:38.000000000 +0300 -+++ OpenCV-2.4.3/samples/ocl/CMakeLists.txt 2012-11-28 13:16:24.943465391 +0200 +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 (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} @@ -55,9 +55,9 @@ diff -urN OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt OpenCV-2.4.3/samples/ocl/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() -diff -urN OpenCV-2.4.3-orig/samples/python/CMakeLists.txt OpenCV-2.4.3/samples/python/CMakeLists.txt ---- OpenCV-2.4.3-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 -+++ OpenCV-2.4.3/samples/python/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 +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 @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------- +# CMake file for Python samples. See root CMakeLists.txt @@ -71,9 +71,9 @@ diff -urN OpenCV-2.4.3-orig/samples/python/CMakeLists.txt OpenCV-2.4.3/samples/p + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) +endif() -diff -urN OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt OpenCV-2.4.3/samples/python2/CMakeLists.txt ---- OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 -+++ OpenCV-2.4.3/samples/python2/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 +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 @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------- +# CMake file for Python samples. See root CMakeLists.txt diff --git a/opencv-underlinking.patch b/opencv-underlinking.patch index 6f99f01..62e3f3d 100644 --- a/opencv-underlinking.patch +++ b/opencv-underlinking.patch @@ -1,11 +1,11 @@ -diff -urN OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake ---- OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake 2012-05-31 17:05:39.000000000 +0300 -+++ OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake 2012-06-08 11:26:23.643869881 +0300 -@@ -75,6 +75,7 @@ - ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2) +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) if(WITH_V4L) CHECK_MODULE(libv4l1 HAVE_LIBV4L) + CHECK_MODULE(libv4l2 HAVE_LIBV4L2) CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L) CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2) - endif(WITH_V4L) + CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO) diff --git a/opencv.changes b/opencv.changes index a1f0b13..1bae1c1 100644 --- a/opencv.changes +++ b/opencv.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Mar 5 14:42:49 EET 2013 - koprok@nand.bg + +- Update to OpenCV 2.4.4 + More info at: + http://opencv.org/opencv-2-4-4-is-out.html + The brief list of changes: + * OpenCV Java bindings are ported from Android to desktop Java! + Actually any JVM language will work, see Tutorial for details, + and Java or Scala code samples. + * Android application framework, samples, tutorials, and OpenCV + Manager are improved. + * Optimizations for the new NVIDIA Kepler architecture, CARMA + platform support and other new optimizations in CUDA. + * OpenCL module now builds successfully with various SDKs (from + AMD, NVIDIA, Intel and Apple) and runs well on different GPUs + (AMD, NVidia, Intel HD4000). A lot of new functionality has been + added, tons of bugs fixed, performance of many functions has + been significantly improved. + * 100+ reported problems have been resolved since 2.4.3, thanks + everybody who participated! + ------------------------------------------------------------------- Sat Dec 1 12:56:09 UTC 2012 - tittiatcoke@gmail.com diff --git a/opencv.spec b/opencv.spec index b8dedbf..255de21 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,7 +1,7 @@ # # spec file for package opencv # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: opencv %define libname lib%{name} %define soname 2_4 -Version: 2.4.3 +Version: 2.4.4 Release: 0 Summary: Collection of algorithms for computer vision License: BSD-3-Clause @@ -55,6 +55,7 @@ BuildRequires: pkgconfig(glu) BuildRequires: libffmpeg-devel %endif BuildRequires: libv4l-devel +BuildRequires: python-sphinx %description OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C