Merge branch 'master' into termux-support

Author: jcupitt

README.md

@@ -73,6 +73,9 @@ To your `php.ini`.
 require __DIR__ . '/vendor/autoload.php';
 use Jcupitt\Vips;
 
+// check libvips version
+echo 'libvips version: ' . Vips\Config::version() . PHP_EOL;
+
 // fast thumbnail generator
 $image = Vips\Image::thumbnail('somefile.jpg', 128);
 $image->writeToFile('tiny.jpg');

src/FFI.php

@@ -243,23 +243,10 @@ private static function init(): void
         if (!ini_get('ffi.enable')) {
             throw new Exception("ffi.enable not set to 'true'");
         }
-        if (version_compare(PHP_VERSION, '8.3', '>=') &&
-            ini_get('zend.max_allowed_stack_size') != '-1') {
-            throw new Exception("zend.max_allowed_stack_size not set to '-1'");
-        }
 
-        // Use "libvips.so" on Termux, otherwise use the standard versioned library
-        $vips_libname = getenv('PREFIX') === '/data/data/com.termux/files/usr' 
-            ? "libvips.so" 
-            : self::libraryName("libvips", 42);
-        
-        if (PHP_OS_FAMILY === "Windows") {
-            $glib_libname = self::libraryName("libglib-2.0", 0);
-            $gobject_libname = self::libraryName("libgobject-2.0", 0);
-        } else {
-            $glib_libname = $vips_libname;
-            $gobject_libname = $vips_libname;
-        }
+        $vips_libname = self::libraryName("libvips", 42);
+        $glib_libname = self::libraryName("libglib-2.0", 0);
+        $gobject_libname = self::libraryName("libgobject-2.0", 0);
 
         Utils::debugLog("init", ["library" => $vips_libname]);
 
@@ -779,21 +766,24 @@ private static function init(): void
         }
 
         Utils::debugLog("init", ["binding ..."]);
-        self::$glib = self::libraryLoad(
-            $libraryPaths,
-            $glib_libname,
-            $glib_decls
-        );
-        self::$gobject = self::libraryLoad(
-            $libraryPaths,
-            $gobject_libname,
-            $gobject_decls
-        );
-        self::$vips = self::libraryLoad(
-            $libraryPaths,
-            $vips_libname,
-            $vips_decls
-        );
+
+        /**
+         * We can sometimes get dependent libraries from libvips -- either the platform
+         * will open dependencies for us automatically, or the libvips binary has been
+         * built to includes all main dependencies (common on Windows, can happen
+         * elsewhere).
+         *
+         * We must get GLib functions from libvips if we can, since it will be the
+         * one that libvips itself is using, and they will share runtime types.
+         */
+        self::$glib =
+            self::libraryLoad($libraryPaths, $vips_libname, $glib_decls) ??
+            self::libraryLoad($libraryPaths, $glib_libname, $glib_decls);
+        self::$gobject =
+            self::libraryLoad($libraryPaths, $vips_libname, $gobject_decls) ??
+            self::libraryLoad($libraryPaths, $gobject_libname, $gobject_decls);
+
+        self::$vips = self::libraryLoad($libraryPaths, $vips_libname, $vips_decls);
 
         # Useful for debugging
         # self::$vips->vips_leak_set(1);

src/GObject.php

@@ -60,6 +60,14 @@ abstract class GObject
      */
     private CData $pointer;
 
+    /**
+     * libvips executes FFI callbacks off the main thread and this confuses
+     * the stack limit checks available since PHP 8.3.0. We need to check
+     * if `zend.max_allowed_stack_size` is set to `-1`.
+     * See: https://github.com/libvips/php-vips/pull/237.
+     */
+    private static bool $check_max_stack_size = true;
+
     /**
      * Wrap a GObject around an underlying vips resource. The GObject takes
      * ownership of the pointer and will unref it on finalize.
@@ -104,6 +112,16 @@ public function unref(): void
      */
     public function signalConnect(string $name, callable $callback): void
     {
+        if (self::$check_max_stack_size) {
+            $max_allowed_stack_size = ini_get('zend.max_allowed_stack_size');
+            if ($max_allowed_stack_size !== false &&
+                $max_allowed_stack_size !== '-1') {
+                throw new Exception("signalConnect() requires zend.max_allowed_stack_size set to '-1'");
+            }
+
+            self::$check_max_stack_size = false;
+        }
+
         $marshaler = self::getMarshaler($name, $callback);
         if ($marshaler === null) {
             throw new Exception("unsupported signal $name");