@img/sharp-libvips-dev-wasm32 1.0.1 → 1.0.2

package/include/hwy/targets.h

@@ -127,6 +127,13 @@ static inline HWY_MAYBE_UNUSED const char* TargetName(int64_t target) {
       return "PPC10";
 #endif
 
+#if HWY_ARCH_S390X
+    case HWY_Z14:
+      return "Z14";
+    case HWY_Z15:
+      return "Z15";
+#endif
+
 #if HWY_ARCH_WASM
     case HWY_WASM:
       return "WASM";
@@ -245,20 +252,20 @@ static inline HWY_MAYBE_UNUSED const char* TargetName(int64_t target) {
       HWY_CHOOSE_RVV(func_name), /* RVV */      \
       nullptr                    /* reserved */
 
-#elif HWY_ARCH_PPC
+#elif HWY_ARCH_PPC || HWY_ARCH_S390X
 // See HWY_ARCH_X86 above for details.
 #define HWY_MAX_DYNAMIC_TARGETS 9
 #define HWY_HIGHEST_TARGET_BIT HWY_HIGHEST_TARGET_BIT_PPC
-#define HWY_CHOOSE_TARGET_LIST(func_name)                          \
-  nullptr,                         /* reserved */                  \
-      nullptr,                     /* reserved */                  \
-      nullptr,                     /* reserved */                  \
-      nullptr,                     /* reserved */                  \
-      HWY_CHOOSE_PPC10(func_name), /* PPC10 */                     \
-      HWY_CHOOSE_PPC9(func_name),  /* PPC9 */                      \
-      HWY_CHOOSE_PPC8(func_name),  /* PPC8 */                      \
-      nullptr,                     /* reserved (VSX or AltiVec) */ \
-      nullptr                      /* reserved (VSX or AltiVec) */
+#define HWY_CHOOSE_TARGET_LIST(func_name)         \
+  nullptr,                         /* reserved */ \
+      nullptr,                     /* reserved */ \
+      nullptr,                     /* reserved */ \
+      nullptr,                     /* reserved */ \
+      HWY_CHOOSE_PPC10(func_name), /* PPC10 */    \
+      HWY_CHOOSE_PPC9(func_name),  /* PPC9 */     \
+      HWY_CHOOSE_PPC8(func_name),  /* PPC8 */     \
+      HWY_CHOOSE_Z15(func_name),   /* Z15 */      \
+      HWY_CHOOSE_Z14(func_name)    /* Z14 */
 
 #elif HWY_ARCH_WASM
 // See HWY_ARCH_X86 above for details.

package/include/hwy/timer.h

@@ -50,6 +50,17 @@ HWY_DLLEXPORT double InvariantTicksPerSecond();
 HWY_DLLEXPORT uint64_t TimerResolution();
 
 }  // namespace platform
+
+struct Timestamp {
+  Timestamp() { t = platform::Now(); }
+  double t;
+};
+
+static inline double SecondsSince(const Timestamp& t0) {
+  const Timestamp t1;
+  return t1.t - t0.t;
+}
+
 }  // namespace hwy
 
 #endif  // HIGHWAY_HWY_TIMER_H_

package/include/resvg.h

@@ -17,9 +17,9 @@
 #include <stdint.h>
 
 #define RESVG_MAJOR_VERSION 0
-#define RESVG_MINOR_VERSION 37
+#define RESVG_MINOR_VERSION 40
 #define RESVG_PATCH_VERSION 0
-#define RESVG_VERSION "0.37.0"
+#define RESVG_VERSION "0.40.0"
 
 /**
  * @brief List of possible errors.
@@ -431,7 +431,7 @@ bool resvg_get_node_transform(const resvg_render_tree *tree,
                               resvg_transform *transform);
 
 /**
- * @brief Returns node's bounding box by ID.
+ * @brief Returns node's bounding box in canvas coordinates by ID.
  *
  * @param tree Render tree.
  * @param id Node's ID. Must not be NULL.
@@ -442,6 +442,18 @@ bool resvg_get_node_transform(const resvg_render_tree *tree,
  */
 bool resvg_get_node_bbox(const resvg_render_tree *tree, const char *id, resvg_rect *bbox);
 
+/**
+ * @brief Returns node's bounding box, including stroke, in canvas coordinates by ID.
+ *
+ * @param tree Render tree.
+ * @param id Node's ID. Must not be NULL.
+ * @param bbox Node's bounding box.
+ * @return `false` if a node with such an ID does not exist
+ * @return `false` if ID isn't a UTF-8 string.
+ * @return `false` if ID is an empty string
+ */
+bool resvg_get_node_stroke_bbox(const resvg_render_tree *tree, const char *id, resvg_rect *bbox);
+
 /**
  * @brief Destroys the #resvg_render_tree.
  */

package/include/vips/connection.h

@@ -428,8 +428,11 @@ struct _VipsTarget {
 	int write_point;
 
 	/* Write position in memory_buffer.
+	 *
+	 * off_t can be 32 bits on some platforms, so make sure we have a
+	 * full 64.
 	 */
-	off_t position;
+	gint64 position;
 
 	/* Temp targets on the filesystem need deleting, sometimes.
 	 */
@@ -466,8 +469,11 @@ typedef struct _VipsTargetClass {
 	gint64 (*read)(VipsTarget *, void *, size_t);
 
 	/* Seek output. Args exactly as lseek(2).
+	 *
+	 * We have to use int64 rather than off_t, since we must work on
+	 * Windows, where off_t can be 32-bits.
 	 */
-	off_t (*seek)(VipsTarget *, off_t offset, int whence);
+	gint64 (*seek)(VipsTarget *, gint64 offset, int whence);
 
 	/* Output has been generated, so do any clearing up,
 	 * eg. copy the bytes we saved in memory to the target blob.
@@ -492,7 +498,7 @@ int vips_target_write(VipsTarget *target, const void *data, size_t length);
 VIPS_API
 gint64 vips_target_read(VipsTarget *target, void *buffer, size_t length);
 VIPS_API
-off_t vips_target_seek(VipsTarget *target, off_t offset, int whence);
+gint64 vips_target_seek(VipsTarget *target, gint64 offset, int whence);
 VIPS_API
 int vips_target_end(VipsTarget *target);
 VIPS_DEPRECATED_FOR(vips_target_end)

package/include/vips/util.h

@@ -164,15 +164,6 @@ extern "C" {
 	} \
 	G_STMT_END
 
-/* The g_info() macro was added in 2.40.
- */
-#ifndef g_info
-/* Hopefully we have varargs macros. Maybe revisit this.
- */
-#define g_info(...) \
-	g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__)
-#endif
-
 /* Various integer range clips. Record over/under flows.
  */
 #define VIPS_CLIP_UCHAR(V, SEQ) \

package/include/vips/version.h

@@ -4,16 +4,16 @@
 #ifndef VIPS_VERSION_H
 #define VIPS_VERSION_H
 
-#define VIPS_VERSION "8.15.1"
-#define VIPS_VERSION_STRING "8.15.1"
+#define VIPS_VERSION "8.15.2"
+#define VIPS_VERSION_STRING "8.15.2"
 #define VIPS_MAJOR_VERSION (8)
 #define VIPS_MINOR_VERSION (15)
-#define VIPS_MICRO_VERSION (1)
+#define VIPS_MICRO_VERSION (2)
 
 /* The ABI version, as used for library versioning.
  */
 #define VIPS_LIBRARY_CURRENT (59)
-#define VIPS_LIBRARY_REVISION (1)
+#define VIPS_LIBRARY_REVISION (2)
 #define VIPS_LIBRARY_AGE (17)
 
 #define VIPS_CONFIG "enable debug: false\nenable deprecated: false\nenable modules: false\nenable cplusplus: true\nenable RAD load/save: true\nenable Analyze7 load/save: true\nenable PPM load/save: true\nenable GIF load: true\nuse fftw for FFTs: false\nSIMD support with highway: true\nICC profile support with lcms: true\nzlib: true\ntext rendering with pangocairo: false\nfont file support with fontconfig: false\nEXIF metadata support with libexif: true\nJPEG load/save with libjpeg: true\nJXL load/save with libjxl: false (dynamic module: false)\nJPEG2000 load/save with OpenJPEG: false\nPNG load/save with libspng: true\nPNG load/save with libpng: false\nselected quantisation package: imagequant\nTIFF load/save with libtiff: true\nimage pyramid save with libarchive: false\nHEIC/AVIF load/save with libheif: true (dynamic module: false)\nWebP load/save with libwebp: true\nPDF load with PDFium: false\nPDF load with poppler-glib: false (dynamic module: false)\nSVG load with librsvg: false\nSVG load with resvg: true (dynamic module: false)\nEXR load with OpenEXR: false\nOpenSlide load: false (dynamic module: false)\nMatlab load with libmatio: false\nNIfTI load/save with niftiio: false\nFITS load/save with cfitsio: false\nGIF save with cgif: true\nselected Magick package: none (dynamic module: false)\nMagick API version: none\nMagick load: false\nMagick save: false"

package/include/zconf.h

@@ -116,6 +116,9 @@
 #ifndef ZEXPORTVA
 #  define ZEXPORTVA Z_EXPORTVA
 #endif
+#ifndef FAR
+#  define FAR
+#endif
 
 /* Legacy zlib typedefs for backwards compatibility. Don't assume stdint.h is defined. */
 typedef unsigned char Byte;

package/include/zlib.h

@@ -49,11 +49,11 @@
 extern "C" {
 #endif
 
-#define ZLIBNG_VERSION "2.1.5"
-#define ZLIBNG_VERNUM 0x020105F0L   /* MMNNRRSM: major minor revision status modified */
+#define ZLIBNG_VERSION "2.1.6"
+#define ZLIBNG_VERNUM 0x020106F0L   /* MMNNRRSM: major minor revision status modified */
 #define ZLIBNG_VER_MAJOR 2
 #define ZLIBNG_VER_MINOR 1
-#define ZLIBNG_VER_REVISION 5
+#define ZLIBNG_VER_REVISION 6
 #define ZLIBNG_VER_STATUS F         /* 0=devel, 1-E=beta, F=Release (DEPRECATED) */
 #define ZLIBNG_VER_STATUSH 0xF      /* Hex values: 0=devel, 1-E=beta, F=Release */
 #define ZLIBNG_VER_MODIFIED 0       /* non-zero if modified externally from zlib-ng */

package/lib/glib-2.0/include/glibconfig.h

@@ -16,6 +16,7 @@
 #define GOBJECT_STATIC_COMPILATION 1
 #define GIO_STATIC_COMPILATION 1
 #define GMODULE_STATIC_COMPILATION 1
+#define GI_STATIC_COMPILATION 1
 #define G_INTL_STATIC_COMPILATION 1
 #define FFI_STATIC_BUILD 1
 
@@ -113,7 +114,7 @@ typedef unsigned int guintptr;
 #define G_GUINTPTR_FORMAT       "u"
 
 #define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 79
+#define GLIB_MINOR_VERSION 80
 #define GLIB_MICRO_VERSION 0
 
 #define G_OS_UNIX

package/lib/libexpat.la

@@ -23,9 +23,9 @@ dependency_libs=' -lm -L/src/build/target/lib'
 weak_library_names=''
 
 # Version information for libexpat.
-current=9
-age=8
-revision=10
+current=10
+age=9
+revision=2
 
 # Is this an already installed library?
 installed=yes

package/lib/libffi.la

@@ -1,5 +1,5 @@
 # libffi.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-15build2
+# Generated by libtool (GNU libtool) 2.4.7
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -25,7 +25,7 @@ weak_library_names=''
 # Version information for libffi.
 current=9
 age=1
-revision=2
+revision=4
 
 # Is this an already installed library?
 installed=yes

package/lib/pkgconfig/aom.pc

@@ -5,8 +5,8 @@ includedir=${prefix}/include
 libdir=${exec_prefix}/lib
 
 Name: aom
-Description: Alliance for Open Media AV1 codec library v3.8.0.
-Version: 3.8.0
+Description: Alliance for Open Media AV1 codec library v3.8.2.
+Version: 3.8.2
 Requires:
 Conflicts:
 Libs: -L${libdir} -laom

package/lib/pkgconfig/expat.pc

@@ -4,9 +4,10 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: expat
-Version: 2.5.0
+Version: 2.6.2
 Description: expat XML parser
 URL: https://libexpat.github.io/
 Libs: -L${libdir} -lexpat
 Libs.private: -lm
 Cflags: -I${includedir}
+Cflags.private: -DXML_STATIC

package/lib/pkgconfig/gio-2.0.pc

@@ -18,7 +18,7 @@ gsettings=${bindir}/gsettings
 
 Name: GIO
 Description: glib I/O library
-Version: 2.79.0
+Version: 2.80.0
 Requires: glib-2.0, gobject-2.0, gmodule-no-export-2.0, zlib
 Libs: -L${libdir} -lgio-2.0
 Cflags: -I${includedir}

package/lib/pkgconfig/glib-2.0.pc

@@ -11,6 +11,6 @@ glib_valgrind_suppressions=${datadir}/glib-2.0/valgrind/glib.supp
 
 Name: GLib
 Description: C Utility Library
-Version: 2.79.0
+Version: 2.80.0
 Libs: -L${libdir} -lglib-2.0 -lm -pthread
 Cflags: -I${includedir}/glib-2.0 -pthread -I${libdir}/glib-2.0/include

package/lib/pkgconfig/gmodule-2.0.pc

@@ -6,7 +6,7 @@ gmodule_supported=true
 
 Name: GModule
 Description: Dynamic module loader for GLib
-Version: 2.79.0
+Version: 2.80.0
 Requires: gmodule-no-export-2.0, glib-2.0
 Libs: -Wl,--export-dynamic
 Cflags: -I${includedir}

package/lib/pkgconfig/gmodule-export-2.0.pc

@@ -6,7 +6,7 @@ gmodule_supported=true
 
 Name: GModule
 Description: Dynamic module loader for GLib
-Version: 2.79.0
+Version: 2.80.0
 Requires: gmodule-no-export-2.0, glib-2.0
 Libs: -Wl,--export-dynamic
 Cflags: -I${includedir}

package/lib/pkgconfig/gmodule-no-export-2.0.pc

@@ -6,7 +6,7 @@ gmodule_supported=true
 
 Name: GModule
 Description: Dynamic module loader for GLib
-Version: 2.79.0
+Version: 2.80.0
 Requires: glib-2.0
 Libs: -L${libdir} -lgmodule-2.0 -pthread
 Cflags: -I${includedir} -pthread

package/lib/pkgconfig/gobject-2.0.pc

@@ -4,7 +4,7 @@ libdir=${prefix}/lib
 
 Name: GObject
 Description: GLib Type, Object, Parameter and Signal Library
-Version: 2.79.0
+Version: 2.80.0
 Requires: glib-2.0, libffi >=  3.0.0
 Libs: -L${libdir} -lgobject-2.0
 Cflags: -I${includedir}

package/lib/pkgconfig/gthread-2.0.pc

@@ -4,7 +4,7 @@ libdir=${prefix}/lib
 
 Name: GThread
 Description: Thread support for GLib
-Version: 2.79.0
+Version: 2.80.0
 Requires: glib-2.0
 Libs: -L${libdir} -lgthread-2.0 -pthread
 Cflags: -I${includedir} -pthread

package/lib/pkgconfig/libffi.pc

@@ -6,6 +6,6 @@ includedir=${prefix}/include
 
 Name: libffi
 Description: Library supporting Foreign Function Interfaces
-Version: 3.4.4
+Version: 3.4.6
 Libs: -L${toolexeclibdir} -lffi
 Cflags: -I${includedir}

package/lib/pkgconfig/libhwy.pc

@@ -5,6 +5,6 @@ includedir=${prefix}/include
 
 Name: libhwy
 Description: Efficient and performance-portable SIMD wrapper
-Version: 1.0.7
+Version: 1.1.0
 Libs: -L${libdir} -lhwy
 Cflags: -I${includedir} -DHWY_STATIC_DEFINE

package/lib/pkgconfig/vips-cpp.pc

@@ -4,7 +4,7 @@ libdir=${prefix}/lib
 
 Name: vips-cpp
 Description: C++ API for vips8 image processing library
-Version: 8.15.1
+Version: 8.15.2
 Requires: vips, glib-2.0 >= 2.52, gio-2.0, gobject-2.0, expat, zlib >= 0.4, imagequant, cgif >= 0.2.0, libexif >= 0.6, libjpeg, spng >= 0.7, libwebp >= 0.6, libwebpmux >= 0.6, libwebpdemux >= 0.6, libtiff-4, lcms2, libhwy >= 1.0.5, libheif >= 1.4.0
 Libs: -L${libdir} -lvips-cpp -pthread -lm -lresvg
 Cflags: -I${includedir} -pthread -DHAVE_CONFIG_H=1

package/lib/pkgconfig/vips.pc

@@ -4,7 +4,7 @@ libdir=${prefix}/lib
 
 Name: vips
 Description: Image processing library
-Version: 8.15.1
+Version: 8.15.2
 Requires: glib-2.0 >= 2.52, gio-2.0, gobject-2.0, expat, zlib >= 0.4, imagequant, cgif >= 0.2.0, libexif >= 0.6, libjpeg, spng >= 0.7, libwebp >= 0.6, libwebpmux >= 0.6, libwebpdemux >= 0.6, libtiff-4, lcms2, libhwy >= 1.0.5, libheif >= 1.4.0
 Libs: -L${libdir} -lvips -pthread -lm -lresvg
 Cflags: -I${includedir} -pthread -DHAVE_CONFIG_H=1

package/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 <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",

package/versions.json

@@ -1,20 +1,20 @@
 {
-  "aom": "3.8.0",
+  "aom": "3.8.2",
   "cgif": "0.3.2",
   "emscripten": "3.1.51",
   "exif": "0.6.24",
-  "expat": "2.5.0",
-  "ffi": "3.4.4",
-  "glib": "2.79.0",
+  "expat": "2.6.2",
+  "ffi": "3.4.6",
+  "glib": "2.80.0",
   "heif": "1.17.6",
-  "highway": "1.0.7",
+  "highway": "1.1.0",
   "imagequant": "2.4.1",
   "lcms": "2.16",
   "mozjpeg": "4.1.5",
-  "resvg": "0.37.0",
+  "resvg": "0.40.0",
   "spng": "0.7.4",
   "tiff": "4.6.0",
-  "vips": "8.15.1",
+  "vips": "8.15.2",
   "webp": "1.3.2",
-  "zlib-ng": "2.1.5"
+  "zlib-ng": "2.1.6"
 }