ruby-vips 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf388c9ee4f7b130b34c0a30954da1d9efd08b09799befe88d676bca7c79f64
-  data.tar.gz: 015463ac062367c72195e8349669c8ed80123c81cb88710951130d030b6a4018
+  metadata.gz: f57995edbbad929820ab97faae77cefac5596a6c4e440abfd86dc67a1a3ef6e3
+  data.tar.gz: 2cf84c9faced0678582b7858a1eac8c870e800bbf275c54427cf6f9564a76c13
 SHA512:
-  metadata.gz: e05333180a545ecae8a7aa4da0a0fa1382e2b8e0233338b2e818cfcaa7de6e2a14c9be0d6f11510393ffb4343e5ad84a7100ba665c158546fd8dfcb71e83462e
-  data.tar.gz: b4edb03ea9b62fd30c41fc51bb9cfb94214b4929e83df24c62742de63f7dbff1d13220e57a234da8592816f33e09f0122a9a60c790c9d459b236e655c7691467
+  metadata.gz: 48a29e47be77eca5d376af0f52969b7cf051eced8467c10206ae7ab10d8e48a25482a9c4402116ceb5dbc6fbc034fcc6aa340324bd77330d191d8920af1efb8b
+  data.tar.gz: e3ee97a320b95e9d897cd79754e1db0124c32c2f751e170896e70deecf72bddefa21f1dfda5ea5966846dccbbc95544e5e4ecffc0ebeb0d9f429802c8c62a6a3

data/.github/workflows/test.yml

@@ -38,8 +38,6 @@ jobs:
       matrix:
         os-version: [ 'ubuntu-20.04' ]
         ruby-version:
-          - '2.1'
-          - '2.2'
           - '2.3'
           - '2.4'
           - '2.5'
@@ -48,6 +46,7 @@ jobs:
           - '3.0'
           - '3.1'
           - '3.2'
+          - '3.3'
           - jruby
       fail-fast: true
 
@@ -74,7 +73,7 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
         run:
           # we only need the library
-          sudo apt-get install --fix-missing -qq -o Acquire::Retries=3
+          sudo apt-get install --no-install-recommends --fix-missing -qq -o Acquire::Retries=3
             libvips 
 
       - name: Run Tests

data/CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ## master
 
-## Version 2.2.1 (2023-02-21)
+## Version 2.2.2 (2024-07-17)
+
+* fix compat with unified (semistatic) libvips binaries [kleisauke]
+
+## Version 2.2.1 (2024-02-21)
 
 * add `Vips.block_untrusted` method to block all untrusted operations. Only for libvips >= 8.13. [Docs](https://www.libvips.org/API/current/libvips-vips.html#vips-block-untrusted-set). [#382](https://github.com/libvips/ruby-vips/pull/382) [aglushkov](https://github.com/aglushkov)
 * add `Vips.block` method to block specific operation. Only for libvips >= 8.13. [Docs](https://www.libvips.org/API/current/VipsOperation.html#vips-operation-block-set). [#382](https://github.com/libvips/ruby-vips/pull/382) [aglushkov](https://github.com/aglushkov)

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/lib/vips/object.rb

@@ -9,9 +9,6 @@ require "ffi"
 module Vips
   private
 
-  # debugging support
-  attach_function :vips_object_print_all, [], :void
-
   # we must init these by hand, since they are usually made on first image
   # create
   attach_function :vips_band_format_get_type, [], :GType
@@ -337,6 +334,7 @@ module Vips
       ArgumentClassPtr.ptr, ArgumentInstancePtr.ptr],
     :int
 
+  # debugging support
   attach_function :vips_object_print_all, [], :void
 
   attach_function :vips_object_set_from_string, [:pointer, :string], :int

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module Vips
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/lib/vips.rb

@@ -33,6 +33,30 @@ def library_name(name, abi_number)
   end
 end
 
+# 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
+module Vips
+  extend FFI::Library
+
+  ffi_lib library_name("vips", 42)
+
+  begin
+    attach_function :g_malloc, [:size_t], :pointer
+    @@is_unified = true
+  rescue FFI::NotFoundError
+    @@is_unified = false
+  end
+
+  def self.unified?
+    @@is_unified
+  end
+end
+
 module GLib
   class << self
     attr_accessor :logger
@@ -42,7 +66,11 @@ module GLib
 
   extend FFI::Library
 
-  ffi_lib library_name("glib-2.0", 0)
+  if Vips.unified?
+    ffi_lib library_name("vips", 42)
+  else
+    ffi_lib library_name("glib-2.0", 0)
+  end
 
   attach_function :g_malloc, [:size_t], :pointer
 
@@ -134,7 +162,11 @@ end
 module GObject
   extend FFI::Library
 
-  ffi_lib library_name("gobject-2.0", 0)
+  if Vips.unified?
+    ffi_lib library_name("vips", 42)
+  else
+    ffi_lib library_name("gobject-2.0", 0)
+  end
 
   # we can't just use ulong, windows has different int sizing rules
   if FFI::Platform::ADDRESS_SIZE == 64
@@ -568,9 +600,7 @@ require "vips/gvalue"
 # {Image#median}.
 
 module Vips
-  extend FFI::Library
-
-  ffi_lib library_name("vips", 42)
+  # we've already opened the libvips library
 
   LOG_DOMAIN = "VIPS"
   GLib.set_log_domain LOG_DOMAIN

data/ruby-vips.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_runtime_dependency "ffi", ["~> 1.12"]
+  spec.add_runtime_dependency "logger"
 
   spec.add_development_dependency "rake", ["~> 12.0"]
   spec.add_development_dependency "rspec", ["~> 3.3"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - John Cupitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-21 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: A fast image processing library with low memory needs