Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-12-19 07:15:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to libvips v8.15.5-rc1

Browse Source
This commit is contained in:
Lovell Fuller
2024-10-09 14:31:29 +01:00
parent b249357732
commit a53d7cb6bf
15 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/binding.gyp
View File

@@ -12,7 +12,7 @@
'sharp_libvips_lib_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsLibDir()")'
},
'targets': [{
'target_name': 'libvips-cpp',
'target_name': 'libvips-cpp-<(vips_version)',
'conditions': [
['OS == "win"', {
# Build libvips C++ binding for Windows due to MSVC std library ABI changes
@@ -83,7 +83,7 @@
],
'dependencies': [
'<!(node -p "require(\'node-addon-api\').gyp")',
'libvips-cpp'
'libvips-cpp-<(vips_version)'
],
'variables': {
'conditions': [
@@ -149,7 +149,7 @@
['OS == "mac"', {
'link_settings': {
'libraries': [
'libvips-cpp.42.dylib'
'libvips-cpp.<(vips_version).dylib'
]
},
'xcode_settings': {
@@ -169,7 +169,7 @@
],
'link_settings': {
'libraries': [
'-l:libvips-cpp.so.42'
'-l:libvips-cpp.so.<(vips_version)'
],
'ldflags': [
'-Wl,-s',

4
src/common.h
View File

@@ -16,8 +16,8 @@
#if (VIPS_MAJOR_VERSION < 8) || \
(VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 15) || \
(VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 3)
#error "libvips version 8.15.3+ is required - please see https://sharp.pixelplumbing.com/install"
(VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 5)
#error "libvips version 8.15.5+ is required - please see https://sharp.pixelplumbing.com/install"
#endif
#if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))