Accepting request 234267 from KDE:Extra
Update of opencv. revoke was done by accident. OBS-URL: https://build.opensuse.org/request/show/234267 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=52
This commit is contained in:
parent
ad5cc57973
commit
e027c8208c
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:05606424060e4d59f3269fe74ac0468d44a73073315ed77bb84c645f9ab982a9
|
|
||||||
size 88749781
|
|
3
2.4.9.tar.gz
Normal file
3
2.4.9.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b5b88a64bf80ba953ffe8c33f3e00046edb773ada8aaaab7538c0059a45d1259
|
||||||
|
size 89071769
|
@ -1,7 +1,7 @@
|
|||||||
diff -Naur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
|
diff -urN opencv-2.4.9-orig/CMakeLists.txt opencv-2.4.9/CMakeLists.txt
|
||||||
--- opencv-2.4.7.orig/CMakeLists.txt 2013-11-06 15:26:39.000000000 +0100
|
--- opencv-2.4.9-orig/CMakeLists.txt 2014-04-11 13:15:26.000000000 +0300
|
||||||
+++ opencv-2.4.7/CMakeLists.txt 2013-11-12 23:58:52.378443609 +0100
|
+++ opencv-2.4.9/CMakeLists.txt 2014-05-13 14:42:25.709764721 +0300
|
||||||
@@ -504,7 +504,7 @@
|
@@ -556,7 +556,7 @@
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# examples
|
# examples
|
||||||
@ -10,9 +10,9 @@ diff -Naur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
|
|||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
diff -Naur opencv-2.4.7.orig/samples/CMakeLists.txt opencv-2.4.7/samples/CMakeLists.txt
|
diff -urN opencv-2.4.9-orig/samples/CMakeLists.txt opencv-2.4.9/samples/CMakeLists.txt
|
||||||
--- opencv-2.4.7.orig/samples/CMakeLists.txt 2013-11-06 15:26:39.000000000 +0100
|
--- opencv-2.4.9-orig/samples/CMakeLists.txt 2014-04-11 13:15:26.000000000 +0300
|
||||||
+++ opencv-2.4.7/samples/CMakeLists.txt 2013-11-13 00:01:39.970348422 +0100
|
+++ opencv-2.4.9/samples/CMakeLists.txt 2014-05-13 14:42:25.710764736 +0300
|
||||||
@@ -10,6 +10,7 @@
|
@@ -10,6 +10,7 @@
|
||||||
#
|
#
|
||||||
# ----------------------------------------------------------------------------
|
# ----------------------------------------------------------------------------
|
||||||
@ -34,20 +34,9 @@ diff -Naur opencv-2.4.7.orig/samples/CMakeLists.txt opencv-2.4.7/samples/CMakeLi
|
|||||||
|
|
||||||
#
|
#
|
||||||
# END OF BUILD CASE 1: Build samples with library sources
|
# 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
|
diff -urN opencv-2.4.9-orig/samples/python/CMakeLists.txt opencv-2.4.9/samples/python/CMakeLists.txt
|
||||||
--- opencv-2.4.7.orig/samples/gpu/CMakeLists.txt 2013-11-06 15:26:39.000000000 +0100
|
--- opencv-2.4.9-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
|
||||||
+++ opencv-2.4.7/samples/gpu/CMakeLists.txt 2013-11-13 00:02:21.474829545 +0100
|
+++ opencv-2.4.9/samples/python/CMakeLists.txt 2014-05-13 14:42:25.710764736 +0300
|
||||||
@@ -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}
|
|
||||||
- DESTINATION share/OpenCV/samples/${project}
|
|
||||||
+ DESTINATION share/OpenCV/samples/gpu
|
|
||||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
|
||||||
endif()
|
|
||||||
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 @@
|
@@ -0,0 +1,12 @@
|
||||||
+# -------------------------------------------------------------------------
|
+# -------------------------------------------------------------------------
|
||||||
+# CMake file for Python samples. See root CMakeLists.txt
|
+# CMake file for Python samples. See root CMakeLists.txt
|
||||||
@ -61,9 +50,9 @@ diff -Naur opencv-2.4.7.orig/samples/python/CMakeLists.txt opencv-2.4.7/samples/
|
|||||||
+ GROUP_READ GROUP_EXECUTE
|
+ GROUP_READ GROUP_EXECUTE
|
||||||
+ WORLD_READ WORLD_EXECUTE)
|
+ WORLD_READ WORLD_EXECUTE)
|
||||||
+endif()
|
+endif()
|
||||||
diff -Naur opencv-2.4.7.orig/samples/python2/CMakeLists.txt opencv-2.4.7/samples/python2/CMakeLists.txt
|
diff -urN opencv-2.4.9-orig/samples/python2/CMakeLists.txt opencv-2.4.9/samples/python2/CMakeLists.txt
|
||||||
--- opencv-2.4.7.orig/samples/python2/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
|
--- opencv-2.4.9-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
|
||||||
+++ opencv-2.4.7/samples/python2/CMakeLists.txt 2013-11-13 00:03:51.490704191 +0100
|
+++ opencv-2.4.9/samples/python2/CMakeLists.txt 2014-05-13 14:42:25.711764750 +0300
|
||||||
@@ -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
|
||||||
|
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 13 14:56:21 EEST 2014 - koprok@gmail.com
|
||||||
|
|
||||||
|
- Update to OpenCV 2.4.9
|
||||||
|
More info at:
|
||||||
|
http://opencv.org/opencv-2-4-9-is-out.html
|
||||||
|
The brief list of changes:
|
||||||
|
* new 3D visualization module ‘viz’;
|
||||||
|
* performance fixes in ‘ocl’ module;
|
||||||
|
* fixes in Android Camera;
|
||||||
|
* improved CUDA support for mobile platforms;
|
||||||
|
* bugfixes from community;
|
||||||
|
* 55 reported bugs have been closed;
|
||||||
|
* 156 pull requests have been merged.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Apr 6 16:22:56 UTC 2014 - tittiatcoke@gmail.com
|
Sun Apr 6 16:22:56 UTC 2014 - tittiatcoke@gmail.com
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
%define soname 2_4
|
%define soname 2_4
|
||||||
|
|
||||||
Name: opencv
|
Name: opencv
|
||||||
Version: 2.4.8
|
Version: 2.4.9
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user