Package: release.debian.org Severity: normal Tags: jessie User: release.debian.org@packages.debian.org Usertags: pu If the opencv manintainers do not object (X-Debbugs-Cced), I'd like to fix #784647 in jessie. This is simular to libav's #783082 (pu request #784383), but the fix is easier: it just requires passing the correct value to -march. Debdiff is attached. Cheers -- Sebastian Ramacher
diff -Nru opencv-2.4.9.1+dfsg/debian/changelog opencv-2.4.9.1+dfsg/debian/changelog --- opencv-2.4.9.1+dfsg/debian/changelog 2014-09-19 04:15:33.000000000 +0200 +++ opencv-2.4.9.1+dfsg/debian/changelog 2015-05-25 20:19:36.000000000 +0200 @@ -1,3 +1,10 @@ +opencv (2.4.9.1+dfsg-1+deb8u1) jessie; urgency=medium + + [ Bernhard Übelacker ] + * Build with -march=i586 instead of -march=i686 on i386. (Closes: #784647) + + -- Sebastian Ramacher <sramacher@debian.org> Mon, 25 May 2015 20:19:29 +0200 + opencv (2.4.9.1+dfsg-1) unstable; urgency=medium * New upstream release. diff -Nru opencv-2.4.9.1+dfsg/debian/patches/optimize_i586.patch opencv-2.4.9.1+dfsg/debian/patches/optimize_i586.patch --- opencv-2.4.9.1+dfsg/debian/patches/optimize_i586.patch 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.9.1+dfsg/debian/patches/optimize_i586.patch 2015-05-15 16:44:12.000000000 +0200 @@ -0,0 +1,21 @@ +Description: Optimize of i386 changed from 686 to 586. + Similar to the patch patches/0011_optimize_i486.patch in wheezy + by Nobuhiro Iwamatsu. + Upstream moved the location from CMakeLists.txt to cmake/OpenCVCompilerOptions.cmake. +Author: Bernhard Übelacker <bernhardu@vr-web.de> +Bug-Debian: https://bugs.debian.org/784647 +Origin: other, https://sources.debian.net/src/opencv/2.3.1-11%2Bdeb7u1/debian/patches/0011_optimize_i486.patch/ +Last-Update: 2015-05-09 + + +--- opencv-2.4.9.1+dfsg.orig/cmake/OpenCVCompilerOptions.cmake ++++ opencv-2.4.9.1+dfsg/cmake/OpenCVCompilerOptions.cmake +@@ -109,7 +109,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + endif() + + if(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE) +- add_extra_compiler_option(-march=i686) ++ add_extra_compiler_option(-march=i586) + endif() + + # Other optimizations diff -Nru opencv-2.4.9.1+dfsg/debian/patches/series opencv-2.4.9.1+dfsg/debian/patches/series --- opencv-2.4.9.1+dfsg/debian/patches/series 2014-09-19 04:04:00.000000000 +0200 +++ opencv-2.4.9.1+dfsg/debian/patches/series 2015-05-15 16:43:46.000000000 +0200 @@ -7,3 +7,4 @@ revert-Make-ts-always-static fix_path_of_opencl_headers libav10.patch +optimize_i586.patch
Attachment:
signature.asc
Description: Digital signature