diff --git a/build/lin.sh b/build/lin.sh index e0764051..63563f35 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,8 +118,8 @@ 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 @@ -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 @@ -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 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" + } +}