WIP

Author: navidemad

README.md

@@ -1,61 +1,79 @@
-# heroku-buildpack-imagemagick-heif
 
-[![Build Status](https://github.com/yespark/heroku-imagemagick-buildpack/workflows/ci/badge.svg)](https://github.com/yespark/heroku-imagemagick-buildpack/actions?query=workflow%3Aci)
+# Heroku Buildpack for ImageMagick with HEIF/HEIC/AVIF/WebP Support
+
+```
+    _____                                               _      _    
+    \_   \_ __ ___   __ _  __ _  ___  /\/\   __ _  __ _(_) ___| | __
+     / /\/ '_ ` _ \ / _` |/ _` |/ _ \/    \ / _` |/ _` | |/ __| |/ /
+  /\/ /_ | | | | | | (_| | (_| |  __/ /\/\ \ (_| | (_| | | (__|   < 
+  \____/ |_| |_| |_|\__,_|\__, |\___\/    \/\__,_|\__, |_|\___|_|\_\
+                          |___/                   |___/             
+```
 
-The rise in popularity and use of HEIF/HEIC(High Efficency Image Format) means your project's image processing also needs to be able to handle this format.
-The current default version of imagemagick installed on heroku:24 dynos is a version 6.xx and does not support processing heic image files.
+[![Build Status](https://github.com/yespark/heroku-imagemagick-buildpack/workflows/ci/badge.svg)](https://github.com/yespark/heroku-imagemagick-buildpack/actions?query=workflow%3Aci)
 
-This [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) vendors a version of ImageMagick with **WEBP and HEIF support** binaries into your project.
+# Documentation
 
-This one works was built for [**Heroku stack 20**](https://devcenter.heroku.com/articles/stack).
+With the rise in popularity of HEIF/HEIC (High Efficiency Image Format), your project needs to handle this format efficiently. The default version of ImageMagick installed on Heroku:22/24 dynos (version 7.xx) does not support processing HEIC and AVIF image files.
 
-The tar file in the [/build folder](./build) currently contains:
+This [Heroku buildpack](https://devcenter.heroku.com/articles/buildpacks) includes a version of ImageMagick with **HEIF/HEIC/AVIF/WebP support**.
 
-Version: ImageMagick 7.1.1-35
+The binaries in this repository were built using Heroku Docker images with the [**build.sh**](./build.sh) script. The resulting tar files are stored in the `/build` directory and utilized by the [compile script](./bin/compile).
 
-You will need to build a new binary if you want to use a newer or different version. To build a new binary see [How to Build a New Binary](#how-to-build-a-new-binary)
+The `/build` directory currently contains:
 
-# Usage
+Versions: 
+  - ImageMagick 7.1.1-35
+  - libde265 1.0.15
+  - libwebp 1.4.0
+  - libheif 1.18.1
 
-## Step 1 : Adding the buildpack
+# Using the Heroku Imagemagick buildpack
 
-From your projects "Settings" tab add this buildpack to your app in the 1st position:
+It's suggested that you use the latest version of the release buildpack. You can set it using the heroku-cli.
 
 ```bash
-https://github.com/yespark/heroku-imagemagick-buildpack
+heroku buildpacks:set https://github.com/yespark/heroku-imagemagick-buildpack --index 1 -a your-app-name
 ```
 
-**NOTE:** \__To ensure the newer version of imagemagick is found in the $PATH and installed first make sure this buildpack is added to the top of the buildpack list or at "index 1"._
-
-## Step 2 : Clear the cache(**Not Sure if this is necessary**)
+Your builds will always used the latest published release of the buildpack.
 
-Since the installation is cached you might want to clean it out due to config changes.
+**NOTE:** 
+- To ensure the newer version of ImageMagick is found in the `$PATH` and installed first, make sure this buildpack is added to the top of the buildpack list (index 1).
+- If needed, clear the cache due to configuration changes:
 
 ```bash
 heroku plugins:install heroku-builds
 heroku builds:cache:purge -a HEROKU_APP_NAME
 ```
 
-# How to Build a New Binary (if you want to make somes changes)
-
-The binary in this repo was built in a heroku:22 docker image running in a local dev environment.
-However, there is a script called [**build.sh**](./build.sh) made to build a tar file through docker easily, it will be copied to the `build` directory. Then you should commit this changes to your git, and adjust the buildpack url previously mentioned just above.
-
-## Prerequisites
+## Development
 
-- Docker installed and running in local dev environment. [Get Docker](https://docs.docker.com/get-docker/)
+This Dockerfile builds ImageMagick with updated libraries (libde265, libwebp, and libheif) on a Heroku stack. Here's a breakdown of the process:
 
-## Credits
+- Starts with a Heroku build image and sets up environment variables and arguments.
+- Installs necessary dependencies like `pkg-config`, `ninja-build`, and `yasm`.
+- Builds and installs the following libraries in order:
+  - `libde265`
+  - `libwebp`
+  - `libheif` (including AOM as a dependency)
+  - `ImageMagick`
+- For each library, it:
+  - Downloads the source code from GitHub
+  - Configures the build
+  - Compiles the library
+  - Installs it to `/usr/local`
+- Cleans up unnecessary files and strips the shared libraries.
+- Depending of the stack version, creates a tarball of the built binaries, libraries, and other necessary files.
+- Updates the `ldconfig` cache to ensure the new shared libraries are recognized.
+- Saves the ImageMagick configuration for reference.
 
-- https://medium.com/@eplt/5-minutes-to-install-imagemagick-with-heic-support-on-ubuntu-18-04-digitalocean-fe2d09dcef1
-- https://github.com/brandoncc/heroku-buildpack-vips
-- https://github.com/steeple-dev/heroku-buildpack-imagemagick
-- https://github.com/retailzipline/heroku-buildpack-imagemagick-heif
+The result is a Docker image with updated versions of ImageMagick and its dependencies, with shared libraries (.so files) built and included in a tarball.
 
-## Knowledge Base
+## Bugs
 
-https://devcenter.heroku.com/articles/heroku-24-stack#upgrade-notes
+Please report all bugs to the issue tracker: https://github.com/yespark/heroku-imagemagick-buildpack/issues
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://github.com/yespark/heroku-imagemagick-buildpack/blob/master/LICENSE).
+This buildpack is available as open source under the terms of the [MIT License](https://github.com/yespark/heroku-imagemagick-buildpack/blob/master/LICENSE).

bin/compile

@@ -2,14 +2,8 @@
 
 # bin/compile <build-dir> <cache-dir> <env-dir>
 
-# fail hard
-set -o pipefail
-
-# fail harder
-set -eu
-
-# move hidden files too, just in case
-shopt -s dotglob
+# Fail hard and fast
+set -euo pipefail
 
 BUILD_DIR=$1
 CACHE_DIR=$2

bin/test

@@ -3,11 +3,8 @@
 # bin/test <build-dir> <env-dir>
 # env vars are passed in already, so we can ignore the dir
 
-# fail hard
-set -o pipefail
-
-# fail harder
-set -eu
+# Fail hard and fast
+set -euo pipefail
 
 # Setup Path variables, for later use in the Buildpack.
 BIN_DIR=$(cd "$(dirname "$0")"; pwd)

build.sh

@@ -1,20 +1,11 @@
 #!/usr/bin/env bash
 
-# fail hard
-set -o pipefail
+# Fail hard and fast
+set -euo pipefail
 
-# fail harder
-set -eu
-
-# move hidden files too, just in case
-shopt -s dotglob
-
-# Remove existing builds so that unsupported stacks are automatically removed
-rm -rf ./build/*.tar.bz2
-
-# Remove configuration logs so that unsupported stacks are automatically removed
+# Remove existing builds and configuration logs so that unsupported stacks are automatically removed
+rm -rf ./build/*.tar.bz2 ./build/configurations/*.log 2> /dev/null || true
 mkdir -p ./build/configurations
-rm -rf ./build/configurations/*.log
 
 # Stacks
 STACK_VERSIONS=(24)
@@ -27,6 +18,7 @@ for stack_version in "${STACK_VERSIONS[@]}"; do
     --platform linux/amd64 \
     --build-arg STACK_VERSION=${stack_version} \
     --tag $image_name \
+    --progress=plain \
     --pull \
     --file container/Dockerfile \
     container

build/configurations/heroku-24.config.log

@@ -5,18 +5,18 @@ Path: /usr/local/lib/ImageMagick-7.1.1//config-Q16HDRI/configure.xml
 Name                  Value
 -------------------------------------------------------------------------------
 CC                    gcc
-CFLAGS                -I/usr/include/libxml2 -I/usr/local/include -I/usr/local/include/webp -I/usr/local/include -I/usr/local/include/webp -I/usr/local/include -I/usr/local/include/webp -I/usr/include/libpng16 -I/usr/include/OpenEXR -pthread -I/usr/include/Imath -I/usr/include/lqr-1 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/openjpeg-2.5 -I/usr/local/include -I/usr/local/include/webp -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -pthread -fopenmp -Wall -g -O2 -mtune=westmere -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -DMAGICKCORE_CHANNEL_MASK_DEPTH=32
+CFLAGS                -I/usr/include/libxml2 -I/usr/local/include -I/usr/local/include/webp -I/usr/local/include -I/usr/local/include/webp -I/usr/include/libpng16 -I/usr/include/lqr-1 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/openjpeg-2.5 -I/usr/local/include -I/usr/local/include/webp -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -pthread -fopenmp -Wall -g -O2 -mtune=westmere -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -DMAGICKCORE_CHANNEL_MASK_DEPTH=32
 CHANNEL_MASK_DEPTH    32
 CODER_PATH            /usr/local/lib/ImageMagick-7.1.1/modules-Q16HDRI/coders
-CONFIGURE             ./configure  '--prefix=/usr/local' '--disable-docs' '--disable-static' '--without-gvc' 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig'
+CONFIGURE             ./configure  '--prefix=/usr/local' '--enable-shared=yes' '--disable-docs' '--disable-static' '--without-gvc' '--without-openexr' '--without-tiff' 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig'
 CONFIGURE_PATH        /usr/local/etc/ImageMagick-7/
 COPYRIGHT             Copyright (C) 1999 ImageMagick Studio LLC
 CPPFLAGS              -I/usr/local/include/ImageMagick-7
 CXX                   g++
 CXXFLAGS              -g -O2 -pthread
 DEFS                  -DHAVE_CONFIG_H
-DELEGATES             bzlib djvu fontconfig freetype heic jbig jng jp2 jpeg lcms lqr lzma openexr png tiff webp x xml zip zlib zstd
-DISTCHECK_CONFIG_FLAGS  --disable-deprecated  --with-quantum-depth=16  --with-jemalloc=no  --with-umem=no  --with-autotrace=no  --with-dps=no  --with-fftw=no  --with-flif=no  --with-fpx=no  --with-gslib=no  --with-fontpath=  --with-gvc=no  --with-rsvg=no  --with-uhdr=no  --with-wmf=no  --with-perl=no 
+DELEGATES             bzlib djvu fontconfig freetype heic jbig jng jp2 jpeg lcms lqr lzma png webp x xml zip zlib zstd
+DISTCHECK_CONFIG_FLAGS  --disable-deprecated  --with-quantum-depth=16  --with-jemalloc=no  --with-umem=no  --with-autotrace=no  --with-dps=no  --with-fftw=no  --with-flif=no  --with-fpx=no  --with-gslib=no  --with-fontpath=  --with-gvc=no  --with-openexr=no  --with-rsvg=no  --with-tiff=no  --with-uhdr=no  --with-wmf=no  --with-perl=no 
 DOCUMENTATION_PATH    /usr/local/share/doc/ImageMagick-7
 EXEC-PREFIX           /usr/local
 EXECUTABLE_PATH       /usr/local/bin
@@ -29,7 +29,7 @@ LDFLAGS               -L/usr/local/lib
 LIB_VERSION           0x711
 LIB_VERSION_NUMBER    7,1,1,35
 LIBRARY_PATH          /usr/local/lib/ImageMagick-7.1.1
-LIBS                   -ljbig -llcms2   -L/usr/local/lib -ltiff  -lfreetype   -ljpeg   -llqr-1 -lglib-2.0  -lpng16   -ldjvulibre     -lfontconfig -lfreetype  -L/usr/local/lib -lheif  -L/usr/local/lib -lwebpmux -lwebpdemux  -L/usr/local/lib -lwebp    -lXext -lXt   -lSM -lICE -lX11  -llzma  -lbz2 -lOpenEXR-3_1 -lOpenEXRUtil-3_1 -lOpenEXRCore-3_1 -lIex-3_1 -lIlmThread-3_1 -lImath-3_1  -lopenjp2     -lxml2   -lz  -lzip     -lm    -lpthread    -lgomp
+LIBS                   -ljbig -llcms2    -lfreetype   -ljpeg   -llqr-1 -lglib-2.0  -lpng16   -ldjvulibre     -lfontconfig -lfreetype  -L/usr/local/lib -lheif  -L/usr/local/lib -lwebpmux -lwebpdemux  -L/usr/local/lib -lwebp    -lXext -lXt   -lSM -lICE -lX11  -llzma  -lbz2  -lopenjp2     -lxml2   -lz  -lzip     -lm    -lpthread    -lgomp
 NAME                  ImageMagick
 PCFLAGS               -fopenmp -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -DMAGICKCORE_CHANNEL_MASK_DEPTH=32
 PREFIX                /usr/local
@@ -48,7 +48,7 @@ Path: [built-in]
 
 Name                  Value
 -------------------------------------------------------------------------------
-DELEGATES             bzlib djvu fontconfig freetype heic jbig jng jp2 jpeg lcms lqr lzma openexr png tiff webp x xml zip zlib zstd
+DELEGATES             bzlib djvu fontconfig freetype heic jbig jng jp2 jpeg lcms lqr lzma png webp x xml zip zlib zstd
 FEATURES              Cipher DPC HDRI OpenMP(4.5) 
 MAGICK_TEMPORARY_PATH /tmp
 NAME                  ImageMagick

build/heroku-24.tar.bz2

@@ -1,21 +1,15 @@
 #!/usr/bin/env bash
-set -e
+set -euo pipefail
 
-COMPILE_VERSION_LIBTIFF=$(cat container/Dockerfile | egrep -o 'COMPILE_VERSION_LIBTIFF=([0-9.-]+)' | cut -f 2 -d =)
 COMPILE_VERSION_LIBDE265=$(cat container/Dockerfile | egrep -o 'COMPILE_VERSION_LIBDE265=([0-9.-]+)' | cut -f 2 -d =)
 COMPILE_VERSION_LIBWEBP=$(cat container/Dockerfile | egrep -o 'COMPILE_VERSION_LIBWEBP=([0-9.-]+)' | cut -f 2 -d =)
 COMPILE_VERSION_LIBHEIF=$(cat container/Dockerfile | egrep -o 'COMPILE_VERSION_LIBHEIF=([0-9.-]+)' | cut -f 2 -d =)
 COMPILE_VERSION_IMAGEMAGICK=$(cat container/Dockerfile | egrep -o 'COMPILE_VERSION_IMAGEMAGICK=([0-9.-]+)' | cut -f 2 -d =)
 
-LATEST_VERSION_LIBTIFF=$(curl --retry-connrefused --retry 3 --silent "https://api.github.com/repos/libsdl-org/libtiff/tags" | jq -r '.[0].name' | sed 's/v//')
-LATEST_VERSION_LIBDE265=$(curl --retry-connrefused --retry 3 --silent "https://api.github.com/repos/strukturag/libde265/releases/latest" | jq -r .tag_name | sed 's/v//')
-LATEST_VERSION_LIBWEBP=$(curl --retry-connrefused --retry 3 --silent "https://api.github.com/repos/webmproject/libwebp/tags" | jq -r '.[0].name' | sed 's/v//')
-LATEST_VERSION_LIBHEIF=$(curl --retry-connrefused --retry 3 --silent "https://api.github.com/repos/strukturag/libheif/releases/latest" | jq -r .tag_name | sed 's/v//')
-LATEST_VERSION_IMAGEMAGICK=$(curl --retry-connrefused --retry 3 --silent "https://api.github.com/repos/ImageMagick/ImageMagick/releases/latest" | jq -r .tag_name | sed 's/v//')
-
-if [ "$COMPILE_VERSION_LIBTIFF" != "$LATEST_VERSION_LIBTIFF" ]; then
-  echo -e "COMPILE_VERSION_LIBTIFF ($COMPILE_VERSION_LIBTIFF)\nNew version available: $LATEST_VERSION_LIBTIFF"
-fi
+LATEST_VERSION_LIBDE265=$(curl --retry-connrefused --retry 3 -ksSL "https://api.github.com/repos/strukturag/libde265/releases/latest" | jq -r .tag_name | sed 's/v//')
+LATEST_VERSION_LIBWEBP=$(curl --retry-connrefused --retry 3 -ksSL "https://api.github.com/repos/webmproject/libwebp/tags" | jq -r '.[0].name' | sed 's/v//')
+LATEST_VERSION_LIBHEIF=$(curl --retry-connrefused --retry 3 -ksSL "https://api.github.com/repos/strukturag/libheif/releases/latest" | jq -r .tag_name | sed 's/v//')
+LATEST_VERSION_IMAGEMAGICK=$(curl --retry-connrefused --retry 3 -ksSL "https://api.github.com/repos/ImageMagick/ImageMagick/releases/latest" | jq -r .tag_name | sed 's/v//')
 
 if [ "$COMPILE_VERSION_LIBDE265" != "$LATEST_VERSION_LIBDE265" ]; then
   echo -e "COMPILE_VERSION_LIBDE265 ($COMPILE_VERSION_LIBDE265)\nNew version available: $LATEST_VERSION_LIBDE265"