Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2016-06-14 23:05:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-qt5.changes 2016-03-26 15:20:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes 2016-06-14 23:05:36.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jun 7 08:53:04 UTC 2016 - dims...@opensuse.org + +- In case we build using GCC6 (or newer), add -mlra to CFLAGS to + workaround gcc bug + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71294. + +------------------------------------------------------------------- +Wed May 25 13:38:26 UTC 2016 - martin.li...@suse.com + +- Apply upstream patch opencv-gcc6-disable-pch.patch to disable + PCH for GCC6. + +------------------------------------------------------------------- opencv.changes: same change New: ---- opencv-gcc6-disable-pch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv-qt5.spec ++++++ --- /var/tmp/diff_new_pack.ZDYveX/_old 2016-06-14 23:05:39.000000000 +0200 +++ /var/tmp/diff_new_pack.ZDYveX/_new 2016-06-14 23:05:39.000000000 +0200 @@ -39,6 +39,8 @@ Patch7: opencv-gles.patch # PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes Patch8: opencv-build-compare.patch +# PATCH-FIX-OPENSUSE opencv-gcc6-disable-pch.patch -- Disable PCH for GCC6. +Patch9: opencv-gcc6-disable-pch.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: unzip @@ -161,13 +163,19 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Remove Windows specific files rm -f doc/packaging.txt %build +%ifarch ppc64le +if [ $(gcc -dumpversion) -ge 6 ]; then +export mlra=-mlra +fi +%endif export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)" -export CXXFLAGS="%{optflags} $(getconf LFS_CFLAGS)" +export CXXFLAGS="%{optflags} ${mlra} $(getconf LFS_CFLAGS)" mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release \ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.ZDYveX/_old 2016-06-14 23:05:39.000000000 +0200 +++ /var/tmp/diff_new_pack.ZDYveX/_new 2016-06-14 23:05:39.000000000 +0200 @@ -35,6 +35,8 @@ Patch6: opencv-gcc5.patch # PATCH-FIX-OPENSUSE opencv-build-compare.patch -- avoid republish if some random external version number changes Patch8: opencv-build-compare.patch +# PATCH-FIX-OPENSUSE opencv-gcc6-disable-pch.patch -- Disable PCH for GCC6. +Patch9: opencv-gcc6-disable-pch.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: unzip @@ -146,6 +148,7 @@ %setup -q -a 1 %patch6 -p1 %patch8 -p1 +%patch9 -p1 # Remove Windows specific files rm -f doc/packaging.txt @@ -153,8 +156,13 @@ # sed -i 's/\r$//' samples/c/facedetect.cmd %build +%ifarch ppc64le +if [ $(gcc -dumpversion) -ge 6 ]; then +export mlra=-mlra +fi +%endif export CFLAGS="%{optflags} $(getconf LFS_CFLAGS)" -export CXXFLAGS="%{optflags} $(getconf LFS_CFLAGS)" +export CXXFLAGS="%{optflags} ${mlra} $(getconf LFS_CFLAGS)" mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release \ ++++++ opencv-gcc6-disable-pch.patch ++++++ >From a0fdc91a14f07de25d858037940fcd3ba859b4e2 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin <maksim.shabu...@itseez.com> Date: Fri, 13 May 2016 13:28:09 +0300 Subject: [PATCH] Disabled PCH support for gcc >= 6.0.0 Command line generation routine uses "-isystem" to include headers outside of "<opencv>/modules" folder, but GCC 6 does not work when passed "-isystem /usr/include" option. --- cmake/OpenCVPCHSupport.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake index 243fb4c..a2df014 100644 --- a/cmake/OpenCVPCHSupport.cmake +++ b/cmake/OpenCVPCHSupport.cmake @@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion OUTPUT_VARIABLE gcc_compiler_version) #MESSAGE("GCC Version: ${gcc_compiler_version}") - IF(gcc_compiler_version VERSION_GREATER "4.2.-1") + IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0") SET(PCHSupport_FOUND TRUE) ENDIF() -- 2.8.2
