doom 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f1be6b4e908fb60c850e5ac7e4e9d5ade8fff60fd7c9744d89da3132625e5a
-  data.tar.gz: bdbc30dcb9141292e4c6ae8d974b604b0d8cdb440dac964bc637615fd9cf53b4
+  metadata.gz: '08767e4f911ccfa133987896b1a26669e9c8e4e61aac202d9f15af080f6df789'
+  data.tar.gz: c281b8a23b05e748522069b538519ee321b43a6621a5f4dac5fa94379c2e9815
 SHA512:
-  metadata.gz: e5a2273db5baa4bb26c5d9d08cc78b734ef102d7b8d354a95109e44e72bb8deaf901b743aa59a9a3ff4f1770059d13b2e7069f3f8be5d6ccaec942b7b69d3053
-  data.tar.gz: 6cb2b7e235928e9a72ab95a87a44c7be3c84dbc0f59bcd45d7c0e40f0f3ebee54a46198baea930191b2355cc7a713e326d8c412354ab6eee103adf7ebe9bf5c9
+  metadata.gz: 787fdb4e71f127f091f5d8fbcc523189b1edc9a8075e5a34b0f1625c599ca7912fdc6b9532026ebb7d25d7f3581655df0318a47d3af0f1b7159348d03c8c9443
+  data.tar.gz: e3807b2509c349b09c9c473ed0372e9f04f1e3fa53e89c714c0e3ca3c20f2c91d81332f57c962e0e2396cbe0a22ca71c86a23691611b7e115cff149dd9a41557

data/README.md

@@ -127,6 +127,9 @@ to present every frame the old way.
 brew install sdl2
 ```
 
+If an older installation reports `symbol not found in flat namespace _OBJC_CLASS_$_NSScreen`,
+update the gem with `gem update doom`. This is fixed in Doom Ruby 0.11.1.
+
 **Ubuntu/Debian:**
 ```bash
 sudo apt-get install build-essential libsdl2-dev libgl1-mesa-dev libopenal-dev libsndfile1-dev libmpg123-dev libfontconfig1-dev

data/lib/doom/platform/gosu_loader.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rbconfig'
+
+module Doom
+  module Platform
+    # Gosu 1.4.6's macOS extension can be linked without its AppKit and SDL2
+    # dependencies when sdl2-config does not implement --static-libs. Load the
+    # frameworks globally first so dyld can resolve the extension's symbols.
+    module GosuLoader
+      APPKIT = '/System/Library/Frameworks/AppKit.framework/AppKit'
+      SDL2_CANDIDATES = %w[
+        /opt/homebrew/opt/sdl2/lib/libSDL2.dylib
+        /usr/local/opt/sdl2/lib/libSDL2.dylib
+        /opt/homebrew/lib/libSDL2.dylib
+        /usr/local/lib/libSDL2.dylib
+      ].freeze
+
+      module_function
+
+      def prepare!
+        return unless RbConfig::CONFIG['host_os'].include?('darwin')
+
+        require 'fiddle'
+        flags = Fiddle::RTLD_GLOBAL | Fiddle::RTLD_LAZY
+        @handles ||= []
+        @handles << Fiddle::Handle.new(APPKIT, flags)
+
+        sdl2 = SDL2_CANDIDATES.find { |path| File.file?(path) }
+        unless sdl2
+          raise LoadError,
+                'Could not find Homebrew SDL2 required by Gosu. Install it with `brew install sdl2`.'
+        end
+
+        @sdl2_handle = Fiddle::Handle.new(sdl2, flags)
+        @handles << @sdl2_handle
+      rescue Fiddle::DLError => e
+        raise LoadError, "Could not load macOS frameworks required by Gosu: #{e.message}"
+      end
+
+      def sdl2_handle
+        @sdl2_handle
+      end
+    end
+  end
+end

data/lib/doom/platform/gosu_window.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'gosu_loader'
+Doom::Platform::GosuLoader.prepare!
 require 'gosu'
 require_relative 'sdl'
 require_relative 'window_logic'

data/lib/doom/platform/sdl.rb

@@ -9,12 +9,13 @@ module Doom
         gosu_spec = Gem.loaded_specs['gosu']
         lib_ext = RbConfig::CONFIG['DLEXT'] || 'so'
         bundle = File.join(gosu_spec.full_gem_path, 'lib', "gosu.#{lib_ext}")
-        @lib = Fiddle.dlopen(bundle)
+        @gosu_lib = Fiddle.dlopen(bundle)
+        @sdl_lib = Doom::Platform::GosuLoader.sdl2_handle || @gosu_lib
         @shared_window = Fiddle::Function.new(
-          @lib['_ZN4Gosu13shared_windowEv'], [], Fiddle::TYPE_VOIDP
+          @gosu_lib['_ZN4Gosu13shared_windowEv'], [], Fiddle::TYPE_VOIDP
         )
         @set_kb_grab = Fiddle::Function.new(
-          @lib['SDL_SetWindowKeyboardGrab'],
+          @sdl_lib['SDL_SetWindowKeyboardGrab'],
           [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT], Fiddle::TYPE_VOID
         )
         @ready = true
@@ -52,7 +53,8 @@ module Doom
         require 'fiddle'
         gosu_spec = Gem.loaded_specs['gosu']
         lib_ext = RbConfig::CONFIG['DLEXT'] || 'so'
-        lib = Fiddle.dlopen(File.join(gosu_spec.full_gem_path, 'lib', "gosu.#{lib_ext}"))
+        bundle = File.join(gosu_spec.full_gem_path, 'lib', "gosu.#{lib_ext}")
+        lib = Doom::Platform::GosuLoader.sdl2_handle || Fiddle.dlopen(bundle)
 
         get_mode = Fiddle::Function.new(
           lib['SDL_GetCurrentDisplayMode'],

data/lib/doom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Doom
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doom
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Chris Hasinski
@@ -148,6 +148,7 @@ files:
 - lib/doom/net/protocol.rb
 - lib/doom/net/session.rb
 - lib/doom/net/transport.rb
+- lib/doom/platform/gosu_loader.rb
 - lib/doom/platform/gosu_window.rb
 - lib/doom/platform/sdl.rb
 - lib/doom/platform/window_logic.rb
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Doom engine port with multiplayer and modern renderers
 test_files: []