From f3e237092bdc389fc7a2c418884ab02228c9e6b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 17 Aug 2021 23:14:03 +0200 Subject: [PATCH] - fix building with gcc 11 --- framewave.spec | 4 +++- gcc11.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gcc11.patch diff --git a/framewave.spec b/framewave.spec index 5f7d0a3..9e833d0 100644 --- a/framewave.spec +++ b/framewave.spec @@ -19,6 +19,7 @@ Patch4: %{name}-warnings.patch Patch5: %{name}-cpuid.patch Patch6: %{name}-scons.patch Patch7: %{name}-opt.patch +Patch8: gcc11.patch URL: http://framewave.sourceforge.net/ BuildRequires: boost-devel >= 1.34 BuildRequires: libstdc++-devel @@ -78,11 +79,12 @@ Statyczne biblioteki Framewave. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # kill precompiled binaries %{__rm} BuildTools/bin/FwHeaderConvert_* -%{__sed} -i -e "s/'-O2'/'%{rpmcxxflags}'/" BuildTools/buildscripts/fwflags_gcc.py +%{__sed} -i -e "s/'-O2'/'%{rpmcxxflags} -std=c++11'/" BuildTools/buildscripts/fwflags_gcc.py %build cd Framewave diff --git a/gcc11.patch b/gcc11.patch new file mode 100644 index 0000000..859afba --- /dev/null +++ b/gcc11.patch @@ -0,0 +1,31 @@ +--- FRAMEWAVE_1.3.1_SRC/Framewave/domain/fwImage/src/formatConversion.cpp~ 2009-07-09 11:15:34.000000000 +0200 ++++ FRAMEWAVE_1.3.1_SRC/Framewave/domain/fwImage/src/formatConversion.cpp 2021-08-17 20:02:38.764534982 +0200 +@@ -11,22 +11,23 @@ + + using namespace OPT_LEVEL; + +-#define CMC_CHECK_PARAMS if( pDst ==0 || pSrc ==0 ) return fwStsNullPtrErr; \ +- if( dstStep<=0 || srcStep<=0 ) return fwStsStepErr; \ +- if( roiSize.height<=0 || roiSize.width <=0 ) return fwStsSizeErr; + + FwStatus PREFIX_OPT( OPT_PREFIX, fwiYCbCr422_8u_C2P3R )( const Fw8u* pSrc, int srcStep, + Fw8u* pDst[3], int dstStep[3], + FwiSize roiSize ) + { +- CMC_CHECK_PARAMS; ++ if( pDst ==0 || pSrc ==0 ) return fwStsNullPtrErr; ++ if( srcStep<=0 ) return fwStsStepErr; ++ if( roiSize.height<=0 || roiSize.width <=0 ) return fwStsSizeErr; + return CMC::ModelCP ::ConvertREF( pSrc, srcStep, pDst, dstStep, roiSize ); + } + + FwStatus PREFIX_OPT( OPT_PREFIX, fwiYCbCr422_8u_P3C2R )( const Fw8u* const pSrc[3], int srcStep[3], + Fw8u* pDst, int dstStep, FwiSize roiSize ) + { +- CMC_CHECK_PARAMS; ++ if( pDst ==0 || pSrc ==0 ) return fwStsNullPtrErr; ++ if( dstStep<=0 ) return fwStsStepErr; ++ if( roiSize.height<=0 || roiSize.width <=0 ) return fwStsSizeErr; + return CMC::ModelPC< CMC::CH_FC_P3C2 >::ConvertREF( pSrc, srcStep, pDst, dstStep, roiSize ); + } + -- 2.44.0