commit octave-forge-image for openSUSE:Factory
Hello community, here is the log from the commit of package octave-forge-image for openSUSE:Factory checked in at 2020-02-10 21:54:01 Comparing /work/SRC/openSUSE:Factory/octave-forge-image (Old) and /work/SRC/openSUSE:Factory/.octave-forge-image.new.26092 (New) Package is "octave-forge-image" Mon Feb 10 21:54:01 2020 rev:8 rq:772512 version:2.12.0 Changes: --- /work/SRC/openSUSE:Factory/octave-forge-image/octave-forge-image.changes 2019-02-25 17:48:29.130830420 +0100 +++ /work/SRC/openSUSE:Factory/.octave-forge-image.new.26092/octave-forge-image.changes 2020-02-10 21:54:05.958213407 +0100 @@ -1,0 +2,25 @@ +Sun Feb 9 07:03:22 UTC 2020 - Stefan Brüns + +- Update to version 2.12.0: + * The following functions are new: + imref2d integralImage integralImage3 + imref3d + * Improved the cubic interpolation method in imremap. This should +also cause improved results in the functions imperspectivewarp, +imresize, and imrotate when using the cubic or bicubic methods. + * The function labelmatrix was changed for compatibility with the +upcoming Octave version 6. + * The function bwmorph now supports the "endpoints" operation. + * The function nonmax_supress was renamed nonmax_suppress to fix its +incorrect spelling. The incorrectly named function is kept for +backwards compatibility. + * The functions imremap, imperspectivewrap, and imrotate no longer +return the `valid' output argument. + * The imgradientxy function will now recognize the methods "central" +and "intermediate" for Matlab compatibility. Their previous names +"centraldifference" and "intermediatedifference" continue to work +for backwards compatibility. + * The stdfilt function will again handle all images of non floating +type (a regression introduced in the version 2.10.0). + +--- Old: image-2.10.0.tar.gz New: image-2.12.0.tar.gz Other differences: -- ++ octave-forge-image.spec ++ --- /var/tmp/diff_new_pack.NM9KnW/_old 2020-02-10 21:54:06.490213701 +0100 +++ /var/tmp/diff_new_pack.NM9KnW/_new 2020-02-10 21:54:06.490213701 +0100 @@ -1,7 +1,7 @@ # # spec file for package octave-forge-image # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,12 +18,12 @@ %define octpkg image Name: octave-forge-%{octpkg} -Version:2.10.0 +Version:2.12.0 Release:0 Summary:Image Processing for Octave License:GPL-3.0-or-later AND BSD-2-Clause AND MIT Group: Productivity/Scientific/Math -Url:https://octave.sourceforge.net +URL:https://octave.sourceforge.io/%{octpkg}/index.html Source0: https://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: hdf5-devel ++ image-2.10.0.tar.gz -> image-2.12.0.tar.gz ++ 4723 lines of diff (skipped)
commit octave-forge-image for openSUSE:Factory
Hello community, here is the log from the commit of package octave-forge-image for openSUSE:Factory checked in at 2019-02-25 17:48:23 Comparing /work/SRC/openSUSE:Factory/octave-forge-image (Old) and /work/SRC/openSUSE:Factory/.octave-forge-image.new.28833 (New) Package is "octave-forge-image" Mon Feb 25 17:48:23 2019 rev:7 rq:666305 version:2.10.0 Changes: --- /work/SRC/openSUSE:Factory/octave-forge-image/octave-forge-image.changes 2018-11-26 10:29:18.777097879 +0100 +++ /work/SRC/openSUSE:Factory/.octave-forge-image.new.28833/octave-forge-image.changes 2019-02-25 17:48:29.130830420 +0100 @@ -1,0 +2,27 @@ +Mon Jan 14 14:00:30 UTC 2019 - hiwatari.se...@gmail.com + +- Update to version 2.10.0: + * The following functions are new: axes2pix, colorangle, houghpeaks +bwpack, deconvwnr, otsuthresh, bwunpack, houghlines + * The functions entropyfilt, rangefilt, and stdfilt were completely +incorrect and have now been fixed. + * In function regionprops, "Perimeter" was changed to be compatible +with Matlab, and "PerimterOld" was added. + * In function regionprops, properties "ConvexHull", "ConvexImage", +"ConvexArea", and "Solidity" were added. + * In function bwfill, the parameter connectivity was changed to be +Matlab compatible. + * grayslice now expects argument V to be a vector with the actual +values used to perform threshold. + * The function operation "thin" in bwmorph was changed to be Matlab +compatible. + * imcast now also converts images to logical type. + * wiener2 is now able to handle images with arbitrary number of +dimensions. + * Other functions that have been changed for smaller bugfixes, +increased Matlab compatibility, or performance: bwdist, entropy +hough_line, bwmorph, graythresh + Read /usr/share/octave/packages/image-2.10.0/packinfo/NEWS for + more details + +--- Old: image-2.8.1.tar.gz New: image-2.10.0.tar.gz Other differences: -- ++ octave-forge-image.spec ++ --- /var/tmp/diff_new_pack.b2geZG/_old 2019-02-25 17:48:29.894830106 +0100 +++ /var/tmp/diff_new_pack.b2geZG/_new 2019-02-25 17:48:29.898830104 +0100 @@ -1,7 +1,7 @@ # # spec file for package octave-forge-image # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,19 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define octpkg image Name: octave-forge-%{octpkg} -Version:2.8.1 +Version:2.10.0 Release:0 Summary:Image Processing for Octave License:GPL-3.0-or-later AND BSD-2-Clause AND MIT Group: Productivity/Scientific/Math -Url:http://octave.sourceforge.net -Source0: http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz +Url:https://octave.sourceforge.net +Source0: https://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: hdf5-devel BuildRequires: octave-devel >= 4.2.0 ++ image-2.8.1.tar.gz -> image-2.10.0.tar.gz ++ 5496 lines of diff (skipped)
commit octave-forge-image for openSUSE:Factory
Hello community, here is the log from the commit of package octave-forge-image for openSUSE:Factory checked in at 2018-11-26 10:29:04 Comparing /work/SRC/openSUSE:Factory/octave-forge-image (Old) and /work/SRC/openSUSE:Factory/.octave-forge-image.new.19453 (New) Package is "octave-forge-image" Mon Nov 26 10:29:04 2018 rev:6 rq:651313 version:2.8.1 Changes: --- /work/SRC/openSUSE:Factory/octave-forge-image/octave-forge-image.changes 2018-07-28 12:40:16.976411992 +0200 +++ /work/SRC/openSUSE:Factory/.octave-forge-image.new.19453/octave-forge-image.changes 2018-11-26 10:29:18.777097879 +0100 @@ -1,0 +2,7 @@ +Wed Nov 21 10:59:46 UTC 2018 - badshah...@gmail.com + +- Update to version 2.8.1: + * Fix imcrop for non-square images, a regression introduced in +version 2.8.0. + +--- Old: image-2.8.0.tar.gz New: image-2.8.1.tar.gz Other differences: -- ++ octave-forge-image.spec ++ --- /var/tmp/diff_new_pack.kaTOO8/_old 2018-11-26 10:29:19.277097292 +0100 +++ /var/tmp/diff_new_pack.kaTOO8/_new 2018-11-26 10:29:19.281097288 +0100 @@ -18,7 +18,7 @@ %define octpkg image Name: octave-forge-%{octpkg} -Version:2.8.0 +Version:2.8.1 Release:0 Summary:Image Processing for Octave License:GPL-3.0-or-later AND BSD-2-Clause AND MIT ++ image-2.8.0.tar.gz -> image-2.8.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-2.8.0/DESCRIPTION new/image-2.8.1/DESCRIPTION --- old/image-2.8.0/DESCRIPTION 2018-06-19 02:08:42.0 +0200 +++ new/image-2.8.1/DESCRIPTION 2018-10-26 17:16:12.201001000 +0200 @@ -1,6 +1,6 @@ Name: image -Version: 2.8.0 -Date: 2018-06-19 +Version: 2.8.1 +Date: 2018-10-26 Author: various authors Maintainer: Carnë Draug Title: Image Processing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-2.8.0/NEWS new/image-2.8.1/NEWS --- old/image-2.8.0/NEWS2018-06-19 02:08:42.0 +0200 +++ new/image-2.8.1/NEWS2018-10-26 17:16:12.209001000 +0200 @@ -1,4 +1,13 @@ - Summary of important user-visible changes for image 2.8.0 (2018/06/19): + Summary of important user-visible changes for image 2.8.1 (2018/10/26): +- + + ** image 2.8.1 is a patch release. + + ** Fix imcrop for non-square images. This a regression introduced in +version 2.8.0. + + +Summary of important user-visible changes for image 2.8.0 (2018/06/19): - ** The following functions are new: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-2.8.0/inst/imcrop.m new/image-2.8.1/inst/imcrop.m --- old/image-2.8.0/inst/imcrop.m 2018-06-19 02:08:42.0 +0200 +++ new/image-2.8.1/inst/imcrop.m 2018-10-26 17:16:12.305001000 +0200 @@ -177,7 +177,7 @@ rect = [x(1) y(1) x(2)-x(1) y(2)-y(1)]; endif i_ini = max (round ([rect(1) rect(2)]), [1 1]); - i_end = min (round ([rect(1)+rect(3) rect(2)+rect(4)]), size (cdata)(1:2)); + i_end = min (round ([rect(1)+rect(3) rect(2)+rect(4)]), size (cdata)([2 1])); img = cdata(i_ini(2):i_end(2), i_ini(1):i_end(1),:,:); # don't forget RGB and ND images ## Even the API for the output is complicated @@ -252,6 +252,15 @@ %! assert (imcrop (im, [1 -3 2 5]), im(1:2,1:3)) %! assert (imcrop (im, [5 -3 2 5]), im(1:2,5)) +## out of bounds ROIs with non-square images (bug #54370) +%!test +%! im = [1:7] .* [1; 2; 3; 4; 5]; +%! assert (imcrop (im, [1 1 5 5]), im(:,1:6)) +%! assert (imcrop (im, [0 0 5 5]), im(:,1:5)) +%! assert (imcrop (im, [1 1 2 5]), im(:,1:3)) +%! assert (imcrop (im, [1 -3 2 7]), im(1:4,1:3)) +%! assert (imcrop (im, [7 -3 2 7]), im(1:4,7)) + %!test %! ## Matlab returns [] (size 0x0) for this cases, while we return %! ## [] (size 2x0). We are not compatible by design. If it ever diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-2.8.0/src/aclocal.m4 new/image-2.8.1/src/aclocal.m4 --- old/image-2.8.0/src/aclocal.m4 2018-06-19 02:09:41.928105108 +0200 +++ new/image-2.8.1/src/aclocal.m4 2018-10-26 17:16:13.145001000 +0200 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or
commit octave-forge-image for openSUSE:Factory
Hello community, here is the log from the commit of package octave-forge-image for openSUSE:Factory checked in at 2018-07-28 12:40:15 Comparing /work/SRC/openSUSE:Factory/octave-forge-image (Old) and /work/SRC/openSUSE:Factory/.octave-forge-image.new (New) Package is "octave-forge-image" Sat Jul 28 12:40:15 2018 rev:5 rq:624035 version:2.8.0 Changes: --- /work/SRC/openSUSE:Factory/octave-forge-image/octave-forge-image.changes 2017-02-03 17:51:46.345355673 +0100 +++ /work/SRC/openSUSE:Factory/.octave-forge-image.new/octave-forge-image.changes 2018-07-28 12:40:16.976411992 +0200 @@ -1,0 +2,45 @@ +Wed Jul 18 07:42:49 UTC 2018 - badshah...@gmail.com + +- Update to version 2.8.0: + * The following functions are new: hough, imhmax, ntsc2rgb, +imextendedmax, imhmin, rgb2ntsc, imextendedmin, imimposemin, +viscircles, imfindcircles, imsharpen, wiener2. + * Octave version 4.0 is no longer supported. This makes Octave +version 4.2.0 the minimum requirement. + * The functions ntsc2rgb and rgb2ntsc have been removed in Octave +core version 4.4 and are now part of the image package. In a +similar manner, rgb2gray, which has always been part of the image +package, is part of Octave core version 4.4. The versions in +the image package will only be installed if they are missing +from Octave to avoid shadowing the core functions. + * imcrop will now adjust the region to crop to the image +boundaries when the region to crop goes beyond the image +boundaries. + * ycbcr2rgb, rgb2ycbcr, and rgb2gray will return an image of +class single if the input was class single (they were previously +returning a double for such cases). + * The function imdither has been removed. This function hadn't +work since Octave version 3.8.0 and would need to be +rewritten. The function dither from Octave core should be +used instead but hasn't been implemented yet. Instead of +rewriting imdither, the missing dither function should be +written. See bug #41768. + * graythresh will now clip values outside the [0 1] range in +images of floating point class. A side effect of this is that +it will no longer distinguish between an image of floating +point class that has only one one row or column, and an +histogram. Breaks backwards compatibility if you were +previously relying on something like 'graythresh (img(:), +...)' and img is of class single or double. + * Fix regionprops Perimeter when using a labelled image or a +bwconncomp structure, from connectivity different from 8. + * The functions ycbcr2rgb and rgb2ycbcr now support conversion +according to the BT.2020 standard. + * Other functions that have been changed for smaller bugfixes, +increased Matlab compatibility, or performance: bwperim, +imlincomb, imrotate, entropy, imreconstruct, normxcorr2, +graythresh, imregionalmax, phantom, imhist, imregionalmin, +rgb2gray. +- Update (Build)Requires: octave >= 4.2.0 now required. + +--- Old: image-2.6.1.tar.gz New: image-2.8.0.tar.gz Other differences: -- ++ octave-forge-image.spec ++ --- /var/tmp/diff_new_pack.Tc1kC8/_old 2018-07-28 12:40:17.512413022 +0200 +++ /var/tmp/diff_new_pack.Tc1kC8/_new 2018-07-28 12:40:17.512413022 +0200 @@ -1,7 +1,7 @@ # # spec file for package octave-forge-image # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -18,17 +18,17 @@ %define octpkg image Name: octave-forge-%{octpkg} -Version:2.6.1 +Version:2.8.0 Release:0 Summary:Image Processing for Octave -License:GPL-3.0+ and BSD-2-Clause and MIT +License:GPL-3.0-or-later AND BSD-2-Clause AND MIT Group: Productivity/Scientific/Math Url:http://octave.sourceforge.net Source0: http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: hdf5-devel -BuildRequires: octave-devel -Requires: octave-cli >= 4.0.0 +BuildRequires: octave-devel >= 4.2.0 +Requires: octave-cli >= 4.2.0 %description Functions for processing images. The package also provides functions ++ image-2.6.1.tar.gz -> image-2.8.0.tar.gz ++ 6080 lines of diff (skipped)
commit octave-forge-image for openSUSE:Factory
Hello community, here is the log from the commit of package octave-forge-image for openSUSE:Factory checked in at 2017-01-29 10:34:15 Comparing /work/SRC/openSUSE:Factory/octave-forge-image (Old) and /work/SRC/openSUSE:Factory/.octave-forge-image.new (New) Package is "octave-forge-image" Changes: --- /work/SRC/openSUSE:Factory/octave-forge-image/octave-forge-image.changes 2015-08-31 22:58:50.0 +0200 +++ /work/SRC/openSUSE:Factory/.octave-forge-image.new/octave-forge-image.changes 2017-02-03 17:51:46.345355673 +0100 @@ -1,0 +2,7 @@ +Thu Nov 24 13:11:20 UTC 2016 - dmitr...@opensuse.org + +- Update to version 2.6.1 + * New functions. + * Better MATLAB compatibility. + +--- Old: image-2.4.1.tar.gz New: image-2.6.1.tar.gz Other differences: -- ++ octave-forge-image.spec ++ --- /var/tmp/diff_new_pack.1NsJA9/_old 2017-02-03 17:51:46.717303231 +0100 +++ /var/tmp/diff_new_pack.1NsJA9/_new 2017-02-03 17:51:46.717303231 +0100 @@ -1,7 +1,7 @@ # # spec file for package octave-forge-image # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -18,7 +18,7 @@ %define octpkg image Name: octave-forge-%{octpkg} -Version:2.4.1 +Version:2.6.1 Release:0 Summary:Image Processing for Octave License:GPL-3.0+ and BSD-2-Clause and MIT ++ image-2.4.1.tar.gz -> image-2.6.1.tar.gz ++ 15071 lines of diff (skipped)
commit octave-forge-image for openSUSE:Factory
Hello community, here is the log from the commit of package octave-forge-image for openSUSE:Factory checked in at 2015-08-31 22:58:49 Comparing /work/SRC/openSUSE:Factory/octave-forge-image (Old) and /work/SRC/openSUSE:Factory/.octave-forge-image.new (New) Package is "octave-forge-image" Changes: --- /work/SRC/openSUSE:Factory/octave-forge-image/octave-forge-image.changes 2015-06-23 11:58:40.0 +0200 +++ /work/SRC/openSUSE:Factory/.octave-forge-image.new/octave-forge-image.changes 2015-08-31 22:58:50.0 +0200 @@ -1,0 +2,7 @@ +Thu Aug 13 10:31:19 UTC 2015 - dmitr...@opensuse.org + +- Update to version 2.4.1 + * Bugfix release +- Drop ovsolete workaround_gcc_65843.patch + +--- Old: image-2.4.0.tar.gz workaround_gcc_65843.patch New: image-2.4.1.tar.gz Other differences: -- ++ octave-forge-image.spec ++ --- /var/tmp/diff_new_pack.FtUm3d/_old 2015-08-31 22:58:51.0 +0200 +++ /var/tmp/diff_new_pack.FtUm3d/_new 2015-08-31 22:58:51.0 +0200 @@ -18,19 +18,13 @@ %define octpkg image Name: octave-forge-%{octpkg} -Version:2.4.0 +Version:2.4.1 Release:0 Summary:Image Processing for Octave License:GPL-3.0+ and BSD-2-Clause and MIT Group: Productivity/Scientific/Math Url:http://octave.sourceforge.net Source0: http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM workaround_gcc_65843.patch -- https://savannah.gnu.org/bugs/?45096 -Patch1: workaround_gcc_65843.patch -%if 0%{?suse_version} > 1320 -BuildRequires: autoconf -BuildRequires: automake -%endif BuildRequires: gcc-c++ BuildRequires: hdf5-devel BuildRequires: octave-devel @@ -44,12 +38,6 @@ %prep %setup -q -c %{name}-%{version} -%if 0%{?suse_version} > 1320 -%patch1 -p1 -d %{octpkg}-%{version} -pushd %{octpkg}-%{version}/src -autoreconf -fi -popd -%endif %octave_pkg_src %build ++ image-2.4.0.tar.gz -> image-2.4.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-2.4.0/DESCRIPTION new/image-2.4.1/DESCRIPTION --- old/image-2.4.0/DESCRIPTION 2015-04-06 18:42:52.0 +0200 +++ new/image-2.4.1/DESCRIPTION 2015-08-07 14:34:57.0 +0200 @@ -1,6 +1,6 @@ Name: image -Version: 2.4.0 -Date: 2015-04-06 +Version: 2.4.1 +Date: 2015-08-07 Author: various authors Maintainer: Carnë DraugTitle: Image Processing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-2.4.0/NEWS new/image-2.4.1/NEWS --- old/image-2.4.0/NEWS2015-04-06 18:42:52.0 +0200 +++ new/image-2.4.1/NEWS2015-08-07 14:34:57.0 +0200 @@ -1,3 +1,19 @@ + Summary of important user-visible changes for image 2.4.1 (2015/08/07): +- + + ** Image 2.4.1 is a bug fixing release. + + ** Fixed regression on bwhitmiss which was completely broken since +version 2.2.0. + + ** Fixed regressions on rangefilt and stdfilt which made them always +throw an error. + + ** Removed broken support for signed integers to entropyfilt(). Not +only it was returning incorrect values and ocasional endless loops, +it failed to build in some architectures. + + Summary of important user-visible changes for image 2.4.0 (2015/04/06): - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/image-2.4.0/inst/@strel/getsequence.m new/image-2.4.1/inst/@strel/getsequence.m --- old/image-2.4.0/inst/@strel/getsequence.m 2015-04-06 18:42:52.0 +0200 +++ new/image-2.4.1/inst/@strel/getsequence.m 2015-08-07 14:34:57.0 +0200 @@ -21,6 +21,15 @@ ## Returns a strel object @var{se} that can be indexed with @code{()} to obtain ## the decomposed structuring elements that can be used to "rebuild" @var{se}. ## +## Decomposing a structuring element may lead to faster operations by +## replacing a single operation with a large @var{se} (large nhood), with +## multiple operations with smaller @var{se}. +## +## Most functions will automatically perform SE decomposition provided a +## strel object is used (instead of a logical array). This also requires +## that specific shapes are specified instead of @qcode{"arbitrary"}, since +## it may prevent SE decomposition. +## ## @seealso{imdilate, imerode, strel} ## @end deftypefn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore'
commit octave-forge-image for openSUSE:Factory
Hello community, here is the log from the commit of package octave-forge-image for openSUSE:Factory checked in at 2015-06-23 11:58:39 Comparing /work/SRC/openSUSE:Factory/octave-forge-image (Old) and /work/SRC/openSUSE:Factory/.octave-forge-image.new (New) Package is octave-forge-image Changes: --- /work/SRC/openSUSE:Factory/octave-forge-image/octave-forge-image.changes 2015-06-16 15:11:51.0 +0200 +++ /work/SRC/openSUSE:Factory/.octave-forge-image.new/octave-forge-image.changes 2015-06-23 11:58:40.0 +0200 @@ -1,0 +2,6 @@ +Sat Jun 20 08:22:07 UTC 2015 - dmitr...@opensuse.org + +- Fix build with GCC5 + * workaround_gcc_65843.patch + +--- New: workaround_gcc_65843.patch Other differences: -- ++ octave-forge-image.spec ++ --- /var/tmp/diff_new_pack.BUG7vW/_old 2015-06-23 11:58:41.0 +0200 +++ /var/tmp/diff_new_pack.BUG7vW/_new 2015-06-23 11:58:41.0 +0200 @@ -25,6 +25,12 @@ Group: Productivity/Scientific/Math Url:http://octave.sourceforge.net Source0: http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM workaround_gcc_65843.patch -- https://savannah.gnu.org/bugs/?45096 +Patch1: workaround_gcc_65843.patch +%if 0%{?suse_version} 1320 +BuildRequires: autoconf +BuildRequires: automake +%endif BuildRequires: gcc-c++ BuildRequires: hdf5-devel BuildRequires: octave-devel @@ -38,6 +44,12 @@ %prep %setup -q -c %{name}-%{version} +%if 0%{?suse_version} 1320 +%patch1 -p1 -d %{octpkg}-%{version} +pushd %{octpkg}-%{version}/src +autoreconf -fi +popd +%endif %octave_pkg_src %build ++ workaround_gcc_65843.patch ++ # HG changeset patch # User Carnë Draug carandr...@octave.org # Date 1433513310 -3600 # Fri Jun 05 15:08:30 2015 +0100 # Branch stable # Node ID e1a242fb2d2a040f5fb3c1cd4e4677c9cd8785e8 # Parent 3a088259e1678db32e73ca184ea3aa09a4c9f42e imreconstruct: workaround gcc bug #65843 for gcc 5.0 and 5.1 (bug #45096) * src/imreconstruct.cc: gcc 5.0 and gcc 5.1 have a regression where use of a reference to a const int in a lambda template function caused compile error. Check for presence of the bug and workaround by not making it const. diff -r 3a088259e167 -r e1a242fb2d2a src/Makefile.in --- a/src/Makefile.in Sun May 24 17:19:16 2015 +0100 +++ b/src/Makefile.in Fri Jun 05 15:08:30 2015 +0100 @@ -1,7 +1,7 @@ MKOCTFILE ?= mkoctfile -Wall OCTAVE ?= octave -FLAGGED_MKOCTFILE = CXXFLAGS=@CXXFLAGS@ $(MKOCTFILE) +FLAGGED_MKOCTFILE = CXXFLAGS=@CXXFLAGS@ @DEFS@ $(MKOCTFILE) ## We can't link oct files, and Octave's package system does not handle ## shared libraries. Because of this, we need to create object files for diff -r 3a088259e167 -r e1a242fb2d2a src/configure.ac --- a/src/configure.ac Sun May 24 17:19:16 2015 +0100 +++ b/src/configure.ac Fri Jun 05 15:08:30 2015 +0100 @@ -6,6 +6,27 @@ AX_CXX_COMPILE_STDCXX_11() +## Test for gcc bug #65843 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65843 +## which shows up as Octave bug #45096 https://savannah.gnu.org/bugs/?45096 +AC_CACHE_CHECK([whether templated lambda functions accept 'const int'], + [_cv_template_lambda_accepts_ref_const_inst], + [AC_COMPILE_IFELSE( +[AC_LANG_PROGRAM([[ + templateclass T + void test (T b) + { +const int a = b; +[] () { return a, a; }(); + } + ]], [[ test (1); ]])], +[_cv_template_lambda_accepts_ref_const_inst=yes], +[_cv_template_lambda_accepts_ref_const_inst=no]) +]) +if test $_cv_template_lambda_accepts_ref_const_inst = no; then + AC_DEFINE(HAVE_GCC_BUG_658433, 1, +[Define to 1 if compiler shows gcc bug #65843.]) +fi + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff -r 3a088259e167 -r e1a242fb2d2a src/imreconstruct.cc --- a/src/imreconstruct.cc Sun May 24 17:19:16 2015 +0100 +++ b/src/imreconstruct.cc Fri Jun 05 15:08:30 2015 +0100 @@ -100,7 +100,11 @@ const octave_idx_type* pads = padding_lengths.fortran_vec (); const octave_idx_type* neighbours = raster_neighbours.fortran_vec (); +#ifdef HAVE_GCC_BUG_658433 + octave_idx_type n_neighbours = raster_neighbours.numel (); +#else const octave_idx_type n_neighbours = raster_neighbours.numel (); +#endif // We probably should not be using this but converting to Array // just to have fortran_vec seems a bit too much. @@ -151,7 +155,11 @@ const octave_idx_type* pads = padding_lengths.fortran_vec (); const octave_idx_type* neighbours = antiraster_neighbours.fortran_vec (); +#ifdef HAVE_GCC_BUG_658433 + octave_idx_type n_neighbours = antiraster_neighbours.numel (); +#else const octave_idx_type n_neighbours =