docker/ubuntu: remove openjpeg build

This was disabled when updating to Ubuntu 20.04 in 941a78b, so remove the code now.
innFactory · Oct 12, 2024 · f924228 · f924228
1 parent 51ee141
commit f924228
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 40 deletions.
diff --git a/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile
@@ -242,27 +242,6 @@ RUN --mount=type=cache,id=ubuntu-full-tiledb,target=$HOME/.cache \
     && for i in /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu/*; do strip -s $i 2>/dev/null || /bin/true; done \
     && for i in /build_thirdparty/usr/bin/*; do strip -s $i 2>/dev/null || /bin/true; done
 
-# Build openjpeg
-ARG OPENJPEG_VERSION=
-RUN . /buildscripts/bh-set-envvars.sh \
-    && if test "${OPENJPEG_VERSION}" != ""; then ( \
-    curl -LO -fsS https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz \
-    && tar xzf v${OPENJPEG_VERSION}.tar.gz \
-    && rm -f v${OPENJPEG_VERSION}.tar.gz \
-    && cd openjpeg-${OPENJPEG_VERSION} \
-    && cmake . -G Ninja -DBUILD_SHARED_LIBS=ON  -DBUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-    && ninja \
-    && ninja install \
-    && mkdir -p /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu \
-    && rm -f /usr/lib/${GCC_ARCH}-linux-gnu/libopenjp2.so* \
-    && mv /usr/lib/libopenjp2.so* /usr/lib/${GCC_ARCH}-linux-gnu \
-    && cp -P /usr/lib/${GCC_ARCH}-linux-gnu/libopenjp2.so* /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu \
-    && for i in /build_thirdparty/usr/lib/${GCC_ARCH}-linux-gnu/*; do strip -s $i 2>/dev/null || /bin/true; done \
-    && cd .. \
-    && rm -rf openjpeg-${OPENJPEG_VERSION} \
-    ); fi
-
 # Build libOpenDRIVE
 ARG OPENDRIVE_VERSION=0.6.0-gdal
 RUN --mount=type=cache,id=ubuntu-full-libopendrive,target=$HOME/.cache \

diff --git a/docker/ubuntu-small/Dockerfile b/docker/ubuntu-small/Dockerfile
@@ -74,25 +74,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
        libspatialite-dev${APT_ARCH_SUFFIX} \
        autoconf automake sqlite3 bash-completion swig
 
-# Build openjpeg
-ARG OPENJPEG_VERSION=
-RUN . /buildscripts/bh-set-envvars.sh \
-    && if test "${OPENJPEG_VERSION}" != ""; then ( \
-    curl -LO -fsS https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz \
-    && tar xzf v${OPENJPEG_VERSION}.tar.gz \
-    && rm -f v${OPENJPEG_VERSION}.tar.gz \
-    && cd openjpeg-${OPENJPEG_VERSION} \
-    && cmake . -G Ninja -DBUILD_SHARED_LIBS=ON  -DBUILD_STATIC_LIBS=OFF -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-    && ninja \
-    && ninja install \
-    && mkdir -p /build_thirdparty/usr/lib \
-    && cp -P /usr/lib/libopenjp2*.so* /build_thirdparty/usr/lib \
-    && for i in /build_thirdparty/usr/lib/*; do strip -s $i 2>/dev/null || /bin/true; done \
-    && cd .. \
-    && rm -rf openjpeg-${OPENJPEG_VERSION} \
-    ); fi
-
 ARG PROJ_INSTALL_PREFIX
 ARG PROJ_DATUMGRID_LATEST_LAST_MODIFIED
 RUN \