gentoo resync : 27.03.2018

3 files changed, 49 insertions, 2 deletions

diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 02ca4b3a6b05..3bf5d09fb1cb 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -2,9 +2,10 @@ AUX freeimage-3.15.4-CVE-2015-0852.patch 6191 BLAKE2B 1b5c66b65ced14f45a9cb87b3e
 AUX freeimage-3.15.4-CVE-2016-5684-1.patch 690 BLAKE2B dc22eefe8b21c960095a4b531cc13762e6042dc2f4d1718e116bb83cf1d1efc6111116c7ed5c4e55fcfeef1c0e9250065205104b83e2ba06adf3a65a8de0db30 SHA512 7c535725fddb0a4f97c2634cf6144c9fea9d5963279265e0f08d9cc2f6a4aaf24a6fa27096dc5a50457db90bb93b895936d5967ae08ea9d93ebea89cd2ff724d
 AUX freeimage-3.15.4-CVE-2016-5684-2.patch 369 BLAKE2B d1c7950cb6839b8782d1c409d3f96ad9da09b6f7bf1728b01e4ce4ece8ce1d37838640fceabbc4357aad5e0f53ba2fbf34b5ffbd53aedb7dd6a4b6a1f981e6de SHA512 275871b569301af72d7db03c390113124b15a16d043bb7c95d10b4fe7a79cd092e2d320efe0ec6038f64f29e07ea443b97c367ff78dbd718ae04393e956be533
 AUX freeimage-3.15.4-libjpeg-turbo.patch 20346 BLAKE2B 38ecea346812c292e697717319db206c658cc30a04de9b7e5dff2bd531c03424982aba7b3206ad69ffb75132779b1e0c07e0a49c7e8e127d59ce0d85afdf8335 SHA512 effe0dd7d47400e57d4754a5d9b4533051aae0410fc9b579dd4af902c39538bf071bcc492a68cb027b0a28bc2f627357f26f4cb4f1d0ba93a34d0d5c0dfc524e
+AUX freeimage-3.15.4-libjpeg9.patch 1581 BLAKE2B 717a2e0b757c5d7ca540ec5ef6cfa2a2bc06bfc2de86e7b67bfc6c8010b7b32272456ed67d3297f02477318b3c3af8075df004c432cd1bd795652dab4096f7e5 SHA512 76f05f35118e96405977ebe746b600a3887677c30ce1fe0600d1e8f0c2aa0238f4dd418a0c612021ec8551692c2420190bcfb2f6b305a24c5a4070c77f1b7899
 AUX freeimage-3.15.4-raw.patch 350 BLAKE2B 4f97bc847878eef03c4af249fb20353979aa043fd37840b9cdb3159fa097a8b52455c2a0f4bd6f97140ebcf15739692c270f7ae1e62859da7188b835fb28a9f8 SHA512 2429bec7ec8f4963d3b0bd658093e8c3ff83d8ea5d934beb28526b80e89cb3aee6fe849800d80a81680614fa98e962744ced33ee198e04e32fc4be4d105e528b
 AUX freeimage-3.15.4-unbundling.patch 17258 BLAKE2B 309707fe4b07c3808fb2824a07eeef77a6b424267b5363e7b67c5677f33903962b887d1116e6c8bdd786c244cb80e84b4a2d9b5941a89ed640aabc6fddd1e320 SHA512 96883a598a6386b322e69497760cff606d95e354dd7a197b858060b41402641c9188bf6c77a9a249d04a8c3d59561ccb034581a43e1df3fd0806f3a2a521f3a0
 DIST FreeImage3154.pdf 1007480 BLAKE2B 801d39c4b7eeab833c7225c2d53a3a0e8e9d2a91ea3f7173047705c8b750706f3a4a9ac60f7ba9d5e8150b548bd5add242e9e40f498c57ad9e5a623972bbb239 SHA512 cebde5e2609c9a0c06b4e07e1c595d7d6714895095cd9935f59c8b2ff9b34116248f5453b41f469f6242d87cae79be82d59f6a9ec0f75b1ea3df61ac1f651b28
 DIST FreeImage3154.zip 5513923 BLAKE2B 376b00faaae2c10c9eb36f89726a022734e109ca7ca11951c9e6525f21d2a7ee305ec195be29a272ecb7935ba5d0b61f3d84f26a6aec5f7a9229d5e47cd665bb SHA512 0db9eb7d0ed8e08e10ff4fa274c4484541ca119c3d437a85fdc3b2d9232bf14a7877c79b1e62c8c99278d7020a9f623c161f2342475f3ee526233404138112cc
-EBUILD freeimage-3.15.4-r1.ebuild 2961 BLAKE2B 0137dac8513a66b8c5cf1f0640d8d5979c209e1d8d2b30e943ce74a75e6e1f177fc932719804646bef9793d2bbb4ff948a0873dce03c36a785e219ca1f7604b6 SHA512 746d2c66294780d0b3b702b659f0c4217887474d954633bbc80b43e0333c2364e5f56c59e97bb3708160a5fc28a0ef78642befdef71fabc0b13f3ac340683ccc
+EBUILD freeimage-3.15.4-r1.ebuild 3004 BLAKE2B 64f989b270e7dceec8d7d542fad6dcb5e7ce2c5a0e3193ca3df3fedbf4bb888322b7ec8fe3277aaa3cdb507f04bb0080dfd949744d9bb41c2e82dc4086ad8bc2 SHA512 cbd8f7e0efcbeb15a9ff258a718ef8b2d784824abe3b57df34e25fedbeeac7e4f3a4d6c982f3928afa914a83743ba3b197bede97a87506ba84141eef168f3c23
 MISC metadata.xml 332 BLAKE2B e0048362683712cbd48296fa15c743d7ec86e71a7ab1c58f8abece77dd77b38e2f67b099efc2ece05294a9a39258ad81f5947162b66fa020d6fa639f8abb95a9 SHA512 060e17cbb418ebf7df3ee40bb1e99e12ce281101fc50e62e1a1d9cf0294fffbb2f475df1c25e954cb049bf065b316e155ccbf94dcae0bf49acf9e45e306144c5
diff --git a/media-libs/freeimage/files/freeimage-3.15.4-libjpeg9.patch b/media-libs/freeimage/files/freeimage-3.15.4-libjpeg9.patch
new file mode 100644
index 000000000000..24eb9e010fca
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.15.4-libjpeg9.patch
@@ -0,0 +1,45 @@
+Bug: https://bugs.gentoo.org/647422

+Upstream Patch: https://sourceforge.net/p/freeimage/patches/130/

+

+diff -Naur a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
+--- a/Source/FreeImage/PluginJPEG.cpp	2018-03-24 23:24:11.062695375 -0400
++++ b/Source/FreeImage/PluginJPEG.cpp	2018-03-24 23:25:39.451124161 -0400
+@@ -1586,14 +1586,14 @@
+ 
+ 			// thumbnail support (JFIF 1.02 extension markers)
+ 			if(FreeImage_GetThumbnail(dib) != NULL) {
+-				cinfo.write_JFIF_header = 1; //<### force it, though when color is CMYK it will be incorrect
++				cinfo.write_JFIF_header = static_cast<boolean>(1); //<### force it, though when color is CMYK it will be incorrect
+ 				cinfo.JFIF_minor_version = 2;
+ 			}
+ 
+ 			// baseline JPEG support
+ 			if ((flags & JPEG_BASELINE) ==  JPEG_BASELINE) {
+-				cinfo.write_JFIF_header = 0;	// No marker for non-JFIF colorspaces
+-				cinfo.write_Adobe_marker = 0;	// write no Adobe marker by default				
++				cinfo.write_JFIF_header = static_cast<boolean>(0);	// No marker for non-JFIF colorspaces
++				cinfo.write_Adobe_marker = static_cast<boolean>(0);	// write no Adobe marker by default
+ 			}
+ 
+ 			// set subsampling options if required
+diff -Naur a/Source/FreeImage.h b/Source/FreeImage.h
+--- a/Source/FreeImage.h	2018-03-24 23:24:11.066695395 -0400
++++ b/Source/FreeImage.h	2018-03-24 23:26:35.945391182 -0400
+@@ -117,12 +117,17 @@
+ #ifndef _WINDOWS_
+ #define _WINDOWS_
+ 
++#if JPEG_LIB_VERSION < 90
++
+ #ifndef FALSE
+ #define FALSE 0
+ #endif
+ #ifndef TRUE
+ #define TRUE 1
+ #endif
++
++#endif
++
+ #ifndef NULL
+ #define NULL 0
+ #endif
diff --git a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
index 666fba9ba67b..d40deb296850 100644
--- a/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.15.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.15.4-CVE-2016-5684-1.patch
 	"${FILESDIR}"/${PN}-3.15.4-CVE-2016-5684-2.patch
 	"${FILESDIR}"/${PN}-3.15.4-CVE-2015-0852.patch
+	"${FILESDIR}"/${PN}-3.15.4-libjpeg9.patch
 )
 
 src_prepare() {