gentoo resync : 28.04.2019

7 files changed, 189 insertions, 5 deletions

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 6cffb736981b..ea88b51d53d3 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -5,11 +5,16 @@ AUX openexr-2.2.0-fix-build-system.patch 17897 BLAKE2B 95f44167ce0590ee591a7b7de
 AUX openexr-2.2.0-fix-config.h-collision.patch 1556 BLAKE2B d7366aeae2a4d5b5496815d844de90c381d3a514dde0e37f86d2b2c5a8fe11eb3631aa44a554a5390cd2a43700cc8a36ff88af4a0e894c4774c45edf0129c4c5 SHA512 15d654f9e1546ea32a6175b1cce24ed9d979afe7dd763ca53a17c1020ca8851c31cc3b8fc0e4ef31722ead91557e24a67958ca9ee5fd0fa4e574304c3153be33
 AUX openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch 2536 BLAKE2B 7eb4db8596cd157f30ba7be564f776598cfa0d893dbaf8f729e8041079e851b0272ba595298e10792a5c74c14b21fbea78a4157d9494501f2c1ca5ef946dc6af SHA512 530088a51d97039e951055361526b8afa2c322351971d26302d21ddd6fdf2d21682df0577872be608b8cd0c3d3fc05792d871e7c724546be42bfa439e74bb726
 AUX openexr-2.2.0-use-ull-for-64-bit-literals.patch 1934 BLAKE2B 616f29857b5cd95c21bfba22ed7df51b1fab88476836eecee08a1befea4f82303ce35bc00eab34762d6cbba660851356198420e6a96092b8eb0a630829d3f132 SHA512 b799c5924bf8dba468236f4d43feab8ca7d8a88444595f2355671337f38d2868957d1372385000c36ed7ae74499925060d402ef9a82a352ea85dc7378cde21e2
+AUX openexr-2.3.0-bigendian.patch 2226 BLAKE2B e11a081bee4916276a912a0e96c873a9cee093df84aac0d69bf1c071d53b79064603c09637a446438d014739ba2c27b12f42567e5135af4a9913464f25fabe44 SHA512 2d1e300a3b5d0de7611c2b155f6123c778546a0cba0ee569c915ebcc39c343f88894286e6204bb10f153c824fd6ffed78979fc51804f56065ebf478c553f1e2f
+AUX openexr-2.3.0-bigendian2.patch 655 BLAKE2B 0bbafb66a643263e756d473216f262a9e307b805bd428f102c8aa6ed28e7ce42fa7549a6a4c820b56b6195e9301f97433a0c18e5b03a2207bbb14bdc1dfb25c0 SHA512 c0d4b2b79102f8d75134debc10f4324921233384b1b404a957db2d36948527a764e2e8d911c14230b849b91cd050d3de2fc222437434802b1d71c5d9fba3e1fe
 AUX openexr-2.3.0-fix-build-system.patch 2381 BLAKE2B 37fd9c6ae5357ffb93fd47344137b4c91110a79ab2b685ac048109192f87e41f01aaa0a0fbee222bfa10ffdc58340d7c803b3068bca8bf99c323dfe46252597d SHA512 36889880813acf75a77d3d34ea3f0a6535ca45194ad491bec17df3701d1eabd2bb03d81c525ba96cf695e91ec67abeb1b2395cfa45ff0767d90b4600d63e768a
+AUX openexr-2.3.0-skip-bogus-tests.patch 1429 BLAKE2B fe9dcafb4ea5990cfcf36b16f377592dba1a6f9c31315e38596b67007b2cb67fa46a3217f335202b86b5aa8fb0498c5af5a0905a5a57b9af42b601da1bdae473 SHA512 ff13061b24f6477195e189c38e2bf855a46ab77461c8622dd2e2414a7d2103b260f5184735bb142275690e66fb469e6f6c1fbf626dd9c1c2afbc15b975eba78a
+AUX openexr-2.3.0-tests-32bits-2.patch 586 BLAKE2B 83d36040f751e07f30c5cc3be10f8ac43d62d91b87b87bc2735ecc22426401b3b671d0b397e6a9a1fba351ae66e022c9bb488f95d29a9fbcca479d3d70501eac SHA512 5ffc8bda7e476ce71ee103b519c76e630371e5cc005b04f99d2c054580e387cc2b3b9598cbe4442415c5dfe85b0de8ceedf87079c3f738b7ebb737ea23ea7729
+AUX openexr-2.3.0-tests-32bits.patch 1537 BLAKE2B 96cc98ef34a6c18102e5b96f4373f41b77d25aaf04f9a20d0d406eeae17988cc6f3eecf805f6bac1e42805b283f3123455ca1b069d7c0dc04628835ded2d8dec SHA512 58ad1d8f5dc28be60cdc290c7829d8b50708d26f3a769530e054c629170457f6b7e2b526455f6f86d2ee24931d8afdb61345ada99ae49897d926c0d50fb579f6
 DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403
 DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
 DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 EBUILD openexr-2.1.0.ebuild 1256 BLAKE2B 0c8154e2bf910e9d3994c28f9a29f725efc1c677d1a587162e6766d24e6f6ac7d0ab7fd98b46d5ea3103321d12de217678d4de97ab555733af8e99cb1aed97fb SHA512 c5a8158b4ebb432479f7edfb39b41d3742d0bcd3cca4782dac1bfa1b4aaa6191355dc0a4b2a5c643874c19829c2118052ef1841975b6f7c97ee23542dd3063fd
 EBUILD openexr-2.2.0-r2.ebuild 1862 BLAKE2B 2ddcfb899e3213db76211cbacf9fe7afa597ac0fece9ec4655e390fd6501a5cb15f3553d374408d748c2a4364b519f15f71e82af7d93402736b9c1c245b50266 SHA512 028067478c69a1eade6bda177b734f6530de91e6350e9057aadef4028c0a5c3cc5ca8989186fe59c9b9075d9d17e119e7b53d3713acc29228af52100250a9fda
-EBUILD openexr-2.3.0.ebuild 1933 BLAKE2B ec44faffda4f70c5a9964dc09d6ec2e3c068fcb6463524d64a3cd0613e48d9f3b8250d3a9b8f7a05414b9df506de67c90df08c24dcc1b71a83306eb4d738180a SHA512 502493e8c7793954b4255b7f6e73835c068a70287ada74f2a21bc42377830258e0420400276808d8c21a0ecb00ac5cdcae1aa4d9cc5747b492e64eb390773add
+EBUILD openexr-2.3.0.ebuild 2233 BLAKE2B 2a7644dfe44203aa435684ce454cc4dd0fddd7dc495a9c9d044e95c02194090e898b688d582fb444859935e02bd9e46eaabd00d860b4d6ebe3184daa524aa66b SHA512 28e7b5580b6d19f0584b80b8d3fadef1707412007c41a2fcb5317d6b6b4d8a5a08e5ee320529e974f0e7ccc81c561479075ec12d8f25c8cb2fd4f702b9003baa
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
new file mode 100644
index 000000000000..0851fe957354
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
@@ -0,0 +1,71 @@
+Description: Fix test-suite on some big-endian archs
+Author: Dennis Gilmore <dennis@ausil.us>
+Bug-Debian: https://bugs.debian.org/793040
+Origin: vendor, https://github.com/openexr/openexr/issues/81
+Reviewed-by: Mathieu Malaterre <malat@debian.org>
+
+Index: openexr/IlmImfTest/testFutureProofing.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/testFutureProofing.cpp
++++ openexr/IlmImfTest/testFutureProofing.cpp
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <byteswap.h>
+ 
+ #include "tmpDir.h"
+ #include "testFutureProofing.h"
+@@ -64,6 +65,7 @@
+ #include <ImfNamespace.h>
+ #include <ImathNamespace.h>
+ #include <IlmThreadNamespace.h>
++#include <ImfSystemSpecific.h>
+ 
+ namespace IMF = OPENEXR_IMF_NAMESPACE;
+ using namespace IMF;
+@@ -1234,6 +1236,12 @@ modifyType (bool modify_version)
+             
+             //length of attribute
+             fread(&length,4,1,f);
++            if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
++            {
++                int tmp = bswap_32(length);
++        	length = tmp;
++            }
++
+             if(!modify_version && attrib_name=="type")
+             {
+                 // modify the type of part 1 to be 'X<whatevever>'
+Index: openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/testMultiPartFileMixingBasic.cpp
++++ openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <byteswap.h>
+ 
+ #include "tmpDir.h"
+ #include "testMultiPartFileMixingBasic.h"
+@@ -59,6 +60,7 @@
+ #include <ImfDeepScanLineInputPart.h>
+ #include <ImfPartType.h>
+ #include <ImfMisc.h>
++#include <ImfSystemSpecific.h>
+ 
+ namespace IMF = OPENEXR_IMF_NAMESPACE;
+ using namespace IMF;
+@@ -1383,6 +1385,11 @@ killOffsetTables (const std::string & fn
+             
+             //length of attribute
+             fread(&length,4,1,f);
++    	    if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
++    	    {
++    		int tmp = bswap_32(length);
++    		length = tmp;
++    	    }
+             
+             //value of attribute
+             for(int i=0;i<length;i++) 
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
new file mode 100644
index 000000000000..cf1ad7b09027
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
@@ -0,0 +1,17 @@
+Description: Upstream is not interested in big endian arch
+ Seems to only affect the test suite.
+Author: Mathieu Malaterre <malat@debian.org>
+
+Index: openexr/IlmImfTest/main.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/main.cpp
++++ openexr/IlmImfTest/main.cpp
+@@ -153,7 +153,7 @@ main (int argc, char *argv[])
+     TEST (testHuf, "core");
+     TEST (testWav, "core");
+     TEST (testRgba, "basic");
+-    TEST (testSharedFrameBuffer, "basic");
++    //TEST (testSharedFrameBuffer, "basic");
+     TEST (testRgbaThreading, "basic");
+     TEST (testChannels, "basic");
+     TEST (testAttributes, "core");
diff --git a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
new file mode 100644
index 000000000000..360b9609b2dc
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
@@ -0,0 +1,31 @@
+Description: Remove bogus test from suite
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: https://bugs.debian.org/790495
+Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790495#15
+
+--- openexr-2.2.0.orig/IlmImfTest/testSampleImages.cpp
++++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp
+@@ -162,15 +162,15 @@ testSampleImages (const std::string&)
+ 	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr",
+ 		       ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr");
+ 
+-	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
+-		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
+-	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
+-		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
++//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
++//		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
++//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
++//		       ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
+ 
+-	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
+-		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
+-	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
+-		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
++//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
++//		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
++//	compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
++//		       ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
+ 
+ 
+ 	cout << "ok\n" << endl;
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
new file mode 100644
index 000000000000..bb3917d79961
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
@@ -0,0 +1,17 @@
+Description: Usual double rounding issue with x87
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: https://bugs.debian.org/909865
+Forwarded: https://github.com/openexr/openexr/issues/346
+Last-Update: 2018-12-19
+
+--- openexr-2.3.0.orig/IlmImfTest/Makefile.am
++++ openexr-2.3.0/IlmImfTest/Makefile.am
+@@ -54,6 +54,8 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
+ 
+ AM_CPPFLAGS = -DILM_IMF_TEST_IMAGEDIR=\"$(srcdir)/\"
+ 
++AM_CPPFLAGS += -ffloat-store
++
+ if BUILD_IMFHUGETEST
+ IlmImfTest_SOURCES += testDeepScanLineHuge.cpp testDeepScanLineHuge.h
+ AM_CPPFLAGS += -DENABLE_IMFHUGETEST
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
new file mode 100644
index 000000000000..430bb20bcfae
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
@@ -0,0 +1,36 @@
+Description: Fix test-suite on some 32bits archs
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: https://bugs.debian.org/791478
+
+Index: openexr/IlmImfTest/Makefile.am
+===================================================================
+--- openexr.orig/IlmImfTest/Makefile.am
++++ openexr/IlmImfTest/Makefile.am
+@@ -44,7 +44,6 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
+ 		     testDeepScanLineMultipleRead.h testDeepScanLineMultipleRead.cpp  \
+ 		     testPartHelper.h testPartHelper.cpp \
+ 		     testOptimized.cpp testOptimized.h \
+-		     testOptimizedInterleavePatterns.cpp testOptimizedInterleavePatterns.h \
+ 		     testBadTypeAttributes.cpp testBadTypeAttributes.h \
+ 		     testFutureProofing.cpp testFutureProofing.h \
+ 	             compareDwa.cpp compareDwa.h \
+Index: openexr/IlmImfTest/main.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/main.cpp
++++ openexr/IlmImfTest/main.cpp
+@@ -82,7 +82,6 @@
+ #include "testCopyMultiPartFile.h"
+ #include "testPartHelper.h"
+ #include "testOptimized.h"
+-#include "testOptimizedInterleavePatterns.h"
+ #include "testBadTypeAttributes.h"
+ #include "testFutureProofing.h"
+ #include "testPartHelper.h"
+@@ -174,7 +173,6 @@ main (int argc, char *argv[])
+     TEST (testExistingStreams, "core");
+     TEST (testStandardAttributes, "core");
+     TEST (testOptimized, "basic");
+-    TEST (testOptimizedInterleavePatterns, "basic");
+     TEST (testYca, "basic");
+     TEST (testTiledYa, "basic");
+     TEST (testNativeFormat, "basic");
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
index 99f63d05e1f9..d617628cbfa7 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/24" # based on SONAME
-KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 -arm arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx examples static-libs"
 
 RDEPEND="
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 
+RESTRICT="test" # Tests broken upstream doesn't really care about them, bug #656680
+
 DOCS=( AUTHORS ChangeLog NEWS README.md )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h )
 
@@ -31,6 +33,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
 	"${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
 	"${FILESDIR}/${P}-fix-build-system.patch"
+	# From Debian
+	"${FILESDIR}/${PN}-2.3.0-tests-32bits.patch"
+	"${FILESDIR}/${PN}-2.3.0-skip-bogus-tests.patch"
+	"${FILESDIR}/${PN}-2.3.0-bigendian.patch"
+	"${FILESDIR}/${PN}-2.3.0-bigendian2.patch"
+	"${FILESDIR}/${PN}-2.3.0-tests-32bits-2.patch"
 )
 
 src_prepare() {
@@ -66,6 +74,5 @@ multilib_src_install_all() {
 		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
 	fi
 
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }