CI: Update plugin download script to handle latest kimageformats-bina…

…ries
jurplel · May 19, 2024 · 88cb527 · 88cb527
1 parent bd62c7c
commit 88cb527
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/dist/scripts/download-plugins.ps1 b/dist/scripts/download-plugins.ps1
@@ -11,7 +11,7 @@ Write-Host "Detected Qt Version $qtVersion"
 if ($IsWindows) {
     $imageName = "windows-2019"
 } elseif ($IsMacOS) {
-    $imageName = "macos-latest"
+    $imageName = "macos-12"
 } else {
     $imageName = "ubuntu-20.04"
 }
@@ -76,8 +76,9 @@ if ($pluginNames -contains 'kimageformats') {
         # copy heif stuff
         if (Test-Path -Path kimageformats/kimageformats/output/heif.dll -PathType Leaf) {
             cp kimageformats/kimageformats/output/heif.dll "$out_frm/"
-            cp kimageformats/kimageformats/output/de265.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/libde265.dll "$out_frm/"
             cp kimageformats/kimageformats/output/libx265.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/aom.dll "$out_frm/"
         }
         # copy raw stuff
         if (Test-Path -Path kimageformats/kimageformats/output/raw.dll -PathType Leaf) {
@@ -88,19 +89,22 @@ if ($pluginNames -contains 'kimageformats') {
         # copy jxl stuff
         if (Test-Path -Path kimageformats/kimageformats/output/jxl.dll -PathType Leaf) {
             cp kimageformats/kimageformats/output/jxl.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/jxl_cms.dll "$out_frm/"
             cp kimageformats/kimageformats/output/jxl_threads.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/lcms2.dll "$out_frm/"
             cp kimageformats/kimageformats/output/hwy.dll "$out_frm/"
             cp kimageformats/kimageformats/output/brotlicommon.dll "$out_frm/"
             cp kimageformats/kimageformats/output/brotlidec.dll "$out_frm/"
             cp kimageformats/kimageformats/output/brotlienc.dll "$out_frm/"
         }
-        # copy jxl stuff
-        if (Test-Path -Path kimageformats/kimageformats/output/OpenEXR-3_1.dll -PathType Leaf) {
-            cp kimageformats/kimageformats/output/zlib1.dll "$out_frm/"
-            cp kimageformats/kimageformats/output/OpenEXR-3_1.dll "$out_frm/"
+        # copy openexr stuff
+        if (Test-Path -Path kimageformats/kimageformats/output/OpenEXR-3_2.dll -PathType Leaf) {
+            cp kimageformats/kimageformats/output/deflate.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/OpenEXR-3_2.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/OpenEXRCore-3_2.dll "$out_frm/"
             cp kimageformats/kimageformats/output/Imath-3_1.dll "$out_frm/"
-            cp kimageformats/kimageformats/output/IlmThread-3_1.dll "$out_frm/"
-            cp kimageformats/kimageformats/output/Iex-3_1.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/IlmThread-3_2.dll "$out_frm/"
+            cp kimageformats/kimageformats/output/Iex-3_2.dll "$out_frm/"
         }
     } elseif ($IsMacOS) {
         cp kimageformats/kimageformats/output/*.so "$out_imf/"

diff --git a/dist/scripts/macdeploy.sh b/dist/scripts/macdeploy.sh
@@ -10,7 +10,15 @@ fi
 cd bin
 
 macdeployqt qView.app
+
+if [[ -f "qView.app/Contents/PlugIns/imageformats/kimg_heif.so" && -f "qView.app/Contents/PlugIns/imageformats/libqmacheif.dylib" ]]; then
+    # Prefer kimageformats HEIF plugin for proper color space handling
+    echo "Removing duplicate HEIF plugin"
+    rm "qView.app/Contents/PlugIns/imageformats/libqmacheif.dylib"
+fi
+
 codesign --sign - --deep qView.app
+
 if [ $1 != "" ]; then
     BUILD_NAME=qView-nightly-$1
     mv qView.app "$BUILD_NAME.app"