Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
navidemad committed Aug 1, 2024
1 parent 7655139 commit ca3bb2b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions build/configurations/heroku-24.config.log
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ 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/include/x86_64-linux-gnu -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' '--enable-shared=yes' '--disable-docs' '--disable-static' '--without-gvc' '--without-openexr' '--without-zip' 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig'
CONFIGURE ./configure '--prefix=/usr/local' '--disable-docs' '--with-avif=yes' '--with-heic=yes' '--with-webp=yes' '--with-tiff=yes' '--with-x=no' '-with-gvc=no' '--with-openexr=no' '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 png tiff webp x xml zlib zstd
DISTCHECK_CONFIG_FLAGS --disable-deprecated --with-quantum-depth=16 --with-jemalloc=no --with-umem=no --with-zip=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-uhdr=no --with-wmf=no --with-perl=no
DELEGATES bzlib djvu fontconfig freetype heic jbig jng jp2 jpeg lcms lqr lzma png tiff webp 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-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
Expand All @@ -29,7 +29,7 @@ LDFLAGS -L/usr/local/lib
LIB_VERSION 0x711
LIB_VERSION_NUMBER 7,1,1,36
LIBRARY_PATH /usr/local/lib/ImageMagick-7.1.1
LIBS -ljbig -llcms2 -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 -lopenjp2 -lxml2 -lz -lm -lpthread -lgomp
LIBS -ljbig -llcms2 -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 -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
Expand All @@ -48,7 +48,7 @@ Path: [built-in]

Name Value
-------------------------------------------------------------------------------
DELEGATES bzlib djvu fontconfig freetype heic jbig jng jp2 jpeg lcms lqr lzma png tiff webp x xml zlib zstd
DELEGATES bzlib djvu fontconfig freetype heic jbig jng jp2 jpeg lcms lqr lzma png tiff webp xml zip zlib zstd
FEATURES Cipher DPC HDRI OpenMP(4.5)
MAGICK_TEMPORARY_PATH /tmp
NAME ImageMagick
Expand Down
Binary file modified build/heroku-24.tar.bz2
Binary file not shown.
6 changes: 3 additions & 3 deletions container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ RUN set -ex \
&& mkdir -p imagemagick \
&& cd imagemagick \
&& curl --retry-connrefused --retry 3 -ksSL "https://api.github.com/repos/ImageMagick/ImageMagick/tarball/${COMPILE_VERSION_IMAGEMAGICK}" | tar zx --strip-components=1 \
&& ./configure --prefix=$PREFIX --enable-shared=yes --disable-docs --disable-static --without-gvc --without-openexr --without-zip \
&& ./configure --prefix=$PREFIX --disable-docs --with-avif=yes --with-heic=yes --with-webp=yes --with-tiff=yes --with-openexr=no --with-x=no -with-gvc=no --with-openexr=no \
&& make V=0 --jobs=$(nproc) \
&& make install --jobs=$(nproc)

# Clean and package
RUN set -ex \
&& cd $PREFIX \
&& rm -rf src/libwebp src/libheif src/imagemagick lib/*.a lib/*.la share/gtk-doc share/man share/thumbnailer \
&& strip lib/lib*.so* \
&& rm -rf src/libwebp src/libheif src/imagemagick share/gtk-doc share/man share/thumbnailer \
&& strip lib/*.a lib/lib*.so* \
&& rm -rf build \
&& mkdir -p build \
&& tar cjf "build/heroku-$STACK_VERSION.tar.bz2" bin include lib etc share
Expand Down

0 comments on commit ca3bb2b

Please sign in to comment.