@ohos-ports/sharp 0.34.5-beta.5 → 0.34.5-beta.6

package/lib/sharp.js

@@ -10,29 +10,38 @@ const { familySync, versionSync } = require('detect-libc');
 const { runtimePlatformArch, isUnsupportedNodeRuntime, prebuiltPlatforms, minimumLibvipsVersion } = require('./libvips');
 const runtimePlatform = runtimePlatformArch();
 
-// OpenHarmony: create soname symlink for transitive .so dependency
-// sharp.node NEEDED is patched to use full filename (libvips-cpp.so.42.20.3),
-// but libvips-cpp.so.42.20.3 still NEEDED libvips.so.42 (soname).
-// The libvips package only ships libvips.so.42.20.3, no soname symlink.
+// OpenHarmony: set LD_LIBRARY_PATH for libvips before loading native binary
+// The .node binary's RPATH references @img/ namespace but the actual .so
+// files are installed under @ohos-ports/img-sharp-libvips-{platform}/lib
 try {
-  const path = require('node:path');
-  const fs = require('node:fs');
   const libvipsLibPath = require(`@ohos-ports/img-sharp-libvips-${runtimePlatform}/lib`);
   if (libvipsLibPath) {
-    for (const file of fs.readdirSync(libvipsLibPath)) {
-      const m = file.match(/^(.+\.so\.\d+)\.\d+\.\d+$/);
-      if (m) {
-        const soname = path.join(libvipsLibPath, m[1]);
-        if (!fs.existsSync(soname)) {
-          try { fs.symlinkSync(file, soname); } catch (_) {}
+    const path = require('node:path');
+    const fs = require('node:fs');
+    // Create soname symlinks: libXXX.so.Y.Z.W → libXXX.so.Y
+    // The .node binary NEEDED entries request sonames (e.g. libvips-cpp.so.42)
+    // but the libvips package only ships full-version files (e.g. libvips-cpp.so.42.20.3)
+    try {
+      for (const file of fs.readdirSync(libvipsLibPath)) {
+        const m = file.match(/^(.+\.so\.\d+)\.\d+\.\d+$/);
+        if (m) {
+          const soname = path.join(libvipsLibPath, m[1]);
+          if (!fs.existsSync(soname)) {
+            try { fs.symlinkSync(file, soname); } catch (_) {
+              try { fs.copyFileSync(path.join(libvipsLibPath, file), soname); } catch (_) {}
+            }
+          }
         }
       }
+    } catch (_) {}
+    const currentLdPath = process.env.LD_LIBRARY_PATH || '';
+    if (!currentLdPath.includes(libvipsLibPath)) {
+      process.env.LD_LIBRARY_PATH = `${libvipsLibPath}:${currentLdPath}`;
     }
   }
-} catch (_e) { /* skip */ }
+} catch (_e) { /* libvips not available as separate package, skip */ }
 
 const paths = [
-  `./sharp-${runtimePlatform}.node`,
   `../src/build/Release/sharp-${runtimePlatform}.node`,
   '../src/build/Release/sharp-wasm32.node',
   `@ohos-ports/img-sharp-${runtimePlatform}/sharp.node`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ohos-ports/sharp",
   "description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images",
-  "version": "0.34.5-beta.5",
+  "version": "0.34.5-beta.6",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -15,7 +15,7 @@
     "Brandon Aaron <hello.brandon@aaron.sh>",
     "Andreas Lind <andreas@one.com>",
     "Maurus Cuelenaere <mcuelenaere@gmail.com>",
-    "Linus Unneb\u00e4ck <linus@folkdatorn.se>",
+    "Linus Unnebäck <linus@folkdatorn.se>",
     "Victor Mateevitsi <mvictoras@gmail.com>",
     "Alaric Holloway <alaric.holloway@gmail.com>",
     "Bernhard K. Weisshuhn <bkw@codingforce.com>",
@@ -23,7 +23,7 @@
     "David Carley <dacarley@gmail.com>",
     "John Tobin <john@limelightmobileinc.com>",
     "Kenton Gray <kentongray@gmail.com>",
-    "Felix B\u00fcnemann <Felix.Buenemann@gmail.com>",
+    "Felix Bünemann <Felix.Buenemann@gmail.com>",
     "Samy Al Zahrani <samyalzahrany@gmail.com>",
     "Chintan Thakkar <lemnisk8@gmail.com>",
     "F. Orlando Galashan <frulo@gmx.de>",
@@ -31,7 +31,7 @@
     "Matt Hirsch <mhirsch@media.mit.edu>",
     "Matthias Thoemmes <thoemmes@gmail.com>",
     "Patrick Paskaris <patrick@paskaris.gr>",
-    "J\u00e9r\u00e9my Lal <kapouer@melix.org>",
+    "Jérémy Lal <kapouer@melix.org>",
     "Rahul Nanwani <r.nanwani@gmail.com>",
     "Alice Monday <alice0meta@gmail.com>",
     "Kristo Jorgenson <kristo.jorgenson@gmail.com>",
@@ -41,7 +41,7 @@
     "Matt Parrish <matt.r.parrish@gmail.com>",
     "Marcel Bretschneider <marcel.bretschneider@gmail.com>",
     "Matthew McEachen <matthew+github@mceachen.org>",
-    "Jarda Kot\u011b\u0161ovec <jarda.kotesovec@gmail.com>",
+    "Jarda Kotěšovec <jarda.kotesovec@gmail.com>",
     "Kenric D'Souza <kenric.dsouza@gmail.com>",
     "Oleh Aleinyk <oleg.aleynik@gmail.com>",
     "Marcel Bretschneider <marcel.bretschneider@gmail.com>",
@@ -70,7 +70,7 @@
     "Roman Malieiev <aromaleev@gmail.com>",
     "Tomas Szabo <tomas.szabo@deftomat.com>",
     "Robert O'Rourke <robert@o-rourke.org>",
-    "Guillermo Alfonso Varela Chouci\u00f1o <guillevch@gmail.com>",
+    "Guillermo Alfonso Varela Chouciño <guillevch@gmail.com>",
     "Christian Flintrup <chr@gigahost.dk>",
     "Manan Jadhav <manan@motionden.com>",
     "Leon Radley <leon@radley.se>",
@@ -79,7 +79,7 @@
     "Michael Nutt <michael@nutt.im>",
     "Brad Parham <baparham@gmail.com>",
     "Taneli Vatanen <taneli.vatanen@gmail.com>",
-    "Joris Dugu\u00e9 <zaruike10@gmail.com>",
+    "Joris Dugué <zaruike10@gmail.com>",
     "Chris Banks <christopher.bradley.banks@gmail.com>",
     "Ompal Singh <ompal.hitm09@gmail.com>",
     "Brodan <christopher.hranj@gmail.com>",
@@ -168,7 +168,7 @@
     "@img/sharp-win32-arm64": "0.34.5",
     "@img/sharp-win32-ia32": "0.34.5",
     "@img/sharp-win32-x64": "0.34.5",
-    "@ohos-ports/img-sharp-openharmony-arm64": "0.34.5-beta.0"
+    "@ohos-ports/img-sharp-openharmony-arm64": "0.34.5-beta.1"
   },
   "devDependencies": {
     "@ohos-ports/biomejs-biome": "^2.3.4-beta.0",
@@ -200,4 +200,4 @@
   "funding": {
     "url": "https://opencollective.com/libvips"
   }
-}
+}