From fb47706d5295bb4f64968236ff16929015c1a037e6b1869eebef94adbbe3ea5f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 30 Nov 2012 11:26:16 +0000 Subject: [PATCH] Accepting request 143632 from KDE:Distro:Factory Update to OpenCV 2.4.3 (forwarded request 143410 from koprok) OBS-URL: https://build.opensuse.org/request/show/143632 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=36 --- OpenCV-2.4.2.tar.bz2 | 3 --- OpenCV-2.4.3.tar.bz2 | 3 +++ opencv-samples.patch | 62 ++++++++++++++++++++++++++------------------ opencv.changes | 29 +++++++++++++++++++++ opencv.spec | 2 +- 5 files changed, 70 insertions(+), 29 deletions(-) delete mode 100644 OpenCV-2.4.2.tar.bz2 create mode 100644 OpenCV-2.4.3.tar.bz2 diff --git a/OpenCV-2.4.2.tar.bz2 b/OpenCV-2.4.2.tar.bz2 deleted file mode 100644 index b642435..0000000 --- a/OpenCV-2.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:690023811e03e21df996291392fcf78e43e42ef557b9307503c74c74b4272c28 -size 52562911 diff --git a/OpenCV-2.4.3.tar.bz2 b/OpenCV-2.4.3.tar.bz2 new file mode 100644 index 0000000..6045a8a --- /dev/null +++ b/OpenCV-2.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b +size 67240491 diff --git a/opencv-samples.patch b/opencv-samples.patch index e0f1ad6..5e80cc8 100644 --- a/opencv-samples.patch +++ b/opencv-samples.patch @@ -1,7 +1,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 @@ +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) # examples @@ -10,9 +10,9 @@ diff -urN OpenCV-2.4.2-orig/CMakeLists.txt OpenCV-2.4.2/CMakeLists.txt add_subdirectory(samples) endif() -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 +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 @@ -3,6 +3,7 @@ # # ---------------------------------------------------------------------------- @@ -21,7 +21,7 @@ diff -urN OpenCV-2.4.2-orig/samples/CMakeLists.txt OpenCV-2.4.2/samples/CMakeLis add_subdirectory(c) add_subdirectory(cpp) add_subdirectory(gpu) -@@ -10,3 +11,9 @@ +@@ -11,3 +12,9 @@ if(ANDROID AND BUILD_ANDROID_EXAMPLES) add_subdirectory(android) endif() @@ -31,21 +31,33 @@ diff -urN OpenCV-2.4.2-orig/samples/CMakeLists.txt OpenCV-2.4.2/samples/CMakeLis +add_subdirectory(python) +add_subdirectory(python2) +endif() -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 +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 @@ -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 ) - install(FILES ${install_list} -- DESTINATION share/OpenCV/samples/${project} -+ DESTINATION share/OpenCV/samples/gpu - PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) - endif() - -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 + 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 + 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 +@@ -58,7 +58,7 @@ + if (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.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 @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------- +# CMake file for Python samples. See root CMakeLists.txt @@ -59,9 +71,9 @@ diff -urN OpenCV-2.4.2-orig/samples/python/CMakeLists.txt OpenCV-2.4.2/samples/p + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) +endif() -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 +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 @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------- +# CMake file for Python samples. See root CMakeLists.txt diff --git a/opencv.changes b/opencv.changes index 5145cf1..badca48 100644 --- a/opencv.changes +++ b/opencv.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Nov 28 11:33:38 EET 2012 - koprok@nand.bg + +- Update to OpenCV 2.4.3 + More info at: + http://opencv.org/opencv-2-4-3-released.html + The nicely formatted changelog can be seen here: + http://code.opencv.org/projects/opencv/wiki/ChangeLog; + here are the highlights: + * A lot of good stuff from the Google Summer of Code 2012 has been + integrated; this was a very productive summer! + * Significantly improved and optimized Android and iOS ports. + * Greatly extended GPU (i.e. CUDA-based) module. + * The brand new ocl (OpenCL-based) module that unleashes GPU power + also for AMD and Intel GPU users. It’s not included into the + binary package, since there are different SDKs, and it’s not + turned on by default. You need to run CMake and turn on + “WITH_OPENCL”. Also, please note that this is very first version + of the module, so it may be not very stable and not very + functional. + * Much better performance on many-core systems out of the box. You + do not need TBB anymore on MacOSX, iOS and Windows. BTW, the + binary package for Windows is now built without TBB support. + Libraries and DLLs for Visual Studio 2010 use the Concurrency + framework. + * About 130 bugs have been fixed since 2.4.2. + * Since 2.4.3rc we fixed several more problems, in particular some + compile problems with iOS 6 SDK. + ------------------------------------------------------------------- Tue Sep 18 07:22:59 UTC 2012 - coolo@suse.com diff --git a/opencv.spec b/opencv.spec index c293758..bfc793c 100644 --- a/opencv.spec +++ b/opencv.spec @@ -21,7 +21,7 @@ Name: opencv %define libname lib%{name} %define soname 2_4 -Version: 2.4.2 +Version: 2.4.3 Release: 0 Summary: Collection of algorithms for computer vision License: BSD-3-Clause