Skip to content

Commit 901ae96

Browse files
committed
update deps
- update boost download url - apply libtiff cmake patch from sme_deps_common
1 parent 025a1ca commit 901ae96

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

Dockerfile

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/pypa/manylinux_2_28_x86_64:2024-09-09-f386546 as builder
1+
FROM quay.io/pypa/manylinux_2_28_x86_64:2025-01-05-75aeda9 as builder
22

33
ARG NPROCS=24
44
ARG BUILD_DIR=/opt/smelibs
@@ -85,19 +85,19 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
8585
&& make install \
8686
&& rm -rf $TMP_DIR
8787

88-
ARG BOOST_VERSION="1.86.0"
89-
ARG BOOST_VERSION_="1_86_0"
88+
ARG BOOST_VERSION="1.87.0"
89+
ARG BOOST_VERSION_="1_87_0"
9090
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
9191
&& curl -L \
92-
"https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_}.tar.bz2" \
92+
"https://archives.boost.io/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_}.tar.bz2" \
9393
--output boost.tar.bz2 \
9494
&& tar xjf boost.tar.bz2 \
9595
&& cd boost_${BOOST_VERSION_} \
9696
&& ./bootstrap.sh --prefix="$BUILD_DIR" --with-libraries=serialization \
9797
&& ./b2 link=static install \
9898
&& rm -rf $TMP_DIR
9999

100-
ARG CGAL_VERSION="v5.6.1"
100+
ARG CGAL_VERSION="v6.0.1"
101101
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
102102
&& git clone \
103103
-b $CGAL_VERSION \
@@ -118,7 +118,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
118118
&& ninja install \
119119
&& rm -rf $TMP_DIR
120120

121-
ARG LIBEXPAT_VERSION="R_2_6_3"
121+
ARG LIBEXPAT_VERSION="R_2_6_4"
122122
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
123123
&& git clone \
124124
-b $LIBEXPAT_VERSION \
@@ -144,15 +144,15 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
144144
&& ninja install \
145145
&& rm -rf $TMP_DIR
146146

147-
ARG LIBTIFF_VERSION="v4.6.0"
148-
# plus patch for cmake CMath issue
147+
ARG LIBTIFF_VERSION="v4.7.0"
148+
# includes patch for cmake linking CMath issue from sme_deps_common
149149
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
150150
&& git clone \
151151
-b $LIBTIFF_VERSION \
152152
--depth=1 \
153153
https://gitlab.com/libtiff/libtiff.git \
154154
&& cd libtiff \
155-
&& curl -L https://gitlab.com/libtiff/libtiff/-/commit/67f73084ca824e6c2465c47a5b67b16b5beca569.diff --output patch.diff \
155+
&& curl -L https://raw.githubusercontent.com/spatial-model-editor/sme_deps_common/refs/heads/main/libtiff.diff --output patch.diff \
156156
&& git apply --ignore-space-change --ignore-whitespace --verbose patch.diff \
157157
&& mkdir cmake-build \
158158
&& cd cmake-build \
@@ -182,7 +182,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
182182
&& ninja install \
183183
&& rm -rf $TMP_DIR
184184

185-
ARG LLVM_VERSION="18.1.8"
185+
ARG LLVM_VERSION="19.1.6"
186186
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
187187
&& git clone \
188188
-b llvmorg-$LLVM_VERSION \
@@ -225,7 +225,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
225225
&& ninja install \
226226
&& rm -rf $TMP_DIR
227227

228-
ARG TBB_VERSION="v2021.13.0"
228+
ARG TBB_VERSION="v2022.0.0"
229229
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
230230
&& git clone \
231231
-b $TBB_VERSION \
@@ -249,7 +249,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
249249
&& ninja install \
250250
&& rm -rf $TMP_DIR
251251

252-
ARG DPL_VERSION="oneDPL-2022.6.0-rc1"
252+
ARG DPL_VERSION="oneDPL-2022.7.1-release"
253253
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
254254
&& git clone \
255255
-b $DPL_VERSION \
@@ -317,7 +317,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
317317
&& cp ../zlib.h $BUILD_DIR/include/. \
318318
&& rm -rf $TMP_DIR
319319

320-
ARG QT_VERSION="v6.7.2"
320+
ARG QT_VERSION="v6.8.1"
321321
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
322322
&& git clone \
323323
-b $QT_VERSION \
@@ -493,7 +493,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
493493
&& ninja install \
494494
&& rm -rf $TMP_DIR
495495

496-
ARG FMT_VERSION="11.0.2"
496+
ARG FMT_VERSION="11.1.1"
497497
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
498498
&& git clone \
499499
-b $FMT_VERSION \
@@ -517,7 +517,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
517517
&& ninja install \
518518
&& rm -rf $TMP_DIR
519519

520-
ARG SPDLOG_VERSION="v1.14.1"
520+
ARG SPDLOG_VERSION="v1.x"
521521
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
522522
&& git clone \
523523
-b $SPDLOG_VERSION \
@@ -575,7 +575,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
575575
&& ninja install \
576576
&& rm -rf $TMP_DIR
577577

578-
ARG SCOTCH_VERSION="v7.0.5"
578+
ARG SCOTCH_VERSION="v7.0.6"
579579
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
580580
&& git clone \
581581
-b $SCOTCH_VERSION \
@@ -606,7 +606,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
606606
&& ninja install \
607607
&& rm -rf $TMP_DIR
608608

609-
ARG DUNE_COPASI_VERSION="releases/2.0"
609+
ARG DUNE_COPASI_VERSION="releases/2.1"
610610
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
611611
&& export DUNE_COPASI_USE_STATIC_DEPS=ON \
612612
&& export CMAKE_INSTALL_PREFIX=$BUILD_DIR \
@@ -701,7 +701,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
701701
&& ninja install \
702702
&& rm -rf $TMP_DIR
703703

704-
ARG CATCH2_VERSION="v3.7.0"
704+
ARG CATCH2_VERSION="v3.7.1"
705705
RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
706706
&& git clone \
707707
-b $CATCH2_VERSION \
@@ -724,7 +724,7 @@ RUN mkdir -p $TMP_DIR && cd $TMP_DIR \
724724
&& ninja install \
725725
&& rm -rf $TMP_DIR
726726

727-
FROM quay.io/pypa/manylinux_2_28_x86_64:2024-09-09-f386546
727+
FROM quay.io/pypa/manylinux_2_28_x86_64:2025-01-05-75aeda9
728728

729729
LABEL org.opencontainers.image.source=https://github.com/spatial-model-editor/sme_manylinux_x86_64
730730
LABEL org.opencontainers.image.description="manylinux x86_64 image for compiling Spatial Model Editor python wheels"

0 commit comments

Comments
 (0)