rpm/opencv
SHA256
1
0
Fork 0
forked from pool/opencv
Code Pull Requests Activity

Accepting request 157414 from KDE:Distro:Factory

Browse Source 
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
This commit is contained in:
Stephan Kulow 2013-03-06 06:22:17 +00:00 committed by Git OBS Bridge
parent bbb57e2559
commit 47aa691da9
6 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenCV-2.4.3.tar.bz2
View File

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5e43a98ebf7d25691a5b5a6c7f11cb6c1ca2cf2d42a2dfae0b605d4b4bc6d770
size 58528727

42
opencv-samples.patch
View File

@ -1,8 +1,8 @@
diff -urN OpenCV-2.4.3-orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt diff -urN OpenCV-2.4.4-orig/CMakeLists.txt OpenCV-2.4.4/CMakeLists.txt
--- OpenCV-2.4.3-orig/CMakeLists.txt 2012-11-02 17:04:07.000000000 +0200 --- OpenCV-2.4.4-orig/CMakeLists.txt 2013-03-01 17:48:03.000000000 +0200
+++ OpenCV-2.4.3/CMakeLists.txt 2012-11-28 12:01:07.942804657 +0200 +++ OpenCV-2.4.4/CMakeLists.txt 2013-03-05 15:05:43.155239930 +0200
@@ -455,7 +455,7 @@ @@ -457,7 +457,7 @@
add_subdirectory(apps) endif()
# examples # examples
-if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_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) add_subdirectory(samples)
endif() endif()
diff -urN OpenCV-2.4.3-orig/samples/CMakeLists.txt OpenCV-2.4.3/samples/CMakeLists.txt diff -urN OpenCV-2.4.4-orig/samples/CMakeLists.txt OpenCV-2.4.4/samples/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/CMakeLists.txt 2012-08-09 01:55:05.000000000 +0300 --- OpenCV-2.4.4-orig/samples/CMakeLists.txt 2013-01-28 01:00:48.000000000 +0200
+++ OpenCV-2.4.3/samples/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 +++ OpenCV-2.4.4/samples/CMakeLists.txt 2013-03-05 15:05:43.156239810 +0200
@@ -3,6 +3,7 @@ @@ -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(python)
+add_subdirectory(python2) +add_subdirectory(python2)
+endif() +endif()
diff -urN OpenCV-2.4.3-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt diff -urN OpenCV-2.4.4-orig/samples/gpu/CMakeLists.txt OpenCV-2.4.4/samples/gpu/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/gpu/CMakeLists.txt 2012-10-18 01:55:38.000000000 +0300 --- OpenCV-2.4.4-orig/samples/gpu/CMakeLists.txt 2013-01-28 01:00:49.000000000 +0200
+++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt 2012-11-28 12:01:07.943804624 +0200 +++ OpenCV-2.4.4/samples/gpu/CMakeLists.txt 2013-03-05 15:05:43.156239810 +0200
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
if (INSTALL_C_EXAMPLES AND NOT WIN32) if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) 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) PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif() endif()
diff -urN OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt OpenCV-2.4.3/samples/ocl/CMakeLists.txt diff -urN OpenCV-2.4.4-orig/samples/ocl/CMakeLists.txt OpenCV-2.4.4/samples/ocl/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/ocl/CMakeLists.txt 2012-10-18 01:55:38.000000000 +0300 --- OpenCV-2.4.4-orig/samples/ocl/CMakeLists.txt 2013-01-28 01:00:49.000000000 +0200
+++ OpenCV-2.4.3/samples/ocl/CMakeLists.txt 2012-11-28 13:16:24.943465391 +0200 +++ OpenCV-2.4.4/samples/ocl/CMakeLists.txt 2013-03-05 15:05:43.156239810 +0200
@@ -58,7 +58,7 @@ @@ -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 ) file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${install_list} install(FILES ${install_list}
- DESTINATION share/opencv/samples/${project} - 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) PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif() endif()
diff -urN OpenCV-2.4.3-orig/samples/python/CMakeLists.txt OpenCV-2.4.3/samples/python/CMakeLists.txt diff -urN OpenCV-2.4.4-orig/samples/python/CMakeLists.txt OpenCV-2.4.4/samples/python/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 --- OpenCV-2.4.4-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 +++ OpenCV-2.4.4/samples/python/CMakeLists.txt 2013-03-05 15:05:43.157239687 +0200
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+# ------------------------------------------------------------------------- +# -------------------------------------------------------------------------
+# CMake file for Python samples. See root CMakeLists.txt +# 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 + GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE) + WORLD_READ WORLD_EXECUTE)
+endif() +endif()
diff -urN OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt OpenCV-2.4.3/samples/python2/CMakeLists.txt diff -urN OpenCV-2.4.4-orig/samples/python2/CMakeLists.txt OpenCV-2.4.4/samples/python2/CMakeLists.txt
--- OpenCV-2.4.3-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 --- OpenCV-2.4.4-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 +++ OpenCV-2.4.4/samples/python2/CMakeLists.txt 2013-03-05 15:05:43.157239687 +0200
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+# ------------------------------------------------------------------------- +# -------------------------------------------------------------------------
+# CMake file for Python samples. See root CMakeLists.txt +# CMake file for Python samples. See root CMakeLists.txt

12
opencv-underlinking.patch
View File

@ -1,11 +1,11 @@
diff -urN OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake diff -urN OpenCV-2.4.4-orig/cmake/OpenCVFindLibsVideo.cmake OpenCV-2.4.4/cmake/OpenCVFindLibsVideo.cmake
--- OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake 2012-05-31 17:05:39.000000000 +0300 --- OpenCV-2.4.4-orig/cmake/OpenCVFindLibsVideo.cmake 2013-01-30 00:55:13.000000000 +0200
+++ OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake 2012-06-08 11:26:23.643869881 +0300 +++ OpenCV-2.4.4/cmake/OpenCVFindLibsVideo.cmake 2013-03-05 15:14:30.268631569 +0200
@@ -75,6 +75,7 @@ @@ -88,6 +88,7 @@
ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2) ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2 HAVE_VIDEOIO)
if(WITH_V4L) if(WITH_V4L)
CHECK_MODULE(libv4l1 HAVE_LIBV4L) CHECK_MODULE(libv4l1 HAVE_LIBV4L)
+ CHECK_MODULE(libv4l2 HAVE_LIBV4L2) + CHECK_MODULE(libv4l2 HAVE_LIBV4L2)
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L) CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2) CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
endif(WITH_V4L) CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO)

22
opencv.changes
View File

@ -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 Sat Dec 1 12:56:09 UTC 2012 - tittiatcoke@gmail.com

5
opencv.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package opencv # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -21,7 +21,7 @@
Name: opencv Name: opencv
%define libname lib%{name} %define libname lib%{name}
%define soname 2_4 %define soname 2_4
Version: 2.4.3 Version: 2.4.4
Release: 0 Release: 0
Summary: Collection of algorithms for computer vision Summary: Collection of algorithms for computer vision
License: BSD-3-Clause License: BSD-3-Clause
@ -55,6 +55,7 @@ BuildRequires: pkgconfig(glu)
BuildRequires: libffmpeg-devel BuildRequires: libffmpeg-devel
%endif %endif
BuildRequires: libv4l-devel BuildRequires: libv4l-devel
BuildRequires: python-sphinx
%description %description
OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C