From b00747b9d82d9b8bd448304fb9c28c70095c2d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Ga=C5=A1pari=C4=87?= <56818232+codedoga@users.noreply.github.com> Date: Tue, 27 May 2025 11:38:51 +0200 Subject: [PATCH] update libheif1 from bookworm-backports (#96) --- .github/workflows/test.yml | 6 +++++- Dockerfile | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f484ede..3ac1952 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,6 +23,8 @@ jobs: - name: Install linux dependencies run: | + # Add backports for updated libheif + echo "deb http://archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse" | sudo tee /etc/apt/sources.list.d/backports.list sudo apt-get update sudo apt-get install -y \ meson ninja-build \ @@ -30,10 +32,12 @@ jobs: libjpeg-turbo8-dev libimagequant-dev libfftw3-dev \ libpoppler-glib-dev libxml2-dev \ libopenslide-dev libcfitsio-dev liborc-0.4-dev libpango1.0-dev \ - libtiff5-dev libgsf-1-dev giflib-tools libwebp-dev libheif-dev \ + libtiff5-dev libgsf-1-dev giflib-tools libwebp-dev \ yasm libx264-dev libx265-dev libnuma-dev libvpx-dev libtheora-dev \ librtmp-dev libvorbis-dev \ libopenjp2-7-dev libcgif-dev + # Install newer libheif from backports + sudo apt-get install -y -t jammy-backports libheif-dev || sudo apt-get install -y libheif-dev - name: Cache libvips uses: actions/cache@v3 diff --git a/Dockerfile b/Dockerfile index 7d570f6..a99da86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,15 +81,17 @@ COPY --from=builder /usr/local/lib /usr/local/lib COPY --from=builder /etc/ssl/certs /etc/ssl/certs # Install runtime dependencies -RUN DEBIAN_FRONTEND=noninteractive \ +RUN echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list && \ + DEBIAN_FRONTEND=noninteractive \ apt-get update && \ apt-get install --no-install-recommends -y \ procps libglib2.0-0 libjpeg62-turbo libpng16-16 libopenexr-3-1-30 \ libwebp7 libwebpmux3 libwebpdemux2 libtiff6 libexif12 libxml2 libpoppler-glib8 \ libpango1.0-0 libmatio11 libopenslide0 libopenjp2-7 libjemalloc2 \ - libgsf-1-114 libfftw3-bin liborc-0.4-0 librsvg2-2 libcfitsio10 libimagequant0 libaom3 libheif1 \ + libgsf-1-114 libfftw3-bin liborc-0.4-0 librsvg2-2 libcfitsio10 libimagequant0 libaom3 \ libx264-dev libx265-dev libnuma-dev libvpx7 libtheora0 libvorbis-dev \ libspng0 libcgif0 && \ + apt-get install --no-install-recommends -y -t bookworm-backports libheif1 && \ ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so && \ apt-get autoremove -y && \ apt-get autoclean && \