diff --git a/easybuild/easyconfigs/e/ecCodes/ecCodes-2.20.0-gompi-2020b.eb b/easybuild/easyconfigs/e/ecCodes/ecCodes-2.20.0-gompi-2020b.eb index f0104f79dfc..54cb9105d3e 100644 --- a/easybuild/easyconfigs/e/ecCodes/ecCodes-2.20.0-gompi-2020b.eb +++ b/easybuild/easyconfigs/e/ecCodes/ecCodes-2.20.0-gompi-2020b.eb @@ -19,7 +19,7 @@ builddependencies = [('CMake', '3.18.4')] dependencies = [ ('netCDF', '4.7.4'), - ('JasPer', '2.0.14'), + ('JasPer', '2.0.24'), ('libjpeg-turbo', '2.0.5'), ('libpng', '1.6.37'), ('zlib', '1.2.11'), diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.0.10-35-GCCcore-10.2.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.0.10-35-GCCcore-10.2.0.eb index b59eec36499..980874e68be 100644 --- a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.0.10-35-GCCcore-10.2.0.eb +++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.0.10-35-GCCcore-10.2.0.eb @@ -20,7 +20,7 @@ dependencies = [ ('bzip2', '1.0.8'), ('X11', '20201008'), ('Ghostscript', '9.53.3'), - ('JasPer', '2.0.14'), + ('JasPer', '2.0.24'), ('libjpeg-turbo', '2.0.5'), ('LibTIFF', '4.1.0'), ('LittleCMS', '2.11'), diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.14-GCCcore-10.2.0.eb b/easybuild/easyconfigs/j/JasPer/JasPer-2.0.14-GCCcore-10.2.0.eb deleted file mode 100644 index 460a679974c..00000000000 --- a/easybuild/easyconfigs/j/JasPer/JasPer-2.0.14-GCCcore-10.2.0.eb +++ /dev/null @@ -1,35 +0,0 @@ -easyblock = 'CMakeMake' - -name = 'JasPer' -version = '2.0.14' - -homepage = 'https://www.ece.uvic.ca/~frodo/jasper/' - -description = """ - The JasPer Project is an open-source initiative to provide a free - software-based reference implementation of the codec specified in - the JPEG-2000 Part-1 standard. -""" - -toolchain = {'name': 'GCCcore', 'version': '10.2.0'} -toolchainopts = {'pic': True} - -source_urls = ['https://www.ece.uvic.ca/~frodo/jasper/software/'] -sources = [SOURCELOWER_TAR_GZ] -checksums = ['2a1f61e55afe8b4ce8115e1508c5d7cb314d56dfcc2dd323f90c072f88ccf57b'] - -builddependencies = [ - ('binutils', '2.35'), - ('CMake', '3.18.4'), -] - -separate_build_dir = True - -configopts = '-DJAS_ENABLE_DOC=OFF ' - -sanity_check_paths = { - 'files': ['bin/jasper', ('lib/libjasper.%s' % SHLIB_EXT, 'lib64/libjasper.%s' % SHLIB_EXT)], - 'dirs': ['include'], -} - -moduleclass = 'vis' diff --git a/easybuild/easyconfigs/q/Qt5/Qt5-5.14.2-GCCcore-10.2.0.eb b/easybuild/easyconfigs/q/Qt5/Qt5-5.14.2-GCCcore-10.2.0.eb index bde35a1625c..ad095ebda27 100644 --- a/easybuild/easyconfigs/q/Qt5/Qt5-5.14.2-GCCcore-10.2.0.eb +++ b/easybuild/easyconfigs/q/Qt5/Qt5-5.14.2-GCCcore-10.2.0.eb @@ -22,6 +22,7 @@ patches = [ 'Qt5-5.14.2_fix-missing-stdint.patch', 'Qt5-5.14.2_fix-webengine-bison.patch', 'Qt5-5.14.2_fix-std-runtime_error.patch', + 'Qt5-5.14.2_fix-include-math.patch', ] checksums = [ 'c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa', # qt-everywhere-src-5.14.2.tar.xz @@ -31,6 +32,7 @@ checksums = [ '648e2a92d5ea139543db5d01a80aa33d4721e52bb59c785490b64497b0ede4ab', # Qt5-5.14.2_fix-missing-stdint.patch '6ace4735e35dee95d6b6c7eea3a7c46c264589a319d745310282ee724f632861', # Qt5-5.14.2_fix-webengine-bison.patch '290d91efe8fc7c6daedf01f4a055ff30123c987d41b1832a34920ef521579f5c', # Qt5-5.14.2_fix-std-runtime_error.patch + '32c975b4ad12150f872554f1960c7108bc9c994e318988bab27e762a6c666fa2', # Qt5-5.14.2_fix-include-math.patch ] builddependencies = [ @@ -59,7 +61,7 @@ dependencies = [ ('libjpeg-turbo', '2.0.5'), ('NSS', '3.57'), ('snappy', '1.1.8'), - ('JasPer', '2.0.14'), + ('JasPer', '2.0.24'), ('bzip2', '1.0.8'), # OS dependency should be preferred if the os version is more recent then this version, # it is nice to have an up to date openssl for security reasons diff --git a/easybuild/easyconfigs/q/Qt5/Qt5-5.14.2_fix-include-math.patch b/easybuild/easyconfigs/q/Qt5/Qt5-5.14.2_fix-include-math.patch new file mode 100644 index 00000000000..57d81753743 --- /dev/null +++ b/easybuild/easyconfigs/q/Qt5/Qt5-5.14.2_fix-include-math.patch @@ -0,0 +1,13 @@ +add missing include statement to fix compilation error for qjp2handler.cpp with recent JasPer: +"error: pow was not declared in this scope" +see also https://github.com/qt/qtimageformats/commit/704868db61be1542c2d9e2b75ead00c45c56cc36 +--- qt-everywhere-src-5.14.2/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp.orig 2021-02-25 13:10:44.890921650 +0100 ++++ qt-everywhere-src-5.14.2/qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp 2021-02-25 13:11:04.310799662 +0100 +@@ -45,6 +45,7 @@ + #include "qcolor.h" + + #include ++#include // for pow + + QT_BEGIN_NAMESPACE +