Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=efae5d4335781e82b364d6a02e22d417af86a0e0
commit efae5d4335781e82b364d6a02e22d417af86a0e0 Author: crazy <[email protected]> Date: Wed Feb 7 20:40:17 2018 +0100 freeimage-3.17.0-4-x86_64 * rebuild with tc * added gcc7 patch * C/CXX Flags fix * drop i686 diff --git a/source/xlib-extra/freeimage/FrugalBuild b/source/xlib-extra/freeimage/FrugalBuild index cc9b55c..ba1703c 100644 --- a/source/xlib-extra/freeimage/FrugalBuild +++ b/source/xlib-extra/freeimage/FrugalBuild @@ -5,21 +5,24 @@ ## FIXME: unbundle libs -- crazy -- pkgname=freeimage pkgver=3.17.0 -pkgrel=3 +pkgrel=4 pkgdesc="Image library" -depends=('libstdc++>=6.2.1-5') +depends=('libstdc++>=7.3.0-7') makedepends=('hd2u') groups=('xlib-extra') -archs=('i686' 'x86_64') +archs=('x86_64') _F_cd_path="FreeImage" _F_sourceforge_mirror="freefr" Finclude sourceforge url="http://freeimage.sourceforge.net/"; up2date="lynx -dump http://freeimage.sourceforge.net/download.html|grep -om1 'Download FreeImage\(.*\)'|sed 's/.*ge \(.*\).*/\1/'" source=(http://$_F_sourceforge_mirror.dl.sourceforge.net/project/$pkgname/Source%20Distribution/$pkgver/${_F_cd_path}${pkgver//./}.zip \ - gcc5.patch FreeImage-3.17.0_CVE-2015-0852.patch) + gcc5.patch FreeImage-3.17.0_CVE-2015-0852.patch libraw-gcc7.patch) sha1sums=('6752c83798c2f81dee71a2e8bb11657068672669' \ '75f42afda577cc99a3c497c1d5a0e49ca7f8183f' \ - '27759bd56f739bd5f50c60fe7d37a585dec4ded8') + '27759bd56f739bd5f50c60fe7d37a585dec4ded8' \ + 'c794193b3e5da4dd2f86daee43da7462b1a7e1f4') +unset MAKEFLAGS CXXFLAGS+=" -Wno-narrowing -Wno-deprecated -Wno-deprecated-declarations" +CFLAGS+=" -Wno-narrowing -Wno-deprecated -Wno-deprecated-declarations" # optimization OK diff --git a/source/xlib-extra/freeimage/libraw-gcc7.patch b/source/xlib-extra/freeimage/libraw-gcc7.patch new file mode 100644 index 0000000..6ece4e9 --- /dev/null +++ b/source/xlib-extra/freeimage/libraw-gcc7.patch @@ -0,0 +1,21 @@ +diff -Naur FreeImage/Source/LibRawLite/internal/dcraw_common.cpp FreeImage-p/Source/LibRawLite/internal/dcraw_common.cpp +--- FreeImage/Source/LibRawLite/internal/dcraw_common.cpp 2015-03-08 21:27:50.000000000 +0100 ++++ FreeImage-p/Source/LibRawLite/internal/dcraw_common.cpp 2018-02-07 20:35:47.628666837 +0100 +@@ -6937,7 +6937,7 @@ + if (table_buf[iLensData+9] && + (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) + imgdata.lens.makernotes.CurFocal = +- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); ++ 10*(table_buf[iLensData+9]>>2) * powf64((float)4, (table_buf[iLensData+9] & 0x03)-2); + if (table_buf[iLensData+10] & 0xf0) + imgdata.lens.makernotes.MaxAp4CurFocal = + powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); +@@ -7809,7 +7809,7 @@ + { + if (table_buf[iLensData+9] && (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) + imgdata.lens.makernotes.CurFocal = +- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); ++ 10*(table_buf[iLensData+9]>>2) * powf64((float)4, (table_buf[iLensData+9] & 0x03)-2); + if (table_buf[iLensData+10] & 0xf0) + imgdata.lens.makernotes.MaxAp4CurFocal = + powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
