libpng 1.6.58.0 → 1.6.58.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424bb2ec057dfcb24902b7d42a4ca73936d54cd30ca0cbdb81df8277a97d3ba1
-  data.tar.gz: f424a0836d9ce74aaccacd16ab7aa6cb60aee534576b25a72a4d22d9752b4adc
+  metadata.gz: 91ec3180573925adf91a3fb1463a008d05a113f633ca4a4dcd00546008585699
+  data.tar.gz: 34cc29c477d3bd9939067304ef3fc21357b773df42022bf16c6ef52323f25c5b
 SHA512:
-  metadata.gz: dd873ee26bb9b3a7e2c52cded5e501de1ed59bc1c1250132c60ef71ffdc99af9e5d6a09aa3399f5ddee3eff7a4ced98772fa3eb2f058076e7410e770bd0225ea
-  data.tar.gz: 40b078365a95aff0413904b94092eed3f76f6f0cc42dd637d5b16c1ee1d72fe2cb05c89ac9f0513f140591dc28ccbc84f997dc3f64ed0e03e53487dd04b9da70
+  metadata.gz: 4489b62efba7933a588fabafd4d0cb65122a77d0a363a476a80db1e726affcffbe70a02ac7783b916b867d59ad9a0f6ebd1319d12421a3ab65e74d92822e143c
+  data.tar.gz: 34042f2512c7234881c36bbcb140b283f267288d7b0575a71131773a681419f5542b9419de40355a5190050f9415b0081af3396e7115153fb6026575b58d5415

data/.github/workflows/build.yml

@@ -53,7 +53,7 @@ jobs:
 
     - name: Install build tools (Windows)
       if: startsWith(matrix.os, 'windows')
-      uses: ilammy/msvc-dev-tools@v1
+      uses: step-security/msvc-dev-cmd@v1
 
     - run: bundle exec rake
 
@@ -71,15 +71,24 @@ jobs:
           - os: ubuntu-latest
             platform: x86_64-linux
             ruby-version: ${{ needs.prepare.outputs.default-ruby-version }}
+          - os: ubuntu-24.04-arm
+            platform: aarch64-linux
+            ruby-version: ${{ needs.prepare.outputs.default-ruby-version }}
           - os: windows-latest
             platform: x64-mingw32
             ruby-version: ${{ needs.prepare.outputs.default-ruby-version }}
           - os: windows-latest
             platform: x64-mingw-ucrt
             ruby-version: ${{ needs.prepare.outputs.default-ruby-version }}
-          - os: macos-latest
+          - os: windows-11-arm
+            platform: aarch64-mingw-ucrt
+            ruby-version: '3.4'
+          - os: macos-15-intel
             platform: x86_64-darwin
             ruby-version: ${{ needs.prepare.outputs.default-ruby-version }}
+          - os: macos-latest
+            platform: arm64-darwin
+            ruby-version: ${{ needs.prepare.outputs.default-ruby-version }}
 
     steps:
     - uses: actions/checkout@v4
@@ -103,7 +112,9 @@ jobs:
 
     - name: Install build tools (Windows)
       if: startsWith(matrix.os, 'windows')
-      uses: ilammy/msvc-dev-tools@v1
+      uses: step-security/msvc-dev-cmd@v1
+      with:
+        arch: ${{ matrix.platform == 'aarch64-mingw-ucrt' && 'arm64' || 'x64' }}
 
     - run: bundle exec rake gem:native:${{ matrix.platform }}
 
@@ -116,5 +127,64 @@ jobs:
       run: gem install -b pkg/libpng-*.gem
 
     - name: Test conversion
+      shell: bash
+      run: |
+        ruby -rlibpng -e 'png = Libpng.encode(2, 2, "\xff" * 16, pixel_format: "RGBA"); File.binwrite("test.png", png); puts Libpng.decode(png, pixel_format: "RGBA").inspect'
+
+  build_musl:
+    name: build ${{ matrix.platform }} (Alpine)
+    runs-on: ${{ matrix.os }}
+    needs: prepare
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            platform: x86_64-linux-musl
+          - os: ubuntu-24.04-arm
+            platform: aarch64-linux-musl
+
+    steps:
+    - uses: actions/checkout@v4
+
+    # Run the entire build inside an Alpine container via `docker run` rather
+    # than the workflow `container:` field. The latter only works on x64
+    # runners (Actions' JS runtime has no arm64-musl build), but arm64 Ubuntu
+    # runners can run arm64 Alpine images natively via Docker.
+    - name: Build in Alpine container
+      shell: bash
+      env:
+        PLATFORM: ${{ matrix.platform }}
+        RUBY_VERSION: ${{ needs.prepare.outputs.default-ruby-version }}
       run: |
-        ruby -rlibpng -e "png = Libpng.encode(2, 2, \"\\xff\" * 16, pixel_format: 'RGBA'); File.binwrite('test.png', png); puts Libpng.decode(png, pixel_format: 'RGBA').inspect"
+        cat > /tmp/alpine-build.sh <<'BUILD_EOF'
+        #!/bin/sh
+        set -e
+        apk add --no-cache build-base cmake ninja git file zlib-dev
+        # The mounted /work volume is owned by the host runner user; git in
+        # the container (running as root) refuses to operate on it without
+        # this. Without it, `git ls-files` in the gemspec returns empty and
+        # the built gem is missing lib/libpng.rb.
+        git config --global --add safe.directory /work
+        bundle install --jobs 4
+        bundle exec rake "gem:native:${PLATFORM}"
+        gem install -b pkg/libpng-*.gem
+        # Smoke test from /tmp so bundler's source-tree LOAD_PATH doesn't
+        # shadow the installed gem. Activate via `gem` so RubyGems resolves
+        # the platform-specific binary gem (Alpine Ruby's platform string
+        # is *-linux-musl, which must match the gem's platform suffix).
+        (cd /tmp && ruby -e 'gem "libpng"; require "libpng"; png = Libpng.encode(2, 2, "\xff" * 16, pixel_format: "RGBA"); File.binwrite("test.png", png); puts Libpng.decode(png, pixel_format: "RGBA").inspect')
+        BUILD_EOF
+        chmod +x /tmp/alpine-build.sh
+        docker run --rm \
+          -v "$PWD:/work" \
+          -v /tmp/alpine-build.sh:/alpine-build.sh \
+          -w /work \
+          -e PLATFORM \
+          ruby:${RUBY_VERSION}-alpine \
+          /alpine-build.sh
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: pkg-${{ matrix.platform }}
+        path: pkg/*.gem

data/.github/workflows/release.yml

@@ -129,15 +129,24 @@ jobs:
           - os: ubuntu-latest
             platform: x86_64-linux
             ruby-version: '3.3'
+          - os: ubuntu-24.04-arm
+            platform: aarch64-linux
+            ruby-version: '3.3'
           - os: windows-latest
             platform: x64-mingw32
             ruby-version: '3.3'
           - os: windows-latest
             platform: x64-mingw-ucrt
             ruby-version: '3.3'
-          - os: macos-latest
+          - os: windows-11-arm
+            platform: aarch64-mingw-ucrt
+            ruby-version: '3.4'
+          - os: macos-15-intel
             platform: x86_64-darwin
             ruby-version: '3.3'
+          - os: macos-latest
+            platform: arm64-darwin
+            ruby-version: '3.3'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -161,7 +170,9 @@ jobs:
 
       - name: Install build tools (Windows)
         if: startsWith(matrix.os, 'windows')
-        uses: ilammy/msvc-dev-tools@v1
+        uses: step-security/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.platform == 'aarch64-mingw-ucrt' && 'arm64' || 'x64' }}
 
       - run: bundle exec rake gem:native:${{ matrix.platform }}
 
@@ -174,10 +185,11 @@ jobs:
         run: gem install -b pkg/libpng-*.gem
 
       - name: Test conversion
+        shell: bash
         run: |
-          ruby -rlibpng -e "png = Libpng.encode(2, 2, \"\\xff\" * 16, pixel_format: 'RGBA'); puts Libpng.decode(png, pixel_format: 'RGBA').inspect"
+          ruby -rlibpng -e 'png = Libpng.encode(2, 2, "\xff" * 16, pixel_format: "RGBA"); puts Libpng.decode(png, pixel_format: "RGBA").inspect'
 
-  cross:
+  build_musl:
     needs: bump
     if: always() && !cancelled() && !failure() && (needs.bump.result == 'success' || needs.bump.result == 'skipped')
     runs-on: ${{ matrix.os }}
@@ -186,43 +198,45 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            platform: aarch64-linux
-            ruby-version: '3.3'
-          - os: macos-latest
-            platform: arm64-darwin
-            ruby-version: '3.3'
+            platform: x86_64-linux-musl
+          - os: ubuntu-24.04-arm
+            platform: aarch64-linux-musl
     steps:
       - uses: actions/checkout@v4
         with:
           ref: ${{ needs.bump.outputs.sha || github.ref }}
 
-      - name: Install Ubuntu cross-build packages
-        if: startsWith(matrix.os, 'ubuntu')
+      - name: Build in Alpine container
+        shell: bash
+        env:
+          PLATFORM: ${{ matrix.platform }}
         run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu cmake ninja-build zlib1g-dev:arm64
-
-      - name: Install macOS build packages
-        if: startsWith(matrix.os, 'macos')
-        run: brew install cmake ninja
-
-      - uses: ruby/setup-ruby@master
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-
-      - run: bundle exec rake gem:native:${{ matrix.platform }}
+          cat > /tmp/alpine-build.sh <<'BUILD_EOF'
+          #!/bin/sh
+          set -e
+          apk add --no-cache build-base cmake ninja git file zlib-dev
+          git config --global --add safe.directory /work
+          bundle install --jobs 4
+          bundle exec rake "gem:native:${PLATFORM}"
+          gem install -b pkg/libpng-*.gem
+          (cd /tmp && ruby -e 'gem "libpng"; require "libpng"; png = Libpng.encode(2, 2, "\xff" * 16, pixel_format: "RGBA"); puts Libpng.decode(png, pixel_format: "RGBA").inspect')
+          BUILD_EOF
+          chmod +x /tmp/alpine-build.sh
+          docker run --rm \
+            -v "$PWD:/work" \
+            -v /tmp/alpine-build.sh:/alpine-build.sh \
+            -w /work \
+            -e PLATFORM \
+            ruby:3.3-alpine \
+            /alpine-build.sh
 
       - uses: actions/upload-artifact@v4
         with:
           name: pkg-${{ matrix.platform }}
           path: pkg/*.gem
 
-      - name: Install gem
-        run: gem install -b pkg/libpng-*.gem
-
   publish:
-    needs: [ bump, build, cross ]
+    needs: [ bump, build, build_musl ]
     if: always() && !cancelled() && !failure()
     runs-on: ubuntu-latest
     steps:
@@ -245,5 +259,23 @@ jobs:
         uses: rubygems/configure-rubygems-credentials@main
 
       - name: Publish to rubygems.org
+        shell: bash
         run: |
-          for gem in pkg/*.gem; do gem push -V "$gem"; done
+          set +e
+          for gem in pkg/*.gem; do
+            output=$(gem push -V "$gem" 2>&1)
+            rc=$?
+            if [ $rc -eq 0 ]; then
+              echo "$output"
+              continue
+            fi
+            # RubyGems rejects re-pushing the same version with 422, even for
+            # identical content. Tolerate that so we can publish newly-added
+            # platform variants at a version whose source gem already exists.
+            if echo "$output" | grep -qE "already (exists|pushed)|Conflict|Repushing"; then
+              echo "Skip $(basename "$gem") (already published)"
+              continue
+            fi
+            echo "$output" >&2
+            exit 1
+          done

data/Rakefile

@@ -34,8 +34,11 @@ end
 platforms = %w[
   x64-mingw32
   x64-mingw-ucrt
+  aarch64-mingw-ucrt
   x86_64-linux
+  x86_64-linux-musl
   aarch64-linux
+  aarch64-linux-musl
   x86_64-darwin
   arm64-darwin
 ]

data/ext/extconf.rb

@@ -1,6 +1,12 @@
 $: << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 
 require 'libpng/recipe'
+require 'mkmf'
 
 recipe = Libpng::Recipe.new
 recipe.cook_if_not
+
+# RubyGems requires every extconf.rb to leave a Makefile behind, even if
+# no native extension is compiled (libpng is built by Recipe#cook above
+# and loaded via FFI at runtime). dummy_makefile satisfies that contract.
+create_makefile('libpng/dummy')

data/lib/libpng/recipe.rb

@@ -32,6 +32,7 @@ module Libpng
 
       @target = ROOT.join(@target).to_s
       @printed = {}
+      setup_cross_compile if cross_compile?
     end
 
     # libpng ships a CMake build alongside the autotools one. We use CMake
@@ -69,10 +70,12 @@ module Libpng
 
     def install
       super
-      # After `make install`, the .so/.dylib/.dll is under ports/<name>/<ver>/lib/.
-      # Copy it into the gem's lib/libpng/ so FFI can load it at runtime.
-      libs = Dir.glob(File.join(port_path, 'lib', shared_lib_glob))
-      raise "no libpng shared lib produced at #{port_path}/lib" if libs.empty?
+      # After `make install`, the shared lib lives under ports/<name>/<ver>/.
+      # On Linux/macOS that's lib/. On Windows, CMake's GNUInstallDirs puts
+      # the .dll in bin/ and the import library (.dll.a) in lib/ — we only
+      # ship the .dll, so search both.
+      libs = Dir.glob(File.join(port_path, shared_lib_install_glob))
+      raise "no libpng shared lib produced under #{port_path}" if libs.empty?
 
       target_dir = ROOT.join('lib', 'libpng')
       FileUtils.mkdir_p(target_dir)
@@ -125,6 +128,16 @@ module Libpng
       end
     end
 
+    # Glob (with port_path prefix) for the freshly installed shared lib.
+    # On Windows the .dll installs to bin/; on Unix-likes it stays in lib/.
+    def shared_lib_install_glob
+      if MiniPortile.windows?
+        '{bin,lib}/libpng16*.dll'
+      else
+        "lib/#{shared_lib_glob}"
+      end
+    end
+
     def each_built_lib(&block)
       Dir.glob(ROOT.join('lib', 'libpng', shared_lib_glob)).each(&block)
     end
@@ -134,10 +147,16 @@ module Libpng
         case @host
         when /\Ax86_64.*mingw32/
           'x64-mingw32'
+        when /\A(aarch64|arm64).*mingw/
+          'aarch64-mingw-ucrt'
+        when /\Ax86_64.*linux-musl/
+          'x86_64-linux-musl'
+        when /\A(aarch64|arm64).*linux-musl/
+          'aarch64-linux-musl'
         when /\Ax86_64.*linux/
           'x86_64-linux'
-        when /\A(arm64|aarch64).*linux/
-          'arm64-linux'
+        when /\A(aarch64|arm64).*linux/
+          'aarch64-linux'
         when /\Ax86_64.*(darwin|macos|osx)/
           'x86_64-darwin'
         when /\A(arm64|aarch64).*(darwin|macos|osx)/
@@ -154,13 +173,49 @@ module Libpng
           'arm64-darwin'
         when /\Ax86_64.*(darwin|macos|osx)/
           'x86_64-darwin'
+        when /\A(arm64|aarch64).*linux-musl/
+          'aarch64-linux-musl'
         when /\A(arm64|aarch64).*linux/
           'aarch64-linux'
+        when /\Ax86_64.*linux-musl/
+          'x86_64-linux-musl'
         else
           ENV.fetch('target_platform', host_platform)
         end
     end
 
+    def cross_compile?
+      target_platform != host_platform
+    end
+
+    # Configure MiniPortile + CMake for cross-compilation. Native builds
+    # (host_platform == target_platform) skip this entirely.
+    def setup_cross_compile
+      # All targeted platforms now have native runners (ubuntu-24.04-arm for
+      # aarch64-linux, windows-11-arm for aarch64-mingw-ucrt, Alpine containers
+      # for the musl variants). This hook is kept as a seam for future
+      # cross-compile targets (e.g. aarch64-linux on an x86_64 host).
+    end
+
+    def cpu_type
+      case target_platform
+      when 'aarch64-linux', 'aarch64-linux-musl', 'arm64-darwin', 'aarch64-mingw-ucrt' then 'aarch64'
+      when 'x86_64-linux', 'x86_64-linux-musl', 'x86_64-darwin', /\Ax64-mingw/ then 'x86_64'
+      else
+        super
+      end
+    end
+
+    def cmake_system_name
+      case target_platform
+      when 'aarch64-linux', 'x86_64-linux', 'aarch64-linux-musl', 'x86_64-linux-musl' then 'Linux'
+      when 'arm64-darwin', 'x86_64-darwin' then 'Darwin'
+      when /\A(aarch64-)?mingw/, /\Ax64-mingw/ then 'Windows'
+      else
+        super
+      end
+    end
+
     def target_format
       @target_format ||=
         case target_platform
@@ -168,10 +223,12 @@ module Libpng
           /Mach-O 64-bit dynamically linked shared library arm64/
         when 'x86_64-darwin'
           /Mach-O 64-bit dynamically linked shared library x86_64/
-        when 'aarch64-linux'
+        when 'aarch64-linux', 'aarch64-linux-musl'
           /ELF 64-bit LSB shared object, ARM aarch64/
-        when 'x86_64-linux'
+        when 'x86_64-linux', 'x86_64-linux-musl'
           /ELF 64-bit LSB shared object, x86-64/
+        when 'aarch64-mingw-ucrt'
+          /PE32\+ executable.*\(DLL\).*ARM64/
         when /\Ax64-mingw(32|-ucrt)/
           /PE32\+ executable.*\(DLL\).*x86-64/
         else

data/lib/libpng/version.rb

@@ -11,6 +11,6 @@ module Libpng
   # new libpng release. The iteration resets to 0 each time
   # LIBPNG_VERSION bumps.
   LIBPNG_VERSION = '1.6.58'
-  LIBPNG_RUBY_ITERATION = 0
+  LIBPNG_RUBY_ITERATION = 1
   VERSION = "#{LIBPNG_VERSION}.#{LIBPNG_RUBY_ITERATION}"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libpng
 version: !ruby/object:Gem::Version
-  version: 1.6.58.0
+  version: 1.6.58.1
 platform: ruby
 authors:
 - Ribose Inc.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -71,6 +72,7 @@ metadata:
   source_code_uri: https://github.com/claricle/libpng-ruby
   changelog_uri: https://github.com/claricle/libpng-ruby/blob/main/README.adoc#versioning
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,7 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: libpng for Ruby (pre-compiled, FFI-based).
 test_files: []