From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 22 Aug 2020 07:00:52 +0000 (+0200)
Subject: - added opt patch (fixes build with more aggressive inlining, e.g. gcc 10); release 16
X-Git-Tag: auto/th/framewave-1.3.1-16
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fframewave.git;a=commitdiff_plain;h=680106b

- added opt patch (fixes build with more aggressive inlining, e.g. gcc 10); release 16
---

diff --git a/framewave-opt.patch b/framewave-opt.patch
new file mode 100644
index 0000000..4ea7f1d
--- /dev/null
+++ b/framewave-opt.patch
@@ -0,0 +1,14 @@
+--- FRAMEWAVE_1.3.1_SRC/Framewave/domain/fwImage/src/ResizeShift.cpp.orig	2020-08-21 23:27:33.944259671 +0200
++++ FRAMEWAVE_1.3.1_SRC/Framewave/domain/fwImage/src/ResizeShift.cpp	2020-08-22 08:42:32.082811114 +0200
+@@ -79,6 +79,11 @@
+ 	FwStatus My_FW_ParaCheck<Fw8u>(const Fw8u*pSrc, FwiSize srcSize, int srcStep, FwiRect srcRoi,
+ 		Fw8u*pDst, int dstStep, FwiSize dstRoiSize, int channel);
+ 
++	// explicit instantiation, so implementation code won't be optimized out
++	template
++	FwStatus My_FW_ParaCheck<float>(const float*pSrc, FwiSize srcSize, int srcStep, FwiRect srcRoi,
++		float*pDst, int dstStep, FwiSize dstRoiSize, int channel);
++
+ 	template< class TS, CH chSrc, DispatchType disp >
+ 	extern FwStatus My_FW_Resize(const TS *pSrc, int srcStep, FwiRect srcRoi,	
+ 		TS*pDst, int dstStep, FwiSize dstRoiSize,
diff --git a/framewave.spec b/framewave.spec
index 30eb927..5f7d0a3 100644
--- a/framewave.spec
+++ b/framewave.spec
@@ -6,7 +6,7 @@ Summary:	Framewave - set of popular image and signal processing routines
 Summary(pl.UTF-8):	Framewave - zestaw popularnych funkcji do przetwarzania obrazu i sygnału
 Name:		framewave
 Version:	1.3.1
-Release:	15
+Release:	16
 License:	Apache v2.0
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/framewave/FRAMEWAVE_%{version}_SRC.tar.gz
@@ -18,6 +18,7 @@ Patch3:		%{name}-templates.patch
 Patch4:		%{name}-warnings.patch
 Patch5:		%{name}-cpuid.patch
 Patch6:		%{name}-scons.patch
+Patch7:		%{name}-opt.patch
 URL:		http://framewave.sourceforge.net/
 BuildRequires:	boost-devel >= 1.34
 BuildRequires:	libstdc++-devel
@@ -76,6 +77,7 @@ Statyczne biblioteki Framewave.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # kill precompiled binaries
 %{__rm} BuildTools/bin/FwHeaderConvert_*