From f6a5287d862145f9845b4d150cf330ec885395a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 31 Jan 2024 09:16:55 +0100
Subject: [PATCH] Version 0.7.4, buillt against zlib 1.3.1 / zlib-ng 2.1.6.

---
 .github/workflows/libspng.yml | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/libspng.yml b/.github/workflows/libspng.yml
index 404ae59..d08c26e 100644
--- a/.github/workflows/libspng.yml
+++ b/.github/workflows/libspng.yml
@@ -6,13 +6,10 @@ env:
   # Idiotic GitHub Actions "language" can't handle environment variables
   # referencing environment variables defined in outer scope, so these aren't
   # actually used anywhere BUT INSTEAD THE VERSION IS DUPLICATED, F.F.S.
-  # ZLIB_VERSION: 1.2.13
-  # ZLIBNG_VERSION: 2.0.4-579-gbfde
+  # ZLIB_VERSION: 1.3.1
+  # ZLIBNG_VERSION: 2.1.6
 
-  # Version 0.7.3 suffers from https://github.com/randy408/libspng/pull/245
-  # which makes the static-only build impossible, using 0.7.2 until a new
-  # version is tagged.
-  LIBSPNG_VERSION: 0.7.2
+  LIBSPNG_VERSION: 0.7.4
 
 jobs:
   windows:
@@ -24,12 +21,12 @@ jobs:
         - os: windows-2019
           env:
             # THIS STUPID CRAP CAN NOT DO `zlib-${{ env.ZLIB_VERSION }}`, FUCK
-            ZLIB_LIBRARY: zlib-1.2.13
+            ZLIB_LIBRARY: zlib-1.3.1
             SUFFIX:
         - os: windows-2019
           env:
             # SAME, FUCK
-            ZLIB_LIBRARY: zlib-ng-2.0.4-579-gbfde
+            ZLIB_LIBRARY: zlib-ng-2.1.6
             SUFFIX: -zng
     steps:
     - name: Install Ninja
@@ -40,7 +37,7 @@ jobs:
       run: |
         mkdir deps
         cd deps
-        Invoke-WebRequest https://ci.magnum.graphics/${{ matrix.env.ZLIB_LIBRARY }}-${{ matrix.os }}.zip -O zlib.zip
+        Invoke-WebRequest https://ci.magnum.graphics/${{ matrix.env.ZLIB_LIBRARY }}-${{ matrix.os }}.zip -OutFile zlib.zip
         unzip zlib.zip
     - name: Clone libspng
       uses: actions/checkout@v3
@@ -75,12 +72,12 @@ jobs:
         - os: windows-2019
           env:
             # THIS STUPID CRAP CAN NOT DO `zlib-${{ env.ZLIB_VERSION }}`, FUCK
-            ZLIB_LIBRARY: zlib-1.2.13
+            ZLIB_LIBRARY: zlib-1.3.1
             SUFFIX:
         - os: windows-2019
           env:
             # SAME, FUCK
-            ZLIB_LIBRARY: zlib-ng-2.0.4-579-gbfde
+            ZLIB_LIBRARY: zlib-ng-2.1.6
             SUFFIX: -zng
     steps:
     - name: Install Ninja
@@ -91,7 +88,7 @@ jobs:
       run: |
         mkdir deps
         cd deps
-        Invoke-WebRequest https://ci.magnum.graphics/${{ matrix.env.ZLIB_LIBRARY }}-windows-mingw.zip -O zlib.zip
+        Invoke-WebRequest https://ci.magnum.graphics/${{ matrix.env.ZLIB_LIBRARY }}-windows-mingw.zip -OutFile zlib.zip
         unzip zlib.zip
     - name: Clone libspng
       uses: actions/checkout@v3
@@ -135,14 +132,14 @@ jobs:
           container: ubuntu:bionic-20220427
           env:
             # THIS STUPID CRAP CAN NOT DO `zlib-${{ env.ZLIB_VERSION }}`, FUCK
-            ZLIB_LIBRARY: zlib-1.2.13
+            ZLIB_LIBRARY: zlib-1.3.1
             SUFFIX:
         - os: ubuntu-18.04
           runs-on: ubuntu-latest
           container: ubuntu:bionic-20220427
           env:
             # SAME, FUCK
-            ZLIB_LIBRARY: zlib-ng-2.0.4-579-gbfde
+            ZLIB_LIBRARY: zlib-ng-2.1.6
             SUFFIX: -zng
     steps:
     - name: Install base build tools
@@ -151,6 +148,13 @@ jobs:
         apt update
         apt install -y wget unzip ninja-build cmake g++
         mkdir -p deps
+    # It needs CMake 3.12, 18.04 has 3.10
+    - name: Download CMake 3.12
+      run: |
+          mkdir -p $HOME/cmake && cd $HOME/cmake
+          wget --no-check-certificate https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.tar.gz
+          tar --strip-components=1 -xzf cmake-3.12.4-Linux-x86_64.tar.gz
+          echo "$HOME/cmake/bin" >> $GITHUB_PATH
     - name: Fetch prebuilt zlib${{ matrix.env.SUFFIX }}
       run: |
         cd deps