Skip to content

Commit

Permalink
Fixing bookworm
Browse files Browse the repository at this point in the history
  • Loading branch information
dooman87 committed Jul 20, 2024
1 parent 3a27ed8 commit e62288b
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Dockerfile.bookworm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ 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 \
Expand Down Expand Up @@ -52,7 +54,9 @@ RUN apt-get -y update && \
rm -rf build_aom && \
# Building libheif
git clone -b v${LIB_HEIF_VERSION} --depth 1 https://github.com/strukturag/libheif.git && \
cd libheif/ && mkdir build && cd build && cmake --preset=release .. && make && make install && cd ../../ && \
cd libheif/ && \
git apply /libheif-libbrotli.patch && \
mkdir build && cd build && cmake --preset=release .. && make && make install && cd ../../ && \
ldconfig /usr/local/lib && \
rm -rf libheif && \
# Building ImageMagick
Expand Down
26 changes: 26 additions & 0 deletions libheif-libbrotli.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 97e8c246e4449a4a1725baeffb355faf043a27ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
<[email protected]>
Date: Wed, 10 Jul 2024 14:07:24 +0200
Subject: [PATCH] Fix libbrotlidec pkg-config requires

---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12c4039..92e9551 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -407,7 +407,7 @@ if (WITH_HEADER_COMPRESSION OR WITH_UNCOMPRESSED_CODEC)
find_package(Brotli)
if (Brotli_FOUND)
message("Brotli found")
- list(APPEND REQUIRES_PRIVATE "libbrotli")
+ list(APPEND REQUIRES_PRIVATE "libbrotlidec")
else()
message("Brotli not found")
endif()
--
2.39.2

0 comments on commit e62288b

Please sign in to comment.