IM 7.1.1-36, libaom-3.9.1

dooman87 · Aug 1, 2024 · a1807ae · a1807ae
1 parent e2d898f
commit a1807ae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 38 deletions.
diff --git a/Dockerfile.bookworm b/Dockerfile.bookworm
@@ -2,14 +2,12 @@ FROM debian:bookworm-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-ARG IM_VERSION=7.1.1-35
-ARG LIB_HEIF_VERSION=1.18.0
+ARG IM_VERSION=7.1.1-36
+ARG LIB_HEIF_VERSION=1.18.1
 ARG LIB_AOM_VERSION=3.9.1
 ARG LIB_WEBP_VERSION=1.4.0
 ARG LIBJXL_VERSION=0.10.3
 
-COPY libheif-libbrotli.patch /
-
 RUN apt-get -y update && \
     apt-get -y upgrade && \
     apt-get install -y --no-install-recommends git make pkg-config autoconf curl cmake clang libomp-dev ca-certificates automake \
@@ -55,7 +53,6 @@ RUN apt-get -y update && \
     # Building libheif
     git clone -b v${LIB_HEIF_VERSION} --depth 1 https://github.com/strukturag/libheif.git && \
     cd libheif/ && \
-    mv /libheif-libbrotli.patch ./ && git apply ./libheif-libbrotli.patch && \
     mkdir build && cd build && cmake --preset=release .. && make && make install && cd ../../ && \
     ldconfig /usr/local/lib && \
     rm -rf libheif && \

diff --git a/Dockerfile.bullseye b/Dockerfile.bullseye
@@ -2,8 +2,8 @@ FROM debian:bullseye-slim
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-ARG IM_VERSION=7.1.1-35
-ARG LIB_HEIF_VERSION=1.18.0
+ARG IM_VERSION=7.1.1-36
+ARG LIB_HEIF_VERSION=1.18.1
 ARG LIB_AOM_VERSION=3.9.1
 ARG LIB_WEBP_VERSION=1.4.0
 ARG LIBJXL_VERSION=0.10.3

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -2,14 +2,12 @@ FROM ubuntu:noble
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-ARG IM_VERSION=7.1.1-35
-ARG LIB_HEIF_VERSION=1.18.0
+ARG IM_VERSION=7.1.1-36
+ARG LIB_HEIF_VERSION=1.18.1
 ARG LIB_AOM_VERSION=3.9.1
 ARG LIB_WEBP_VERSION=1.4.0
 ARG LIBJXL_VERSION=0.10.3
 
-COPY libheif-libbrotli.patch /
-
 RUN apt-get -y update && \
     apt-get -y upgrade && \
     apt-get install -y git make gcc pkg-config autoconf curl g++ cmake clang \
@@ -55,7 +53,6 @@ RUN apt-get -y update && \
     # Building libheif \
     git clone -b v${LIB_HEIF_VERSION} --depth 1 https://github.com/strukturag/libheif.git && \
     cd libheif/ && \
-    mv /libheif-libbrotli.patch ./ && git apply ./libheif-libbrotli.patch && \
     mkdir build && cd build && cmake --preset=release .. && make && make install && cd ../../ && \
     ldconfig /usr/local/lib && \
     rm -rf libheif && \

diff --git a/libheif-libbrotli.patch b/libheif-libbrotli.patch