[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/295: gnu: ilmbase: Update to 2.5.2.
From: |
guix-commits |
Subject: |
19/295: gnu: ilmbase: Update to 2.5.2. |
Date: |
Mon, 27 Jul 2020 06:25:05 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit e0bb6391a9bd55f3856fa45f23a7891d29b834ad
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jun 27 15:57:12 2020 +0200
gnu: ilmbase: Update to 2.5.2.
* gnu/packages/patches/ilmbase-fix-test-arm.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/graphics.scm (ilmbase): Update to 2.5.2.
[source](patches): Remove 'ilmbase-fix-test-arm.patch'.
(openexr)[arguments]: Really increase test timeout, as the previous fix was
ineffective.
---
gnu/local.mk | 1 -
gnu/packages/graphics.scm | 15 ++++---
gnu/packages/patches/ilmbase-fix-test-arm.patch | 60 -------------------------
3 files changed, 9 insertions(+), 67 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 396629c..fb157c0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1106,7 +1106,6 @@ dist_patch_DATA =
\
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
- %D%/packages/patches/ilmbase-fix-test-arm.patch \
%D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 0d768b8..e8bff9b 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -359,7 +359,7 @@ many more.")
(define-public ilmbase
(package
(name "ilmbase")
- (version "2.5.0")
+ (version "2.5.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -368,9 +368,8 @@ many more.")
(file-name (git-file-name "ilmbase" version))
(sha256
(base32
- "1k50cvi3sk6gf6w713lkk2gv5cvs74vkc7s7k4z6nmyhi4g89w4y"))
- (patches (search-patches "ilmbase-fix-tests.patch"
- "ilmbase-fix-test-arm.patch"))))
+ "1vf8bqld2bpcdi99jbr043y6vp01cp3fvbiasrn66xn91mf6imbn"))
+ (patches (search-patches "ilmbase-fix-tests.patch"))))
(build-system cmake-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@@ -589,11 +588,15 @@ graphics.")
(lambda _
(chdir "OpenEXR")
#t))
- (add-before 'check 'increase-test-timeout
+ (add-after 'change-directory 'increase-test-timeout
(lambda _
;; On armhf-linux, we need to override the CTest default
;; timeout of 1500 seconds for the OpenEXR.IlmImf test.
- (setenv "CTEST_TEST_TIMEOUT" "2000")
+ (substitute* "IlmImfTest/CMakeLists.txt"
+ (("add_test\\(NAME OpenEXR\\.IlmImf.*" all)
+ (string-append
+ all
+ "set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT
2000)")))
#t))
,@(if (not (target-64bit?))
`((add-after 'change-directory 'disable-broken-test
diff --git a/gnu/packages/patches/ilmbase-fix-test-arm.patch
b/gnu/packages/patches/ilmbase-fix-test-arm.patch
deleted file mode 100644
index 2dbc55e..0000000
--- a/gnu/packages/patches/ilmbase-fix-test-arm.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix a test failure on ARM platforms:
-
-https://github.com/AcademySoftwareFoundation/openexr/issues/713
-
-Taken from upstream:
-
-https://github.com/AcademySoftwareFoundation/openexr/commit/76d9839cd1b300398f8b801dfcb4bcf2f8c0096f
-
-diff --git a/OpenEXR/IlmImfTest/testHuf.cpp b/OpenEXR/IlmImfTest/testHuf.cpp
-index 4c887ee8..a93b8ea9 100644
---- a/OpenEXR/IlmImfTest/testHuf.cpp
-+++ b/OpenEXR/IlmImfTest/testHuf.cpp
-@@ -181,9 +181,9 @@ compressUncompressSubset(const unsigned short raw[], int n)
- // This DEK hash is determined from an aprior initial run of this
- // test noting its value from the assert message compressVerify().
- //
--#define HUF_COMPRESS_DEK_HASH_FOR_FILL4_USHRT_MAX_PLUS_ONE 2956869585U
--#define HUF_COMPRESS_DEK_HASH_FOR_FILL4_N 3414126535U
--#define HUF_COMPRESS_DEK_HASH_FOR_FILL5_N 169791374U
-+#define HUF_COMPRESS_DEK_HASH_FOR_FILL4_USHRT_MAX_PLUS_ONE 2013380646U
-+#define HUF_COMPRESS_DEK_HASH_FOR_FILL4_N 213880353U
-+#define HUF_COMPRESS_DEK_HASH_FOR_FILL5_N 2492982090U
-
- void
- compressVerify (const unsigned short raw[],
-@@ -200,7 +200,7 @@ compressVerify (const unsigned short raw[],
- // under the topic of sorting and search chapter 6.4.
- //
- unsigned int compressedHash = nCompressed;
-- const char* cptr = compressed;
-+ const unsigned char* cptr = reinterpret_cast<const unsigned char*>(
(const char*) compressed);
- for (int i = 0; i < nCompressed; ++i)
- {
- compressedHash =
-@@ -210,6 +210,25 @@ compressVerify (const unsigned short raw[],
- cout << "verifying compressed checksum hash = "
- << compressedHash << std::endl;
-
-+ if (compressedHash != dekHash)
-+ {
-+ cout << "hash verification failed. Got " << compressedHash << "
expected " << dekHash << std::endl;
-+ const unsigned char* cptr = reinterpret_cast<const unsigned char*>(
(const char*) compressed);
-+ for(int i = 0 ; i < nCompressed ; ++i )
-+ {
-+ cout << std::hex << (0xFF & (int) (*cptr++));
-+ if ( (i & 0xF) ==0 )
-+ {
-+ cout << '\n';
-+ }
-+ else
-+ {
-+ cout << ' ';
-+ }
-+ }
-+ cout << "\n";
-+ }
-+
- assert (compressedHash == dekHash);
- }
-
- 57/295: gnu: Add rust-scrypt-0.2., (continued)
- 57/295: gnu: Add rust-scrypt-0.2., guix-commits, 2020/07/27
- 58/295: gnu: r-qtl2: Update to 0.22-8., guix-commits, 2020/07/27
- 59/295: gnu: r-qtl2: Update synopsis, description., guix-commits, 2020/07/27
- 62/295: services: Add rshiny service., guix-commits, 2020/07/27
- 74/295: gnu: Add rust-digest-0.9., guix-commits, 2020/07/27
- 75/295: gnu: Add rust-block-buffer-0.9., guix-commits, 2020/07/27
- 78/295: gnu: rust-sha1-asm-0.4: Don't skip build., guix-commits, 2020/07/27
- 12/295: gnu: dav1d: Update to 0.7.1., guix-commits, 2020/07/27
- 15/295: gnu: python-gevent: Update to 20.6.2., guix-commits, 2020/07/27
- 13/295: gnu: Add python2-selectors2., guix-commits, 2020/07/27
- 19/295: gnu: ilmbase: Update to 2.5.2.,
guix-commits <=
- 17/295: gnu: exempi: Delete the static library., guix-commits, 2020/07/27
- 14/295: gnu: python-greenlet: Update to 0.4.16., guix-commits, 2020/07/27
- 21/295: gnu: x265: Update to 3.4., guix-commits, 2020/07/27
- 22/295: gnu: Add emacs-browse-kill-ring., guix-commits, 2020/07/27
- 25/295: gnu: python-setproctitle: Fix indentation., guix-commits, 2020/07/27
- 23/295: gnu: Add r-shapforxgboost., guix-commits, 2020/07/27
- 28/295: daemon: Map directly to gcrypt hash functions., guix-commits, 2020/07/27
- 29/295: daemon: Remove OpenSSL hash compatibility wrappers., guix-commits, 2020/07/27
- 31/295: packages: Recognize SHA3 and BLAKE2s for 'content-hash'., guix-commits, 2020/07/27
- 32/295: gnu: libtiff: Use HTTPS., guix-commits, 2020/07/27