Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2015-05-10 10:53:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv" Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2015-01-30 17:47:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2015-05-10 10:53:34.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Apr 29 11:53:09 UTC 2015 - co...@suse.com + +- support gcc 5 (i.e. gcc versions without minor version): + opencv-gcc5.patch + +------------------------------------------------------------------- +Wed Apr 29 09:35:29 UTC 2015 - co...@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 + +------------------------------------------------------------------- Old: ---- 2.4.9.tar.gz bomb_commit_gstreamer-1x-support.patch opencv-underlinking.patch New: ---- 2.4.11.tar.gz opencv-gcc5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv-qt5.spec ++++++ --- /var/tmp/diff_new_pack.P0DkPQ/_old 2015-05-10 10:53:36.000000000 +0200 +++ /var/tmp/diff_new_pack.P0DkPQ/_new 2015-05-10 10:53:36.000000000 +0200 @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %define soname 5_4 Name: opencv-qt5 -Version: 2.4.9 +Version: 2.4.11 Release: 0 Summary: Collection of algorithms for computer vision License: BSD-3-Clause @@ -33,8 +33,6 @@ Patch0: opencv-qt5-sobump.diff # PATCH-FIX-UPSTREAM opencv-samples.patch kop...@nand.bg -- Improve samples installation. Patch1: opencv-samples.patch -# PATCH-FIX-UPSTREAM opencv-underlinking.patch kop...@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 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 @@ -42,8 +40,8 @@ # PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157 Patch4: opencv-pkgconfig.patch Patch5: opencv-altivec-vector.patch -# PATCH-FIX-UPSTREAM bomb_commit_gstreamer-1x-support.patch -- Add Gstreamer 1.x support -Patch6: bomb_commit_gstreamer-1x-support.patch +# PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version co...@suse.de +Patch6: opencv-gcc5.patch BuildRequires: cmake BuildRequires: fdupes %if 0%{?suse_version} > 1310 @@ -78,13 +76,13 @@ BuildRequires: OpenEXR-devel BuildRequires: libilmbase-devel %endif +BuildRequires: libpng16-compat-devel +BuildRequires: libpng16-devel BuildRequires: python-devel BuildRequires: python-numpy-devel BuildRequires: python-sphinx BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) -BuildRequires: libpng16-devel -BuildRequires: libpng16-compat-devel Conflicts: opencv BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -147,9 +145,8 @@ %setup -q -n opencv-%version %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -p0 -%patch4 -p1 +#%patch4 -p1 %patch5 -p1 %patch6 -p1 ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.P0DkPQ/_old 2015-05-10 10:53:36.000000000 +0200 +++ /var/tmp/diff_new_pack.P0DkPQ/_new 2015-05-10 10:53:36.000000000 +0200 @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %define soname 2_4 Name: opencv -Version: 2.4.9 +Version: 2.4.11 Release: 0 Summary: Collection of algorithms for computer vision License: BSD-3-Clause @@ -31,8 +31,6 @@ Source0: https://github.com/Itseez/%{name}/archive/%{version}.tar.gz # PATCH-FIX-UPSTREAM opencv-samples.patch kop...@nand.bg -- Improve samples installation. Patch1: %{name}-samples.patch -# PATCH-FIX-UPSTREAM opencv-underlinking.patch kop...@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 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 @@ -40,8 +38,8 @@ # PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157 Patch4: opencv-pkgconfig.patch Patch5: opencv-altivec-vector.patch -# PATCH-FIX-UPSTREAM bomb_commit_gstreamer-1x-support.patch -- Add Gstreamer 1.x support -Patch6: bomb_commit_gstreamer-1x-support.patch +# PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version co...@suse.de +Patch6: opencv-gcc5.patch BuildRequires: cmake BuildRequires: fdupes %if 0%{?suse_version} > 1310 @@ -72,13 +70,13 @@ BuildRequires: OpenEXR-devel BuildRequires: libilmbase-devel %endif +BuildRequires: libpng16-compat-devel +BuildRequires: libpng16-devel BuildRequires: python-devel BuildRequires: python-numpy-devel BuildRequires: python-sphinx BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) -BuildRequires: libpng16-devel -BuildRequires: libpng16-compat-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -136,9 +134,8 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 %patch3 -p0 -%patch4 -p1 +#%patch4 -p1 %patch5 -p1 %patch6 -p1 ++++++ 2.4.9.tar.gz -> 2.4.11.tar.gz ++++++ /work/SRC/openSUSE:Factory/opencv/2.4.9.tar.gz /work/SRC/openSUSE:Factory/.opencv.new/2.4.11.tar.gz differ: char 34, line 1 ++++++ improve-sphinx-search.diff ++++++ --- /var/tmp/diff_new_pack.P0DkPQ/_old 2015-05-10 10:53:36.000000000 +0200 +++ /var/tmp/diff_new_pack.P0DkPQ/_new 2015-05-10 10:53:36.000000000 +0200 @@ -1,7 +1,8 @@ -diff -Naur opencv-2.4.7.orig/cmake/OpenCVDetectPython.cmake opencv-2.4.7/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 -@@ -109,11 +109,11 @@ +Index: cmake/OpenCVDetectPython.cmake +=================================================================== +--- cmake/OpenCVDetectPython.cmake.orig ++++ cmake/OpenCVDetectPython.cmake +@@ -126,7 +126,7 @@ if(PYTHON_EXECUTABLE) OUTPUT_QUIET ERROR_VARIABLE SPHINX_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -10,8 +11,3 @@ set(SPHINX_VERSION "${CMAKE_MATCH_1}") set(HAVE_SPHINX 1) message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}") -- endif() -+ endif() - endif() - endif(BUILD_DOCS) - endif(PYTHON_EXECUTABLE) ++++++ opencv-gcc5.patch ++++++ 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) ++++++ opencv-samples.patch ++++++ --- /var/tmp/diff_new_pack.P0DkPQ/_old 2015-05-10 10:53:36.000000000 +0200 +++ /var/tmp/diff_new_pack.P0DkPQ/_new 2015-05-10 10:53:36.000000000 +0200 @@ -1,7 +1,8 @@ -diff -urN opencv-2.4.9-orig/CMakeLists.txt opencv-2.4.9/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 -@@ -556,7 +556,7 @@ +Index: opencv-2.4.11/CMakeLists.txt +=================================================================== +--- opencv-2.4.11.orig/CMakeLists.txt ++++ opencv-2.4.11/CMakeLists.txt +@@ -576,7 +576,7 @@ if(BUILD_opencv_apps) endif() # examples @@ -10,10 +11,11 @@ add_subdirectory(samples) endif() -diff -urN opencv-2.4.9-orig/samples/CMakeLists.txt opencv-2.4.9/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 -@@ -10,6 +10,7 @@ +Index: opencv-2.4.11/samples/CMakeLists.txt +=================================================================== +--- opencv-2.4.11.orig/samples/CMakeLists.txt ++++ opencv-2.4.11/samples/CMakeLists.txt +@@ -10,6 +10,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_C # # ---------------------------------------------------------------------------- @@ -21,22 +23,35 @@ add_subdirectory(c) add_subdirectory(cpp) add_subdirectory(gpu) -@@ -18,7 +19,12 @@ - if(ANDROID AND BUILD_ANDROID_EXAMPLES) +@@ -19,11 +20,17 @@ if(ANDROID AND BUILD_ANDROID_EXAMPLES) add_subdirectory(android) endif() -+endif() +if(INSTALL_PYTHON_EXAMPLES) +add_subdirectory(python) +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() # # 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 ---- 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 +@@ -70,4 +77,4 @@ add_subdirectory(gpu) + # + # 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 @@ +# ------------------------------------------------------------------------- +# CMake file for Python samples. See root CMakeLists.txt @@ -50,9 +65,10 @@ + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) +endif() -diff -urN opencv-2.4.9-orig/samples/python2/CMakeLists.txt opencv-2.4.9/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 +Index: opencv-2.4.11/samples/python2/CMakeLists.txt +=================================================================== +--- /dev/null ++++ opencv-2.4.11/samples/python2/CMakeLists.txt @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------- +# CMake file for Python samples. See root CMakeLists.txt @@ -66,3 +82,16 @@ + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) +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")
