From e5871a2b6b767dbf7f46467d9db454087bb5e9a7 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 11 Jan 2024 15:18:31 +0000 Subject: [PATCH 001/109] Release v1.0.1 (libvips v8.15.1) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index dc3cd718..f64dae8d 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index fb3624d2..a26fd817 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index 3231e098..be68c190 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.0.0", + "version": "1.0.1", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index 28f1fda6..a493295d 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.0.0", + "version": "1.0.1", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index f10c90cd..6bb39c5d 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 40a924e0..06ad6ff7 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index 75add4df..cbb8ec1c 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index d30bfeaa..0d317c81 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index 80b79101..4c743b10 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index bba47410..62a5cead 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index 1732c34a..68e97dc8 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.0.0", + "version": "1.0.1", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 66784c2e..835b70c4 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index 2743d272..6a75b113 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.0.0", + "version": "1.0.1", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From 0fd2f6c7939b30f4f5420239640d0c701c00cf00 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 21 Jan 2024 10:54:14 +0000 Subject: [PATCH 002/109] Bump deps: aom, xml2 --- build/lin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 9d953909..7378d378 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -95,7 +95,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" VERSION_ZLIB_NG=2.1.6 VERSION_FFI=3.4.4 VERSION_GLIB=2.79.0 -VERSION_XML2=2.12.3 +VERSION_XML2=2.12.4 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 @@ -117,7 +117,7 @@ VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.13 VERSION_PANGO=1.51.0 VERSION_RSVG=2.57.1 -VERSION_AOM=3.8.0 +VERSION_AOM=3.8.1 VERSION_HEIF=1.17.6 VERSION_CGIF=0.3.2 From eb6fedeea4dacbc214cf978a5ba75657295ac274 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sun, 11 Feb 2024 18:47:27 +0100 Subject: [PATCH 003/109] Bump deps: expat, glib, pango, pixman, png, rsvg, xml2 (#217) --- build/lin.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 7378d378..9b75dee7 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -94,12 +94,12 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.1.6 VERSION_FFI=3.4.4 -VERSION_GLIB=2.79.0 -VERSION_XML2=2.12.4 +VERSION_GLIB=2.79.1 +VERSION_XML2=2.12.5 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 -VERSION_PNG16=1.6.40 +VERSION_PNG16=1.6.42 VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 VERSION_WEBP=1.3.2 @@ -108,15 +108,15 @@ VERSION_HWY=1.0.7 VERSION_PROXY_LIBINTL=0.4 VERSION_GDKPIXBUF=2.42.10 VERSION_FREETYPE=2.13.2 -VERSION_EXPAT=2.5.0 +VERSION_EXPAT=2.6.0 VERSION_ARCHIVE=3.7.2 VERSION_FONTCONFIG=2.15.0 VERSION_HARFBUZZ=8.3.0 -VERSION_PIXMAN=0.43.0 +VERSION_PIXMAN=0.43.2 VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.13 -VERSION_PANGO=1.51.0 -VERSION_RSVG=2.57.1 +VERSION_PANGO=1.51.2 +VERSION_RSVG=2.57.91 VERSION_AOM=3.8.1 VERSION_HEIF=1.17.6 VERSION_CGIF=0.3.2 @@ -174,7 +174,7 @@ version_latest "harfbuzz" "$VERSION_HARFBUZZ" "1299" version_latest "pixman" "$VERSION_PIXMAN" "3648" version_latest "cairo" "$VERSION_CAIRO" "247" version_latest "fribidi" "$VERSION_FRIBIDI" "857" -#version_latest "pango" "$VERSION_PANGO" "11783" https://gitlab.gnome.org/GNOME/pango/-/issues/760 +version_latest "pango" "$VERSION_PANGO" "11783" version_latest "rsvg" "$VERSION_RSVG" "5420" version_latest "aom" "$VERSION_AOM" "17628" version_latest "heif" "$VERSION_HEIF" "strukturag/libheif" From 7a0ef14781fa1992df0a519f757acc2e52a3126e Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sun, 11 Feb 2024 20:40:45 +0100 Subject: [PATCH 004/109] Build FreeType against HarfBuzz (#218) Resolves: #113. --- build/lin.sh | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 9b75dee7..e07d7fea 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -345,14 +345,18 @@ meson setup _build --default-library=static --buildtype=release --strip --prefix -Dtiff=disabled -Dintrospection=disabled -Dtests=false -Dinstalled_tests=false -Dgio_sniffing=false -Dman=false -Dbuiltin_loaders=png,jpeg meson install -C _build --tag devel # Include libjpeg and libpng as a dependency of gdk-pixbuf, see: https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/50 -sed -i'.bak' "s/^\(Requires:.*\)/\1 libjpeg, libpng16/" ${TARGET}/lib/pkgconfig/gdk-pixbuf-2.0.pc - -mkdir ${DEPS}/freetype -$CURL https://github.com/freetype/freetype/archive/VER-${VERSION_FREETYPE//./-}.tar.gz | tar xzC ${DEPS}/freetype --strip-components=1 -cd ${DEPS}/freetype -meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - -Dzlib=enabled -Dpng=disabled -Dharfbuzz=disabled -Dbrotli=disabled -Dbzip2=disabled -meson install -C _build --tag devel +sed -i'.bak' "/^Requires:/s/$/ libjpeg, libpng16/" ${TARGET}/lib/pkgconfig/gdk-pixbuf-2.0.pc + +build_freetype() { + rm -rf ${DEPS}/freetype + mkdir ${DEPS}/freetype + $CURL https://github.com/freetype/freetype/archive/VER-${VERSION_FREETYPE//./-}.tar.gz | tar xzC ${DEPS}/freetype --strip-components=1 + cd ${DEPS}/freetype + meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ + -Dzlib=enabled -Dpng=disabled -Dbrotli=disabled -Dbzip2=disabled "$@" + meson install -C _build --tag devel +} +build_freetype -Dharfbuzz=disabled mkdir ${DEPS}/expat $CURL https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//./_}/expat-${VERSION_EXPAT}.tar.xz | tar xJC ${DEPS}/expat --strip-components=1 @@ -388,6 +392,15 @@ meson setup _build --default-library=static --buildtype=release --strip --prefix -Dgobject=disabled -Dicu=disabled -Dtests=disabled -Dintrospection=disabled -Ddocs=disabled -Dbenchmark=disabled ${DARWIN:+-Dcoretext=enabled} meson install -C _build --tag devel +# pkg-config provided by Amazon Linux 2 doesn't support circular `Requires` dependencies. +# https://bugs.freedesktop.org/show_bug.cgi?id=7331 +# https://gitlab.freedesktop.org/pkg-config/pkg-config/-/commit/6d6dd43e75e2bc82cfe6544f8631b1bef6e1cf45 +# TODO(kleisauke): Remove when Amazon Linux 2 reaches EOL. +sed -i'.bak' "/^Requires:/s/ freetype2,//" ${TARGET}/lib/pkgconfig/harfbuzz.pc +sed -i'.bak' "/^Libs:/s/$/ -lfreetype/" ${TARGET}/lib/pkgconfig/harfbuzz.pc + +build_freetype -Dharfbuzz=enabled + mkdir ${DEPS}/pixman $CURL https://cairographics.org/releases/pixman-${VERSION_PIXMAN}.tar.gz | tar xzC ${DEPS}/pixman --strip-components=1 cd ${DEPS}/pixman From bb88053feac82486cceb0055e5cb294a1443ca44 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 19 Feb 2024 10:29:23 +0100 Subject: [PATCH 005/109] Bump deps: ffi, glib, highway (#219) --- build/lin.sh | 8 ++++---- platforms/linux-s390x/Dockerfile | 9 ++++++++- platforms/linux-s390x/Toolchain.cmake | 2 ++ platforms/linux-s390x/meson.ini | 1 + 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index e07d7fea..ca8c8255 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -93,8 +93,8 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.1.6 -VERSION_FFI=3.4.4 -VERSION_GLIB=2.79.1 +VERSION_FFI=3.4.5 +VERSION_GLIB=2.79.2 VERSION_XML2=2.12.5 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 @@ -104,7 +104,7 @@ VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 VERSION_WEBP=1.3.2 VERSION_TIFF=4.6.0 -VERSION_HWY=1.0.7 +VERSION_HWY=1.1.0 VERSION_PROXY_LIBINTL=0.4 VERSION_GDKPIXBUF=2.42.10 VERSION_FREETYPE=2.13.2 @@ -437,7 +437,7 @@ mkdir ${DEPS}/rsvg $CURL https://download.gnome.org/sources/librsvg/$(without_patch $VERSION_RSVG)/librsvg-${VERSION_RSVG}.tar.xz | tar xJC ${DEPS}/rsvg --strip-components=1 cd ${DEPS}/rsvg # Add missing pkg-config deps -sed -i'.bak' "s/^\(Requires:.*\)/\1 cairo-gobject pangocairo libxml-2.0/" librsvg.pc.in +sed -i'.bak' "/^Requires:/s/$/ cairo-gobject pangocairo libxml-2.0/" librsvg.pc.in # LTO optimization does not work for staticlib+rlib compilation sed -i'.bak' "/crate-type = /s/, \"rlib\"//" librsvg-c/Cargo.toml # We build Cairo with `-Dzlib=disabled`, which implicitly disables the PDF/PostScript surface backends diff --git a/platforms/linux-s390x/Dockerfile b/platforms/linux-s390x/Dockerfile index 57dde0d2..8720d832 100644 --- a/platforms/linux-s390x/Dockerfile +++ b/platforms/linux-s390x/Dockerfile @@ -37,6 +37,10 @@ RUN \ rustup target add s390x-unknown-linux-gnu && \ pip3 install meson +# Handy for debugging the compiled targets in Highway (hwy_list_targets) +#RUN apt-get install -y qemu-user-static +#ENV QEMU_LD_PREFIX="/usr/s390x-linux-gnu" + # Compiler settings ENV \ PKG_CONFIG="s390x-linux-gnu-pkg-config --static" \ @@ -44,7 +48,10 @@ ENV \ CHOST="s390x-linux-gnu" \ RUST_TARGET="s390x-unknown-linux-gnu" \ FLAGS="" \ - # https://github.com/google/highway/issues/1153 + # Highway supports IBMZ starting from IBM/Z14, which needs GCC 11 or + # higher (i.e. Debian 12, glibc 2.36). Therefore, it should be disabled + # for the time being. + #FLAGS="-march=z14 -mzvector" \ WITHOUT_HIGHWAY="true" \ MESON="--cross-file=/root/meson.ini" diff --git a/platforms/linux-s390x/Toolchain.cmake b/platforms/linux-s390x/Toolchain.cmake index fb400635..7520ceb6 100644 --- a/platforms/linux-s390x/Toolchain.cmake +++ b/platforms/linux-s390x/Toolchain.cmake @@ -8,6 +8,8 @@ SET(CMAKE_AR s390x-linux-gnu-gcc-ar) SET(CMAKE_STRIP s390x-linux-gnu-gcc-strip) SET(CMAKE_RANLIB s390x-linux-gnu-gcc-ranlib) +#SET(CMAKE_CROSSCOMPILING_EMULATOR qemu-s390x-static) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/platforms/linux-s390x/meson.ini b/platforms/linux-s390x/meson.ini index 80ee833c..b02a748b 100644 --- a/platforms/linux-s390x/meson.ini +++ b/platforms/linux-s390x/meson.ini @@ -13,6 +13,7 @@ ld = 's390x-linux-gnu-gcc-ld' strip = 's390x-linux-gnu-strip' ranlib = 's390x-linux-gnu-gcc-ranlib' pkg-config = ['s390x-linux-gnu-pkg-config', '--static'] +#exe_wrapper = 'qemu-s390x-static' [built-in options] libdir = 'lib' From 01f409040ffec4b97d5e9f5508edc904121dc124 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Fri, 23 Feb 2024 11:50:09 +0100 Subject: [PATCH 006/109] Bump dep: ffi (#220) --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index ca8c8255..4b12a2f6 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -93,7 +93,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.1.6 -VERSION_FFI=3.4.5 +VERSION_FFI=3.4.6 VERSION_GLIB=2.79.2 VERSION_XML2=2.12.5 VERSION_EXIF=0.6.24 From 41cd61b11ebf6bb6ed45702cd447be6b37811612 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Fri, 23 Feb 2024 11:17:19 +0100 Subject: [PATCH 007/109] CI: upgrade ARM64 runner to Ubuntu 22.04 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f7aa613..d9448b25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: linux-arm64v8: resource_class: arm.medium machine: - image: ubuntu-2004:202101-01 + image: ubuntu-2204:current steps: - checkout - github-cli/setup From 2436bd92021300a20a0c3ec8238299f94a095d5c Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Fri, 23 Feb 2024 11:46:35 +0100 Subject: [PATCH 008/109] CI: upgrade circleci/github-cli orb to 2.0 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d9448b25..bb4ee54d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 orbs: - github-cli: circleci/github-cli@1.0 + github-cli: circleci/github-cli@2.0 workflows: build: @@ -23,4 +23,4 @@ jobs: - when: condition: <> steps: - - run: gh release upload --repo lovell/sharp-libvips $CIRCLE_TAG *.tar.gz *.integrity + - run: gh release upload --repo "$(git config --get remote.origin.url)" $CIRCLE_TAG *.tar.gz *.integrity From 4720684c736dc204987cebd1e5abbecaddae2632 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 23 Feb 2024 11:26:33 +0000 Subject: [PATCH 009/109] CI: Upgrade to actions/checkout v4 --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index aced7dc3..66ad55d9 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -39,7 +39,7 @@ jobs: platform: 'darwin-arm64v8' steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install dependencies (macOS) if: runner.os == 'macOS' run: | From 96e00ee648253621cea103820631f79c09d8cdea Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Thu, 14 Mar 2024 12:23:15 +0100 Subject: [PATCH 010/109] Bump deps: aom, expat, glib, pango, pixman, png, rsvg (#224) --- build/lin.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 4b12a2f6..b444b5b9 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -94,12 +94,12 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.1.6 VERSION_FFI=3.4.6 -VERSION_GLIB=2.79.2 +VERSION_GLIB=2.80.0 VERSION_XML2=2.12.5 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 -VERSION_PNG16=1.6.42 +VERSION_PNG16=1.6.43 VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 VERSION_WEBP=1.3.2 @@ -108,16 +108,16 @@ VERSION_HWY=1.1.0 VERSION_PROXY_LIBINTL=0.4 VERSION_GDKPIXBUF=2.42.10 VERSION_FREETYPE=2.13.2 -VERSION_EXPAT=2.6.0 +VERSION_EXPAT=2.6.2 VERSION_ARCHIVE=3.7.2 VERSION_FONTCONFIG=2.15.0 VERSION_HARFBUZZ=8.3.0 -VERSION_PIXMAN=0.43.2 +VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.13 -VERSION_PANGO=1.51.2 -VERSION_RSVG=2.57.91 -VERSION_AOM=3.8.1 +VERSION_PANGO=1.52.1 +VERSION_RSVG=2.57.92 +VERSION_AOM=3.8.2 VERSION_HEIF=1.17.6 VERSION_CGIF=0.3.2 From fd01c52acdb14974d9d86fc34132449727006fd5 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Fri, 15 Mar 2024 11:20:31 +0100 Subject: [PATCH 011/109] Upgrade to libvips v8.15.2 (#225) --- LIBVIPS_VERSION | 2 +- build/lin.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LIBVIPS_VERSION b/LIBVIPS_VERSION index 5816526f..e7ab33dc 100644 --- a/LIBVIPS_VERSION +++ b/LIBVIPS_VERSION @@ -1 +1 @@ -8.15.1 +8.15.2 diff --git a/build/lin.sh b/build/lin.sh index b444b5b9..3cbedd30 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -457,7 +457,7 @@ CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=r meson install -C _build --tag devel mkdir ${DEPS}/vips -$CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}/vips-$(without_prerelease $VERSION_VIPS).tar.xz | tar xJC ${DEPS}/vips --strip-components=1 +$CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}a/vips-$(without_prerelease $VERSION_VIPS).tar.xz | tar xJC ${DEPS}/vips --strip-components=1 cd ${DEPS}/vips # Link libvips.so.42 statically into libvips-cpp.so.42 sed -i'.bak' "s/library('vips'/static_&/" libvips/meson.build @@ -475,7 +475,7 @@ fi # Disable building man pages, gettext po files, tools, and (fuzz-)tests sed -i'.bak' "/subdir('man')/{N;N;N;N;d;}" meson.build CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" meson setup _build --default-library=shared --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - -Ddeprecated=false -Dintrospection=disabled -Dmodules=disabled -Dcfitsio=disabled -Dfftw=disabled -Djpeg-xl=disabled \ + -Ddeprecated=false -Dexamples=false -Dintrospection=disabled -Dmodules=disabled -Dcfitsio=disabled -Dfftw=disabled -Djpeg-xl=disabled \ ${WITHOUT_HIGHWAY:+-Dhighway=disabled} -Dorc=disabled -Dmagick=disabled -Dmatio=disabled -Dnifti=disabled -Dopenexr=disabled \ -Dopenjpeg=disabled -Dopenslide=disabled -Dpdfium=disabled -Dpoppler=disabled -Dquantizr=disabled \ -Dppm=false -Danalyze=false -Dradiance=false \ From d7a5f55c23ae824ae3672f5fc65d3af334088de8 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 17 Mar 2024 09:59:09 +0000 Subject: [PATCH 012/109] Bump dep: xml2 --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 3cbedd30..e3b57471 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -95,7 +95,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" VERSION_ZLIB_NG=2.1.6 VERSION_FFI=3.4.6 VERSION_GLIB=2.80.0 -VERSION_XML2=2.12.5 +VERSION_XML2=2.12.6 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 From c597a776921508edacccd2396e50cfdaff4dd411 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 17 Mar 2024 10:15:50 +0000 Subject: [PATCH 013/109] vips: remove release label suffix --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index e3b57471..6d973908 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -457,7 +457,7 @@ CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=r meson install -C _build --tag devel mkdir ${DEPS}/vips -$CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}a/vips-$(without_prerelease $VERSION_VIPS).tar.xz | tar xJC ${DEPS}/vips --strip-components=1 +$CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}/vips-$(without_prerelease $VERSION_VIPS).tar.xz | tar xJC ${DEPS}/vips --strip-components=1 cd ${DEPS}/vips # Link libvips.so.42 statically into libvips-cpp.so.42 sed -i'.bak' "s/library('vips'/static_&/" libvips/meson.build From e5cb0768603818dd5ac45da7f0fe87f7dc25e01f Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 17 Mar 2024 19:46:11 +0000 Subject: [PATCH 014/109] rsvg: pin to version 2.57.2 --- build/lin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 6d973908..998e8e89 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -116,7 +116,7 @@ VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.13 VERSION_PANGO=1.52.1 -VERSION_RSVG=2.57.92 +VERSION_RSVG=2.57.2 VERSION_AOM=3.8.2 VERSION_HEIF=1.17.6 VERSION_CGIF=0.3.2 @@ -175,7 +175,7 @@ version_latest "pixman" "$VERSION_PIXMAN" "3648" version_latest "cairo" "$VERSION_CAIRO" "247" version_latest "fribidi" "$VERSION_FRIBIDI" "857" version_latest "pango" "$VERSION_PANGO" "11783" -version_latest "rsvg" "$VERSION_RSVG" "5420" +#version_latest "rsvg" "$VERSION_RSVG" "5420" # https://github.com/lovell/sharp-libvips/issues/226 version_latest "aom" "$VERSION_AOM" "17628" version_latest "heif" "$VERSION_HEIF" "strukturag/libheif" version_latest "cgif" "$VERSION_CGIF" "dloebl/cgif" From 5f044c34f4ac3c9e85f251aa31e41f4c37b38839 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 17 Mar 2024 21:01:49 +0000 Subject: [PATCH 015/109] Release v1.0.2 (libvips v8.15.2) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index f64dae8d..cae6a826 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index a26fd817..d72fe07a 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index be68c190..48f106ee 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.0.1", + "version": "1.0.2", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index a493295d..1551339c 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.0.1", + "version": "1.0.2", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 6bb39c5d..b2ba2a5a 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 06ad6ff7..4c5a982a 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index cbb8ec1c..5d8d71f7 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 0d317c81..ff499eef 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index 4c743b10..df6cea90 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index 62a5cead..274672a3 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index 68e97dc8..787d8538 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.0.1", + "version": "1.0.2", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 835b70c4..6dc321c8 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index 6a75b113..93cafc94 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.0.1", + "version": "1.0.2", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From 7d5110cc05b03c2c62517f2b3a8ff04565361568 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 18 Mar 2024 15:39:30 +0000 Subject: [PATCH 016/109] Re-build of dev-wasm32 as 1.0.3 Update build script to ensure the WASM Docker image is rebuilt every time (relies on Docker's cache) and therefore the version of emscripten is up-to-date. (Version 1.0.2 of dev-wasm32 package used an old emscripten.) --- build/wasm.sh | 10 +++++----- npm/dev-wasm32/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/wasm.sh b/build/wasm.sh index 5cb4f201..5eb70d89 100755 --- a/build/wasm.sh +++ b/build/wasm.sh @@ -34,15 +34,15 @@ if [ "$VERSION_VIPS" != "$VERSION_VIPS_UPSTREAM" ]; then fi # Create container with emscripten -if [ -z "$(docker images -q ${TAG})" ]; then - pushd "${DIR}" - docker build -t "${TAG}" . - popd -fi +pushd "${DIR}" +docker build -t "${TAG}" . +popd # Build libvips and dependencies as static Wasm libraries via emscripten if [ ! -d "$DIR/build/target/lib" ]; then docker run --rm -v "$PWD/${DIR}":/src "${TAG}" -c "./build.sh --disable-bindings --disable-modules --disable-jxl --enable-libvips-cpp" +else + echo "Skipping build: found existing files in $DIR/build/target" fi # Copy only the files we need diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index 48f106ee..40cb7cfb 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.0.2", + "version": "1.0.3", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From 8c27a005c6ec56cf4a13b12aeff6c35adae57b1d Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 18 Mar 2024 16:03:50 +0000 Subject: [PATCH 017/109] Bump dep: harfbuzz --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 998e8e89..b8a5d1b7 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -111,7 +111,7 @@ VERSION_FREETYPE=2.13.2 VERSION_EXPAT=2.6.2 VERSION_ARCHIVE=3.7.2 VERSION_FONTCONFIG=2.15.0 -VERSION_HARFBUZZ=8.3.0 +VERSION_HARFBUZZ=8.3.1 VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.13 From aaff2e7b37c3570127e09219aa1c92a29cae3c3a Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sun, 24 Mar 2024 16:14:26 +0100 Subject: [PATCH 018/109] Build FreeType with libpng support (#228) Allows use of OpenType fonts with CBDT raster glyphs --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index b8a5d1b7..2f9fb8e9 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -353,7 +353,7 @@ build_freetype() { $CURL https://github.com/freetype/freetype/archive/VER-${VERSION_FREETYPE//./-}.tar.gz | tar xzC ${DEPS}/freetype --strip-components=1 cd ${DEPS}/freetype meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - -Dzlib=enabled -Dpng=disabled -Dbrotli=disabled -Dbzip2=disabled "$@" + -Dzlib=enabled -Dpng=enabled -Dbrotli=disabled -Dbzip2=disabled "$@" meson install -C _build --tag devel } build_freetype -Dharfbuzz=disabled From 6e8348267b4ec7581dabe2b048329898308d26ea Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sun, 24 Mar 2024 17:37:26 +0100 Subject: [PATCH 019/109] Meson: specify default system directories in machine files (#227) --- build/lin.sh | 3 +-- platforms/darwin-arm64v8/meson.ini | 4 ++++ platforms/darwin-x64/meson.ini | 4 ++++ platforms/linux-arm64v8/meson.ini | 4 ++++ platforms/linux-armv6/meson.ini | 4 ++++ platforms/linux-armv7/meson.ini | 4 ++++ platforms/linux-s390x/meson.ini | 4 ++++ platforms/linux-x64/meson.ini | 4 ++++ platforms/linuxmusl-arm64v8/meson.ini | 4 ++++ platforms/linuxmusl-x64/meson.ini | 4 ++++ 10 files changed, 37 insertions(+), 2 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 2f9fb8e9..18058362 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -379,8 +379,7 @@ mkdir ${DEPS}/fontconfig $CURL https://www.freedesktop.org/software/fontconfig/release/fontconfig-${VERSION_FONTCONFIG}.tar.xz | tar xJC ${DEPS}/fontconfig --strip-components=1 cd ${DEPS}/fontconfig meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - -Dcache-build=disabled -Ddoc=disabled -Dnls=disabled -Dtests=disabled -Dtools=disabled \ - ${LINUX:+--sysconfdir=/etc} ${DARWIN:+--sysconfdir=/usr/local/etc} + -Dcache-build=disabled -Ddoc=disabled -Dnls=disabled -Dtests=disabled -Dtools=disabled meson install -C _build --tag devel mkdir ${DEPS}/harfbuzz diff --git a/platforms/darwin-arm64v8/meson.ini b/platforms/darwin-arm64v8/meson.ini index de108582..d58ed9ee 100644 --- a/platforms/darwin-arm64v8/meson.ini +++ b/platforms/darwin-arm64v8/meson.ini @@ -12,4 +12,8 @@ objcpp = 'clang++' strip = ['strip', '-x'] [built-in options] +datadir = '/usr/local/share' +localedir = '/usr/local/share/locale' +sysconfdir = '/usr/local/etc' +localstatedir = '/usr/local/var' wrap_mode = 'nofallback' diff --git a/platforms/darwin-x64/meson.ini b/platforms/darwin-x64/meson.ini index e7e7f1cb..527b0705 100644 --- a/platforms/darwin-x64/meson.ini +++ b/platforms/darwin-x64/meson.ini @@ -2,4 +2,8 @@ strip = ['strip', '-x'] [built-in options] +datadir = '/usr/local/share' +localedir = '/usr/local/share/locale' +sysconfdir = '/usr/local/etc' +localstatedir = '/usr/local/var' wrap_mode = 'nofallback' diff --git a/platforms/linux-arm64v8/meson.ini b/platforms/linux-arm64v8/meson.ini index 981d25d0..2548a4c1 100644 --- a/platforms/linux-arm64v8/meson.ini +++ b/platforms/linux-arm64v8/meson.ini @@ -4,4 +4,8 @@ pkg-config = ['pkg-config', '--static'] [built-in options] libdir = 'lib' +datadir = '/usr/share' +localedir = '/usr/share/locale' +sysconfdir = '/etc' +localstatedir = '/var' wrap_mode = 'nofallback' diff --git a/platforms/linux-armv6/meson.ini b/platforms/linux-armv6/meson.ini index d8583a7b..0ea12eb2 100644 --- a/platforms/linux-armv6/meson.ini +++ b/platforms/linux-armv6/meson.ini @@ -16,4 +16,8 @@ pkg-config = ['arm-linux-gnueabihf-pkg-config', '--static'] [built-in options] libdir = 'lib' +datadir = '/usr/share' +localedir = '/usr/share/locale' +sysconfdir = '/etc' +localstatedir = '/var' wrap_mode = 'nofallback' diff --git a/platforms/linux-armv7/meson.ini b/platforms/linux-armv7/meson.ini index ab9c086a..85c79a5d 100644 --- a/platforms/linux-armv7/meson.ini +++ b/platforms/linux-armv7/meson.ini @@ -16,4 +16,8 @@ pkg-config = ['arm-linux-gnueabihf-pkg-config', '--static'] [built-in options] libdir = 'lib' +datadir = '/usr/share' +localedir = '/usr/share/locale' +sysconfdir = '/etc' +localstatedir = '/var' wrap_mode = 'nofallback' diff --git a/platforms/linux-s390x/meson.ini b/platforms/linux-s390x/meson.ini index b02a748b..fdb69d2f 100644 --- a/platforms/linux-s390x/meson.ini +++ b/platforms/linux-s390x/meson.ini @@ -17,4 +17,8 @@ pkg-config = ['s390x-linux-gnu-pkg-config', '--static'] [built-in options] libdir = 'lib' +datadir = '/usr/share' +localedir = '/usr/share/locale' +sysconfdir = '/etc' +localstatedir = '/var' wrap_mode = 'nofallback' diff --git a/platforms/linux-x64/meson.ini b/platforms/linux-x64/meson.ini index 981d25d0..2548a4c1 100644 --- a/platforms/linux-x64/meson.ini +++ b/platforms/linux-x64/meson.ini @@ -4,4 +4,8 @@ pkg-config = ['pkg-config', '--static'] [built-in options] libdir = 'lib' +datadir = '/usr/share' +localedir = '/usr/share/locale' +sysconfdir = '/etc' +localstatedir = '/var' wrap_mode = 'nofallback' diff --git a/platforms/linuxmusl-arm64v8/meson.ini b/platforms/linuxmusl-arm64v8/meson.ini index c8418115..435abb62 100644 --- a/platforms/linuxmusl-arm64v8/meson.ini +++ b/platforms/linuxmusl-arm64v8/meson.ini @@ -21,4 +21,8 @@ has_function_inotify_init1 = false [built-in options] libdir = 'lib' +datadir = '/usr/share' +localedir = '/usr/share/locale' +sysconfdir = '/etc' +localstatedir = '/var' wrap_mode = 'nofallback' diff --git a/platforms/linuxmusl-x64/meson.ini b/platforms/linuxmusl-x64/meson.ini index 12d1fec7..1bced856 100644 --- a/platforms/linuxmusl-x64/meson.ini +++ b/platforms/linuxmusl-x64/meson.ini @@ -8,4 +8,8 @@ pkg-config = ['pkg-config', '--static'] has_function_inotify_init1 = false [built-in options] +datadir = '/usr/share' +localedir = '/usr/share/locale' +sysconfdir = '/etc' +localstatedir = '/var' wrap_mode = 'nofallback' From 625f82e188dfb40298e805c686c906bd958a5924 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 1 Apr 2024 20:27:23 +0200 Subject: [PATCH 020/109] Bump deps: harfbuzz, pango, rsvg (#230) --- build/lin.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 18058362..4989e32b 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -111,12 +111,12 @@ VERSION_FREETYPE=2.13.2 VERSION_EXPAT=2.6.2 VERSION_ARCHIVE=3.7.2 VERSION_FONTCONFIG=2.15.0 -VERSION_HARFBUZZ=8.3.1 +VERSION_HARFBUZZ=8.4.0 VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.13 -VERSION_PANGO=1.52.1 -VERSION_RSVG=2.57.2 +VERSION_PANGO=1.52.2 +VERSION_RSVG=2.57.3 VERSION_AOM=3.8.2 VERSION_HEIF=1.17.6 VERSION_CGIF=0.3.2 @@ -395,7 +395,7 @@ meson install -C _build --tag devel # https://bugs.freedesktop.org/show_bug.cgi?id=7331 # https://gitlab.freedesktop.org/pkg-config/pkg-config/-/commit/6d6dd43e75e2bc82cfe6544f8631b1bef6e1cf45 # TODO(kleisauke): Remove when Amazon Linux 2 reaches EOL. -sed -i'.bak' "/^Requires:/s/ freetype2,//" ${TARGET}/lib/pkgconfig/harfbuzz.pc +sed -i'.bak' "/^Requires:/s/ freetype2.*,//" ${TARGET}/lib/pkgconfig/harfbuzz.pc sed -i'.bak' "/^Libs:/s/$/ -lfreetype/" ${TARGET}/lib/pkgconfig/harfbuzz.pc build_freetype -Dharfbuzz=enabled From 8d0ec1ada5c4947464f27590795f4a999eb344d1 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Tue, 2 Apr 2024 13:10:54 +0200 Subject: [PATCH 021/109] vips: disable HBR support in heifsave (#231) --- build/lin.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/lin.sh b/build/lin.sh index 4989e32b..a4385461 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -458,6 +458,8 @@ meson install -C _build --tag devel mkdir ${DEPS}/vips $CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}/vips-$(without_prerelease $VERSION_VIPS).tar.xz | tar xJC ${DEPS}/vips --strip-components=1 cd ${DEPS}/vips +# Disable HBR support in heifsave +$CURL https://github.com/kleisauke/libvips/commit/ad921cf9396dc5a224e93c71b601e87bd3a8a521.patch | patch -p1 # Link libvips.so.42 statically into libvips-cpp.so.42 sed -i'.bak' "s/library('vips'/static_&/" libvips/meson.build sed -i'.bak' "/version: library_version/{N;d;}" libvips/meson.build From a684ad0734f837bdcc03b982738a71e13654902a Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Tue, 2 Apr 2024 13:12:54 +0200 Subject: [PATCH 022/109] Update libpng licence location (#232) --- THIRD-PARTY-NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md index 79e5bfc5..b84e3fac 100644 --- a/THIRD-PARTY-NOTICES.md +++ b/THIRD-PARTY-NOTICES.md @@ -23,7 +23,7 @@ used under the terms of the following licences: | libheif | LGPLv3 | | libimagequant | [BSD 2-Clause](https://github.com/lovell/libimagequant/blob/main/COPYRIGHT) | | libnsgif | MIT Licence | -| libpng | [libpng License](https://github.com/glennrp/libpng/blob/master/LICENSE) | +| libpng | [libpng License](https://github.com/pnggroup/libpng/blob/master/LICENSE) | | librsvg | LGPLv3 | | libspng | [BSD 2-Clause, libpng License](https://github.com/randy408/libspng/blob/master/LICENSE) | | libtiff | [libtiff License](https://gitlab.com/libtiff/libtiff/blob/master/LICENSE.md) (BSD-like) | From 1acfeb9935c611b2659cde6157879ed564872565 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sun, 14 Apr 2024 19:09:56 +0200 Subject: [PATCH 023/109] Bump deps: archive, cgif, webp (#235) --- build/lin.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index a4385461..f8aa1c51 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -102,14 +102,14 @@ VERSION_MOZJPEG=4.1.5 VERSION_PNG16=1.6.43 VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 -VERSION_WEBP=1.3.2 +VERSION_WEBP=1.4.0 VERSION_TIFF=4.6.0 VERSION_HWY=1.1.0 VERSION_PROXY_LIBINTL=0.4 VERSION_GDKPIXBUF=2.42.10 VERSION_FREETYPE=2.13.2 VERSION_EXPAT=2.6.2 -VERSION_ARCHIVE=3.7.2 +VERSION_ARCHIVE=3.7.3 VERSION_FONTCONFIG=2.15.0 VERSION_HARFBUZZ=8.4.0 VERSION_PIXMAN=0.43.4 @@ -119,7 +119,7 @@ VERSION_PANGO=1.52.2 VERSION_RSVG=2.57.3 VERSION_AOM=3.8.2 VERSION_HEIF=1.17.6 -VERSION_CGIF=0.3.2 +VERSION_CGIF=0.4.0 # Remove patch version component without_patch() { @@ -143,7 +143,7 @@ version_latest() { VERSION_SELECTOR="versions" fi if [[ "$3" == *"/"* ]]; then - VERSION_LATEST=$(git ls-remote --tags --refs https://github.com/$3.git | sort -t'/' -k3 -V | awk -F'/' 'END{print $3}' | tr -d 'vV') + VERSION_LATEST=$(git -c 'versionsort.suffix=-' ls-remote --tags --refs --sort='v:refname' https://github.com/$3.git | awk -F'/' 'END{print $3}' | tr -d 'v') else VERSION_LATEST=$($CURL "https://release-monitoring.org/api/v2/versions/?project_id=$3" | jq -j ".$VERSION_SELECTOR[0]" | tr '_' '.') fi @@ -449,7 +449,7 @@ PKG_CONFIG=${PKG_CONFIG/ --static/} ./configure --host=${CHOST} --prefix=${TARGE PKG_CONFIG_ALL_STATIC=1 make install-strip bin_SCRIPTS= mkdir ${DEPS}/cgif -$CURL https://github.com/dloebl/cgif/archive/V${VERSION_CGIF}.tar.gz | tar xzC ${DEPS}/cgif --strip-components=1 +$CURL https://github.com/dloebl/cgif/archive/v${VERSION_CGIF}.tar.gz | tar xzC ${DEPS}/cgif --strip-components=1 cd ${DEPS}/cgif CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ -Dtests=false From 759ef305f378c25075b45d2042bfe965381da2f6 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sat, 27 Apr 2024 14:10:24 +0200 Subject: [PATCH 024/109] Bump deps: aom, archive, fribidi, rsvg - Remove unused gdk-pixbuf dependency. --- THIRD-PARTY-NOTICES.md | 1 - build.sh | 1 + build/lin.sh | 57 ++++++++------------------ platforms/linux-arm64v8/Dockerfile | 2 + platforms/linux-arm64v8/meson.ini | 1 - platforms/linux-armv6/Dockerfile | 2 + platforms/linux-armv6/meson.ini | 1 - platforms/linux-armv7/Dockerfile | 2 + platforms/linux-armv7/meson.ini | 1 - platforms/linux-s390x/Dockerfile | 2 + platforms/linux-s390x/meson.ini | 1 - platforms/linux-x64/Dockerfile | 2 + platforms/linux-x64/meson.ini | 1 - platforms/linuxmusl-arm64v8/Dockerfile | 14 ++++--- platforms/linuxmusl-arm64v8/meson.ini | 1 - platforms/linuxmusl-x64/Dockerfile | 12 +++--- platforms/linuxmusl-x64/meson.ini | 1 - 17 files changed, 44 insertions(+), 58 deletions(-) diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md index b84e3fac..7b794812 100644 --- a/THIRD-PARTY-NOTICES.md +++ b/THIRD-PARTY-NOTICES.md @@ -12,7 +12,6 @@ used under the terms of the following licences: | fontconfig | [fontconfig Licence](https://gitlab.freedesktop.org/fontconfig/fontconfig/blob/main/COPYING) (BSD-like) | | freetype | [freetype Licence](https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT) (BSD-like) | | fribidi | LGPLv3 | -| gdk-pixbuf | LGPLv3 | | glib | LGPLv3 | | harfbuzz | MIT Licence | | highway | Apache-2.0 License, BSD 3-Clause | diff --git a/build.sh b/build.sh index d32817a9..fa9350ab 100755 --- a/build.sh +++ b/build.sh @@ -60,6 +60,7 @@ for flavour in darwin-x64 darwin-arm64v8; do if [ $PLATFORM = "darwin-arm64v8" ]; then # ARM64 builds work via cross compilation from an x86_64 machine export CHOST="aarch64-apple-darwin" + export RUST_TARGET="aarch64-apple-darwin" export FLAGS+=" -target arm64-apple-macos11" # macOS 11 Big Sur is the first version to support ARM-based macs export MACOSX_DEPLOYMENT_TARGET="11.0" diff --git a/build/lin.sh b/build/lin.sh index f8aa1c51..cc37e800 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -106,18 +106,17 @@ VERSION_WEBP=1.4.0 VERSION_TIFF=4.6.0 VERSION_HWY=1.1.0 VERSION_PROXY_LIBINTL=0.4 -VERSION_GDKPIXBUF=2.42.10 VERSION_FREETYPE=2.13.2 VERSION_EXPAT=2.6.2 -VERSION_ARCHIVE=3.7.3 +VERSION_ARCHIVE=3.7.4 VERSION_FONTCONFIG=2.15.0 VERSION_HARFBUZZ=8.4.0 VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 -VERSION_FRIBIDI=1.0.13 +VERSION_FRIBIDI=1.0.14 VERSION_PANGO=1.52.2 -VERSION_RSVG=2.57.3 -VERSION_AOM=3.8.2 +VERSION_RSVG=2.58.91 +VERSION_AOM=3.9.0 VERSION_HEIF=1.17.6 VERSION_CGIF=0.4.0 @@ -165,7 +164,6 @@ version_latest "webp" "$VERSION_WEBP" "webmproject/libwebp" version_latest "tiff" "$VERSION_TIFF" "1738" version_latest "highway" "$VERSION_HWY" "205809" version_latest "proxy-libintl" "$VERSION_PROXY_LIBINTL" "frida/proxy-libintl" -version_latest "gdkpixbuf" "$VERSION_GDKPIXBUF" "9533" version_latest "freetype" "$VERSION_FREETYPE" "854" version_latest "expat" "$VERSION_EXPAT" "770" version_latest "archive" "$VERSION_ARCHIVE" "1558" @@ -175,7 +173,7 @@ version_latest "pixman" "$VERSION_PIXMAN" "3648" version_latest "cairo" "$VERSION_CAIRO" "247" version_latest "fribidi" "$VERSION_FRIBIDI" "857" version_latest "pango" "$VERSION_PANGO" "11783" -#version_latest "rsvg" "$VERSION_RSVG" "5420" # https://github.com/lovell/sharp-libvips/issues/226 +version_latest "rsvg" "$VERSION_RSVG" "5420" version_latest "aom" "$VERSION_AOM" "17628" version_latest "heif" "$VERSION_HEIF" "strukturag/libheif" version_latest "cgif" "$VERSION_CGIF" "dloebl/cgif" @@ -189,6 +187,7 @@ if [ "$DARWIN" = true ]; then if [ "$DARWIN_ARM" = true ]; then ${CARGO_HOME}/bin/rustup target add aarch64-apple-darwin fi + CFLAGS= cargo install cargo-c fi if [ "${PLATFORM%-*}" == "linuxmusl" ] || [ "$DARWIN" = true ]; then @@ -223,7 +222,7 @@ $CURL https://gist.github.com/kleisauke/284d685efa00908da99ea6afbaaf39ae/raw/36e meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ --force-fallback-for=gvdb -Dintrospection=disabled -Dnls=disabled -Dlibmount=disabled -Dlibelf=disabled \ -Dtests=false -Dglib_assert=false -Dglib_checks=false ${DARWIN:+-Dbsymbolic_functions=false} -# bin-devel is needed for glib-compile-resources, as required by gdk-pixbuf +# bin-devel is needed for glib-compile-resources meson install -C _build --tag bin-devel,devel mkdir ${DEPS}/xml2 @@ -326,27 +325,6 @@ if [ -z "$WITHOUT_HIGHWAY" ]; then make install/strip fi -mkdir ${DEPS}/gdkpixbuf -$CURL https://download.gnome.org/sources/gdk-pixbuf/$(without_patch $VERSION_GDKPIXBUF)/gdk-pixbuf-${VERSION_GDKPIXBUF}.tar.xz | tar xJC ${DEPS}/gdkpixbuf --strip-components=1 -cd ${DEPS}/gdkpixbuf -# Skip thumbnailer -sed -i'.bak' "/subdir('thumbnailer')/d" meson.build -sed -i'.bak' "/post-install/{N;N;N;N;d;}" meson.build -# Skip the built-in loaders for BMP, GIF, ICO, PNM, XPM, XBM, TGA, ICNS and QTIF -sed -i'.bak' "/'bmp':/{N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" gdk-pixbuf/meson.build -sed -i'.bak' "/'pnm':/{N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" gdk-pixbuf/meson.build -# Skip executables -sed -i'.bak' "/gdk-pixbuf-csource/{N;N;d;}" gdk-pixbuf/meson.build -sed -i'.bak' "/loaders_cache = custom/{N;N;N;N;N;N;N;N;N;c\\ - loaders_cache = []\\ - loaders_dep = declare_dependency() -}" gdk-pixbuf/meson.build -meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - -Dtiff=disabled -Dintrospection=disabled -Dtests=false -Dinstalled_tests=false -Dgio_sniffing=false -Dman=false -Dbuiltin_loaders=png,jpeg -meson install -C _build --tag devel -# Include libjpeg and libpng as a dependency of gdk-pixbuf, see: https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/50 -sed -i'.bak' "/^Requires:/s/$/ libjpeg, libpng16/" ${TARGET}/lib/pkgconfig/gdk-pixbuf-2.0.pc - build_freetype() { rm -rf ${DEPS}/freetype mkdir ${DEPS}/freetype @@ -435,18 +413,20 @@ meson install -C _build --tag devel mkdir ${DEPS}/rsvg $CURL https://download.gnome.org/sources/librsvg/$(without_patch $VERSION_RSVG)/librsvg-${VERSION_RSVG}.tar.xz | tar xJC ${DEPS}/rsvg --strip-components=1 cd ${DEPS}/rsvg -# Add missing pkg-config deps -sed -i'.bak' "/^Requires:/s/$/ cairo-gobject pangocairo libxml-2.0/" librsvg.pc.in -# LTO optimization does not work for staticlib+rlib compilation -sed -i'.bak' "/crate-type = /s/, \"rlib\"//" librsvg-c/Cargo.toml +# Disallow GIF and WebP embedded in SVG images +sed -i'.bak' "/image = /s/, \"gif\", \"webp\"//" rsvg/Cargo.toml # We build Cairo with `-Dzlib=disabled`, which implicitly disables the PDF/PostScript surface backends sed -i'.bak' "/cairo-rs = /s/, \"pdf\", \"ps\"//" {librsvg-c,rsvg}/Cargo.toml -# Remove the --static flag from the PKG_CONFIG env since Rust does not -# support that. Build with PKG_CONFIG_ALL_STATIC=1 instead. -PKG_CONFIG=${PKG_CONFIG/ --static/} ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ - --disable-introspection --disable-pixbuf-loader ${DARWIN:+--disable-Bsymbolic} # Skip build of rsvg-convert -PKG_CONFIG_ALL_STATIC=1 make install-strip bin_SCRIPTS= +sed -i'.bak' "/subdir('rsvg_convert')/d" meson.build +# Regenerate the lockfile after making the above changes +cargo generate-lockfile +# Remove the --static flag from the PKG_CONFIG env since Rust does not +# parse that correctly. +PKG_CONFIG=${PKG_CONFIG/ --static/} meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ + -Dintrospection=disabled -Dpixbuf{,-loader}=disabled -Ddocs=disabled -Dvala=disabled -Dtests=false \ + ${RUST_TARGET:+-Dtriplet=$RUST_TARGET} +meson install -C _build --tag devel mkdir ${DEPS}/cgif $CURL https://github.com/dloebl/cgif/archive/v${VERSION_CGIF}.tar.gz | tar xzC ${DEPS}/cgif --strip-components=1 @@ -544,7 +524,6 @@ printf "{\n\ \"fontconfig\": \"${VERSION_FONTCONFIG}\",\n\ \"freetype\": \"${VERSION_FREETYPE}\",\n\ \"fribidi\": \"${VERSION_FRIBIDI}\",\n\ - \"gdkpixbuf\": \"${VERSION_GDKPIXBUF}\",\n\ \"glib\": \"${VERSION_GLIB}\",\n\ \"harfbuzz\": \"${VERSION_HARFBUZZ}\",\n\ \"heif\": \"${VERSION_HEIF}\",\n\ diff --git a/platforms/linux-arm64v8/Dockerfile b/platforms/linux-arm64v8/Dockerfile index 5d845107..60a73b24 100644 --- a/platforms/linux-arm64v8/Dockerfile +++ b/platforms/linux-arm64v8/Dockerfile @@ -28,6 +28,7 @@ RUN \ gperf \ jq \ make \ + openssl-devel \ patch \ pkgconfig \ python3 \ @@ -48,6 +49,7 @@ RUN \ --profile minimal \ --default-host aarch64-unknown-linux-gnu \ && \ + cargo install cargo-c && \ ln -s /usr/bin/cmake3 /usr/bin/cmake && \ pip3 install meson ninja packaging diff --git a/platforms/linux-arm64v8/meson.ini b/platforms/linux-arm64v8/meson.ini index 2548a4c1..2f9d2ad0 100644 --- a/platforms/linux-arm64v8/meson.ini +++ b/platforms/linux-arm64v8/meson.ini @@ -1,6 +1,5 @@ [binaries] strip = 'strip' -pkg-config = ['pkg-config', '--static'] [built-in options] libdir = 'lib' diff --git a/platforms/linux-armv6/Dockerfile b/platforms/linux-armv6/Dockerfile index a28d057d..042e7278 100644 --- a/platforms/linux-armv6/Dockerfile +++ b/platforms/linux-armv6/Dockerfile @@ -23,6 +23,7 @@ RUN \ git \ gperf \ jq \ + libssl-dev \ libtool \ ninja-build \ pkg-config \ @@ -36,6 +37,7 @@ RUN \ --profile minimal \ && \ rustup target add arm-unknown-linux-gnueabihf && \ + cargo install cargo-c && \ pip3 install meson # Compiler settings diff --git a/platforms/linux-armv6/meson.ini b/platforms/linux-armv6/meson.ini index 0ea12eb2..d06f2638 100644 --- a/platforms/linux-armv6/meson.ini +++ b/platforms/linux-armv6/meson.ini @@ -12,7 +12,6 @@ nm = 'arm-rpi-linux-gnueabihf-gcc-nm' ld = 'arm-rpi-linux-gnueabihf-gcc-ld' strip = 'arm-rpi-linux-gnueabihf-strip' ranlib = 'arm-rpi-linux-gnueabihf-gcc-ranlib' -pkg-config = ['arm-linux-gnueabihf-pkg-config', '--static'] [built-in options] libdir = 'lib' diff --git a/platforms/linux-armv7/Dockerfile b/platforms/linux-armv7/Dockerfile index f5c3b1e0..cd41ef17 100644 --- a/platforms/linux-armv7/Dockerfile +++ b/platforms/linux-armv7/Dockerfile @@ -24,6 +24,7 @@ RUN \ git \ gperf \ jq \ + libssl-dev \ libtool \ ninja-build \ pkg-config \ @@ -35,6 +36,7 @@ RUN \ --profile minimal \ && \ rustup target add arm-unknown-linux-gnueabihf && \ + cargo install cargo-c && \ pip3 install meson # Compiler settings diff --git a/platforms/linux-armv7/meson.ini b/platforms/linux-armv7/meson.ini index 85c79a5d..af494050 100644 --- a/platforms/linux-armv7/meson.ini +++ b/platforms/linux-armv7/meson.ini @@ -12,7 +12,6 @@ nm = 'arm-linux-gnueabihf-gcc-nm' ld = 'arm-linux-gnueabihf-gcc-ld' strip = 'arm-linux-gnueabihf-strip' ranlib = 'arm-linux-gnueabihf-gcc-ranlib' -pkg-config = ['arm-linux-gnueabihf-pkg-config', '--static'] [built-in options] libdir = 'lib' diff --git a/platforms/linux-s390x/Dockerfile b/platforms/linux-s390x/Dockerfile index 8720d832..78d5638f 100644 --- a/platforms/linux-s390x/Dockerfile +++ b/platforms/linux-s390x/Dockerfile @@ -24,6 +24,7 @@ RUN \ git \ gperf \ jq \ + libssl-dev \ libtool \ ninja-build \ pkg-config \ @@ -35,6 +36,7 @@ RUN \ --profile minimal \ && \ rustup target add s390x-unknown-linux-gnu && \ + cargo install cargo-c && \ pip3 install meson # Handy for debugging the compiled targets in Highway (hwy_list_targets) diff --git a/platforms/linux-s390x/meson.ini b/platforms/linux-s390x/meson.ini index fdb69d2f..29cbf642 100644 --- a/platforms/linux-s390x/meson.ini +++ b/platforms/linux-s390x/meson.ini @@ -12,7 +12,6 @@ nm = 's390x-linux-gnu-gcc-nm' ld = 's390x-linux-gnu-gcc-ld' strip = 's390x-linux-gnu-strip' ranlib = 's390x-linux-gnu-gcc-ranlib' -pkg-config = ['s390x-linux-gnu-pkg-config', '--static'] #exe_wrapper = 'qemu-s390x-static' [built-in options] diff --git a/platforms/linux-x64/Dockerfile b/platforms/linux-x64/Dockerfile index 141328c1..be135987 100644 --- a/platforms/linux-x64/Dockerfile +++ b/platforms/linux-x64/Dockerfile @@ -29,6 +29,7 @@ RUN \ jq \ make \ nasm \ + openssl-devel \ patch \ pkgconfig \ python3 \ @@ -47,6 +48,7 @@ RUN \ --no-modify-path \ --profile minimal \ && \ + cargo install cargo-c && \ ln -s /usr/bin/cmake3 /usr/bin/cmake && \ pip3 install meson ninja packaging diff --git a/platforms/linux-x64/meson.ini b/platforms/linux-x64/meson.ini index 2548a4c1..2f9d2ad0 100644 --- a/platforms/linux-x64/meson.ini +++ b/platforms/linux-x64/meson.ini @@ -1,6 +1,5 @@ [binaries] strip = 'strip' -pkg-config = ['pkg-config', '--static'] [built-in options] libdir = 'lib' diff --git a/platforms/linuxmusl-arm64v8/Dockerfile b/platforms/linuxmusl-arm64v8/Dockerfile index 0b6721c2..7ccc15e2 100644 --- a/platforms/linuxmusl-arm64v8/Dockerfile +++ b/platforms/linuxmusl-arm64v8/Dockerfile @@ -9,6 +9,12 @@ ENV \ CARGO_HOME="/usr/local/cargo" \ PATH="/usr/local/cargo/bin:$PATH" +# Musl defaults to static libs but we need them to be dynamic for host toolchain. +# The toolchain will produce static libs by default. +# We also need to add the directory containing libc.a to the library search path. +ENV \ + RUSTFLAGS="-Ctarget-feature=-crt-static -Lnative=/aarch64-linux-musl/lib" + # Build dependencies RUN \ apk update && apk upgrade && \ @@ -27,6 +33,7 @@ RUN \ libtool \ linux-headers \ ninja \ + openssl-dev \ pkgconf \ py3-packaging \ py3-pip \ @@ -39,6 +46,7 @@ RUN \ --profile minimal \ && \ rustup target add aarch64-unknown-linux-musl && \ + cargo install cargo-c && \ pip3 install meson # Compiler settings @@ -50,11 +58,5 @@ ENV \ FLAGS="-march=armv8-a" \ MESON="--cross-file=/root/meson.ini" -# Musl defaults to static libs but we need them to be dynamic for host toolchain. -# The toolchain will produce static libs by default. -# We also need to add the directory containing libc.a to the library search path. -ENV \ - RUSTFLAGS="-Ctarget-feature=-crt-static -Lnative=/aarch64-linux-musl/lib" - COPY Toolchain.cmake /root/ COPY meson.ini /root/ diff --git a/platforms/linuxmusl-arm64v8/meson.ini b/platforms/linuxmusl-arm64v8/meson.ini index 435abb62..4f47b7d5 100644 --- a/platforms/linuxmusl-arm64v8/meson.ini +++ b/platforms/linuxmusl-arm64v8/meson.ini @@ -12,7 +12,6 @@ nm = 'aarch64-linux-musl-nm' ld = 'aarch64-linux-musl-ld' strip = 'aarch64-linux-musl-strip' ranlib = 'aarch64-linux-musl-ranlib' -pkg-config = ['aarch64-linux-musl-pkg-config', '--static'] # Ensure we disable the inotify backend in GIO # See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2991#note_1592863 diff --git a/platforms/linuxmusl-x64/Dockerfile b/platforms/linuxmusl-x64/Dockerfile index b8dfd6df..31940da0 100644 --- a/platforms/linuxmusl-x64/Dockerfile +++ b/platforms/linuxmusl-x64/Dockerfile @@ -9,6 +9,11 @@ ENV \ CARGO_HOME="/usr/local/cargo" \ PATH="/usr/local/cargo/bin:$PATH" +# Musl defaults to static libs but we need them to be dynamic for host toolchain. +# The toolchain will produce static libs by default. +ENV \ + RUSTFLAGS="-Ctarget-feature=-crt-static" + # Build dependencies RUN \ apk update && apk upgrade && \ @@ -28,6 +33,7 @@ RUN \ linux-headers \ nasm \ ninja \ + openssl-dev \ pkgconf \ py3-packaging \ py3-pip \ @@ -37,6 +43,7 @@ RUN \ --no-modify-path \ --profile minimal \ && \ + cargo install cargo-c && \ pip3 install meson # Compiler settings @@ -46,10 +53,5 @@ ENV \ FLAGS="-march=nehalem" \ MESON="--cross-file=/root/meson.ini" -# Musl defaults to static libs but we need them to be dynamic for host toolchain. -# The toolchain will produce static libs by default. -ENV \ - RUSTFLAGS="-Ctarget-feature=-crt-static" - COPY Toolchain.cmake /root/ COPY meson.ini /root/ diff --git a/platforms/linuxmusl-x64/meson.ini b/platforms/linuxmusl-x64/meson.ini index 1bced856..8496c9bb 100644 --- a/platforms/linuxmusl-x64/meson.ini +++ b/platforms/linuxmusl-x64/meson.ini @@ -1,6 +1,5 @@ [binaries] strip = 'strip' -pkg-config = ['pkg-config', '--static'] # Ensure we disable the inotify backend in GIO # See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2991#note_1592863 From e4027448589c6a083441240197d7d011bd4fce9c Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sat, 27 Apr 2024 14:13:57 +0200 Subject: [PATCH 025/109] linux-s390x: upgrade to glibc 2.31 (Debian 11) --- platforms/linux-s390x/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/linux-s390x/Dockerfile b/platforms/linux-s390x/Dockerfile index 78d5638f..11819c24 100644 --- a/platforms/linux-s390x/Dockerfile +++ b/platforms/linux-s390x/Dockerfile @@ -1,7 +1,7 @@ -FROM debian:buster +FROM debian:bullseye LABEL maintainer="Lovell Fuller " -# Create Debian 10 (glibc 2.28) container suitable for cross-compiling Linux s390x binaries +# Create Debian 11 (glibc 2.31) container suitable for cross-compiling Linux s390x binaries # Path settings ENV \ From 5f524acbc937c5f1822714ca3de0bc3d7beaf196 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 13 May 2024 15:35:13 +0100 Subject: [PATCH 026/109] Bump deps: glib, xml2 exif: patch for SRATIONAL denominator sanity check --- build/lin.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index cc37e800..4b17b760 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -94,8 +94,8 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.1.6 VERSION_FFI=3.4.6 -VERSION_GLIB=2.80.0 -VERSION_XML2=2.12.6 +VERSION_GLIB=2.80.2 +VERSION_XML2=2.12.7 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 @@ -235,6 +235,8 @@ make install-strip mkdir ${DEPS}/exif $CURL https://github.com/libexif/libexif/releases/download/v${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.bz2 | tar xjC ${DEPS}/exif --strip-components=1 cd ${DEPS}/exif +# https://github.com/libexif/libexif/pull/147 +$CURL https://github.com/lovell/libexif/commit/db84aefa1deb103604c5860dd6486b1dd3af676b.patch | patch -p1 ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ --disable-nls --without-libiconv-prefix --without-libintl-prefix \ CPPFLAGS="${CPPFLAGS} -DNO_VERBOSE_TAG_DATA" From 04439814fa726a4d60dfa743f386c416cf8a90f8 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 21 May 2024 10:13:05 +0100 Subject: [PATCH 027/109] Bump dep: harfbuzz --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 4b17b760..34fd2204 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -110,7 +110,7 @@ VERSION_FREETYPE=2.13.2 VERSION_EXPAT=2.6.2 VERSION_ARCHIVE=3.7.4 VERSION_FONTCONFIG=2.15.0 -VERSION_HARFBUZZ=8.4.0 +VERSION_HARFBUZZ=8.5.0 VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.14 From f3aff14fc37cf7a8344d4b7242e7207d3f706b90 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 21 May 2024 10:15:20 +0100 Subject: [PATCH 028/109] CI: Upgrade to macOS 12 (Monterey) macOS 11 (Big Sur) will be removed on 28th June --- .github/workflows/build-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 66ad55d9..25026828 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -33,9 +33,9 @@ jobs: - 'win32-x64' - 'win32-arm64v8' include: - - os: macos-11 + - os: macos-12 platform: 'darwin-x64' - - os: macos-11 + - os: macos-12 platform: 'darwin-arm64v8' steps: - name: Checkout From cfe521581d7fcb94148aa78eb4fa45c69bcca84f Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 13 Jun 2024 11:24:21 +0100 Subject: [PATCH 029/109] Bump deps: aom, fribidi, glib, hwy, pango, xml2 --- build/lin.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 34fd2204..97ace25b 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -94,8 +94,8 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.1.6 VERSION_FFI=3.4.6 -VERSION_GLIB=2.80.2 -VERSION_XML2=2.12.7 +VERSION_GLIB=2.80.3 +VERSION_XML2=2.13.0 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 @@ -104,7 +104,7 @@ VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 VERSION_WEBP=1.4.0 VERSION_TIFF=4.6.0 -VERSION_HWY=1.1.0 +VERSION_HWY=1.2.0 VERSION_PROXY_LIBINTL=0.4 VERSION_FREETYPE=2.13.2 VERSION_EXPAT=2.6.2 @@ -113,10 +113,10 @@ VERSION_FONTCONFIG=2.15.0 VERSION_HARFBUZZ=8.5.0 VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 -VERSION_FRIBIDI=1.0.14 -VERSION_PANGO=1.52.2 +VERSION_FRIBIDI=1.0.15 +VERSION_PANGO=1.54.0 VERSION_RSVG=2.58.91 -VERSION_AOM=3.9.0 +VERSION_AOM=3.9.1 VERSION_HEIF=1.17.6 VERSION_CGIF=0.4.0 @@ -406,10 +406,10 @@ meson install -C _build --tag devel mkdir ${DEPS}/pango $CURL https://download.gnome.org/sources/pango/$(without_patch $VERSION_PANGO)/pango-${VERSION_PANGO}.tar.xz | tar xJC ${DEPS}/pango --strip-components=1 cd ${DEPS}/pango -# Disable utils, examples, tests and tools -sed -i'.bak' "/subdir('utils')/{N;N;N;d;}" meson.build +# Disable utils and tools +sed -i'.bak' "/subdir('utils')/{N;d;}" meson.build meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - -Dgtk_doc=false -Dintrospection=disabled -Dfontconfig=enabled + -Ddocumentation=false -Dbuild-testsuite=false -Dbuild-examples=false -Dintrospection=disabled -Dfontconfig=enabled meson install -C _build --tag devel mkdir ${DEPS}/rsvg From bc005dc4b2d164540239d566a83e15d7d6bb2d68 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 13 Jun 2024 11:56:13 +0100 Subject: [PATCH 030/109] linuxmusl: remove aom patch, now fixed upstream https://aomedia.googlesource.com/aom/+/0a0e504 --- build/lin.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 97ace25b..fb376fa2 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -251,10 +251,6 @@ meson install -C _build --tag devel mkdir ${DEPS}/aom $CURL https://storage.googleapis.com/aom-releases/libaom-${VERSION_AOM}.tar.gz | tar xzC ${DEPS}/aom --strip-components=1 cd ${DEPS}/aom -if [ "${PLATFORM%-*}" == "linuxmusl" ]; then - # https://bugs.chromium.org/p/aomedia/issues/detail?id=2754 - $CURL https://gist.github.com/lovell/3e70b51079af2c9b78e5a0e6f6ad0e59/raw/92864bf57345f57cf32307dd3b399a6bd430b78e/aom-ensure-thread-stack-size-is-at-least-256-KB.patch | patch -p1 -fi mkdir aom_build cd aom_build AOM_AS_FLAGS="${FLAGS}" cmake -G"Unix Makefiles" \ From 2335e6f20c996c7dd96b46cc4c46062a18c970b9 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 13 Jun 2024 12:22:47 +0100 Subject: [PATCH 031/109] macOS: pkg-config is already available --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 25026828..2c44a23a 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -44,7 +44,7 @@ jobs: if: runner.os == 'macOS' run: | pip3 install meson ninja packaging - brew install automake nasm pkg-config + brew install automake nasm - name: Build ${{ matrix.platform }} id: build-release run: ./build.sh $(cat LIBVIPS_VERSION) ${{ matrix.platform }} From 459b35f0b8b67dd3ae0bec9dc27ec6914f92981f Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 13 Jun 2024 12:23:35 +0100 Subject: [PATCH 032/109] Remove engines property from package.json files https://github.com/lovell/sharp/issues/4130 --- npm/darwin-arm64/package.json | 6 ------ npm/darwin-x64/package.json | 6 ------ npm/linux-arm/package.json | 5 +---- npm/linux-arm64/package.json | 5 +---- npm/linux-s390x/package.json | 5 +---- npm/linux-x64/package.json | 5 +---- npm/linuxmusl-arm64/package.json | 5 +---- npm/linuxmusl-x64/package.json | 5 +---- 8 files changed, 6 insertions(+), 36 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index cae6a826..4db0ff46 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -27,12 +27,6 @@ "./package": "./package.json", "./versions": "./versions.json" }, - "engines": { - "npm": ">=9.6.5", - "yarn": ">=3.2.0", - "pnpm": ">=7.1.0", - "macos": ">=11" - }, "os": [ "darwin" ], diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index d72fe07a..d96aadc8 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -27,12 +27,6 @@ "./package": "./package.json", "./versions": "./versions.json" }, - "engines": { - "npm": ">=9.6.5", - "yarn": ">=3.2.0", - "pnpm": ">=7.1.0", - "macos": ">=10.13" - }, "os": [ "darwin" ], diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index b2ba2a5a..b7d0ff2a 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -27,10 +27,7 @@ "./versions": "./versions.json" }, "type": "commonjs", - "engines": { - "npm": ">=9.6.5", - "yarn": ">=3.2.0", - "pnpm": ">=7.1.0", + "config": { "glibc": ">=2.28" }, "os": [ diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 4c5a982a..2d9b5ed2 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -27,10 +27,7 @@ "./package": "./package.json", "./versions": "./versions.json" }, - "engines": { - "npm": ">=9.6.5", - "yarn": ">=3.2.0", - "pnpm": ">=7.1.0", + "config": { "glibc": ">=2.26" }, "os": [ diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index 5d8d71f7..801fb02b 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -27,10 +27,7 @@ "./versions": "./versions.json" }, "type": "commonjs", - "engines": { - "npm": ">=9.6.5", - "yarn": ">=3.2.0", - "pnpm": ">=7.1.0", + "config": { "glibc": ">=2.28" }, "os": [ diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index ff499eef..af6ee5c0 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -27,10 +27,7 @@ "./package": "./package.json", "./versions": "./versions.json" }, - "engines": { - "npm": ">=9.6.5", - "yarn": ">=3.2.0", - "pnpm": ">=7.1.0", + "config": { "glibc": ">=2.26" }, "os": [ diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index df6cea90..2792ce2b 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -27,10 +27,7 @@ "./package": "./package.json", "./versions": "./versions.json" }, - "engines": { - "npm": ">=9.6.5", - "yarn": ">=3.2.0", - "pnpm": ">=7.1.0", + "config": { "musl": ">=1.2.2" }, "os": [ diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index 274672a3..d165920a 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -27,10 +27,7 @@ "./package": "./package.json", "./versions": "./versions.json" }, - "engines": { - "npm": ">=9.6.5", - "yarn": ">=3.2.0", - "pnpm": ">=7.1.0", + "config": { "musl": ">=1.2.2" }, "os": [ From ab05993c7e8f986656c3a5e4e1e9de5c77db8ef3 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 13 Jun 2024 15:39:03 +0100 Subject: [PATCH 033/109] linux-s390x: upgrade to glibc 2.31 (commit e402744) --- npm/linux-s390x/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index 801fb02b..e6a8456c 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -28,7 +28,7 @@ }, "type": "commonjs", "config": { - "glibc": ">=2.28" + "glibc": ">=2.31" }, "os": [ "linux" From 1eec548a4a239dcc5641bb352196c4c8dc7b5727 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 19 Jun 2024 07:39:32 +0100 Subject: [PATCH 034/109] Bump dep: cgif --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index fb376fa2..053fec06 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -118,7 +118,7 @@ VERSION_PANGO=1.54.0 VERSION_RSVG=2.58.91 VERSION_AOM=3.9.1 VERSION_HEIF=1.17.6 -VERSION_CGIF=0.4.0 +VERSION_CGIF=0.4.1 # Remove patch version component without_patch() { From 8a25b0ac0ca482ae48c2e1d161c013def87816a7 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sat, 22 Jun 2024 11:41:03 +0200 Subject: [PATCH 035/109] Bump deps: xml2, zlib-ng (#237) --- build/lin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 053fec06..ea5e7cb3 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -92,10 +92,10 @@ unset PKG_CONFIG_PATH CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers -VERSION_ZLIB_NG=2.1.6 +VERSION_ZLIB_NG=2.1.7 VERSION_FFI=3.4.6 VERSION_GLIB=2.80.3 -VERSION_XML2=2.13.0 +VERSION_XML2=2.13.1 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 @@ -151,7 +151,7 @@ version_latest() { echo "$1 version $2 has been superseded by $VERSION_LATEST" fi } -version_latest "zlib-ng" "$VERSION_ZLIB_NG" "115592" +#version_latest "zlib-ng" "$VERSION_ZLIB_NG" "115592" # latest version in release monitoring is a release candidate version_latest "ffi" "$VERSION_FFI" "1611" version_latest "glib" "$VERSION_GLIB" "10024" "unstable" version_latest "xml2" "$VERSION_XML2" "1783" From 291ce6ade9c473090d59601ac02085935257116e Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 2 Jul 2024 20:26:23 +0100 Subject: [PATCH 036/109] Bump dep: zlib-ng --- build/lin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index ea5e7cb3..633723ae 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -92,7 +92,7 @@ unset PKG_CONFIG_PATH CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers -VERSION_ZLIB_NG=2.1.7 +VERSION_ZLIB_NG=2.2.1 VERSION_FFI=3.4.6 VERSION_GLIB=2.80.3 VERSION_XML2=2.13.1 @@ -151,7 +151,7 @@ version_latest() { echo "$1 version $2 has been superseded by $VERSION_LATEST" fi } -#version_latest "zlib-ng" "$VERSION_ZLIB_NG" "115592" # latest version in release monitoring is a release candidate +version_latest "zlib-ng" "$VERSION_ZLIB_NG" "115592" version_latest "ffi" "$VERSION_FFI" "1611" version_latest "glib" "$VERSION_GLIB" "10024" "unstable" version_latest "xml2" "$VERSION_XML2" "1783" @@ -175,7 +175,7 @@ version_latest "fribidi" "$VERSION_FRIBIDI" "857" version_latest "pango" "$VERSION_PANGO" "11783" version_latest "rsvg" "$VERSION_RSVG" "5420" version_latest "aom" "$VERSION_AOM" "17628" -version_latest "heif" "$VERSION_HEIF" "strukturag/libheif" +version_latest "heif" "$VERSION_HEIF" "64439" version_latest "cgif" "$VERSION_CGIF" "dloebl/cgif" if [ "$ALL_AT_VERSION_LATEST" = "false" ]; then exit 1; fi From e397099c39ee0e92394b88bfb06b76314e849dd0 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 3 Jul 2024 08:00:23 +0100 Subject: [PATCH 037/109] zlib-ng: prevent use of aligned_alloc with darwin-x64 This feature is unsupported on macOS 10.13. Can be removed when the minimum x64 macOS version increases to 10.15. --- build/lin.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/lin.sh b/build/lin.sh index 633723ae..2af913aa 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -203,6 +203,9 @@ fi mkdir ${DEPS}/zlib-ng $CURL https://github.com/zlib-ng/zlib-ng/archive/${VERSION_ZLIB_NG}.tar.gz | tar xzC ${DEPS}/zlib-ng --strip-components=1 cd ${DEPS}/zlib-ng +if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.13" ]; then + sed -i'.bak' "/-DHAVE_ALIGNED_ALLOC/d" CMakeLists.txt +fi CFLAGS="${CFLAGS} -O3" cmake -G"Unix Makefiles" \ -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=FALSE -DZLIB_COMPAT=TRUE -DWITH_ARMV6=FALSE From 4ef08c70b3b72292fa17e04670a0aaa439de6762 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 8 Jul 2024 11:14:28 +0200 Subject: [PATCH 038/109] Bump deps: glib, harfbuzz, xml2 (#239) --- build/lin.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 2af913aa..00629024 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -94,8 +94,8 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.1 VERSION_FFI=3.4.6 -VERSION_GLIB=2.80.3 -VERSION_XML2=2.13.1 +VERSION_GLIB=2.81.0 +VERSION_XML2=2.13.2 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 @@ -110,7 +110,7 @@ VERSION_FREETYPE=2.13.2 VERSION_EXPAT=2.6.2 VERSION_ARCHIVE=3.7.4 VERSION_FONTCONFIG=2.15.0 -VERSION_HARFBUZZ=8.5.0 +VERSION_HARFBUZZ=9.0.0 VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.15 @@ -223,7 +223,7 @@ $CURL https://download.gnome.org/sources/glib/$(without_patch $VERSION_GLIB)/gli cd ${DEPS}/glib $CURL https://gist.github.com/kleisauke/284d685efa00908da99ea6afbaaf39ae/raw/36e32c79e7962c5ea96cbb3f9c629e9145253e30/glib-without-gregex.patch | patch -p1 meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - --force-fallback-for=gvdb -Dintrospection=disabled -Dnls=disabled -Dlibmount=disabled -Dlibelf=disabled \ + --force-fallback-for=gvdb -Dintrospection=disabled -Dnls=disabled -Dlibmount=disabled -Dsysprof=disabled -Dlibelf=disabled \ -Dtests=false -Dglib_assert=false -Dglib_checks=false ${DARWIN:+-Dbsymbolic_functions=false} # bin-devel is needed for glib-compile-resources meson install -C _build --tag bin-devel,devel @@ -258,7 +258,7 @@ mkdir aom_build cd aom_build AOM_AS_FLAGS="${FLAGS}" cmake -G"Unix Makefiles" \ -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=MinSizeRel \ - -DBUILD_SHARED_LIBS=FALSE -DENABLE_DOCS=0 -DENABLE_TESTS=0 -DENABLE_TESTDATA=0 -DENABLE_TOOLS=0 -DENABLE_EXAMPLES=0 \ + -DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=0 -DENABLE_DOCS=0 -DENABLE_TESTS=0 -DENABLE_TESTDATA=0 -DENABLE_TOOLS=0 -DENABLE_EXAMPLES=0 \ -DCONFIG_PIC=1 -DENABLE_NASM=1 ${WITHOUT_NEON:+-DENABLE_NEON=0} ${DARWIN_ARM:+-DCONFIG_RUNTIME_CPU_DETECT=0} \ -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_WEBM_IO=0 \ .. From 2d75cd5c480b2ad921083de40dc634fb5e6fbfc7 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 8 Jul 2024 15:17:13 +0200 Subject: [PATCH 039/109] Disable build of cruft (#241) Mirrors commit libvips/libvips@ee482ca and libvips/libvips@a9e161f. --- build/lin.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 00629024..b96f73a6 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -215,7 +215,7 @@ mkdir ${DEPS}/ffi $CURL https://github.com/libffi/libffi/releases/download/v${VERSION_FFI}/libffi-${VERSION_FFI}.tar.gz | tar xzC ${DEPS}/ffi --strip-components=1 cd ${DEPS}/ffi ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ - --disable-builddir --disable-multi-os-directory --disable-raw-api --disable-structs + --disable-builddir --disable-multi-os-directory --disable-raw-api --disable-structs --disable-docs make install-strip mkdir ${DEPS}/glib @@ -243,7 +243,7 @@ $CURL https://github.com/lovell/libexif/commit/db84aefa1deb103604c5860dd6486b1dd ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ --disable-nls --without-libiconv-prefix --without-libintl-prefix \ CPPFLAGS="${CPPFLAGS} -DNO_VERBOSE_TAG_DATA" -make install-strip +make install-strip doc_DATA= mkdir ${DEPS}/lcms2 $CURL https://github.com/mm2/Little-CMS/releases/download/lcms${VERSION_LCMS2}/lcms2-${VERSION_LCMS2}.tar.gz | tar xzC ${DEPS}/lcms2 --strip-components=1 @@ -258,7 +258,7 @@ mkdir aom_build cd aom_build AOM_AS_FLAGS="${FLAGS}" cmake -G"Unix Makefiles" \ -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=MinSizeRel \ - -DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=0 -DENABLE_DOCS=0 -DENABLE_TESTS=0 -DENABLE_TESTDATA=0 -DENABLE_TOOLS=0 -DENABLE_EXAMPLES=0 \ + -DBUILD_SHARED_LIBS=FALSE -DENABLE_DOCS=0 -DENABLE_TESTS=0 -DENABLE_TESTDATA=0 -DENABLE_TOOLS=0 -DENABLE_EXAMPLES=0 \ -DCONFIG_PIC=1 -DENABLE_NASM=1 ${WITHOUT_NEON:+-DENABLE_NEON=0} ${DARWIN_ARM:+-DCONFIG_RUNTIME_CPU_DETECT=0} \ -DCONFIG_AV1_HIGHBITDEPTH=0 -DCONFIG_WEBM_IO=0 \ .. @@ -271,7 +271,7 @@ cd ${DEPS}/heif sed -i'.bak' "/^cmake_minimum_required/s/3.16.3/3.12/" CMakeLists.txt CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" cmake -G"Unix Makefiles" \ -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=FALSE -DENABLE_PLUGIN_LOADING=0 -DWITH_EXAMPLES=0 -DWITH_LIBDE265=0 -DWITH_X265=0 + -DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=0 -DENABLE_PLUGIN_LOADING=0 -DWITH_EXAMPLES=0 -DWITH_LIBDE265=0 -DWITH_X265=0 make install/strip mkdir ${DEPS}/jpeg @@ -285,14 +285,15 @@ make install/strip mkdir ${DEPS}/png16 $CURL https://downloads.sourceforge.net/project/libpng/libpng16/${VERSION_PNG16}/libpng-${VERSION_PNG16}.tar.xz | tar xJC ${DEPS}/png16 --strip-components=1 cd ${DEPS}/png16 -./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking -make install-strip +./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ + --disable-tools --without-binconfigs --disable-unversioned-libpng-config +make install-strip dist_man_MANS= mkdir ${DEPS}/spng $CURL https://github.com/randy408/libspng/archive/v${VERSION_SPNG}.tar.gz | tar xzC ${DEPS}/spng --strip-components=1 cd ${DEPS}/spng CFLAGS="${CFLAGS} -O3 -DSPNG_SSE=4" meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - -Dstatic_zlib=true + -Dstatic_zlib=true -Dbuild_examples=false meson install -C _build --tag devel mkdir ${DEPS}/imagequant @@ -306,7 +307,7 @@ $CURL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/lib cd ${DEPS}/webp ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ --enable-libwebpmux --enable-libwebpdemux ${WITHOUT_NEON:+--disable-neon} -make install-strip +make install-strip bin_PROGRAMS= noinst_PROGRAMS= man_MANS= mkdir ${DEPS}/tiff $CURL https://download.osgeo.org/libtiff/tiff-${VERSION_TIFF}.tar.gz | tar xzC ${DEPS}/tiff --strip-components=1 @@ -314,7 +315,7 @@ cd ${DEPS}/tiff # Propagate -pthread into CFLAGS to ensure WebP support CFLAGS="${CFLAGS} -pthread" ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ --disable-tools --disable-tests --disable-contrib --disable-docs --disable-mdi --disable-pixarlog --disable-old-jpeg --disable-cxx --disable-lzma --disable-zstd -make install-strip +make install-strip noinst_PROGRAMS= dist_doc_DATA= if [ -z "$WITHOUT_HIGHWAY" ]; then mkdir ${DEPS}/hwy @@ -343,7 +344,7 @@ cd ${DEPS}/expat ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared \ --disable-dependency-tracking --without-xmlwf --without-docbook --without-getrandom --without-sys-getrandom \ --without-libbsd --without-examples --without-tests -make install-strip +make install-strip dist_cmake_DATA= nodist_cmake_DATA= mkdir ${DEPS}/archive $CURL https://github.com/libarchive/libarchive/releases/download/v${VERSION_ARCHIVE}/libarchive-${VERSION_ARCHIVE}.tar.xz | tar xJC ${DEPS}/archive --strip-components=1 @@ -352,7 +353,7 @@ cd ${DEPS}/archive --disable-bsdtar --disable-bsdcat --disable-bsdcpio --disable-bsdunzip --disable-posix-regex-lib --disable-xattr --disable-acl \ --without-bz2lib --without-libb2 --without-iconv --without-lz4 --without-zstd --without-lzma \ --without-lzo2 --without-cng --without-openssl --without-xml2 --without-expat -make install-strip +make install-strip libarchive_man_MANS= mkdir ${DEPS}/fontconfig $CURL https://www.freedesktop.org/software/fontconfig/release/fontconfig-${VERSION_FONTCONFIG}.tar.xz | tar xJC ${DEPS}/fontconfig --strip-components=1 From ad960df07ac72b911086a514683dbd346038ff3f Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Tue, 9 Jul 2024 09:10:22 +0200 Subject: [PATCH 040/109] xml2: switch from autotools to meson (#240) --- build/lin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index b96f73a6..8a729f50 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -231,9 +231,9 @@ meson install -C _build --tag bin-devel,devel mkdir ${DEPS}/xml2 $CURL https://download.gnome.org/sources/libxml2/$(without_patch $VERSION_XML2)/libxml2-${VERSION_XML2}.tar.xz | tar xJC ${DEPS}/xml2 --strip-components=1 cd ${DEPS}/xml2 -./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ - --with-minimum --with-reader --with-writer --with-valid --with-http --with-tree --with-zlib --without-python --without-lzma -make install-strip +meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ + -Dminimum=true +meson install -C _build --tag devel mkdir ${DEPS}/exif $CURL https://github.com/libexif/libexif/releases/download/v${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.bz2 | tar xjC ${DEPS}/exif --strip-components=1 From a34823b45f04b1efb923089e150eefc8ee7bb581 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Tue, 16 Jul 2024 14:32:24 +0200 Subject: [PATCH 041/109] Bump deps: heif, rsvg (#243) * Bump deps: heif, rsvg * Add tomli dependency in Docker containers Required by Cargo projects since Meson 1.5.0. Python >= 3.11 have one built-in, older Python versions require either the external `tomli` module or `toml2json` program. --- build/lin.sh | 4 ++-- platforms/linux-arm64v8/Dockerfile | 2 +- platforms/linux-armv6/Dockerfile | 2 +- platforms/linux-armv7/Dockerfile | 2 +- platforms/linux-s390x/Dockerfile | 2 +- platforms/linux-x64/Dockerfile | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 8a729f50..6544f6ee 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -115,9 +115,9 @@ VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.15 VERSION_PANGO=1.54.0 -VERSION_RSVG=2.58.91 +VERSION_RSVG=2.58.92 VERSION_AOM=3.9.1 -VERSION_HEIF=1.17.6 +VERSION_HEIF=1.18.0 VERSION_CGIF=0.4.1 # Remove patch version component diff --git a/platforms/linux-arm64v8/Dockerfile b/platforms/linux-arm64v8/Dockerfile index 60a73b24..e034dd09 100644 --- a/platforms/linux-arm64v8/Dockerfile +++ b/platforms/linux-arm64v8/Dockerfile @@ -51,7 +51,7 @@ RUN \ && \ cargo install cargo-c && \ ln -s /usr/bin/cmake3 /usr/bin/cmake && \ - pip3 install meson ninja packaging + pip3 install meson ninja packaging tomli # Compiler settings ENV \ diff --git a/platforms/linux-armv6/Dockerfile b/platforms/linux-armv6/Dockerfile index 042e7278..2ea91fec 100644 --- a/platforms/linux-armv6/Dockerfile +++ b/platforms/linux-armv6/Dockerfile @@ -38,7 +38,7 @@ RUN \ && \ rustup target add arm-unknown-linux-gnueabihf && \ cargo install cargo-c && \ - pip3 install meson + pip3 install meson tomli # Compiler settings ENV \ diff --git a/platforms/linux-armv7/Dockerfile b/platforms/linux-armv7/Dockerfile index cd41ef17..9cbbeed8 100644 --- a/platforms/linux-armv7/Dockerfile +++ b/platforms/linux-armv7/Dockerfile @@ -37,7 +37,7 @@ RUN \ && \ rustup target add arm-unknown-linux-gnueabihf && \ cargo install cargo-c && \ - pip3 install meson + pip3 install meson tomli # Compiler settings ENV \ diff --git a/platforms/linux-s390x/Dockerfile b/platforms/linux-s390x/Dockerfile index 11819c24..d88981d3 100644 --- a/platforms/linux-s390x/Dockerfile +++ b/platforms/linux-s390x/Dockerfile @@ -37,7 +37,7 @@ RUN \ && \ rustup target add s390x-unknown-linux-gnu && \ cargo install cargo-c && \ - pip3 install meson + pip3 install meson tomli # Handy for debugging the compiled targets in Highway (hwy_list_targets) #RUN apt-get install -y qemu-user-static diff --git a/platforms/linux-x64/Dockerfile b/platforms/linux-x64/Dockerfile index be135987..1743ce63 100644 --- a/platforms/linux-x64/Dockerfile +++ b/platforms/linux-x64/Dockerfile @@ -50,7 +50,7 @@ RUN \ && \ cargo install cargo-c && \ ln -s /usr/bin/cmake3 /usr/bin/cmake && \ - pip3 install meson ninja packaging + pip3 install meson ninja packaging tomli # Compiler settings ENV \ From 6651f42d25659eb200ea75f9d63ad742bbafaf0a Mon Sep 17 00:00:00 2001 From: sumitd2 <91451282+sumitd2@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:57:54 +0530 Subject: [PATCH 042/109] Add linux-ppc64 (little endian) as supported platform (#242) --- .github/workflows/build-release.yml | 1 + README.md | 1 + build.sh | 3 +- npm/linux-ppc64/package.json | 42 +++++++++++++++++++ npm/package.json | 1 + npm/populate.sh | 9 +++- platforms/linux-ppc64le/Dockerfile | 55 +++++++++++++++++++++++++ platforms/linux-ppc64le/Toolchain.cmake | 15 +++++++ platforms/linux-ppc64le/meson.ini | 23 +++++++++++ 9 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 npm/linux-ppc64/package.json create mode 100644 platforms/linux-ppc64le/Dockerfile create mode 100644 platforms/linux-ppc64le/Toolchain.cmake create mode 100644 platforms/linux-ppc64le/meson.ini diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 2c44a23a..2a97cef3 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -27,6 +27,7 @@ jobs: - 'linux-armv7' - 'linuxmusl-x64' - 'linuxmusl-arm64v8' + - 'linux-ppc64le' - 'linux-s390x' - 'wasm32' - 'win32-ia32' diff --git a/README.md b/README.md index a9743ed3..48c76967 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ the same shared libraries within multiple containers. * [ARMv7-A glibc](platforms/linux-armv7/Dockerfile) * [ARM64v8-A glibc](platforms/linux-arm64v8/Dockerfile) * [ARM64v8-A musl](platforms/linuxmusl-arm64v8/Dockerfile) +* [ppc64le glibc](platforms/linux-ppc64le/Dockerfile) * [s390x glibc](platforms/linux-s390x/Dockerfile) ### Windows diff --git a/build.sh b/build.sh index fa9350ab..46337e0a 100755 --- a/build.sh +++ b/build.sh @@ -20,6 +20,7 @@ if [ $# -lt 1 ]; then echo "- linux-armv7" echo "- linux-arm64v8" echo "- linuxmusl-arm64v8" + echo "- linux-ppc64le" echo "- linux-s390x" echo "- darwin-x64" echo "- darwin-arm64v8" @@ -101,7 +102,7 @@ for flavour in win32-ia32 win32-x64 win32-arm64v8; do done # Linux (x64, ARMv6, ARMv7, ARM64v8) -for flavour in linux-x64 linuxmusl-x64 linux-armv6 linux-armv7 linux-arm64v8 linuxmusl-arm64v8 linux-s390x; do +for flavour in linux-x64 linuxmusl-x64 linux-armv6 linux-armv7 linux-arm64v8 linuxmusl-arm64v8 linux-ppc64le linux-s390x; do if [ $PLATFORM = "all" ] || [ $PLATFORM = $flavour ]; then echo "Building $flavour..." docker build -t vips-dev-$flavour platforms/$flavour diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json new file mode 100644 index 00000000..5039afd7 --- /dev/null +++ b/npm/linux-ppc64/package.json @@ -0,0 +1,42 @@ +{ + "name": "@img/sharp-libvips-linux-ppc64", + "version": "1.0.2", + "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) ppc64le", + "author": "Lovell Fuller ", + "homepage": "https://sharp.pixelplumbing.com", + "repository": { + "type": "git", + "url": "git+https://github.com/lovell/sharp-libvips.git", + "directory": "npm/linux-ppc64" + }, + "license": "LGPL-3.0-or-later", + "funding": { + "url": "https://opencollective.com/libvips" + }, + "preferUnplugged": true, + "publishConfig": { + "access": "public" + }, + "files": [ + "lib", + "versions.json" + ], + "exports": { + "./lib": "./lib/index.js", + "./package": "./package.json", + "./versions": "./versions.json" + }, + "type": "commonjs", + "config": { + "glibc": ">=2.31" + }, + "os": [ + "linux" + ], + "libc": [ + "glibc" + ], + "cpu": [ + "ppc64" + ] +} diff --git a/npm/package.json b/npm/package.json index 787d8538..a3446521 100644 --- a/npm/package.json +++ b/npm/package.json @@ -11,6 +11,7 @@ "linux-arm64", "linuxmusl-arm64", "linuxmusl-x64", + "linux-ppc64", "linux-s390x", "linux-x64", "win32-ia32", diff --git a/npm/populate.sh b/npm/populate.sh index 8f91a3a7..39229543 100755 --- a/npm/populate.sh +++ b/npm/populate.sh @@ -6,7 +6,14 @@ CURL="curl --silent --location" download_extract() { PLATFORM="$1" - PACKAGE="${1%v[68]}" # remove ARM version + case $1 in + *ppc64le) + PACKAGE="${1%??}" # package directory is named as npm/linux-ppc64 + ;; + *) + PACKAGE="${1%v[68]}" # remove ARM version + ;; + esac echo "$PLATFORM -> $PACKAGE" rm -rf "npm/$PACKAGE/include" "npm/$PACKAGE/lib" $CURL \ diff --git a/platforms/linux-ppc64le/Dockerfile b/platforms/linux-ppc64le/Dockerfile new file mode 100644 index 00000000..f2a30955 --- /dev/null +++ b/platforms/linux-ppc64le/Dockerfile @@ -0,0 +1,55 @@ +FROM debian:bullseye +LABEL maintainer="Lovell Fuller " + +# Create Debian 11 (glibc 2.31) container suitable for cross-compiling Linux ppc64le binaries + +# Path settings +ENV \ + RUSTUP_HOME="/usr/local/rustup" \ + CARGO_HOME="/usr/local/cargo" \ + PATH="/usr/local/cargo/bin:$PATH" + +# Build dependencies +RUN \ + apt-get update && \ + apt-get install -y curl && \ + dpkg --add-architecture ppc64el && \ + apt-get install -y \ + autoconf \ + autopoint \ + cmake \ + crossbuild-essential-ppc64el \ + gettext \ + git \ + gperf \ + jq \ + libssl-dev \ + libtool \ + ninja-build \ + pkg-config \ + python3-packaging \ + python3-pip \ + && \ + curl https://sh.rustup.rs -sSf | sh -s -- -y \ + --no-modify-path \ + --profile minimal \ + && \ + rustup target add powerpc64le-unknown-linux-gnu && \ + cargo install cargo-c && \ + pip3 install meson tomli + +# Handy for debugging the compiled targets in Highway (hwy_list_targets) +#RUN apt-get install -y qemu-user-static +#ENV QEMU_LD_PREFIX="/usr/powerpc64le-linux-gnu" + +# Compiler settings +ENV \ + PKG_CONFIG="powerpc64le-linux-gnu-pkg-config --static" \ + PLATFORM="linux-ppc64le" \ + CHOST="powerpc64le-linux-gnu" \ + RUST_TARGET="powerpc64le-unknown-linux-gnu" \ + FLAGS="" \ + MESON="--cross-file=/root/meson.ini" + +COPY Toolchain.cmake /root/ +COPY meson.ini /root/ diff --git a/platforms/linux-ppc64le/Toolchain.cmake b/platforms/linux-ppc64le/Toolchain.cmake new file mode 100644 index 00000000..3440b0be --- /dev/null +++ b/platforms/linux-ppc64le/Toolchain.cmake @@ -0,0 +1,15 @@ +set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_SYSTEM_VERSION 1) +set(CMAKE_SYSTEM_PROCESSOR ppc64le) + +SET(CMAKE_C_COMPILER powerpc64le-linux-gnu-gcc) +SET(CMAKE_CXX_COMPILER powerpc64le-linux-gnu-g++) +SET(CMAKE_AR powerpc64le-linux-gnu-gcc-ar) +SET(CMAKE_STRIP powerpc64le-linux-gnu-gcc-strip) +SET(CMAKE_RANLIB powerpc64le-linux-gnu-gcc-ranlib) + +#SET(CMAKE_CROSSCOMPILING_EMULATOR qemu-ppc64le-static) + +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/platforms/linux-ppc64le/meson.ini b/platforms/linux-ppc64le/meson.ini new file mode 100644 index 00000000..d8e648a6 --- /dev/null +++ b/platforms/linux-ppc64le/meson.ini @@ -0,0 +1,23 @@ +[host_machine] +system = 'linux' +cpu_family = 'ppc64' +cpu = 'powerpc64le' +endian = 'little' + +[binaries] +c = 'powerpc64le-linux-gnu-gcc' +cpp = 'powerpc64le-linux-gnu-g++' +ar = 'powerpc64le-linux-gnu-gcc-ar' +nm = 'powerpc64le-linux-gnu-gcc-nm' +ld = 'powerpc64le-linux-gnu-gcc-ld' +strip = 'powerpc64le-linux-gnu-strip' +ranlib = 'powerpc64le-linux-gnu-gcc-ranlib' +#exe_wrapper = 'qemu-ppc64le-static' + +[built-in options] +libdir = 'lib' +datadir = '/usr/share' +localedir = '/usr/share/locale' +sysconfdir = '/etc' +localstatedir = '/var' +wrap_mode = 'nofallback' From d8ce72127239048574784145b5b55df3595f88ff Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 17 Jul 2024 15:31:21 +0100 Subject: [PATCH 043/109] linux-armv6: upgrade to Debian 11 (glibc 2.31) Allows use of the standard crossbuild tooling --- npm/linux-arm/package.json | 2 +- platforms/linux-armv6/Dockerfile | 11 +++++------ platforms/linux-armv6/Toolchain.cmake | 10 +++++----- platforms/linux-armv6/meson.ini | 14 +++++++------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index b7d0ff2a..710c1e70 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -28,7 +28,7 @@ }, "type": "commonjs", "config": { - "glibc": ">=2.28" + "glibc": ">=2.31" }, "os": [ "linux" diff --git a/platforms/linux-armv6/Dockerfile b/platforms/linux-armv6/Dockerfile index 2ea91fec..3ac139fa 100644 --- a/platforms/linux-armv6/Dockerfile +++ b/platforms/linux-armv6/Dockerfile @@ -1,13 +1,13 @@ -FROM debian:buster +FROM debian:bullseye LABEL maintainer="Lovell Fuller " -# Create Debian 10 (glibc 2.28) container suitable for cross-compiling Linux ARMv6 binaries +# Create Debian 11 (glibc 2.31) container suitable for cross-compiling Linux ARMv6 binaries # Path settings ENV \ RUSTUP_HOME="/usr/local/rustup" \ CARGO_HOME="/usr/local/cargo" \ - PATH="/usr/local/cargo/bin:/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin:$PATH" + PATH="/usr/local/cargo/bin:$PATH" # Build dependencies RUN \ @@ -19,6 +19,7 @@ RUN \ autoconf \ autopoint \ cmake \ + crossbuild-essential-armhf \ gettext \ git \ gperf \ @@ -30,8 +31,6 @@ RUN \ python3-packaging \ python3-pip \ && \ - mkdir /root/tools && \ - curl -Ls https://github.com/rvagg/rpi-newer-crosstools/archive/master.tar.gz | tar xzC /root/tools --strip-components=1 && \ curl https://sh.rustup.rs -sSf | sh -s -- -y \ --no-modify-path \ --profile minimal \ @@ -44,7 +43,7 @@ RUN \ ENV \ PKG_CONFIG="arm-linux-gnueabihf-pkg-config --static" \ PLATFORM="linux-armv6" \ - CHOST="arm-rpi-linux-gnueabihf" \ + CHOST="arm-linux-gnueabihf" \ RUST_TARGET="arm-unknown-linux-gnueabihf" \ FLAGS="-marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" \ WITHOUT_NEON="true" \ diff --git a/platforms/linux-armv6/Toolchain.cmake b/platforms/linux-armv6/Toolchain.cmake index 279e2990..3ec1bca1 100644 --- a/platforms/linux-armv6/Toolchain.cmake +++ b/platforms/linux-armv6/Toolchain.cmake @@ -2,11 +2,11 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR armv6-a) -SET(CMAKE_C_COMPILER arm-rpi-linux-gnueabihf-gcc) -set(CMAKE_CXX_COMPILER arm-rpi-linux-gnueabihf-g++) -SET(CMAKE_AR arm-rpi-linux-gnueabihf-ar) -SET(CMAKE_STRIP arm-rpi-linux-gnueabihf-strip) -SET(CMAKE_RANLIB arm-rpi-linux-gnueabihf-ranlib) +SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc) +set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++) +SET(CMAKE_AR arm-linux-gnueabihf-ar) +SET(CMAKE_STRIP arm-linux-gnueabihf-strip) +SET(CMAKE_RANLIB arm-linux-gnueabihf-ranlib) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) diff --git a/platforms/linux-armv6/meson.ini b/platforms/linux-armv6/meson.ini index d06f2638..3920ebec 100644 --- a/platforms/linux-armv6/meson.ini +++ b/platforms/linux-armv6/meson.ini @@ -5,13 +5,13 @@ cpu = 'armv6-a' endian = 'little' [binaries] -c = 'arm-rpi-linux-gnueabihf-gcc' -cpp = 'arm-rpi-linux-gnueabihf-g++' -ar = 'arm-rpi-linux-gnueabihf-ar' -nm = 'arm-rpi-linux-gnueabihf-gcc-nm' -ld = 'arm-rpi-linux-gnueabihf-gcc-ld' -strip = 'arm-rpi-linux-gnueabihf-strip' -ranlib = 'arm-rpi-linux-gnueabihf-gcc-ranlib' +c = 'arm-linux-gnueabihf-gcc' +cpp = 'arm-linux-gnueabihf-g++' +ar = 'arm-linux-gnueabihf-ar' +nm = 'arm-linux-gnueabihf-gcc-nm' +ld = 'arm-linux-gnueabihf-gcc-ld' +strip = 'arm-linux-gnueabihf-strip' +ranlib = 'arm-linux-gnueabihf-gcc-ranlib' [built-in options] libdir = 'lib' From 43820a468ab2e896bf70d4ed50db663df69929a0 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 17 Jul 2024 16:09:04 +0100 Subject: [PATCH 044/109] Remove linux-armv7 This platform was not published to npm and GitHub releases are no longer used. Running 'npm install' on ARMv7 hardware will use the (32-bit) linux-arm package. --- .github/workflows/build-release.yml | 1 - README.md | 1 - build.sh | 5 ++- npm/populate.sh | 2 +- platforms/linux-armv7/Dockerfile | 52 --------------------------- platforms/linux-armv7/Toolchain.cmake | 13 ------- platforms/linux-armv7/meson.ini | 22 ------------ 7 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 platforms/linux-armv7/Dockerfile delete mode 100644 platforms/linux-armv7/Toolchain.cmake delete mode 100644 platforms/linux-armv7/meson.ini diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 2a97cef3..3796b6bd 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -24,7 +24,6 @@ jobs: platform: - 'linux-x64' - 'linux-armv6' - - 'linux-armv7' - 'linuxmusl-x64' - 'linuxmusl-arm64v8' - 'linux-ppc64le' diff --git a/README.md b/README.md index 48c76967..fb9c4aca 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ the same shared libraries within multiple containers. * [x64 glibc](platforms/linux-x64/Dockerfile) * [x64 musl](platforms/linuxmusl-x64/Dockerfile) * [ARMv6 glibc](platforms/linux-armv6/Dockerfile) -* [ARMv7-A glibc](platforms/linux-armv7/Dockerfile) * [ARM64v8-A glibc](platforms/linux-arm64v8/Dockerfile) * [ARM64v8-A musl](platforms/linuxmusl-arm64v8/Dockerfile) * [ppc64le glibc](platforms/linux-ppc64le/Dockerfile) diff --git a/build.sh b/build.sh index 46337e0a..40ec60c3 100755 --- a/build.sh +++ b/build.sh @@ -17,7 +17,6 @@ if [ $# -lt 1 ]; then echo "- linux-x64" echo "- linuxmusl-x64" echo "- linux-armv6" - echo "- linux-armv7" echo "- linux-arm64v8" echo "- linuxmusl-arm64v8" echo "- linux-ppc64le" @@ -101,8 +100,8 @@ for flavour in win32-ia32 win32-x64 win32-arm64v8; do fi done -# Linux (x64, ARMv6, ARMv7, ARM64v8) -for flavour in linux-x64 linuxmusl-x64 linux-armv6 linux-armv7 linux-arm64v8 linuxmusl-arm64v8 linux-ppc64le linux-s390x; do +# Linux (x64, ARMv6, ARM64v8) +for flavour in linux-x64 linuxmusl-x64 linux-armv6 linux-arm64v8 linuxmusl-arm64v8 linux-ppc64le linux-s390x; do if [ $PLATFORM = "all" ] || [ $PLATFORM = $flavour ]; then echo "Building $flavour..." docker build -t vips-dev-$flavour platforms/$flavour diff --git a/npm/populate.sh b/npm/populate.sh index 39229543..84f6c077 100755 --- a/npm/populate.sh +++ b/npm/populate.sh @@ -52,7 +52,7 @@ remove_unused() { } # Download and extract per-platform binaries -PLATFORMS=$(ls platforms --ignore=*armv7 --ignore=win32*) +PLATFORMS=$(ls platforms --ignore=win32*) for platform in $PLATFORMS; do download_extract "$platform" done diff --git a/platforms/linux-armv7/Dockerfile b/platforms/linux-armv7/Dockerfile deleted file mode 100644 index 9cbbeed8..00000000 --- a/platforms/linux-armv7/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -FROM debian:buster -LABEL maintainer="Lovell Fuller " - -# Create Debian 10 (glibc 2.28) container suitable for cross-compiling Linux ARMv7-A binaries - -# Path settings -ENV \ - RUSTUP_HOME="/usr/local/rustup" \ - CARGO_HOME="/usr/local/cargo" \ - PATH="/usr/local/cargo/bin:$PATH" - -# Build dependencies -RUN \ - apt-get update && \ - apt-get install -y curl && \ - dpkg --add-architecture armhf && \ - apt-get update && \ - apt-get install -y \ - autoconf \ - autopoint \ - cmake \ - crossbuild-essential-armhf \ - gettext \ - git \ - gperf \ - jq \ - libssl-dev \ - libtool \ - ninja-build \ - pkg-config \ - python3-packaging \ - python3-pip \ - && \ - curl https://sh.rustup.rs -sSf | sh -s -- -y \ - --no-modify-path \ - --profile minimal \ - && \ - rustup target add arm-unknown-linux-gnueabihf && \ - cargo install cargo-c && \ - pip3 install meson tomli - -# Compiler settings -ENV \ - PKG_CONFIG="arm-linux-gnueabihf-pkg-config --static" \ - PLATFORM="linux-armv7" \ - CHOST="arm-linux-gnueabihf" \ - RUST_TARGET="arm-unknown-linux-gnueabihf" \ - FLAGS="-marm -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard" \ - MESON="--cross-file=/root/meson.ini" - -COPY Toolchain.cmake /root/ -COPY meson.ini /root/ diff --git a/platforms/linux-armv7/Toolchain.cmake b/platforms/linux-armv7/Toolchain.cmake deleted file mode 100644 index 2acdf704..00000000 --- a/platforms/linux-armv7/Toolchain.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR armv7-a) - -SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc) -SET(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++) -SET(CMAKE_AR arm-linux-gnueabihf-gcc-ar) -SET(CMAKE_STRIP arm-linux-gnueabihf-gcc-strip) -SET(CMAKE_RANLIB arm-linux-gnueabihf-gcc-ranlib) - -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/platforms/linux-armv7/meson.ini b/platforms/linux-armv7/meson.ini deleted file mode 100644 index af494050..00000000 --- a/platforms/linux-armv7/meson.ini +++ /dev/null @@ -1,22 +0,0 @@ -[host_machine] -system = 'linux' -cpu_family = 'arm' -cpu = 'armv7-a' -endian = 'little' - -[binaries] -c = 'arm-linux-gnueabihf-gcc' -cpp = 'arm-linux-gnueabihf-g++' -ar = 'arm-linux-gnueabihf-gcc-ar' -nm = 'arm-linux-gnueabihf-gcc-nm' -ld = 'arm-linux-gnueabihf-gcc-ld' -strip = 'arm-linux-gnueabihf-strip' -ranlib = 'arm-linux-gnueabihf-gcc-ranlib' - -[built-in options] -libdir = 'lib' -datadir = '/usr/share' -localedir = '/usr/share/locale' -sysconfdir = '/etc' -localstatedir = '/var' -wrap_mode = 'nofallback' From dc8d356271c7b9d6799f7375a12e42935b91bc20 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sat, 10 Aug 2024 10:13:32 +0100 Subject: [PATCH 045/109] Bump deps: glib, heif, rsvg, xml2 --- build/lin.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 6544f6ee..b308700b 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -94,8 +94,8 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.1 VERSION_FFI=3.4.6 -VERSION_GLIB=2.81.0 -VERSION_XML2=2.13.2 +VERSION_GLIB=2.81.1 +VERSION_XML2=2.13.3 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 @@ -115,9 +115,9 @@ VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.0 VERSION_FRIBIDI=1.0.15 VERSION_PANGO=1.54.0 -VERSION_RSVG=2.58.92 +VERSION_RSVG=2.58.93 VERSION_AOM=3.9.1 -VERSION_HEIF=1.18.0 +VERSION_HEIF=1.18.2 VERSION_CGIF=0.4.1 # Remove patch version component From 82bee8fd32b32afc8a9a8fde59e174dd2fe88b8a Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sat, 10 Aug 2024 14:58:03 +0100 Subject: [PATCH 046/109] Ensure cargo uses correct linker when cross-compiling --- build/lin.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/lin.sh b/build/lin.sh index b308700b..9710d265 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -85,6 +85,12 @@ export CARGO_PROFILE_RELEASE_PANIC=abort # https://reproducible-builds.org/docs/build-path/ export RUSTFLAGS+=" --remap-path-prefix=$CARGO_HOME/registry/=" +# Ensure Cargo uses correct linker when cross-compiling +if [ "$LINUX" = true ] && [ -n "$CHOST" ]; then + echo "[target.${RUST_TARGET}]" >> "$CARGO_HOME/config" + echo "linker = \"${CHOST}-gcc\"" >> "$CARGO_HOME/config" +fi + # We don't want to use any native libraries, so unset PKG_CONFIG_PATH unset PKG_CONFIG_PATH From e2d84650f12b9d12805d9b3bffe0794305f2bb72 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 12 Aug 2024 10:09:32 +0200 Subject: [PATCH 047/109] rsvg: workaround zune-jpeg issue (#244) See: https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/967#note_2088834 --- build/lin.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 9710d265..49dd4281 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -85,12 +85,6 @@ export CARGO_PROFILE_RELEASE_PANIC=abort # https://reproducible-builds.org/docs/build-path/ export RUSTFLAGS+=" --remap-path-prefix=$CARGO_HOME/registry/=" -# Ensure Cargo uses correct linker when cross-compiling -if [ "$LINUX" = true ] && [ -n "$CHOST" ]; then - echo "[target.${RUST_TARGET}]" >> "$CARGO_HOME/config" - echo "linker = \"${CHOST}-gcc\"" >> "$CARGO_HOME/config" -fi - # We don't want to use any native libraries, so unset PKG_CONFIG_PATH unset PKG_CONFIG_PATH @@ -427,6 +421,13 @@ sed -i'.bak' "/image = /s/, \"gif\", \"webp\"//" rsvg/Cargo.toml sed -i'.bak' "/cairo-rs = /s/, \"pdf\", \"ps\"//" {librsvg-c,rsvg}/Cargo.toml # Skip build of rsvg-convert sed -i'.bak' "/subdir('rsvg_convert')/d" meson.build +# https://github.com/etemesi254/zune-image/pull/187 +# https://github.com/bevyengine/bevy/issues/14117#issuecomment-2236518551 +# https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section +cat >> Cargo.toml < Date: Mon, 12 Aug 2024 10:59:02 +0200 Subject: [PATCH 048/109] Upgrade to libvips v8.15.3 (#245) --- LIBVIPS_VERSION | 2 +- build/lin.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LIBVIPS_VERSION b/LIBVIPS_VERSION index e7ab33dc..d2c1cf91 100644 --- a/LIBVIPS_VERSION +++ b/LIBVIPS_VERSION @@ -1 +1 @@ -8.15.2 +8.15.3 diff --git a/build/lin.sh b/build/lin.sh index 49dd4281..bed28ed1 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -448,7 +448,7 @@ mkdir ${DEPS}/vips $CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}/vips-$(without_prerelease $VERSION_VIPS).tar.xz | tar xJC ${DEPS}/vips --strip-components=1 cd ${DEPS}/vips # Disable HBR support in heifsave -$CURL https://github.com/kleisauke/libvips/commit/ad921cf9396dc5a224e93c71b601e87bd3a8a521.patch | patch -p1 +$CURL https://github.com/libvips/build-win64-mxe/raw/v${VERSION_VIPS}/build/patches/vips-8-heifsave-disable-hbr-support.patch | patch -p1 # Link libvips.so.42 statically into libvips-cpp.so.42 sed -i'.bak' "s/library('vips'/static_&/" libvips/meson.build sed -i'.bak' "/version: library_version/{N;d;}" libvips/meson.build From fd99a03e344cc10b826f8f24269b3e5b3eb9f758 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 12 Aug 2024 22:17:50 +0100 Subject: [PATCH 049/109] Revert "linux-armv6: upgrade to Debian 11 (glibc 2.31)" This reverts commit d8ce72127239048574784145b5b55df3595f88ff. --- npm/linux-arm/package.json | 2 +- platforms/linux-armv6/Dockerfile | 11 ++++++----- platforms/linux-armv6/Toolchain.cmake | 10 +++++----- platforms/linux-armv6/meson.ini | 14 +++++++------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 710c1e70..b7d0ff2a 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -28,7 +28,7 @@ }, "type": "commonjs", "config": { - "glibc": ">=2.31" + "glibc": ">=2.28" }, "os": [ "linux" diff --git a/platforms/linux-armv6/Dockerfile b/platforms/linux-armv6/Dockerfile index 3ac139fa..2ea91fec 100644 --- a/platforms/linux-armv6/Dockerfile +++ b/platforms/linux-armv6/Dockerfile @@ -1,13 +1,13 @@ -FROM debian:bullseye +FROM debian:buster LABEL maintainer="Lovell Fuller " -# Create Debian 11 (glibc 2.31) container suitable for cross-compiling Linux ARMv6 binaries +# Create Debian 10 (glibc 2.28) container suitable for cross-compiling Linux ARMv6 binaries # Path settings ENV \ RUSTUP_HOME="/usr/local/rustup" \ CARGO_HOME="/usr/local/cargo" \ - PATH="/usr/local/cargo/bin:$PATH" + PATH="/usr/local/cargo/bin:/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin:$PATH" # Build dependencies RUN \ @@ -19,7 +19,6 @@ RUN \ autoconf \ autopoint \ cmake \ - crossbuild-essential-armhf \ gettext \ git \ gperf \ @@ -31,6 +30,8 @@ RUN \ python3-packaging \ python3-pip \ && \ + mkdir /root/tools && \ + curl -Ls https://github.com/rvagg/rpi-newer-crosstools/archive/master.tar.gz | tar xzC /root/tools --strip-components=1 && \ curl https://sh.rustup.rs -sSf | sh -s -- -y \ --no-modify-path \ --profile minimal \ @@ -43,7 +44,7 @@ RUN \ ENV \ PKG_CONFIG="arm-linux-gnueabihf-pkg-config --static" \ PLATFORM="linux-armv6" \ - CHOST="arm-linux-gnueabihf" \ + CHOST="arm-rpi-linux-gnueabihf" \ RUST_TARGET="arm-unknown-linux-gnueabihf" \ FLAGS="-marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" \ WITHOUT_NEON="true" \ diff --git a/platforms/linux-armv6/Toolchain.cmake b/platforms/linux-armv6/Toolchain.cmake index 3ec1bca1..279e2990 100644 --- a/platforms/linux-armv6/Toolchain.cmake +++ b/platforms/linux-armv6/Toolchain.cmake @@ -2,11 +2,11 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR armv6-a) -SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc) -set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++) -SET(CMAKE_AR arm-linux-gnueabihf-ar) -SET(CMAKE_STRIP arm-linux-gnueabihf-strip) -SET(CMAKE_RANLIB arm-linux-gnueabihf-ranlib) +SET(CMAKE_C_COMPILER arm-rpi-linux-gnueabihf-gcc) +set(CMAKE_CXX_COMPILER arm-rpi-linux-gnueabihf-g++) +SET(CMAKE_AR arm-rpi-linux-gnueabihf-ar) +SET(CMAKE_STRIP arm-rpi-linux-gnueabihf-strip) +SET(CMAKE_RANLIB arm-rpi-linux-gnueabihf-ranlib) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) diff --git a/platforms/linux-armv6/meson.ini b/platforms/linux-armv6/meson.ini index 3920ebec..d06f2638 100644 --- a/platforms/linux-armv6/meson.ini +++ b/platforms/linux-armv6/meson.ini @@ -5,13 +5,13 @@ cpu = 'armv6-a' endian = 'little' [binaries] -c = 'arm-linux-gnueabihf-gcc' -cpp = 'arm-linux-gnueabihf-g++' -ar = 'arm-linux-gnueabihf-ar' -nm = 'arm-linux-gnueabihf-gcc-nm' -ld = 'arm-linux-gnueabihf-gcc-ld' -strip = 'arm-linux-gnueabihf-strip' -ranlib = 'arm-linux-gnueabihf-gcc-ranlib' +c = 'arm-rpi-linux-gnueabihf-gcc' +cpp = 'arm-rpi-linux-gnueabihf-g++' +ar = 'arm-rpi-linux-gnueabihf-ar' +nm = 'arm-rpi-linux-gnueabihf-gcc-nm' +ld = 'arm-rpi-linux-gnueabihf-gcc-ld' +strip = 'arm-rpi-linux-gnueabihf-strip' +ranlib = 'arm-rpi-linux-gnueabihf-gcc-ranlib' [built-in options] libdir = 'lib' From 01379cfed69f6bdf77506c3182e8f9d4aae4e918 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 12 Aug 2024 22:43:15 +0100 Subject: [PATCH 050/109] Bump dep: freetype --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index bed28ed1..4cd65f11 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -106,7 +106,7 @@ VERSION_WEBP=1.4.0 VERSION_TIFF=4.6.0 VERSION_HWY=1.2.0 VERSION_PROXY_LIBINTL=0.4 -VERSION_FREETYPE=2.13.2 +VERSION_FREETYPE=2.13.3 VERSION_EXPAT=2.6.2 VERSION_ARCHIVE=3.7.4 VERSION_FONTCONFIG=2.15.0 From b510980e9a104a77957e3491ac2d0f22535f29e4 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 13 Aug 2024 15:44:41 +0100 Subject: [PATCH 051/109] Release v1.0.4/v1.0.5 (libvips v8.15.3) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ppc64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 4db0ff46..b76bdb6b 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index d96aadc8..41f84f45 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index 40cb7cfb..4af52f21 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.0.3", + "version": "1.0.5", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index 1551339c..ab273fcb 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.0.2", + "version": "1.0.4", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index b7d0ff2a..183c4907 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.0.2", + "version": "1.0.5", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 2d9b5ed2..3e596fe3 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json index 5039afd7..a1c0c5cc 100644 --- a/npm/linux-ppc64/package.json +++ b/npm/linux-ppc64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-ppc64", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) ppc64le", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index e6a8456c..d8e252d5 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index af6ee5c0..b5d80867 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index 2792ce2b..b7ff60f3 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index d165920a..013b0917 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index a3446521..751dce5c 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.0.2", + "version": "1.0.4", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 6dc321c8..d19b36c5 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index 93cafc94..db7857fd 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.0.2", + "version": "1.0.4", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From a6eb282a7c11b0a6f3259e2ac79f6149168b6d35 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 2 Sep 2024 10:11:41 +0100 Subject: [PATCH 052/109] Bump dep: glib --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 4cd65f11..7e0d7202 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -94,7 +94,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.1 VERSION_FFI=3.4.6 -VERSION_GLIB=2.81.1 +VERSION_GLIB=2.82.0 VERSION_XML2=2.13.3 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 From e9b6265d9de94f7163d15b17c53c21bca4e3380d Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 2 Sep 2024 10:26:08 +0100 Subject: [PATCH 053/109] Bump dep: cairo --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 7e0d7202..60dc36c3 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -112,7 +112,7 @@ VERSION_ARCHIVE=3.7.4 VERSION_FONTCONFIG=2.15.0 VERSION_HARFBUZZ=9.0.0 VERSION_PIXMAN=0.43.4 -VERSION_CAIRO=1.18.0 +VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.15 VERSION_PANGO=1.54.0 VERSION_RSVG=2.58.93 From 0da88328ee775b810297507cfce4b2af995cf5a3 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 2 Sep 2024 10:50:59 +0100 Subject: [PATCH 054/109] Bump dep: rsvg --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 60dc36c3..787cabc4 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -115,7 +115,7 @@ VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.15 VERSION_PANGO=1.54.0 -VERSION_RSVG=2.58.93 +VERSION_RSVG=2.58.94 VERSION_AOM=3.9.1 VERSION_HEIF=1.18.2 VERSION_CGIF=0.4.1 From f88ede1fad3d7d2345a70cc677fc5202f0475ab1 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 2 Sep 2024 10:52:43 +0100 Subject: [PATCH 055/109] glib: prevent debug default (from v2.82.0) --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 787cabc4..45d79b2a 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -224,7 +224,7 @@ cd ${DEPS}/glib $CURL https://gist.github.com/kleisauke/284d685efa00908da99ea6afbaaf39ae/raw/36e32c79e7962c5ea96cbb3f9c629e9145253e30/glib-without-gregex.patch | patch -p1 meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ --force-fallback-for=gvdb -Dintrospection=disabled -Dnls=disabled -Dlibmount=disabled -Dsysprof=disabled -Dlibelf=disabled \ - -Dtests=false -Dglib_assert=false -Dglib_checks=false ${DARWIN:+-Dbsymbolic_functions=false} + -Dtests=false -Dglib_assert=false -Dglib_checks=false -Dglib_debug=disabled ${DARWIN:+-Dbsymbolic_functions=false} # bin-devel is needed for glib-compile-resources meson install -C _build --tag bin-devel,devel From 27c642811bb69264d43eedee1833c1ac8927fd6f Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 2 Sep 2024 10:54:20 +0100 Subject: [PATCH 056/109] cairo: ensure freetype and therefore fontconfig available This re-allows the optional use of fontconfig on macOS via the PANGOCAIRO_BACKEND environment variable. (cairo v1.18.0 switched to a default of coretext-only.) --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 45d79b2a..bb898b43 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -392,7 +392,7 @@ mkdir ${DEPS}/cairo $CURL https://cairographics.org/releases/cairo-${VERSION_CAIRO}.tar.xz | tar xJC ${DEPS}/cairo --strip-components=1 cd ${DEPS}/cairo meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - ${LINUX:+-Dquartz=disabled} ${DARWIN:+-Dquartz=enabled} -Dtee=disabled -Dxcb=disabled -Dxlib=disabled -Dzlib=disabled \ + ${LINUX:+-Dquartz=disabled} ${DARWIN:+-Dquartz=enabled} -Dfreetype=enabled -Dtee=disabled -Dxcb=disabled -Dxlib=disabled -Dzlib=disabled \ -Dtests=disabled -Dspectre=disabled -Dsymbol-lookup=disabled meson install -C _build --tag devel From 273d659a1bd84ba554678bf93d76140de800d34c Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 2 Sep 2024 11:28:46 +0100 Subject: [PATCH 057/109] cairo: ensure cairo-ft can be built on macOS See commit 27c6428 --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index bb898b43..25fc0dd3 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -392,7 +392,7 @@ mkdir ${DEPS}/cairo $CURL https://cairographics.org/releases/cairo-${VERSION_CAIRO}.tar.xz | tar xJC ${DEPS}/cairo --strip-components=1 cd ${DEPS}/cairo meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - ${LINUX:+-Dquartz=disabled} ${DARWIN:+-Dquartz=enabled} -Dfreetype=enabled -Dtee=disabled -Dxcb=disabled -Dxlib=disabled -Dzlib=disabled \ + ${LINUX:+-Dquartz=disabled} ${DARWIN:+-Dquartz=enabled} -Dfreetype=enabled -Dfontconfig=enabled -Dtee=disabled -Dxcb=disabled -Dxlib=disabled -Dzlib=disabled \ -Dtests=disabled -Dspectre=disabled -Dsymbol-lookup=disabled meson install -C _build --tag devel From 9eb45ac88d278d70c7eb7b6d3f7b4fac28008c4d Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 8 Sep 2024 12:15:50 +0100 Subject: [PATCH 058/109] Bump dep: expat --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 25fc0dd3..b51e3f02 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -107,7 +107,7 @@ VERSION_TIFF=4.6.0 VERSION_HWY=1.2.0 VERSION_PROXY_LIBINTL=0.4 VERSION_FREETYPE=2.13.3 -VERSION_EXPAT=2.6.2 +VERSION_EXPAT=2.6.3 VERSION_ARCHIVE=3.7.4 VERSION_FONTCONFIG=2.15.0 VERSION_HARFBUZZ=9.0.0 From 49754b6750e128200ab070792fec2399ab17ae46 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Thu, 3 Oct 2024 11:52:43 +0200 Subject: [PATCH 059/109] Bump deps: archive, fribidi, glib, harfbuzz, png, rsvg, tiff, xml2, zlib-ng (#249) --- build/lin.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index b51e3f02..8b3a724a 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -92,30 +92,30 @@ unset PKG_CONFIG_PATH CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers -VERSION_ZLIB_NG=2.2.1 +VERSION_ZLIB_NG=2.2.2 VERSION_FFI=3.4.6 -VERSION_GLIB=2.82.0 -VERSION_XML2=2.13.3 +VERSION_GLIB=2.82.1 +VERSION_XML2=2.13.4 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 -VERSION_PNG16=1.6.43 +VERSION_PNG16=1.6.44 VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 VERSION_WEBP=1.4.0 -VERSION_TIFF=4.6.0 +VERSION_TIFF=4.7.0 VERSION_HWY=1.2.0 VERSION_PROXY_LIBINTL=0.4 VERSION_FREETYPE=2.13.3 VERSION_EXPAT=2.6.3 -VERSION_ARCHIVE=3.7.4 +VERSION_ARCHIVE=3.7.6 VERSION_FONTCONFIG=2.15.0 -VERSION_HARFBUZZ=9.0.0 +VERSION_HARFBUZZ=10.0.1 VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.2 -VERSION_FRIBIDI=1.0.15 +VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.54.0 -VERSION_RSVG=2.58.94 +VERSION_RSVG=2.59.1 VERSION_AOM=3.9.1 VERSION_HEIF=1.18.2 VERSION_CGIF=0.4.1 From 163fb0a62924889779d55ad90fe973131cfb6065 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 7 Oct 2024 13:00:13 +0200 Subject: [PATCH 060/109] Upgrade to libvips v8.15.5-rc1 (#250) --- LIBVIPS_VERSION | 2 +- build/lin.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LIBVIPS_VERSION b/LIBVIPS_VERSION index d2c1cf91..42a2ffc1 100644 --- a/LIBVIPS_VERSION +++ b/LIBVIPS_VERSION @@ -1 +1 @@ -8.15.3 +8.15.5-rc1 diff --git a/build/lin.sh b/build/lin.sh index 8b3a724a..f412d10b 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -445,7 +445,7 @@ CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=r meson install -C _build --tag devel mkdir ${DEPS}/vips -$CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}/vips-$(without_prerelease $VERSION_VIPS).tar.xz | tar xJC ${DEPS}/vips --strip-components=1 +$CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}/vips-${VERSION_VIPS}.tar.xz | tar xJC ${DEPS}/vips --strip-components=1 cd ${DEPS}/vips # Disable HBR support in heifsave $CURL https://github.com/libvips/build-win64-mxe/raw/v${VERSION_VIPS}/build/patches/vips-8-heifsave-disable-hbr-support.patch | patch -p1 From 9f3d92f5c58d09dd246eb3fdf72d3c5d8aec8a7d Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Tue, 8 Oct 2024 16:50:53 +0200 Subject: [PATCH 061/109] Bump dep: aom (#251) --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index f412d10b..f0f43918 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -116,7 +116,7 @@ VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.54.0 VERSION_RSVG=2.59.1 -VERSION_AOM=3.9.1 +VERSION_AOM=3.10.0 VERSION_HEIF=1.18.2 VERSION_CGIF=0.4.1 From 12104193f5901aed7a39cc93a8312905191abcf0 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 9 Oct 2024 11:15:07 +0100 Subject: [PATCH 062/109] Add libvips version number to shared library SONAME and filename (#252) This should help improve support for multiple versions of sharp that use differing versions of libvips running within the same process by ensuring dlopen accesses the relevant shared library. --- build/lin.sh | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index f0f43918..0097f559 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -1,6 +1,15 @@ #!/usr/bin/env bash set -e +# Remove patch version component +without_patch() { + echo "${1%.[[:digit:]]*}" +} +# Remove prerelease suffix +without_prerelease() { + echo "${1%-[[:alnum:]]*}" +} + # Environment / working directories case ${PLATFORM} in linux*) @@ -9,7 +18,7 @@ case ${PLATFORM} in TARGET=/target PACKAGE=/packaging ROOT=/root - VIPS_CPP_DEP=libvips-cpp.so.42 + VIPS_CPP_DEP=libvips-cpp.so.$(without_prerelease $VERSION_VIPS) ;; darwin*) DARWIN=true @@ -17,7 +26,7 @@ case ${PLATFORM} in TARGET=$PWD/target PACKAGE=$PWD ROOT=$PWD/platforms/$PLATFORM - VIPS_CPP_DEP=libvips-cpp.42.dylib + VIPS_CPP_DEP=libvips-cpp.$(without_prerelease $VERSION_VIPS).dylib ;; esac @@ -120,15 +129,6 @@ VERSION_AOM=3.10.0 VERSION_HEIF=1.18.2 VERSION_CGIF=0.4.1 -# Remove patch version component -without_patch() { - echo "${1%.[[:digit:]]*}" -} -# Remove prerelease suffix -without_prerelease() { - echo "${1%-[[:alnum:]]*}" -} - # Check for newer versions # Skip by setting the VERSION_LATEST_REQUIRED environment variable to "false" ALL_AT_VERSION_LATEST=true @@ -447,13 +447,15 @@ meson install -C _build --tag devel mkdir ${DEPS}/vips $CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}/vips-${VERSION_VIPS}.tar.xz | tar xJC ${DEPS}/vips --strip-components=1 cd ${DEPS}/vips +# Use version number in SONAME +$CURL https://gist.githubusercontent.com/lovell/313a6901e9db1bf285f2a1f1180499e4/raw/3988223c7dfa4d22745d9392034b0117abef1446/libvips-cpp-soversion.patch | patch -p1 # Disable HBR support in heifsave $CURL https://github.com/libvips/build-win64-mxe/raw/v${VERSION_VIPS}/build/patches/vips-8-heifsave-disable-hbr-support.patch | patch -p1 -# Link libvips.so.42 statically into libvips-cpp.so.42 +# Link libvips.so statically into libvips-cpp.so sed -i'.bak' "s/library('vips'/static_&/" libvips/meson.build sed -i'.bak' "/version: library_version/{N;d;}" libvips/meson.build if [ "$LINUX" = true ]; then - # Ensure libvips-cpp.so.42 is linked with -z nodelete + # Ensure libvips-cpp.so is linked with -z nodelete sed -i'.bak' "/gnu_symbol_visibility: 'hidden',/a link_args: nodelete_link_args," cplusplus/meson.build # Ensure symbols from external libs (except for libglib-2.0.a and libgobject-2.0.a) are not exposed EXCLUDE_LIBS=$(find ${TARGET}/lib -maxdepth 1 -name '*.a' ! -name 'libglib-2.0.a' ! -name 'libgobject-2.0.a' -printf "-Wl,--exclude-libs=%f ") From 9c5fe30077bf9ec5e21e6ed97618cb85b568f27a Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 9 Oct 2024 14:30:20 +0100 Subject: [PATCH 063/109] Release v1.0.6 (libvips v8.15.5-rc1) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ppc64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index b76bdb6b..1ee44bdd 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 41f84f45..956e6676 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index 4af52f21..f75daa9c 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.0.5", + "version": "1.0.6", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index ab273fcb..80e92785 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.0.4", + "version": "1.0.6", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 183c4907..0516b2a6 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.0.5", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 3e596fe3..c2bb5ced 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json index a1c0c5cc..b5150b5f 100644 --- a/npm/linux-ppc64/package.json +++ b/npm/linux-ppc64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-ppc64", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) ppc64le", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index d8e252d5..edcffe09 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index b5d80867..420eb774 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index b7ff60f3..f5a52c2e 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index 013b0917..0b50936f 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index 751dce5c..25487bdf 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.0.4", + "version": "1.0.6", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index d19b36c5..f822253b 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index db7857fd..2b471cf7 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.0.4", + "version": "1.0.6", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From d84029b4122685e80e49e32955e313765b500cd7 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sun, 13 Oct 2024 22:16:20 +0200 Subject: [PATCH 064/109] Upgrade to libvips v8.16.0-rc1 (#253) --- LIBVIPS_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LIBVIPS_VERSION b/LIBVIPS_VERSION index 42a2ffc1..87b632ce 100644 --- a/LIBVIPS_VERSION +++ b/LIBVIPS_VERSION @@ -1 +1 @@ -8.15.5-rc1 +8.16.0-rc1 From c88c89f088346cdf8e4e83012ce782eff4299bf9 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 14 Oct 2024 10:12:03 +0100 Subject: [PATCH 065/109] Release v1.1.0-rc1 (libvips v8.16.0-rc1) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ppc64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 1ee44bdd..8e4f486d 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 956e6676..cb590e55 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index f75daa9c..0827183a 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index 80e92785..6161c5ba 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 0516b2a6..c2173a4f 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index c2bb5ced..08017166 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json index b5150b5f..d3fb40cb 100644 --- a/npm/linux-ppc64/package.json +++ b/npm/linux-ppc64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-ppc64", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) ppc64le", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index edcffe09..2d364896 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 420eb774..3333e6fe 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index f5a52c2e..7d66a38a 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index 0b50936f..2c3f283f 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index 25487bdf..da16e50c 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.0.6", + "version": "1.1.0-rc1", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index f822253b..6a125c23 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index 2b471cf7..e717e0be 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.0.6", + "version": "1.1.0-rc1", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From f26590a7861940f0e66e72cdd9240ae5f6338205 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 14 Oct 2024 17:28:33 +0100 Subject: [PATCH 066/109] Bump dep: archive --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 0097f559..94eb2cc4 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -117,7 +117,7 @@ VERSION_HWY=1.2.0 VERSION_PROXY_LIBINTL=0.4 VERSION_FREETYPE=2.13.3 VERSION_EXPAT=2.6.3 -VERSION_ARCHIVE=3.7.6 +VERSION_ARCHIVE=3.7.7 VERSION_FONTCONFIG=2.15.0 VERSION_HARFBUZZ=10.0.1 VERSION_PIXMAN=0.43.4 From db9fdbae98d3bae3346541009f77c80702b28508 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 14 Oct 2024 17:16:14 +0100 Subject: [PATCH 067/109] CI: Upgrade to macOS 13 (Intel), limit permissions --- .github/workflows/build-release.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 3796b6bd..9bd9becf 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -1,8 +1,13 @@ name: Build Release -on: [ push, pull_request ] +on: + - push + - pull_request +permissions: {} jobs: create-release: - runs-on: 'ubuntu-22.04' + permissions: + contents: write + runs-on: 'ubuntu-24.04' outputs: upload_url: ${{ steps.create-release.outputs.upload_url }} steps: @@ -15,12 +20,15 @@ jobs: prerelease: true token: ${{ secrets.GITHUB_TOKEN }} build: + permissions: + contents: write runs-on: ${{ matrix.os }} needs: create-release strategy: fail-fast: false matrix: - os: [ ubuntu-22.04 ] + os: + - 'ubuntu-24.04' platform: - 'linux-x64' - 'linux-armv6' @@ -33,9 +41,9 @@ jobs: - 'win32-x64' - 'win32-arm64v8' include: - - os: macos-12 + - os: macos-13 platform: 'darwin-x64' - - os: macos-12 + - os: macos-13 platform: 'darwin-arm64v8' steps: - name: Checkout From 2078c2349b64f91787ea6510c42b99209b5b2bfc Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 21 Oct 2024 12:13:19 +0200 Subject: [PATCH 068/109] Bump dep: glib (#254) - rsvg: avoid use of `cargo generate-lockfile` - webp: ignore "latest" webp-rfc9649 tag --- build/lin.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 94eb2cc4..ef44c9e5 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -103,7 +103,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.2 VERSION_FFI=3.4.6 -VERSION_GLIB=2.82.1 +VERSION_GLIB=2.82.2 VERSION_XML2=2.13.4 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 @@ -160,7 +160,7 @@ version_latest "lcms2" "$VERSION_LCMS2" "9815" version_latest "mozjpeg" "$VERSION_MOZJPEG" "mozilla/mozjpeg" version_latest "png" "$VERSION_PNG16" "1705" version_latest "spng" "$VERSION_SPNG" "24289" -version_latest "webp" "$VERSION_WEBP" "webmproject/libwebp" +version_latest "webp" "$VERSION_WEBP" "1761" version_latest "tiff" "$VERSION_TIFF" "1738" version_latest "highway" "$VERSION_HWY" "205809" version_latest "proxy-libintl" "$VERSION_PROXY_LIBINTL" "frida/proxy-libintl" @@ -428,8 +428,8 @@ cat >> Cargo.toml < Date: Tue, 22 Oct 2024 11:05:54 +0200 Subject: [PATCH 069/109] Upgrade to libvips v8.16.0-rc2 (#255) * cargo-c: ensure deterministic build --- LIBVIPS_VERSION | 2 +- build/lin.sh | 2 +- platforms/linux-arm64v8/Dockerfile | 2 +- platforms/linux-armv6/Dockerfile | 2 +- platforms/linux-ppc64le/Dockerfile | 2 +- platforms/linux-s390x/Dockerfile | 2 +- platforms/linux-x64/Dockerfile | 2 +- platforms/linuxmusl-arm64v8/Dockerfile | 2 +- platforms/linuxmusl-x64/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/LIBVIPS_VERSION b/LIBVIPS_VERSION index 87b632ce..a52f900f 100644 --- a/LIBVIPS_VERSION +++ b/LIBVIPS_VERSION @@ -1 +1 @@ -8.16.0-rc1 +8.16.0-rc2 diff --git a/build/lin.sh b/build/lin.sh index ef44c9e5..75389bc4 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -187,7 +187,7 @@ if [ "$DARWIN" = true ]; then if [ "$DARWIN_ARM" = true ]; then ${CARGO_HOME}/bin/rustup target add aarch64-apple-darwin fi - CFLAGS= cargo install cargo-c + CFLAGS= cargo install cargo-c --locked fi if [ "${PLATFORM%-*}" == "linuxmusl" ] || [ "$DARWIN" = true ]; then diff --git a/platforms/linux-arm64v8/Dockerfile b/platforms/linux-arm64v8/Dockerfile index e034dd09..14a8e104 100644 --- a/platforms/linux-arm64v8/Dockerfile +++ b/platforms/linux-arm64v8/Dockerfile @@ -49,7 +49,7 @@ RUN \ --profile minimal \ --default-host aarch64-unknown-linux-gnu \ && \ - cargo install cargo-c && \ + cargo install cargo-c --locked && \ ln -s /usr/bin/cmake3 /usr/bin/cmake && \ pip3 install meson ninja packaging tomli diff --git a/platforms/linux-armv6/Dockerfile b/platforms/linux-armv6/Dockerfile index 2ea91fec..6c1b7352 100644 --- a/platforms/linux-armv6/Dockerfile +++ b/platforms/linux-armv6/Dockerfile @@ -37,7 +37,7 @@ RUN \ --profile minimal \ && \ rustup target add arm-unknown-linux-gnueabihf && \ - cargo install cargo-c && \ + cargo install cargo-c --locked && \ pip3 install meson tomli # Compiler settings diff --git a/platforms/linux-ppc64le/Dockerfile b/platforms/linux-ppc64le/Dockerfile index f2a30955..35d69fde 100644 --- a/platforms/linux-ppc64le/Dockerfile +++ b/platforms/linux-ppc64le/Dockerfile @@ -35,7 +35,7 @@ RUN \ --profile minimal \ && \ rustup target add powerpc64le-unknown-linux-gnu && \ - cargo install cargo-c && \ + cargo install cargo-c --locked && \ pip3 install meson tomli # Handy for debugging the compiled targets in Highway (hwy_list_targets) diff --git a/platforms/linux-s390x/Dockerfile b/platforms/linux-s390x/Dockerfile index d88981d3..b5881100 100644 --- a/platforms/linux-s390x/Dockerfile +++ b/platforms/linux-s390x/Dockerfile @@ -36,7 +36,7 @@ RUN \ --profile minimal \ && \ rustup target add s390x-unknown-linux-gnu && \ - cargo install cargo-c && \ + cargo install cargo-c --locked && \ pip3 install meson tomli # Handy for debugging the compiled targets in Highway (hwy_list_targets) diff --git a/platforms/linux-x64/Dockerfile b/platforms/linux-x64/Dockerfile index 1743ce63..83e41cb7 100644 --- a/platforms/linux-x64/Dockerfile +++ b/platforms/linux-x64/Dockerfile @@ -48,7 +48,7 @@ RUN \ --no-modify-path \ --profile minimal \ && \ - cargo install cargo-c && \ + cargo install cargo-c --locked && \ ln -s /usr/bin/cmake3 /usr/bin/cmake && \ pip3 install meson ninja packaging tomli diff --git a/platforms/linuxmusl-arm64v8/Dockerfile b/platforms/linuxmusl-arm64v8/Dockerfile index 7ccc15e2..9f7dda6b 100644 --- a/platforms/linuxmusl-arm64v8/Dockerfile +++ b/platforms/linuxmusl-arm64v8/Dockerfile @@ -46,7 +46,7 @@ RUN \ --profile minimal \ && \ rustup target add aarch64-unknown-linux-musl && \ - cargo install cargo-c && \ + cargo install cargo-c --locked && \ pip3 install meson # Compiler settings diff --git a/platforms/linuxmusl-x64/Dockerfile b/platforms/linuxmusl-x64/Dockerfile index 31940da0..3fa55eca 100644 --- a/platforms/linuxmusl-x64/Dockerfile +++ b/platforms/linuxmusl-x64/Dockerfile @@ -43,7 +43,7 @@ RUN \ --no-modify-path \ --profile minimal \ && \ - cargo install cargo-c && \ + cargo install cargo-c --locked && \ pip3 install meson # Compiler settings From 4578043bc58aceae412503b898d972acad8e1258 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 28 Oct 2024 10:07:58 +0000 Subject: [PATCH 070/109] Release v1.1.0-rc2 (libvips v8.16.0-rc2) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ppc64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 8e4f486d..dd841690 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index cb590e55..aaa1ff38 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index 0827183a..51ff32e7 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index 6161c5ba..16f36257 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index c2173a4f..5e422f7f 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 08017166..6cd8726a 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json index d3fb40cb..c779938a 100644 --- a/npm/linux-ppc64/package.json +++ b/npm/linux-ppc64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-ppc64", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) ppc64le", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index 2d364896..415a3c05 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 3333e6fe..400adf72 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index 7d66a38a..e0665ec9 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index 2c3f283f..643869ac 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index da16e50c..ab903a7f 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 6a125c23..7e7222ec 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index e717e0be..339a2a38 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.1.0-rc1", + "version": "1.1.0-rc2", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From dd14232e8bb0afdcea025670c3df50b7489d47b1 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 28 Oct 2024 11:49:21 +0000 Subject: [PATCH 071/109] tiff: build without libdeflate --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 75389bc4..b5ac0cc7 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -314,7 +314,7 @@ $CURL https://download.osgeo.org/libtiff/tiff-${VERSION_TIFF}.tar.gz | tar xzC $ cd ${DEPS}/tiff # Propagate -pthread into CFLAGS to ensure WebP support CFLAGS="${CFLAGS} -pthread" ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ - --disable-tools --disable-tests --disable-contrib --disable-docs --disable-mdi --disable-pixarlog --disable-old-jpeg --disable-cxx --disable-lzma --disable-zstd + --disable-tools --disable-tests --disable-contrib --disable-docs --disable-mdi --disable-pixarlog --disable-old-jpeg --disable-cxx --disable-lzma --disable-zstd --disable-libdeflate make install-strip noinst_PROGRAMS= dist_doc_DATA= if [ -z "$WITHOUT_HIGHWAY" ]; then From b7f1adc16ccac18f07fc7940de5ed473a36ca713 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Tue, 29 Oct 2024 08:43:14 +0100 Subject: [PATCH 072/109] Upgrade to libvips v8.16.0 (#256) --- LIBVIPS_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LIBVIPS_VERSION b/LIBVIPS_VERSION index a52f900f..894aa0bc 100644 --- a/LIBVIPS_VERSION +++ b/LIBVIPS_VERSION @@ -1 +1 @@ -8.16.0-rc2 +8.16.0 From dc55d50a348d647fe8df1417d77af6a76406c044 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 1 Nov 2024 13:01:24 +0000 Subject: [PATCH 073/109] Bump dep: rsvg --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index b5ac0cc7..c01f35cb 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -124,7 +124,7 @@ VERSION_PIXMAN=0.43.4 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.54.0 -VERSION_RSVG=2.59.1 +VERSION_RSVG=2.59.2 VERSION_AOM=3.10.0 VERSION_HEIF=1.18.2 VERSION_CGIF=0.4.1 From f83d1f92853d059fdfbc2648eeb014479c4f5a28 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 1 Nov 2024 13:02:08 +0000 Subject: [PATCH 074/109] Upgrade version of gcc in ARMv6 container --- platforms/linux-armv6/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/linux-armv6/Dockerfile b/platforms/linux-armv6/Dockerfile index 6c1b7352..ab84dbb2 100644 --- a/platforms/linux-armv6/Dockerfile +++ b/platforms/linux-armv6/Dockerfile @@ -7,7 +7,7 @@ LABEL maintainer="Lovell Fuller " ENV \ RUSTUP_HOME="/usr/local/rustup" \ CARGO_HOME="/usr/local/cargo" \ - PATH="/usr/local/cargo/bin:/root/tools/x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin:$PATH" + PATH="/usr/local/cargo/bin:/root/tools/x64-gcc-12.3.0-glibc-2.28/arm-rpi-linux-gnueabihf/bin:$PATH" # Build dependencies RUN \ From 9e53a16010da5473c7d8bc66c46cb06001a4af90 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 1 Nov 2024 15:31:33 +0000 Subject: [PATCH 075/109] Upgrade minimum macOS version to 10.15 (Catalina) (#257) Required for C++17, aligned alloc etc. --- build.sh | 2 +- build/lin.sh | 3 --- platforms/darwin-x64/Toolchain.cmake | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 40ec60c3..771eb15a 100755 --- a/build.sh +++ b/build.sh @@ -46,7 +46,7 @@ for flavour in darwin-x64 darwin-arm64v8; do export PKG_CONFIG="$(brew --prefix)/bin/pkg-config --static" # Earliest supported version of macOS - export MACOSX_DEPLOYMENT_TARGET="10.13" + export MACOSX_DEPLOYMENT_TARGET="10.15" # Added -fno-stack-check to workaround a stack misalignment bug on macOS 10.15 # See: diff --git a/build/lin.sh b/build/lin.sh index c01f35cb..691b80fc 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -203,9 +203,6 @@ fi mkdir ${DEPS}/zlib-ng $CURL https://github.com/zlib-ng/zlib-ng/archive/${VERSION_ZLIB_NG}.tar.gz | tar xzC ${DEPS}/zlib-ng --strip-components=1 cd ${DEPS}/zlib-ng -if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.13" ]; then - sed -i'.bak' "/-DHAVE_ALIGNED_ALLOC/d" CMakeLists.txt -fi CFLAGS="${CFLAGS} -O3" cmake -G"Unix Makefiles" \ -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=FALSE -DZLIB_COMPAT=TRUE -DWITH_ARMV6=FALSE diff --git a/platforms/darwin-x64/Toolchain.cmake b/platforms/darwin-x64/Toolchain.cmake index 08be8ab0..e1c513f7 100644 --- a/platforms/darwin-x64/Toolchain.cmake +++ b/platforms/darwin-x64/Toolchain.cmake @@ -2,7 +2,7 @@ SET(CMAKE_C_COMPILER clang) SET(CMAKE_CXX_COMPILER clang++) # Earliest supported version of macOS -SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) +SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.15) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) From a280b4833e6b28b9ae97f4054b52eb5b8cde8326 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 3 Nov 2024 09:23:38 +0000 Subject: [PATCH 076/109] Bump dep: heif --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 691b80fc..fed16021 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -126,7 +126,7 @@ VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.54.0 VERSION_RSVG=2.59.2 VERSION_AOM=3.10.0 -VERSION_HEIF=1.18.2 +VERSION_HEIF=1.19.1 VERSION_CGIF=0.4.1 # Check for newer versions From 3718441cc2acc73f8443d2d394a53b6f9ffbb5b3 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 4 Nov 2024 16:22:56 +0000 Subject: [PATCH 077/109] Release v1.1.0-rc3 (libvips v8.16.0) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ppc64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index dd841690..b41d586d 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index aaa1ff38..98a46636 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index 51ff32e7..e056756d 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index 16f36257..d941a8d3 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 5e422f7f..fbf45128 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 6cd8726a..f6363691 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json index c779938a..96ee4755 100644 --- a/npm/linux-ppc64/package.json +++ b/npm/linux-ppc64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-ppc64", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) ppc64le", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index 415a3c05..c445260b 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 400adf72..27321a5f 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index e0665ec9..2ebc16ec 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index 643869ac..65c33eb9 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index ab903a7f..eb8c9f20 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 7e7222ec..d643d1c4 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index 339a2a38..d736e0b0 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.1.0-rc2", + "version": "1.1.0-rc3", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From 5da396cc76fe73bb307d9c7be509045ddc52e5bf Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 4 Nov 2024 20:20:58 +0000 Subject: [PATCH 078/109] linux-arm: upgrade to Debian 11 (glibc 2.31), aids C++17 support --- npm/linux-arm/package.json | 4 ++-- platforms/linux-armv6/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index fbf45128..948aeee9 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.1.0-rc3", + "version": "1.1.0-rc3.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", @@ -28,7 +28,7 @@ }, "type": "commonjs", "config": { - "glibc": ">=2.28" + "glibc": ">=2.31" }, "os": [ "linux" diff --git a/platforms/linux-armv6/Dockerfile b/platforms/linux-armv6/Dockerfile index ab84dbb2..928b367f 100644 --- a/platforms/linux-armv6/Dockerfile +++ b/platforms/linux-armv6/Dockerfile @@ -1,13 +1,13 @@ FROM debian:buster LABEL maintainer="Lovell Fuller " -# Create Debian 10 (glibc 2.28) container suitable for cross-compiling Linux ARMv6 binaries +# Create Debian 11 (glibc 2.31) container suitable for cross-compiling Linux ARMv6 binaries # Path settings ENV \ RUSTUP_HOME="/usr/local/rustup" \ CARGO_HOME="/usr/local/cargo" \ - PATH="/usr/local/cargo/bin:/root/tools/x64-gcc-12.3.0-glibc-2.28/arm-rpi-linux-gnueabihf/bin:$PATH" + PATH="/usr/local/cargo/bin:/root/tools/x64-gcc-10.3.0-glibc-2.28/arm-rpi-linux-gnueabihf/bin:$PATH" # Build dependencies RUN \ From c7f789c15acd11c372461f261221a6491046e16f Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 10 Nov 2024 10:48:18 +0000 Subject: [PATCH 079/109] Bump deps: expat, glib, harfbuzz, heif, pixman --- build/lin.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index fed16021..c83f2e77 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -103,7 +103,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.2 VERSION_FFI=3.4.6 -VERSION_GLIB=2.82.2 +VERSION_GLIB=2.83.0 VERSION_XML2=2.13.4 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 @@ -116,17 +116,17 @@ VERSION_TIFF=4.7.0 VERSION_HWY=1.2.0 VERSION_PROXY_LIBINTL=0.4 VERSION_FREETYPE=2.13.3 -VERSION_EXPAT=2.6.3 +VERSION_EXPAT=2.6.4 VERSION_ARCHIVE=3.7.7 VERSION_FONTCONFIG=2.15.0 -VERSION_HARFBUZZ=10.0.1 -VERSION_PIXMAN=0.43.4 +VERSION_HARFBUZZ=10.1.0 +VERSION_PIXMAN=0.44.0 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.54.0 VERSION_RSVG=2.59.2 VERSION_AOM=3.10.0 -VERSION_HEIF=1.19.1 +VERSION_HEIF=1.19.2 VERSION_CGIF=0.4.1 # Check for newer versions @@ -381,7 +381,7 @@ mkdir ${DEPS}/pixman $CURL https://cairographics.org/releases/pixman-${VERSION_PIXMAN}.tar.gz | tar xzC ${DEPS}/pixman --strip-components=1 cd ${DEPS}/pixman meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - -Dlibpng=disabled -Diwmmxt=disabled -Dgtk=disabled -Dopenmp=disabled -Dtests=disabled \ + -Dlibpng=disabled -Dgtk=disabled -Dopenmp=disabled -Dtests=disabled -Ddemos=disabled \ ${DARWIN_ARM:+-Da64-neon=disabled} meson install -C _build --tag devel From 22969d597bffab4dfcf12c571e5bc678e7a28cee Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 20 Nov 2024 17:17:16 +0000 Subject: [PATCH 080/109] Bump deps: aom, heif, xml2 --- build/lin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index c83f2e77..bcdeabf0 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -104,7 +104,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" VERSION_ZLIB_NG=2.2.2 VERSION_FFI=3.4.6 VERSION_GLIB=2.83.0 -VERSION_XML2=2.13.4 +VERSION_XML2=2.13.5 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 @@ -125,8 +125,8 @@ VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.54.0 VERSION_RSVG=2.59.2 -VERSION_AOM=3.10.0 -VERSION_HEIF=1.19.2 +VERSION_AOM=3.11.0 +VERSION_HEIF=1.19.5 VERSION_CGIF=0.4.1 # Check for newer versions From 5418149bc8596c7b4edd6dfa78a1ada623273110 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 9 Dec 2024 15:04:42 +0000 Subject: [PATCH 081/109] Bump deps: pango, pixman --- build/lin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index bcdeabf0..3756c46f 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -120,10 +120,10 @@ VERSION_EXPAT=2.6.4 VERSION_ARCHIVE=3.7.7 VERSION_FONTCONFIG=2.15.0 VERSION_HARFBUZZ=10.1.0 -VERSION_PIXMAN=0.44.0 +VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 -VERSION_PANGO=1.54.0 +VERSION_PANGO=1.55.0 VERSION_RSVG=2.59.2 VERSION_AOM=3.11.0 VERSION_HEIF=1.19.5 From 37f6402697c530fe4e0288d42dd8e20f4a076eb1 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 9 Dec 2024 15:06:16 +0000 Subject: [PATCH 082/109] exif: patch to relax/allow parsing Samsung metadata --- build/lin.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/lin.sh b/build/lin.sh index 3756c46f..1c5f2e69 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -237,6 +237,8 @@ $CURL https://github.com/libexif/libexif/releases/download/v${VERSION_EXIF}/libe cd ${DEPS}/exif # https://github.com/libexif/libexif/pull/147 $CURL https://github.com/lovell/libexif/commit/db84aefa1deb103604c5860dd6486b1dd3af676b.patch | patch -p1 +# https://github.com/libexif/libexif/pull/183 +$CURL https://github.com/lovell/libexif/commit/ef0887f2635180d1e7197c92756d1dc0243f9a35.patch | patch -p1 ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ --disable-nls --without-libiconv-prefix --without-libintl-prefix \ CPPFLAGS="${CPPFLAGS} -DNO_VERBOSE_TAG_DATA" From c0a0e382796f225e7ebe02ed7d003157dab23f4a Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Thu, 12 Dec 2024 11:52:47 +0100 Subject: [PATCH 083/109] Bump deps: glib, pango (#259) --- build/lin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 1c5f2e69..5eb92ff8 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -103,7 +103,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.2 VERSION_FFI=3.4.6 -VERSION_GLIB=2.83.0 +VERSION_GLIB=2.83.2 VERSION_XML2=2.13.5 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 @@ -123,7 +123,7 @@ VERSION_HARFBUZZ=10.1.0 VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 -VERSION_PANGO=1.55.0 +VERSION_PANGO=1.55.5 VERSION_RSVG=2.59.2 VERSION_AOM=3.11.0 VERSION_HEIF=1.19.5 From fad94a90409cef84a663a705d3b6056bf131542a Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Thu, 12 Dec 2024 14:26:40 +0100 Subject: [PATCH 084/109] pixman: ARM64 intrinsics supported on Mach-O (#260) --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 5eb92ff8..3f5d8572 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -384,7 +384,7 @@ $CURL https://cairographics.org/releases/pixman-${VERSION_PIXMAN}.tar.gz | tar x cd ${DEPS}/pixman meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ -Dlibpng=disabled -Dgtk=disabled -Dopenmp=disabled -Dtests=disabled -Ddemos=disabled \ - ${DARWIN_ARM:+-Da64-neon=disabled} + ${WITHOUT_NEON:+-Da64-neon=disabled} meson install -C _build --tag devel mkdir ${DEPS}/cairo From 6be5623025239acab0b031ebf6c6ca7100ee323f Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Thu, 12 Dec 2024 15:58:53 +0100 Subject: [PATCH 085/109] resvg: update licence (#262) See: https://github.com/linebender/resvg/commit/cfb2ee57d53852d26189adf0dc047b9b68b32c0c --- npm/dev-wasm32/THIRD-PARTY-NOTICES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/dev-wasm32/THIRD-PARTY-NOTICES.md b/npm/dev-wasm32/THIRD-PARTY-NOTICES.md index b5ad47c8..c42babb8 100644 --- a/npm/dev-wasm32/THIRD-PARTY-NOTICES.md +++ b/npm/dev-wasm32/THIRD-PARTY-NOTICES.md @@ -22,7 +22,7 @@ used under the terms of the following licences: | libtiff | [libtiff License](https://gitlab.com/libtiff/libtiff/blob/master/LICENSE.md) (BSD-like) | | libvips | LGPLv3 | | libwebp | New BSD License | -| resvg | MPL-2.0 License | +| resvg | MIT Licence | | zlib-ng | [zlib Licence](https://github.com/zlib-ng/zlib-ng/blob/develop/LICENSE.md) | Use of libraries under the terms of the LGPLv3 is via the From 932de3218f2b976b0d6895d92f12a7b4e174d509 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 6 Jan 2025 15:34:46 +0000 Subject: [PATCH 086/109] Bump deps: webp, zlib-ng --- build/lin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 3f5d8572..a8efab19 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -101,7 +101,7 @@ unset PKG_CONFIG_PATH CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers -VERSION_ZLIB_NG=2.2.2 +VERSION_ZLIB_NG=2.2.3 VERSION_FFI=3.4.6 VERSION_GLIB=2.83.2 VERSION_XML2=2.13.5 @@ -111,7 +111,7 @@ VERSION_MOZJPEG=4.1.5 VERSION_PNG16=1.6.44 VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 -VERSION_WEBP=1.4.0 +VERSION_WEBP=1.5.0 VERSION_TIFF=4.7.0 VERSION_HWY=1.2.0 VERSION_PROXY_LIBINTL=0.4 @@ -172,7 +172,7 @@ version_latest "harfbuzz" "$VERSION_HARFBUZZ" "1299" version_latest "pixman" "$VERSION_PIXMAN" "3648" version_latest "cairo" "$VERSION_CAIRO" "247" version_latest "fribidi" "$VERSION_FRIBIDI" "857" -version_latest "pango" "$VERSION_PANGO" "11783" +version_latest "pango" "$VERSION_PANGO" "11783" "unstable" version_latest "rsvg" "$VERSION_RSVG" "5420" version_latest "aom" "$VERSION_AOM" "17628" version_latest "heif" "$VERSION_HEIF" "64439" From e2407bb4d5c9abb5beb93deba9798a8af27bc573 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 14 Jan 2025 14:57:39 +0000 Subject: [PATCH 087/109] Bump deps: harfbuzz, pango, png --- build/lin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index a8efab19..c1a4d333 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -108,7 +108,7 @@ VERSION_XML2=2.13.5 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 -VERSION_PNG16=1.6.44 +VERSION_PNG16=1.6.45 VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 VERSION_WEBP=1.5.0 @@ -119,11 +119,11 @@ VERSION_FREETYPE=2.13.3 VERSION_EXPAT=2.6.4 VERSION_ARCHIVE=3.7.7 VERSION_FONTCONFIG=2.15.0 -VERSION_HARFBUZZ=10.1.0 +VERSION_HARFBUZZ=10.2.0 VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 -VERSION_PANGO=1.55.5 +VERSION_PANGO=1.56.0 VERSION_RSVG=2.59.2 VERSION_AOM=3.11.0 VERSION_HEIF=1.19.5 From ea981ff04d12256c61592d856863d168c6378388 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 17 Jan 2025 20:50:14 +0000 Subject: [PATCH 088/109] Bump deps: exif, fontconfig --- build/lin.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index c1a4d333..859497d8 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -105,7 +105,7 @@ VERSION_ZLIB_NG=2.2.3 VERSION_FFI=3.4.6 VERSION_GLIB=2.83.2 VERSION_XML2=2.13.5 -VERSION_EXIF=0.6.24 +VERSION_EXIF=0.6.25 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 VERSION_PNG16=1.6.45 @@ -118,7 +118,7 @@ VERSION_PROXY_LIBINTL=0.4 VERSION_FREETYPE=2.13.3 VERSION_EXPAT=2.6.4 VERSION_ARCHIVE=3.7.7 -VERSION_FONTCONFIG=2.15.0 +VERSION_FONTCONFIG=2.16.0 VERSION_HARFBUZZ=10.2.0 VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.2 @@ -235,10 +235,6 @@ meson install -C _build --tag devel mkdir ${DEPS}/exif $CURL https://github.com/libexif/libexif/releases/download/v${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.bz2 | tar xjC ${DEPS}/exif --strip-components=1 cd ${DEPS}/exif -# https://github.com/libexif/libexif/pull/147 -$CURL https://github.com/lovell/libexif/commit/db84aefa1deb103604c5860dd6486b1dd3af676b.patch | patch -p1 -# https://github.com/libexif/libexif/pull/183 -$CURL https://github.com/lovell/libexif/commit/ef0887f2635180d1e7197c92756d1dc0243f9a35.patch | patch -p1 ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ --disable-nls --without-libiconv-prefix --without-libintl-prefix \ CPPFLAGS="${CPPFLAGS} -DNO_VERBOSE_TAG_DATA" From 8d7d28c3373c6714f93f2ec17d43a26ec4a5e37e Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 3 Feb 2025 11:22:20 +0000 Subject: [PATCH 089/109] Bump deps: glib, pango, png --- build/lin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 859497d8..f492e33d 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -103,12 +103,12 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.3 VERSION_FFI=3.4.6 -VERSION_GLIB=2.83.2 +VERSION_GLIB=2.83.3 VERSION_XML2=2.13.5 VERSION_EXIF=0.6.25 VERSION_LCMS2=2.16 VERSION_MOZJPEG=4.1.5 -VERSION_PNG16=1.6.45 +VERSION_PNG16=1.6.46 VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 VERSION_WEBP=1.5.0 @@ -123,7 +123,7 @@ VERSION_HARFBUZZ=10.2.0 VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 -VERSION_PANGO=1.56.0 +VERSION_PANGO=1.56.1 VERSION_RSVG=2.59.2 VERSION_AOM=3.11.0 VERSION_HEIF=1.19.5 From 3f8bff4a5583926d44ef57bda8727f40a9ff5cc4 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Wed, 19 Feb 2025 12:58:32 +0100 Subject: [PATCH 090/109] Bump deps: aom, cgif, ffi, lcms2, png, xml2, zlib-ng (#263) --- build/lin.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index f492e33d..0a8d3a44 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -101,14 +101,14 @@ unset PKG_CONFIG_PATH CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers -VERSION_ZLIB_NG=2.2.3 -VERSION_FFI=3.4.6 +VERSION_ZLIB_NG=2.2.4 +VERSION_FFI=3.4.7 VERSION_GLIB=2.83.3 -VERSION_XML2=2.13.5 +VERSION_XML2=2.13.6 VERSION_EXIF=0.6.25 -VERSION_LCMS2=2.16 +VERSION_LCMS2=2.17 VERSION_MOZJPEG=4.1.5 -VERSION_PNG16=1.6.46 +VERSION_PNG16=1.6.47 VERSION_SPNG=0.7.4 VERSION_IMAGEQUANT=2.4.1 VERSION_WEBP=1.5.0 @@ -125,9 +125,9 @@ VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.56.1 VERSION_RSVG=2.59.2 -VERSION_AOM=3.11.0 +VERSION_AOM=3.12.0 VERSION_HEIF=1.19.5 -VERSION_CGIF=0.4.1 +VERSION_CGIF=0.5.0 # Check for newer versions # Skip by setting the VERSION_LATEST_REQUIRED environment variable to "false" @@ -233,7 +233,7 @@ meson setup _build --default-library=static --buildtype=release --strip --prefix meson install -C _build --tag devel mkdir ${DEPS}/exif -$CURL https://github.com/libexif/libexif/releases/download/v${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.bz2 | tar xjC ${DEPS}/exif --strip-components=1 +$CURL https://github.com/libexif/libexif/releases/download/v${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.xz | tar xJC ${DEPS}/exif --strip-components=1 cd ${DEPS}/exif ./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ --disable-nls --without-libiconv-prefix --without-libintl-prefix \ @@ -243,7 +243,8 @@ make install-strip doc_DATA= mkdir ${DEPS}/lcms2 $CURL https://github.com/mm2/Little-CMS/releases/download/lcms${VERSION_LCMS2}/lcms2-${VERSION_LCMS2}.tar.gz | tar xzC ${DEPS}/lcms2 --strip-components=1 cd ${DEPS}/lcms2 -CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} +CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ + -Dtests=disabled meson install -C _build --tag devel mkdir ${DEPS}/aom @@ -436,7 +437,7 @@ mkdir ${DEPS}/cgif $CURL https://github.com/dloebl/cgif/archive/v${VERSION_CGIF}.tar.gz | tar xzC ${DEPS}/cgif --strip-components=1 cd ${DEPS}/cgif CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ - -Dtests=false + -Dexamples=false -Dtests=false meson install -C _build --tag devel mkdir ${DEPS}/vips From ce6c8889e24293c347929f301a05df192698d61d Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Wed, 19 Feb 2025 14:16:15 +0100 Subject: [PATCH 091/109] rsvg: remove workaround for zune-jpeg (#261) --- build/lin.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 0a8d3a44..c2fb9f52 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -417,14 +417,8 @@ sed -i'.bak' "/image = /s/, \"gif\", \"webp\"//" rsvg/Cargo.toml sed -i'.bak' "/cairo-rs = /s/, \"pdf\", \"ps\"//" {librsvg-c,rsvg}/Cargo.toml # Skip build of rsvg-convert sed -i'.bak' "/subdir('rsvg_convert')/d" meson.build -# https://github.com/etemesi254/zune-image/pull/187 -# https://github.com/bevyengine/bevy/issues/14117#issuecomment-2236518551 -# https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section -cat >> Cargo.toml < Date: Wed, 19 Feb 2025 14:21:00 +0100 Subject: [PATCH 092/109] Linux: ensure GLib's `g_print*()` functions wrap the system ones (#264) C99 `printf()` semantics are well-supported by these Linux cross-targets, avoids the need for gnulib compat functions. An alternative is setting up QEMU when cross-compiling, as this functionality is gated by `meson.can_run_host_binaries()`, but this is a bit simpler. --- platforms/linux-armv6/meson.ini | 6 ++++++ platforms/linux-ppc64le/meson.ini | 6 ++++++ platforms/linux-s390x/meson.ini | 6 ++++++ platforms/linuxmusl-arm64v8/meson.ini | 6 +++++- platforms/linuxmusl-x64/meson.ini | 2 +- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/platforms/linux-armv6/meson.ini b/platforms/linux-armv6/meson.ini index d06f2638..1371dea5 100644 --- a/platforms/linux-armv6/meson.ini +++ b/platforms/linux-armv6/meson.ini @@ -13,6 +13,12 @@ ld = 'arm-rpi-linux-gnueabihf-gcc-ld' strip = 'arm-rpi-linux-gnueabihf-strip' ranlib = 'arm-rpi-linux-gnueabihf-gcc-ranlib' +[properties] +# https://docs.gtk.org/glib/cross-compiling.html#cross-properties +have_c99_vsnprintf = true +have_c99_snprintf = true +have_unix98_printf = true + [built-in options] libdir = 'lib' datadir = '/usr/share' diff --git a/platforms/linux-ppc64le/meson.ini b/platforms/linux-ppc64le/meson.ini index d8e648a6..fcb2c1a9 100644 --- a/platforms/linux-ppc64le/meson.ini +++ b/platforms/linux-ppc64le/meson.ini @@ -14,6 +14,12 @@ strip = 'powerpc64le-linux-gnu-strip' ranlib = 'powerpc64le-linux-gnu-gcc-ranlib' #exe_wrapper = 'qemu-ppc64le-static' +[properties] +# https://docs.gtk.org/glib/cross-compiling.html#cross-properties +have_c99_vsnprintf = true +have_c99_snprintf = true +have_unix98_printf = true + [built-in options] libdir = 'lib' datadir = '/usr/share' diff --git a/platforms/linux-s390x/meson.ini b/platforms/linux-s390x/meson.ini index 29cbf642..0b1cfb15 100644 --- a/platforms/linux-s390x/meson.ini +++ b/platforms/linux-s390x/meson.ini @@ -14,6 +14,12 @@ strip = 's390x-linux-gnu-strip' ranlib = 's390x-linux-gnu-gcc-ranlib' #exe_wrapper = 'qemu-s390x-static' +[properties] +# https://docs.gtk.org/glib/cross-compiling.html#cross-properties +have_c99_vsnprintf = true +have_c99_snprintf = true +have_unix98_printf = true + [built-in options] libdir = 'lib' datadir = '/usr/share' diff --git a/platforms/linuxmusl-arm64v8/meson.ini b/platforms/linuxmusl-arm64v8/meson.ini index 4f47b7d5..f291e68d 100644 --- a/platforms/linuxmusl-arm64v8/meson.ini +++ b/platforms/linuxmusl-arm64v8/meson.ini @@ -13,10 +13,14 @@ ld = 'aarch64-linux-musl-ld' strip = 'aarch64-linux-musl-strip' ranlib = 'aarch64-linux-musl-ranlib' +[properties] # Ensure we disable the inotify backend in GIO # See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2991#note_1592863 -[properties] has_function_inotify_init1 = false +# https://docs.gtk.org/glib/cross-compiling.html#cross-properties +have_c99_vsnprintf = true +have_c99_snprintf = true +have_unix98_printf = true [built-in options] libdir = 'lib' diff --git a/platforms/linuxmusl-x64/meson.ini b/platforms/linuxmusl-x64/meson.ini index 8496c9bb..86c70e82 100644 --- a/platforms/linuxmusl-x64/meson.ini +++ b/platforms/linuxmusl-x64/meson.ini @@ -1,9 +1,9 @@ [binaries] strip = 'strip' +[properties] # Ensure we disable the inotify backend in GIO # See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2991#note_1592863 -[properties] has_function_inotify_init1 = false [built-in options] From 9ea3ead842795bd63f6e7ed9f5e50208a5f7fe08 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Thu, 20 Feb 2025 15:41:43 +0100 Subject: [PATCH 093/109] Bump dep: rsvg (#265) --- build/lin.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index c2fb9f52..2dccc167 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -124,7 +124,7 @@ VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.56.1 -VERSION_RSVG=2.59.2 +VERSION_RSVG=2.59.90 VERSION_AOM=3.12.0 VERSION_HEIF=1.19.5 VERSION_CGIF=0.5.0 @@ -173,7 +173,7 @@ version_latest "pixman" "$VERSION_PIXMAN" "3648" version_latest "cairo" "$VERSION_CAIRO" "247" version_latest "fribidi" "$VERSION_FRIBIDI" "857" version_latest "pango" "$VERSION_PANGO" "11783" "unstable" -version_latest "rsvg" "$VERSION_RSVG" "5420" +version_latest "rsvg" "$VERSION_RSVG" "5420" "unstable" version_latest "aom" "$VERSION_AOM" "17628" version_latest "heif" "$VERSION_HEIF" "64439" version_latest "cgif" "$VERSION_CGIF" "dloebl/cgif" @@ -417,9 +417,10 @@ sed -i'.bak' "/image = /s/, \"gif\", \"webp\"//" rsvg/Cargo.toml sed -i'.bak' "/cairo-rs = /s/, \"pdf\", \"ps\"//" {librsvg-c,rsvg}/Cargo.toml # Skip build of rsvg-convert sed -i'.bak' "/subdir('rsvg_convert')/d" meson.build -# Update and regenerate the lockfile for zune-jpeg -# https://github.com/etemesi254/zune-image/pull/242 -cargo update zune-jpeg +# https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1066#note_2356762 +sed -i'.bak' "/^if host_system in \['windows'/s/, 'linux'//" meson.build +# Regenerate the lockfile after making the above changes +cargo update --workspace # Remove the --static flag from the PKG_CONFIG env since Rust does not # parse that correctly. PKG_CONFIG=${PKG_CONFIG/ --static/} meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ From 474a7d157d73b4a63a32de6cc33936ba91249632 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 20 Feb 2025 15:15:36 +0000 Subject: [PATCH 094/109] Bump dep: glib --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 2dccc167..5cbae0e2 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -103,7 +103,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.4 VERSION_FFI=3.4.7 -VERSION_GLIB=2.83.3 +VERSION_GLIB=2.83.4 VERSION_XML2=2.13.6 VERSION_EXIF=0.6.25 VERSION_LCMS2=2.17 From 8546a72c6f8d77af578fcbf2e46fca29c56402d7 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Sat, 1 Mar 2025 12:00:41 +0100 Subject: [PATCH 095/109] Bump deps: glib, harfbuzz (#266) --- build/lin.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 5cbae0e2..b92f560f 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -103,7 +103,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.4 VERSION_FFI=3.4.7 -VERSION_GLIB=2.83.4 +VERSION_GLIB=2.83.5 VERSION_XML2=2.13.6 VERSION_EXIF=0.6.25 VERSION_LCMS2=2.17 @@ -119,7 +119,7 @@ VERSION_FREETYPE=2.13.3 VERSION_EXPAT=2.6.4 VERSION_ARCHIVE=3.7.7 VERSION_FONTCONFIG=2.16.0 -VERSION_HARFBUZZ=10.2.0 +VERSION_HARFBUZZ=10.4.0 VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 @@ -218,7 +218,7 @@ make install-strip mkdir ${DEPS}/glib $CURL https://download.gnome.org/sources/glib/$(without_patch $VERSION_GLIB)/glib-${VERSION_GLIB}.tar.xz | tar xJC ${DEPS}/glib --strip-components=1 cd ${DEPS}/glib -$CURL https://gist.github.com/kleisauke/284d685efa00908da99ea6afbaaf39ae/raw/36e32c79e7962c5ea96cbb3f9c629e9145253e30/glib-without-gregex.patch | patch -p1 +$CURL https://gist.github.com/kleisauke/284d685efa00908da99ea6afbaaf39ae/raw/936a6b8013d07d358c6944cc5b5f0e27db707ace/glib-without-gregex.patch | patch -p1 meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ --force-fallback-for=gvdb -Dintrospection=disabled -Dnls=disabled -Dlibmount=disabled -Dsysprof=disabled -Dlibelf=disabled \ -Dtests=false -Dglib_assert=false -Dglib_checks=false -Dglib_debug=disabled ${DARWIN:+-Dbsymbolic_functions=false} From 0c612d0a1e906957eeb09edf3c56dd1cd0958d6a Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 3 Mar 2025 17:20:02 +0000 Subject: [PATCH 096/109] Bump dep: heif --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index b92f560f..d9cbc14f 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -126,7 +126,7 @@ VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.56.1 VERSION_RSVG=2.59.90 VERSION_AOM=3.12.0 -VERSION_HEIF=1.19.5 +VERSION_HEIF=1.19.7 VERSION_CGIF=0.5.0 # Check for newer versions From e8cdde70c54975d44eee78c0a3c2353aa55ded9b Mon Sep 17 00:00:00 2001 From: Ivan Barlog Date: Fri, 7 Mar 2025 16:16:03 +0100 Subject: [PATCH 097/109] Bump deps: glib, rsvg (#267) --- build/lin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index d9cbc14f..1bc0bf8b 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -103,7 +103,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.4 VERSION_FFI=3.4.7 -VERSION_GLIB=2.83.5 +VERSION_GLIB=2.84.0 VERSION_XML2=2.13.6 VERSION_EXIF=0.6.25 VERSION_LCMS2=2.17 @@ -124,7 +124,7 @@ VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.2 VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.56.1 -VERSION_RSVG=2.59.90 +VERSION_RSVG=2.59.91 VERSION_AOM=3.12.0 VERSION_HEIF=1.19.7 VERSION_CGIF=0.5.0 From 5e7cf58983e0994747bc7eae10cf094a51f2f6be Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Wed, 12 Mar 2025 20:19:21 +0100 Subject: [PATCH 098/109] Bump deps: cairo, pango (#268) --- build/lin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 1bc0bf8b..75965025 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -121,9 +121,9 @@ VERSION_ARCHIVE=3.7.7 VERSION_FONTCONFIG=2.16.0 VERSION_HARFBUZZ=10.4.0 VERSION_PIXMAN=0.44.2 -VERSION_CAIRO=1.18.2 +VERSION_CAIRO=1.18.4 VERSION_FRIBIDI=1.0.16 -VERSION_PANGO=1.56.1 +VERSION_PANGO=1.56.2 VERSION_RSVG=2.59.91 VERSION_AOM=3.12.0 VERSION_HEIF=1.19.7 From 71ff347ea2ce1a57673ae4e25cfc1a284ca97921 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Wed, 12 Mar 2025 22:59:46 +0100 Subject: [PATCH 099/109] Upgrade to libvips v8.16.1 (#269) --- LIBVIPS_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LIBVIPS_VERSION b/LIBVIPS_VERSION index 894aa0bc..559d6961 100644 --- a/LIBVIPS_VERSION +++ b/LIBVIPS_VERSION @@ -1 +1 @@ -8.16.0 +8.16.1 From 4e1ebe2c69982382d398a3cf7f1d5e536a114542 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 12 Mar 2025 22:14:29 +0000 Subject: [PATCH 100/109] Release v1.1.0-rc4 (libvips v8.16.1) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ppc64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index b41d586d..4e03e1b5 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 98a46636..7e471f37 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index e056756d..23f64e51 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index d941a8d3..580ec5e7 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 948aeee9..cd008142 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.1.0-rc3.1", + "version": "1.1.0-rc4.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index f6363691..c96d3fde 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json index 96ee4755..23b88f28 100644 --- a/npm/linux-ppc64/package.json +++ b/npm/linux-ppc64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-ppc64", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) ppc64le", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index c445260b..2dd24064 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 27321a5f..490bb9a7 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index 2ebc16ec..241b2f1f 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index 65c33eb9..dad8d7bc 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index eb8c9f20..cb3d432c 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index d643d1c4..65830b38 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index d736e0b0..25062143 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.1.0-rc3", + "version": "1.1.0-rc4", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From 32450f2bfc45a41a5bf99645febda97451fdd307 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 3 Apr 2025 11:12:01 +0100 Subject: [PATCH 101/109] Bump deps: archive, expat, fontconfig, harfbuzz, pango, rsvg, xml2 Pin xml2 to 2.13.x release line --- build/lin.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 75965025..462c4d0e 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -104,7 +104,7 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" VERSION_ZLIB_NG=2.2.4 VERSION_FFI=3.4.7 VERSION_GLIB=2.84.0 -VERSION_XML2=2.13.6 +VERSION_XML2=2.13.7 VERSION_EXIF=0.6.25 VERSION_LCMS2=2.17 VERSION_MOZJPEG=4.1.5 @@ -116,15 +116,15 @@ VERSION_TIFF=4.7.0 VERSION_HWY=1.2.0 VERSION_PROXY_LIBINTL=0.4 VERSION_FREETYPE=2.13.3 -VERSION_EXPAT=2.6.4 -VERSION_ARCHIVE=3.7.7 -VERSION_FONTCONFIG=2.16.0 -VERSION_HARFBUZZ=10.4.0 +VERSION_EXPAT=2.7.1 +VERSION_ARCHIVE=3.7.9 +VERSION_FONTCONFIG=2.16.1 +VERSION_HARFBUZZ=11.0.0 VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.4 VERSION_FRIBIDI=1.0.16 -VERSION_PANGO=1.56.2 -VERSION_RSVG=2.59.91 +VERSION_PANGO=1.56.3 +VERSION_RSVG=2.60.0 VERSION_AOM=3.12.0 VERSION_HEIF=1.19.7 VERSION_CGIF=0.5.0 @@ -154,7 +154,7 @@ version_latest() { version_latest "zlib-ng" "$VERSION_ZLIB_NG" "115592" version_latest "ffi" "$VERSION_FFI" "1611" version_latest "glib" "$VERSION_GLIB" "10024" "unstable" -version_latest "xml2" "$VERSION_XML2" "1783" +#version_latest "xml2" "$VERSION_XML2" "1783" # https://gitlab.gnome.org/GNOME/libxml2/-/issues/883 version_latest "exif" "$VERSION_EXIF" "1607" version_latest "lcms2" "$VERSION_LCMS2" "9815" version_latest "mozjpeg" "$VERSION_MOZJPEG" "mozilla/mozjpeg" From b88cd2fd09c76b30b17a46617b0d62cf578e6707 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 3 Apr 2025 11:49:30 +0100 Subject: [PATCH 102/109] fontconfig: release tarballs now hosted via GitLab instance --- build/lin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lin.sh b/build/lin.sh index 462c4d0e..e397b386 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -352,7 +352,7 @@ cd ${DEPS}/archive make install-strip libarchive_man_MANS= mkdir ${DEPS}/fontconfig -$CURL https://www.freedesktop.org/software/fontconfig/release/fontconfig-${VERSION_FONTCONFIG}.tar.xz | tar xJC ${DEPS}/fontconfig --strip-components=1 +$CURL https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/${VERSION_FONTCONFIG}/fontconfig-${VERSION_FONTCONFIG}.tar.gz | tar xzC ${DEPS}/fontconfig --strip-components=1 cd ${DEPS}/fontconfig meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ -Dcache-build=disabled -Ddoc=disabled -Dnls=disabled -Dtests=disabled -Dtools=disabled From 52d8842daa2c12612a8f1fe33abba9ae6b926250 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 3 Apr 2025 14:07:03 +0100 Subject: [PATCH 103/109] Release v1.1.0-rc5 (libvips v8.16.1) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ppc64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 4e03e1b5..e758ec6e 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 7e471f37..797cf13b 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index 23f64e51..8a44a194 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index 580ec5e7..d7d4f4a5 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index cd008142..941c0016 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.1.0-rc4.1", + "version": "1.1.0-rc5.1", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index c96d3fde..b501cfff 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json index 23b88f28..ca73e942 100644 --- a/npm/linux-ppc64/package.json +++ b/npm/linux-ppc64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-ppc64", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) ppc64le", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index 2dd24064..b2d922d1 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 490bb9a7..8e29590b 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index 241b2f1f..f952adf3 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index dad8d7bc..2fd01903 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index cb3d432c..bf357705 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 65830b38..e1d071ec 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index 25062143..f8057158 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.1.0-rc4", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From da86314a0c1caf5b67ab0d905e6ddafccc147e72 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 4 Apr 2025 11:36:25 +0100 Subject: [PATCH 104/109] Remove incorrect prerelease semver suffix --- npm/linux-arm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 941c0016..929caa7b 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.1.0-rc5.1", + "version": "1.1.0-rc5", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From 5b61642067b37ea2e5399eb0145f562ddecb5c78 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 4 Apr 2025 11:36:58 +0100 Subject: [PATCH 105/109] Bump deps: glib, xml2 --- build/lin.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index e397b386..e0764051 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -103,8 +103,8 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.4 VERSION_FFI=3.4.7 -VERSION_GLIB=2.84.0 -VERSION_XML2=2.13.7 +VERSION_GLIB=2.84.1 +VERSION_XML2=2.14.1 VERSION_EXIF=0.6.25 VERSION_LCMS2=2.17 VERSION_MOZJPEG=4.1.5 @@ -154,7 +154,7 @@ version_latest() { version_latest "zlib-ng" "$VERSION_ZLIB_NG" "115592" version_latest "ffi" "$VERSION_FFI" "1611" version_latest "glib" "$VERSION_GLIB" "10024" "unstable" -#version_latest "xml2" "$VERSION_XML2" "1783" # https://gitlab.gnome.org/GNOME/libxml2/-/issues/883 +version_latest "xml2" "$VERSION_XML2" "1783" version_latest "exif" "$VERSION_EXIF" "1607" version_latest "lcms2" "$VERSION_LCMS2" "9815" version_latest "mozjpeg" "$VERSION_MOZJPEG" "mozilla/mozjpeg" @@ -228,6 +228,8 @@ meson install -C _build --tag bin-devel,devel mkdir ${DEPS}/xml2 $CURL https://download.gnome.org/sources/libxml2/$(without_patch $VERSION_XML2)/libxml2-${VERSION_XML2}.tar.xz | tar xJC ${DEPS}/xml2 --strip-components=1 cd ${DEPS}/xml2 +# https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/306 +$CURL https://gitlab.gnome.org/GNOME/libxml2/-/commit/88732cae7d6031b2fa216faa3dd542681b385117.patch | patch -p1 meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ -Dminimum=true meson install -C _build --tag devel From e60df11d4923d5ec681b857e5d5abb0f93c5c06a Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 4 Apr 2025 13:00:27 +0100 Subject: [PATCH 106/109] Release v1.1.0 (libvips v8.16.1) --- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/dev-wasm32/package.json | 2 +- npm/dev/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ppc64/package.json | 2 +- npm/linux-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- npm/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index e758ec6e..dca3473d 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-arm64", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on macOS 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 797cf13b..3a2e38e4 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-darwin-x64", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on macOS x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev-wasm32/package.json b/npm/dev-wasm32/package.json index 8a44a194..531eda52 100644 --- a/npm/dev-wasm32/package.json +++ b/npm/dev-wasm32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev-wasm32", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Header files and static wasm32 libraries for libvips and dependencies to build sharp as wasm32", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/dev/package.json b/npm/dev/package.json index d7d4f4a5..fdaf802b 100644 --- a/npm/dev/package.json +++ b/npm/dev/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-dev", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 929caa7b..e787c5cf 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 32-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index b501cfff..8896ccc7 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-arm64", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json index ca73e942..84f37067 100644 --- a/npm/linux-ppc64/package.json +++ b/npm/linux-ppc64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-ppc64", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) ppc64le", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index b2d922d1..d61d5c6a 100644 --- a/npm/linux-s390x/package.json +++ b/npm/linux-s390x/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-s390x", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) s390x", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 8e29590b..549c5458 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linux-x64", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (glibc) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index f952adf3..99e9af75 100644 --- a/npm/linuxmusl-arm64/package.json +++ b/npm/linuxmusl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-arm64", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) 64-bit ARM", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index 2fd01903..9529117a 100644 --- a/npm/linuxmusl-x64/package.json +++ b/npm/linuxmusl-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-linuxmusl-x64", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on Linux (musl) x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/package.json b/npm/package.json index bf357705..f337131b 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips", - "version": "1.1.0-rc5", + "version": "1.1.0", "private": "true", "workspaces": [ "dev", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index e1d071ec..5a1c411f 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-ia32", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x86", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index f8057158..575ddf32 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "@img/sharp-libvips-win32-x64", - "version": "1.1.0-rc5", + "version": "1.1.0", "description": "Prebuilt libvips and dependencies for use with sharp on Windows x64", "author": "Lovell Fuller ", "homepage": "https://sharp.pixelplumbing.com", From 9260d9341f13c8386aee0cfa0d84bd40dfc4a22c Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 22 Apr 2025 21:59:17 +0100 Subject: [PATCH 107/109] Bump deps: aom, ffi, fontconfig, harfbuzz, xml2 --- build/lin.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index e0764051..7af39940 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -102,9 +102,9 @@ CURL="curl --silent --location --retry 3 --retry-max-time 30" # Dependency version numbers VERSION_ZLIB_NG=2.2.4 -VERSION_FFI=3.4.7 +VERSION_FFI=3.4.8 VERSION_GLIB=2.84.1 -VERSION_XML2=2.14.1 +VERSION_XML2=2.14.2 VERSION_EXIF=0.6.25 VERSION_LCMS2=2.17 VERSION_MOZJPEG=4.1.5 @@ -118,14 +118,14 @@ VERSION_PROXY_LIBINTL=0.4 VERSION_FREETYPE=2.13.3 VERSION_EXPAT=2.7.1 VERSION_ARCHIVE=3.7.9 -VERSION_FONTCONFIG=2.16.1 -VERSION_HARFBUZZ=11.0.0 +VERSION_FONTCONFIG=2.16.2 +VERSION_HARFBUZZ=11.1.0 VERSION_PIXMAN=0.44.2 VERSION_CAIRO=1.18.4 VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.56.3 VERSION_RSVG=2.60.0 -VERSION_AOM=3.12.0 +VERSION_AOM=3.12.1 VERSION_HEIF=1.19.7 VERSION_CGIF=0.5.0 @@ -228,8 +228,6 @@ meson install -C _build --tag bin-devel,devel mkdir ${DEPS}/xml2 $CURL https://download.gnome.org/sources/libxml2/$(without_patch $VERSION_XML2)/libxml2-${VERSION_XML2}.tar.xz | tar xJC ${DEPS}/xml2 --strip-components=1 cd ${DEPS}/xml2 -# https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/306 -$CURL https://gitlab.gnome.org/GNOME/libxml2/-/commit/88732cae7d6031b2fa216faa3dd542681b385117.patch | patch -p1 meson setup _build --default-library=static --buildtype=release --strip --prefix=${TARGET} ${MESON} \ -Dminimum=true meson install -C _build --tag devel From 382dcf160af428cd646f0595b5e5b2bbaff4a621 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 22 Apr 2025 23:12:34 +0100 Subject: [PATCH 108/109] aom: pin to 3.12.0 due to cmake 3.16 dependency linux-armv6 uses Debian 11, which provides cmake 3.13 --- build/lin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lin.sh b/build/lin.sh index 7af39940..63563f35 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -125,7 +125,7 @@ VERSION_CAIRO=1.18.4 VERSION_FRIBIDI=1.0.16 VERSION_PANGO=1.56.3 VERSION_RSVG=2.60.0 -VERSION_AOM=3.12.1 +VERSION_AOM=3.12.0 VERSION_HEIF=1.19.7 VERSION_CGIF=0.5.0 @@ -174,7 +174,7 @@ version_latest "cairo" "$VERSION_CAIRO" "247" version_latest "fribidi" "$VERSION_FRIBIDI" "857" version_latest "pango" "$VERSION_PANGO" "11783" "unstable" version_latest "rsvg" "$VERSION_RSVG" "5420" "unstable" -version_latest "aom" "$VERSION_AOM" "17628" +#version_latest "aom" "$VERSION_AOM" "17628" # aom 3.12.1 requires cmake 3.16 https://aomedia.googlesource.com/aom/+/597a35fbc9837e33366a1108631d9c72ee7a49e7 version_latest "heif" "$VERSION_HEIF" "64439" version_latest "cgif" "$VERSION_CGIF" "dloebl/cgif" if [ "$ALL_AT_VERSION_LATEST" = "false" ]; then exit 1; fi From d02b5257427ddcb596a6c8bf5ccbb60853499724 Mon Sep 17 00:00:00 2001 From: Dennis Ameling Date: Tue, 22 Apr 2025 18:45:47 +0200 Subject: [PATCH 109/109] Publish sharp-libvips-win32-arm64 package to npm --- npm/package.json | 1 + npm/populate.sh | 5 +++-- npm/win32-arm64/package.json | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 npm/win32-arm64/package.json diff --git a/npm/package.json b/npm/package.json index f337131b..34e8bcb0 100644 --- a/npm/package.json +++ b/npm/package.json @@ -14,6 +14,7 @@ "linux-ppc64", "linux-s390x", "linux-x64", + "win32-arm64", "win32-ia32", "win32-x64" ] diff --git a/npm/populate.sh b/npm/populate.sh index 84f6c077..2ebd477e 100755 --- a/npm/populate.sh +++ b/npm/populate.sh @@ -56,8 +56,9 @@ PLATFORMS=$(ls platforms --ignore=win32*) for platform in $PLATFORMS; do download_extract "$platform" done -download_extract "win32-ia32" -download_extract "win32-x64" +for platform in arm64v8 ia32 x64; do + download_extract "win32-$platform" +done # Common header and source files cp -r npm/linux-x64/{include,versions.json,THIRD-PARTY-NOTICES.md} npm/dev/ diff --git a/npm/win32-arm64/package.json b/npm/win32-arm64/package.json new file mode 100644 index 00000000..16942a45 --- /dev/null +++ b/npm/win32-arm64/package.json @@ -0,0 +1,30 @@ +{ + "name": "@img/sharp-libvips-win32-arm64", + "version": "1.1.0", + "description": "Prebuilt libvips and dependencies for use with sharp on Windows 64-bit ARM", + "author": "Lovell Fuller ", + "homepage": "https://sharp.pixelplumbing.com", + "repository": { + "type": "git", + "url": "git+https://github.com/lovell/sharp-libvips.git", + "directory": "npm/win32-arm64" + }, + "license": "LGPL-3.0-or-later", + "funding": { + "url": "https://opencollective.com/libvips" + }, + "preferUnplugged": true, + "publishConfig": { + "access": "public" + }, + "files": [ + "lib", + "versions.json" + ], + "type": "commonjs", + "exports": { + "./lib": "./lib/index.js", + "./package": "./package.json", + "./versions": "./versions.json" + } +}