From fccfc27de0f945c04540937c80e576d5025fb8ca Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 18 May 2016 19:58:30 +0100 Subject: [PATCH] Update ARM packaging to libvips v8.3.1 --- packaging/arm/build.sh | 80 ++++++++++++++++++++++++++++++++-------- packaging/lin/Dockerfile | 8 ++-- 2 files changed, 68 insertions(+), 20 deletions(-) diff --git a/packaging/arm/build.sh b/packaging/arm/build.sh index ca49a024..65fe09a4 100755 --- a/packaging/arm/build.sh +++ b/packaging/arm/build.sh @@ -41,6 +41,9 @@ VERSION_SVG=2.40.15 VERSION_GIF=5.1.4 VERSION_VIPS=8.3.1 +# Least out-of-sync Sourceforge mirror +SOURCEFORGE_MIRROR=netix + mkdir ${DEPS}/zlib curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz | tar xJC ${DEPS}/zlib --strip-components=1 cd ${DEPS}/zlib @@ -68,22 +71,22 @@ cd ${DEPS}/gsf ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip mkdir ${DEPS}/exif -curl -Ls http://heanet.dl.sourceforge.net/project/libexif/libexif/${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.bz2 | tar xjC ${DEPS}/exif --strip-components=1 +curl -Ls http://${SOURCEFORGE_MIRROR}.dl.sourceforge.net/project/libexif/libexif/${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.bz2 | tar xjC ${DEPS}/exif --strip-components=1 cd ${DEPS}/exif ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip mkdir ${DEPS}/lcms2 -curl -Ls http://heanet.dl.sourceforge.net/project/lcms/lcms/${VERSION_LCMS2}/lcms2-${VERSION_LCMS2}.tar.gz | tar xzC ${DEPS}/lcms2 --strip-components=1 +curl -Ls http://${SOURCEFORGE_MIRROR}.dl.sourceforge.net/project/lcms/lcms/${VERSION_LCMS2}/lcms2-${VERSION_LCMS2}.tar.gz | tar xzC ${DEPS}/lcms2 --strip-components=1 cd ${DEPS}/lcms2 ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip mkdir ${DEPS}/jpeg -curl -Ls http://heanet.dl.sourceforge.net/project/libjpeg-turbo/${VERSION_JPEG}/libjpeg-turbo-${VERSION_JPEG}.tar.gz | tar xzC ${DEPS}/jpeg --strip-components=1 +curl -Ls https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${VERSION_JPEG}.tar.gz | tar xzC ${DEPS}/jpeg --strip-components=1 cd ${DEPS}/jpeg -./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --with-jpeg8 --without-turbojpeg && make install-strip +autoreconf -fiv && ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --with-jpeg8 --without-turbojpeg && make install-strip mkdir ${DEPS}/png16 -curl -Ls http://heanet.dl.sourceforge.net/project/libpng/libpng16/${VERSION_PNG16}/libpng-${VERSION_PNG16}.tar.xz | tar xJC ${DEPS}/png16 --strip-components=1 +curl -Ls http://${SOURCEFORGE_MIRROR}.dl.sourceforge.net/project/libpng/libpng16/${VERSION_PNG16}/libpng-${VERSION_PNG16}.tar.xz | tar xJC ${DEPS}/png16 --strip-components=1 cd ${DEPS}/png16 ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip @@ -103,17 +106,62 @@ curl -Ls http://gstreamer.freedesktop.org/data/src/orc/orc-${VERSION_ORC}.tar.xz cd ${DEPS}/orc ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip -# TODO: -# VERSION_GDKPIXBUF=2.34.0 -# VERSION_FREETYPE=2.6.3 -# VERSION_FONTCONFIG=2.11.95 -# VERSION_HARFBUZZ=1.2.6 -# VERSION_PIXMAN=0.34.0 -# VERSION_CAIRO=1.14.6 -# VERSION_PANGO=1.40.1 -# VERSION_CROCO=0.6.11 -# VERSION_SVG=2.40.15 -# VERSION_GIF=5.1.4 +mkdir ${DEPS}/gdkpixbuf +curl -Ls https://download.gnome.org/sources/gdk-pixbuf/2.34/gdk-pixbuf-${VERSION_GDKPIXBUF}.tar.xz | tar xJC ${DEPS}/gdkpixbuf --strip-components=1 +cd ${DEPS}/gdkpixbuf +LD_LIBRARY_PATH=${TARGET}/lib ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking \ + --disable-introspection --disable-modules --without-libpng --without-libjpeg --without-libtiff --without-gdiplus --with-included-loaders= \ + && make install-strip + +mkdir ${DEPS}/freetype +curl -Ls http://download.savannah.gnu.org/releases/freetype/freetype-${VERSION_FREETYPE}.tar.gz | tar xzC ${DEPS}/freetype --strip-components=1 +cd ${DEPS}/freetype +./configure --prefix=${TARGET} --enable-shared --disable-static && make install + +mkdir ${DEPS}/fontconfig +curl -Ls https://www.freedesktop.org/software/fontconfig/release/fontconfig-${VERSION_FONTCONFIG}.tar.bz2 | tar xjC ${DEPS}/fontconfig --strip-components=1 +cd ${DEPS}/fontconfig +./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --enable-libxml2 && make install-strip + +mkdir ${DEPS}/harfbuzz +curl -Ls https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${VERSION_HARFBUZZ}.tar.bz2 | tar xjC ${DEPS}/harfbuzz --strip-components=1 +cd ${DEPS}/harfbuzz +./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip + +mkdir ${DEPS}/pixman +curl -Ls http://cairographics.org/releases/pixman-${VERSION_PIXMAN}.tar.gz | tar xzC ${DEPS}/pixman --strip-components=1 +cd ${DEPS}/pixman +./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --disable-libpng --disable-arm-iwmmxt && make install-strip + +mkdir ${DEPS}/cairo +curl -Ls http://cairographics.org/releases/cairo-${VERSION_CAIRO}.tar.xz | tar xJC ${DEPS}/cairo --strip-components=1 +cd ${DEPS}/cairo +./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking \ + --disable-xlib --disable-xcb --disable-quartz --disable-win32 --disable-egl --disable-glx --disable-wgl \ + --disable-script --disable-ps --disable-gobject --disable-trace --disable-interpreter \ + && make install-strip + +mkdir ${DEPS}/pango +curl -Ls https://download.gnome.org/sources/pango/1.40/pango-${VERSION_PANGO}.tar.xz | tar xJC ${DEPS}/pango --strip-components=1 +cd ${DEPS}/pango +./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip + +mkdir ${DEPS}/croco +curl -Ls https://download.gnome.org/sources/libcroco/0.6/libcroco-${VERSION_CROCO}.tar.xz | tar xJC ${DEPS}/croco --strip-components=1 +cd ${DEPS}/croco +./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip + +mkdir ${DEPS}/svg +curl -Ls https://download.gnome.org/sources/librsvg/2.40/librsvg-${VERSION_SVG}.tar.xz | tar xJC ${DEPS}/svg --strip-components=1 +cd ${DEPS}/svg +./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking \ + --disable-introspection --disable-tools \ + && make install-strip + +mkdir ${DEPS}/gif +curl -Ls http://${SOURCEFORGE_MIRROR}.dl.sourceforge.net/project/giflib/giflib-${VERSION_GIF}.tar.gz | tar xzC ${DEPS}/gif --strip-components=1 +cd ${DEPS}/gif +./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip mkdir ${DEPS}/vips curl -Ls http://www.vips.ecs.soton.ac.uk/supported/8.3/vips-${VERSION_VIPS}.tar.gz | tar xzC ${DEPS}/vips --strip-components=1 diff --git a/packaging/lin/Dockerfile b/packaging/lin/Dockerfile index 1ae6d95b..f68c2b66 100644 --- a/packaging/lin/Dockerfile +++ b/packaging/lin/Dockerfile @@ -170,11 +170,11 @@ WORKDIR ${DEPS}/gif RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip RUN mkdir ${DEPS}/vips -#RUN curl -Ls http://www.vips.ecs.soton.ac.uk/supported/8.3/vips-${VERSION_VIPS}.tar.gz | tar xzC ${DEPS}/vips --strip-components=1 -RUN apt-get install -y swig gobject-introspection gettext glib2.0-dev -RUN curl -Ls https://github.com/jcupitt/libvips/archive/master.tar.gz | tar xzC ${DEPS}/vips --strip-components=1 +RUN curl -Ls http://www.vips.ecs.soton.ac.uk/supported/8.3/vips-${VERSION_VIPS}.tar.gz | tar xzC ${DEPS}/vips --strip-components=1 +#RUN apt-get install -y swig gobject-introspection gettext glib2.0-dev +#RUN curl -Ls https://github.com/jcupitt/libvips/archive/master.tar.gz | tar xzC ${DEPS}/vips --strip-components=1 WORKDIR ${DEPS}/vips -RUN ./bootstrap.sh +#RUN ./bootstrap.sh RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking \ --disable-debug --disable-introspection --without-python --without-fftw \ --without-magick --without-pangoft2 --without-ppm --without-analyze --without-radiance \