Skip to content

Commit 159e359

Browse files
authored
[OpenJpeg] Update to v2.4.0 and build for experimental platforms (#3310)
1 parent 423088e commit 159e359

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

O/OpenJpeg/build_tarballs.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
using BinaryBuilder, Pkg
44

55
name = "OpenJpeg"
6-
version = v"2.3.1"
6+
version = v"2.4.0"
77

88
# Collection of sources required to complete build
99
sources = [
10-
ArchiveSource("https://github.com/uclouvain/openjpeg/archive/v2.3.1/openjpeg-2.3.1.tar.gz", "63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9"),
10+
ArchiveSource("https://github.com/uclouvain/openjpeg/archive/v$(version)/openjpeg-$(version).tar.gz",
11+
"8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d"),
1112
DirectorySource("./bundled")
1213
]
1314

1415
# Bash recipe for building across all platforms
1516
script = raw"""
16-
cd $WORKSPACE/srcdir
17+
cd $WORKSPACE/srcdir/openjpeg-*/
1718
for f in ${WORKSPACE}/srcdir/patches/*.patch; do
1819
atomic_patch -p1 ${f}
1920
done
20-
cd openjpeg-2.3.1/
2121
cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC_LIBS=OFF
2222
make -j${nproc}
2323
make install
2424
"""
2525

2626
# These are the platforms we will build for by default, unless further
2727
# platforms are passed in on the command line
28-
platforms = supported_platforms()
28+
platforms = supported_platforms(; experimental=true)
2929

3030
# The products that we will ensure are always built
3131
products = [
@@ -43,4 +43,4 @@ dependencies = [
4343
]
4444

4545
# Build the tarballs, and possibly a `build.jl` as well.
46-
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies)
46+
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")

O/OpenJpeg/bundled/patches/no_ffast-math.patch

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
diff --git before/openjpeg-2.3.1/CMakeLists.txt after/openjpeg-2.3.1/CMakeLists.txt
2-
index 3ea2424..9dedd3d 100644
3-
--- before/openjpeg-2.3.1/CMakeLists.txt
4-
+++ after/openjpeg-2.3.1/CMakeLists.txt
1+
--- a/CMakeLists.txt
2+
+++ b/CMakeLists.txt
53
@@ -195,9 +195,8 @@ endif()
64
if(CMAKE_COMPILER_IS_GNUCC)
75
# For all builds, make sure openjpeg is std99 compliant:

0 commit comments

Comments
 (0)