pool/opencv
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 304684 from KDE:Extra

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/304684
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=55
This commit is contained in:
Stephan Kulow 2015-05-10 08:53:32 +00:00 committed by Git OBS Bridge
parent dd6910bce1
commit ade761eb52
10 changed files with 102 additions and 1919 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
2.4.11.tar.gz Normal file
View File

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

3
2.4.9.tar.gz
View File

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

1859
bomb_commit_gstreamer-1x-support.patch
View File

File diff suppressed because it is too large Load Diff

14
improve-sphinx-search.diff
View File

@ -1,7 +1,8 @@
diff -Naur opencv-2.4.7.orig/cmake/OpenCVDetectPython.cmake opencv-2.4.7/cmake/OpenCVDetectPython.cmake Index: 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 --- cmake/OpenCVDetectPython.cmake.orig
@@ -109,11 +109,11 @@ +++ cmake/OpenCVDetectPython.cmake
@@ -126,7 +126,7 @@ if(PYTHON_EXECUTABLE)
OUTPUT_QUIET OUTPUT_QUIET
ERROR_VARIABLE SPHINX_OUTPUT ERROR_VARIABLE SPHINX_OUTPUT
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
@ -10,8 +11,3 @@ diff -Naur opencv-2.4.7.orig/cmake/OpenCVDetectPython.cmake opencv-2.4.7/cmake/O
set(SPHINX_VERSION "${CMAKE_MATCH_1}") set(SPHINX_VERSION "${CMAKE_MATCH_1}")
set(HAVE_SPHINX 1) set(HAVE_SPHINX 1)
message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}") message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}")
- endif()
+ endif()
endif()
endif(BUILD_DOCS)
endif(PYTHON_EXECUTABLE)

15
opencv-gcc5.patch Normal file
View File

@ -0,0 +1,15 @@
Index: opencv-2.4.11/cmake/OpenCVDetectCXXCompiler.cmake
===================================================================
--- opencv-2.4.11.orig/cmake/OpenCVDetectCXXCompiler.cmake
+++ opencv-2.4.11/cmake/OpenCVDetectCXXCompiler.cmake
@@ -68,6 +68,10 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
OUTPUT_VARIABLE CMAKE_OPENCV_GCC_VERSION_FULL
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if (CMAKE_OPENCV_GCC_VERSION_FULL MATCHES "5")
+ set(CMAKE_OPENCV_GCC_VERSION_FULL "5.0")
+ endif()
+
execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1} -v
ERROR_VARIABLE CMAKE_OPENCV_GCC_INFO_FULL
OUTPUT_STRIP_TRAILING_WHITESPACE)

17
opencv-qt5.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package opencv-qt5 # spec file for package opencv-qt5
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX 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
@ -22,7 +22,7 @@
%define soname 5_4 %define soname 5_4
Name: opencv-qt5 Name: opencv-qt5
Version: 2.4.9 Version: 2.4.11
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
@ -33,8 +33,6 @@ Source0: https://github.com/Itseez/opencv/archive/%{version}.tar.gz
Patch0: opencv-qt5-sobump.diff Patch0: opencv-qt5-sobump.diff
# PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation. # PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation.
Patch1: opencv-samples.patch Patch1: opencv-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: opencv-underlinking.patch
# PATCH-FIX-OPENSUSE improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version # PATCH-FIX-OPENSUSE improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version
Patch3: improve-sphinx-search.diff Patch3: improve-sphinx-search.diff
# PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on # PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on
@ -42,8 +40,8 @@ Patch3: improve-sphinx-search.diff
# PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157 # PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157
Patch4: opencv-pkgconfig.patch Patch4: opencv-pkgconfig.patch
Patch5: opencv-altivec-vector.patch Patch5: opencv-altivec-vector.patch
# PATCH-FIX-UPSTREAM bomb_commit_gstreamer-1x-support.patch -- Add Gstreamer 1.x support # PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo@suse.de
Patch6: bomb_commit_gstreamer-1x-support.patch Patch6: opencv-gcc5.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
%if 0%{?suse_version} > 1310 %if 0%{?suse_version} > 1310
@ -78,13 +76,13 @@ BuildRequires: openexr-devel
BuildRequires: OpenEXR-devel BuildRequires: OpenEXR-devel
BuildRequires: libilmbase-devel BuildRequires: libilmbase-devel
%endif %endif
BuildRequires: libpng16-compat-devel
BuildRequires: libpng16-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-numpy-devel BuildRequires: python-numpy-devel
BuildRequires: python-sphinx BuildRequires: python-sphinx
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
BuildRequires: libpng16-devel
BuildRequires: libpng16-compat-devel
Conflicts: opencv Conflicts: opencv
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -147,9 +145,8 @@ This package contains the documentation and examples for the OpenCV library.
%setup -q -n opencv-%version %setup -q -n opencv-%version
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p0 %patch3 -p0
%patch4 -p1 #%patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1

63
opencv-samples.patch
View File

@ -1,7 +1,8 @@
diff -urN opencv-2.4.9-orig/CMakeLists.txt opencv-2.4.9/CMakeLists.txt Index: opencv-2.4.11/CMakeLists.txt
--- opencv-2.4.9-orig/CMakeLists.txt 2014-04-11 13:15:26.000000000 +0300 ===================================================================
+++ opencv-2.4.9/CMakeLists.txt 2014-05-13 14:42:25.709764721 +0300 --- opencv-2.4.11.orig/CMakeLists.txt
@@ -556,7 +556,7 @@ +++ opencv-2.4.11/CMakeLists.txt
@@ -576,7 +576,7 @@ if(BUILD_opencv_apps)
endif() endif()
# examples # examples
@ -10,10 +11,11 @@ diff -urN opencv-2.4.9-orig/CMakeLists.txt opencv-2.4.9/CMakeLists.txt
add_subdirectory(samples) add_subdirectory(samples)
endif() endif()
diff -urN opencv-2.4.9-orig/samples/CMakeLists.txt opencv-2.4.9/samples/CMakeLists.txt Index: opencv-2.4.11/samples/CMakeLists.txt
--- opencv-2.4.9-orig/samples/CMakeLists.txt 2014-04-11 13:15:26.000000000 +0300 ===================================================================
+++ opencv-2.4.9/samples/CMakeLists.txt 2014-05-13 14:42:25.710764736 +0300 --- opencv-2.4.11.orig/samples/CMakeLists.txt
@@ -10,6 +10,7 @@ +++ opencv-2.4.11/samples/CMakeLists.txt
@@ -10,6 +10,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_C
# #
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
@ -21,22 +23,35 @@ diff -urN opencv-2.4.9-orig/samples/CMakeLists.txt opencv-2.4.9/samples/CMakeLis
add_subdirectory(c) add_subdirectory(c)
add_subdirectory(cpp) add_subdirectory(cpp)
add_subdirectory(gpu) add_subdirectory(gpu)
@@ -18,7 +19,12 @@ @@ -19,11 +20,17 @@ if(ANDROID AND BUILD_ANDROID_EXAMPLES)
if(ANDROID AND BUILD_ANDROID_EXAMPLES)
add_subdirectory(android) add_subdirectory(android)
endif() endif()
+endif()
+if(INSTALL_PYTHON_EXAMPLES) +if(INSTALL_PYTHON_EXAMPLES)
+add_subdirectory(python) +add_subdirectory(python)
+add_subdirectory(python2) +add_subdirectory(python2)
+endif()
+
if(INSTALL_C_EXAMPLES)
install(FILES "CMakeLists.txt"
DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
endif()
+endif() +endif()
# #
# END OF BUILD CASE 1: Build samples with library sources # END OF BUILD CASE 1: Build samples with library sources
diff -urN opencv-2.4.9-orig/samples/python/CMakeLists.txt opencv-2.4.9/samples/python/CMakeLists.txt @@ -70,4 +77,4 @@ add_subdirectory(gpu)
--- opencv-2.4.9-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 #
+++ opencv-2.4.9/samples/python/CMakeLists.txt 2014-05-13 14:42:25.710764736 +0300 # END OF BUILD CASE 2: Build samples with library binaries
#
-endif()
\ No newline at end of file
+endif()
Index: opencv-2.4.11/samples/python/CMakeLists.txt
===================================================================
--- /dev/null
+++ opencv-2.4.11/samples/python/CMakeLists.txt
@@ -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
@ -50,9 +65,10 @@ diff -urN opencv-2.4.9-orig/samples/python/CMakeLists.txt opencv-2.4.9/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.9-orig/samples/python2/CMakeLists.txt opencv-2.4.9/samples/python2/CMakeLists.txt Index: opencv-2.4.11/samples/python2/CMakeLists.txt
--- opencv-2.4.9-orig/samples/python2/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 ===================================================================
+++ opencv-2.4.9/samples/python2/CMakeLists.txt 2014-05-13 14:42:25.711764750 +0300 --- /dev/null
+++ opencv-2.4.11/samples/python2/CMakeLists.txt
@@ -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
@ -66,3 +82,16 @@ diff -urN opencv-2.4.9-orig/samples/python2/CMakeLists.txt opencv-2.4.9/samples/
+ GROUP_READ GROUP_EXECUTE + GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE) + WORLD_READ WORLD_EXECUTE)
+endif() +endif()
Index: opencv-2.4.11/samples/gpu/CMakeLists.txt
===================================================================
--- opencv-2.4.11.orig/samples/gpu/CMakeLists.txt
+++ opencv-2.4.11/samples/gpu/CMakeLists.txt
@@ -100,7 +100,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_F
include("performance/CMakeLists.txt")
endif()
-if (OCV_DEPENDENCIES_FOUND AND INSTALL_C_EXAMPLES AND NOT WIN32)
+if (BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND AND INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd *.txt)
if(NOT HAVE_OPENGL)
list_filterout(install_list ".*opengl.cpp")

11
opencv-underlinking.patch
View File

@ -1,11 +0,0 @@
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)
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)

19
opencv.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Wed Apr 29 11:53:09 UTC 2015 - coolo@suse.com
- support gcc 5 (i.e. gcc versions without minor version):
opencv-gcc5.patch
-------------------------------------------------------------------
Wed Apr 29 09:35:29 UTC 2015 - coolo@suse.com
- Update to OpenCV 2.4.11 - can't find NEWS or Changelog
merely collecting bug fixes while 3.0 is in the making, 2.4.11
didn't even make it on their web page, it's only on download
server
- remove opencv-underlinking.patch as obsolete
- remove upstream patch bomb_commit_gstreamer-1x-support.patch
- commenting out opencv-pkgconfig.patch - possibly it requires a rebase,
but the problem it tries to solve is unclear
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 26 09:46:21 UTC 2015 - tittiatcoke@gmail.com Mon Jan 26 09:46:21 UTC 2015 - tittiatcoke@gmail.com

17
opencv.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package opencv # spec file for package opencv
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX 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
@ -22,7 +22,7 @@
%define soname 2_4 %define soname 2_4
Name: opencv Name: opencv
Version: 2.4.9 Version: 2.4.11
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
@ -31,8 +31,6 @@ Url: http://opencv.org/
Source0: https://github.com/Itseez/%{name}/archive/%{version}.tar.gz Source0: https://github.com/Itseez/%{name}/archive/%{version}.tar.gz
# PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation. # PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation.
Patch1: %{name}-samples.patch 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 # PATCH-FIX-OPENSUSE improve-sphinx-search.diff -- properly find sphinx with alphabetic chars in version
Patch3: improve-sphinx-search.diff Patch3: improve-sphinx-search.diff
# PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on # PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on
@ -40,8 +38,8 @@ Patch3: improve-sphinx-search.diff
# PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157 # PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157
Patch4: opencv-pkgconfig.patch Patch4: opencv-pkgconfig.patch
Patch5: opencv-altivec-vector.patch Patch5: opencv-altivec-vector.patch
# PATCH-FIX-UPSTREAM bomb_commit_gstreamer-1x-support.patch -- Add Gstreamer 1.x support # PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo@suse.de
Patch6: bomb_commit_gstreamer-1x-support.patch Patch6: opencv-gcc5.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
%if 0%{?suse_version} > 1310 %if 0%{?suse_version} > 1310
@ -72,13 +70,13 @@ BuildRequires: openexr-devel
BuildRequires: OpenEXR-devel BuildRequires: OpenEXR-devel
BuildRequires: libilmbase-devel BuildRequires: libilmbase-devel
%endif %endif
BuildRequires: libpng16-compat-devel
BuildRequires: libpng16-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-numpy-devel BuildRequires: python-numpy-devel
BuildRequires: python-sphinx BuildRequires: python-sphinx
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
BuildRequires: libpng16-devel
BuildRequires: libpng16-compat-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -136,9 +134,8 @@ This package contains the documentation and examples for the OpenCV library.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p0 %patch3 -p0
%patch4 -p1 #%patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1