diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-libs/openexr | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'media-libs/openexr')
12 files changed, 0 insertions, 626 deletions
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index fb826d445585..f5ab7966f968 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,16 +1,4 @@ -AUX openexr-2.2.0-Install-missing-header-files.patch 1929 BLAKE2B 9695d1c5294d312b5551522044d838db8c19e2a46d970b392ebb2d2889ea1c54f765f3195ce9b1df42b9ac7586a6569e9621b039dde5ab562b0bce5b74a9f33b SHA512 b6d1bb5a37bdf2283da8f45b71f3a8830a96437f2459746c5d354cecaaceee5e35ba3e3cf247e3c5c6f7930490233672542d8f7aaa59b79593d209e66eac8421 -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.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-bashisms.patch 4505 BLAKE2B cedadd9425265c9378de1431ccd9875afa047ec1324cf2fcef1de2f3444fa634e94da457050b2d7481b31918fb9855c7e7ff55160af2ce9889f0840cf847fcb9 SHA512 57293c57d8294bb20c075337b933b37e88f396b0c5fa5cd871800249ccbf286edcda1360e53aab9aa5b289bfc5e351e6ccaaa8f182607ce8bd1cc11cab03fad5 -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 AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857 -DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123 DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf -EBUILD openexr-2.3.0.ebuild 2234 BLAKE2B 864ae2338edbf3b058bf5053598b93a251a87a97d351c6fbed658508e9136a965bcae2598182f509ff65b56d6975bb72be3d9286d92b101a7164cabbd42f023b SHA512 f0b6c1c79ea7b49cc6f5157d20bd7001d225bef2729bcef23badbd3e72c8ec4f7b0d2cd2329682f5914ca40ffbc31bfb5715e7f6615988a467e26d23e2b56382 EBUILD openexr-2.5.5.ebuild 1691 BLAKE2B ddaa5c3bca30159e1c1349a8d3ec8b79e670c0739f98abe62dac2286b8207352361f15461ec06577a9c90ab566bc0081372d2fd6f305e6a91fe7083eece97b9a SHA512 840e4a1652df0f5968b015dfcb14ea35f6587338f8b22e3e4b78dc4358dd33108cf7edf01c1406163f8e9a11e3b7c4e7582855d1784c8c4adb1f7d85f8c28015 MISC metadata.xml 704 BLAKE2B 7315b803d664938f38c13ec83a4d4fbfb3364fb5816d816243efe2b350517d561f9aab072df80c117f998fb139b789cd5aade8774f4a118d475ef0146fee0e24 SHA512 041be55dab737fc1d1b94ed930341818e9296a3e24c9838f91605ca001f198493d8784e9bf25da2ed03755382714d5159c5ad6386075d148bb2d1de665980540 diff --git a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch b/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch deleted file mode 100644 index 1075cd9a30fa..000000000000 --- a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a018f82655402421a995565dd4a5192259cbc207 Mon Sep 17 00:00:00 2001 -From: Jonathan Scruggs <j.scruggs@gmail.com> -Date: Sat, 23 Sep 2017 10:36:40 +0100 -Subject: [PATCH] OpenEXR: Install missing header files - -Some header files are not installed via Autotools, but are with -CMake which breaks compatibility with certain programs. This patch -enables Autotools to install these header files. - -Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com> ---- - OpenEXR/IlmImf/Makefile.am | 3 ++- - OpenEXR/IlmImfUtil/Makefile.am | 17 +++++++++++++++++ - 2 files changed, 19 insertions(+), 1 deletion(-) - -diff --git a/IlmImf/Makefile.am b/IlmImf/Makefile.am -index a7c219c..b7b96ac 100644 ---- a/IlmImf/Makefile.am -+++ b/IlmImf/Makefile.am -@@ -162,7 +162,8 @@ libIlmImfinclude_HEADERS = ImfForward.h ImfAttribute.h ImfBoxAttribute.h \ - ImfMisc.h \ - ImfPartHelper.h \ - ImfDeepImageState.h \ -- ImfDeepImageStateAttribute.h -+ ImfDeepImageStateAttribute.h \ -+ ImfFloatVectorAttribute.h - - noinst_HEADERS = ImfCompressor.h \ - ImfRleCompressor.h \ -diff --git a/IlmImfUtil/Makefile.am b/IlmImfUtil/Makefile.am -index 8005ee1..e1d3674 100644 ---- a/IlmImfUtil/Makefile.am -+++ b/IlmImfUtil/Makefile.am -@@ -33,6 +33,23 @@ libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf - - libIlmImfUtilincludedir = $(includedir)/OpenEXR - -+libIlmImfUtilinclude_HEADERS = ImfFlatImage.h \ -+ ImfDeepImage.h \ -+ ImfDeepImageChannel.h \ -+ ImfImageLevel.h \ -+ ImfDeepImageLevel.h \ -+ ImfDeepImageIO.h \ -+ ImfImageChannelRenaming.h \ -+ ImfImageIO.h \ -+ ImfFlatImageChannel.h \ -+ ImfImage.h \ -+ ImfFlatImageLevel.h \ -+ ImfImageDataWindow.h \ -+ ImfSampleCountChannel.h \ -+ ImfFlatImageIO.h \ -+ ImfImageChannel.h -+ -+ - EXTRA_DIST = CMakeLists.txt - - INCLUDES = \ --- -2.14.1 - diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch b/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch deleted file mode 100644 index 53421194c2da..000000000000 --- a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch +++ /dev/null @@ -1,43 +0,0 @@ -Rename enum from VERSION to MYVERSION due to -collision with VERSION from autoheader. - ---- a/IlmImf/ImfDwaCompressor.cpp -+++ b/IlmImf/ImfDwaCompressor.cpp -@@ -1944,7 +1944,7 @@ - - #define OBIDX(x) (Int64 *)&_outBuffer[x * sizeof (Int64)] - -- Int64 *version = OBIDX (VERSION); -+ Int64 *version = OBIDX (MYVERSION); - Int64 *unknownUncompressedSize = OBIDX (UNKNOWN_UNCOMPRESSED_SIZE); - Int64 *unknownCompressedSize = OBIDX (UNKNOWN_COMPRESSED_SIZE); - Int64 *acCompressedSize = OBIDX (AC_COMPRESSED_SIZE); -@@ -2356,7 +2356,7 @@ - - const Int64 *inPtr64 = (const Int64*) inPtr; - -- Int64 version = *(inPtr64 + VERSION); -+ Int64 version = *(inPtr64 + MYVERSION); - Int64 unknownUncompressedSize = *(inPtr64 + UNKNOWN_UNCOMPRESSED_SIZE); - Int64 unknownCompressedSize = *(inPtr64 + UNKNOWN_COMPRESSED_SIZE); - Int64 acCompressedSize = *(inPtr64 + AC_COMPRESSED_SIZE); -@@ -3142,7 +3142,7 @@ - - - // --// Setup channel classification rules when reading files with VERSION < 2 -+// Setup channel classification rules when reading files with MYVERSION < 2 - // - - void ---- a/IlmImf/ImfDwaCompressor.h -+++ b/IlmImf/ImfDwaCompressor.h -@@ -124,7 +124,7 @@ - - enum DataSizesSingle - { -- VERSION = 0, // Version number: -+ MYVERSION = 0, // Version number: - // 0: classic - // 1: adds "end of block" to the AC RLE - diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch b/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch deleted file mode 100644 index 1dc13c724074..000000000000 --- a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-IlmImf_ImfSystemSpecific.cpp,v 1.2 2014/08/19 13:34:42 joerg Exp $ - -Rework cpuid function to use gnuc __get_cpuid (requiring at least gcc 4.3) -This get's over issues such as encountered with PIC builds. -Upstream issue : https://github.com/openexr/openexr/issues/128 - -https://raw.githubusercontent.com/jsonn/pkgsrc/trunk/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp -https://github.com/jsonn/pkgsrc/commit/5158af44e65b6d7b9f1a8aca2eb24cb87d003724 -https://bugs.gentoo.org/show_bug.cgi?id=626760 - ---- a/IlmImf/ImfSystemSpecific.cpp.orig 2014-08-10 04:23:57.000000000 +0000 -+++ b/IlmImf/ImfSystemSpecific.cpp -@@ -40,21 +40,30 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EN - - namespace { - #if defined(IMF_HAVE_SSE2) && defined(__GNUC__) -- - // Helper functions for gcc + SSE enabled -- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx) -+ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, -+ unsigned int &ecx, unsigned int &edx) - { -+#ifdef __i386__ -+ __asm__ __volatile__ ( -+ "pushl %%ebx; cpuid; movl %%ebx, %0; popl %%ebx" -+ : /* Output */ "=m"(ebx), "=a"(eax), "=c"(ecx), "=d"(edx) -+ : /* Input */ "a"(n) -+ : /* Clobber */); -+#else - __asm__ __volatile__ ( - "cpuid" - : /* Output */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) - : /* Input */ "a"(n) - : /* Clobber */); -+#endif - } - - #else // IMF_HAVE_SSE2 && __GNUC__ - - // Helper functions for generic compiler - all disabled -- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx) -+ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, -+ unsigned int &ecx, unsigned int &edx) - { - eax = ebx = ecx = edx = 0; - } -@@ -64,7 +73,7 @@ namespace { - - #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX - -- void xgetbv(int n, int &eax, int &edx) -+ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx) - { - __asm__ __volatile__ ( - "xgetbv" -@@ -75,7 +84,7 @@ namespace { - - #else // OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX - -- void xgetbv(int n, int &eax, int &edx) -+ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx) - { - eax = edx = 0; - } -@@ -94,8 +103,8 @@ CpuId::CpuId(): - f16c(false) - { - bool osxsave = false; -- int max = 0; -- int eax, ebx, ecx, edx; -+ unsigned int max = 0; -+ unsigned int eax, ebx, ecx, edx; - - cpuid(0, max, ebx, ecx, edx); - if (max > 0) diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch deleted file mode 100644 index 0851fe957354..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch +++ /dev/null @@ -1,71 +0,0 @@ -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 deleted file mode 100644 index cf1ad7b09027..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch +++ /dev/null @@ -1,17 +0,0 @@ -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-fix-bashisms.patch b/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch deleted file mode 100644 index f633eb0e49f1..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch +++ /dev/null @@ -1,117 +0,0 @@ -From ba329cba788d4f320e6fc455919233222c27a0dd Mon Sep 17 00:00:00 2001 -From: Kimball Thurston <kdt3rd@gmail.com> -Date: Sun, 21 Jul 2019 23:07:01 +1200 -Subject: [PATCH] Fixes #139 - -Removes bash-isms from the autoconf bootstrap / configure.ac files - -Signed-off-by: Kimball Thurston <kdt3rd@gmail.com> ---- - IlmBase/bootstrap | 4 ++-- - IlmBase/configure.ac | 22 ++++++++++------------ - OpenEXR/bootstrap | 4 ++-- - OpenEXR/configure.ac | 26 +++++++++++++------------- - OpenEXR_Viewers/bootstrap | 4 ++-- - OpenEXR_Viewers/configure.ac | 15 +++++++-------- - PyIlmBase/bootstrap | 4 ++-- - PyIlmBase/configure.ac | 15 +++++++-------- - 8 files changed, 45 insertions(+), 49 deletions(-) - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -76,30 +76,30 @@ AC_ARG_ENABLE(cxxstd, - [enable ISO c++ standard 11/14 [[default=auto]]]), - [cxxstd="${enableval}"], [cxxstd=14]) - --if test "${cxxstd}" == 17 ; then -+if test "${cxxstd}" = 17 ; then - AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++17" - else -- if test "${cxxstd}" == 14 ; then -+ if test "${cxxstd}" = 14 ; then - AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++14" - else -- if test "${cxxstd}" == 11 ; then -+ if test "${cxxstd}" = 11 ; then - AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) - CXXFLAGS="$CXXFLAGS -std=c++11" - else -- if test "${cxxstd}" == 03 ; then -+ if test "${cxxstd}" = 03 ; then - CXXFLAGS="$CXXFLAGS -std=c++03" - else - dnl automatically determine... - AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) - AX_CXX_COMPILE_STDCXX([14], [noext], [optional]) - AX_CXX_COMPILE_STDCXX([17], [noext], [optional]) -- if test "$HAVE_CXX14" == 1 ; then -+ if test "$HAVE_CXX14" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++14" - cxxstd = 14 - else -- if test "$HAVE_CXX11" == 1 ; then -+ if test "$HAVE_CXX11" = 1 ; then - CXXFLAGS="$CXXFLAGS -std=c++11" - cxxstd = 11 - fi -@@ -216,7 +216,7 @@ AC_COMPILE_IFELSE( - [sysconf_nproc="no"] - ) - AC_MSG_RESULT([$sysconf_nproc]) --if test "x${sysconf_nproc}" == xyes ; then -+if test "x${sysconf_nproc}" = xyes ; then - AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count]) - fi - -@@ -297,14 +297,14 @@ LIB_SUFFIX="" - lib_suffix_valid="no" - - lib_namespace="Imf" --if test "x${library_namespace_versioning}" == xyes ; then -+if test "x${library_namespace_versioning}" = xyes ; then - AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR]) - AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR]) - - lib_namespace="Imf_${OPENEXR_VERSION_API}" - LIB_SUFFIX="${OPENEXR_VERSION_API}" - lib_suffix_valid="yes" --elif test "x${library_namespace_versioning}" == xno ; then -+elif test "x${library_namespace_versioning}" = xno ; then - AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR]) - - lib_namespace="Imf" -@@ -318,7 +318,7 @@ else - fi - AC_SUBST(LIB_SUFFIX) - --if test "x${lib_suffix_valid}" == xyes ; then -+if test "x${lib_suffix_valid}" = xyes ; then - AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}") - AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true) - else -@@ -338,11 +338,11 @@ AC_ARG_ENABLE(customusernamespace, - [custom_usr_namespace="${enableval}"], - [custom_usr_namespace=no]) - --if test "x${custom_usr_namespace}" == xyes ; then -+if test "x${custom_usr_namespace}" = xyes ; then - AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf']) - AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR]) - usr_namespace="Imf" --elif test "x${custom_usr_namespace}" == xno ; then -+elif test "x${custom_usr_namespace}" = xno ; then - AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR]) - usr_namespace="Imf" - else -@@ -386,7 +386,7 @@ enable large stack optimizations $large_stack - internal library namespace $lib_namespace - user-client namespace $usr_namespace]) - --if test "x$build_osxuniversal" == xyes; then -+if test "x$build_osxuniversal" = xyes; then - AC_MSG_RESULT([ - build OS X universal binaries $build_osxuniversal]) - fi diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch deleted file mode 100644 index 811a7af38758..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 067f9d0..fdbe2f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) - AC_CANONICAL_HOST - AC_CONFIG_SRCDIR(IlmImfTest/main.cpp) - AC_CONFIG_HEADERS([config/OpenEXRConfig.h]) --AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better --AM_MAINTAINER_MODE -+AM_INIT_AUTOMAKE - - - LIBTOOL_CURRENT=24 -@@ -28,7 +27,7 @@ AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_CC - AC_PROG_LN_S --AC_PROG_LIBTOOL -+LT_INIT - AC_PROG_MAKE_SET - - dnl -@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG( - [ILMBASE]) - - dnl Define the version string --AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string]) --AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string]) -+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string]) -+AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string]) - AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string]) - AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string]) - AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string]) -@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading, - [multithread="${enableval}"], [multithread=yes]) - - AS_IF([test "x${multithread}" != xno], [ -- ACX_PTHREAD( -- [ -- AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD) -- ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS" -- ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS" -- CC="$PTHREAD_CC" -- -- AM_POSIX_SEM() -- ], -- [AC_MSG_ERROR([POSIX thread support required])]) -+ AX_PTHREAD - - AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available]) - -@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip) - dnl AC_LANG_RESTORE - AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available]) - --AC_MSG_CHECKING(for gcc optimization flags) --old_cflags=$CFLAGS --CFLAGS="$CFLAGS -pipe" --AC_TRY_COMPILE([#include <stdio.h>], --[ printf ("hello, world"); ], --[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""]) --CFLAGS=$old_cflags --AC_MSG_RESULT([$EXTRA_OPT_CFLAGS]) -- - - dnl Check to see if the toolset supports AVX instructions in inline asm - AC_ARG_ENABLE([avx], 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 deleted file mode 100644 index 360b9609b2dc..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index bb3917d79961..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index 430bb20bcfae..000000000000 --- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index 69309c6d2019..000000000000 --- a/media-libs/openexr/openexr-2.3.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic toolchain-funcs multilib-minimal - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/" -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-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx examples static-libs" - -RDEPEND=" - >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-archive-2016.09.16 - virtual/pkgconfig -" - -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 ) - -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch" - "${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" - "${FILESDIR}/${P}-fix-bashisms.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() { - default - # Fix path for testsuite - sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-imffuzztest - --disable-imfhugetest - --enable-threading - $(use_enable cpu_flags_x86_avx avx) - $(use_enable examples imfexamples) - $(use_enable static-libs static) - ) - - # TODO: check if this still applies on updates! - # internal tool dwaLookup fails to run when linked with gold linker - tc-ld-disable-gold - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - else - rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die - fi - - find "${D}" -name '*.la' -type f -delete || die -} |