-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #630 from jdpurcell/gvr-mm
Updates for new GraphicsView
- Loading branch information
Showing
51 changed files
with
4,417 additions
and
1,103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| qview (5.0-5) bionic; urgency=low | ||
| qview (6.1-1) bionic; urgency=low | ||
|
|
||
| * Fix not requiring qtbase5-dev-tools | ||
| * Initial release | ||
|
|
||
| -- jurplel <jurplel@interversehq.com> Fri, 14 Jan 2022 20:44:22 -0500 | ||
| -- jurplel <jurplel@interversehq.com> Tue, 15 Aug 2023 20:26:07 -0400 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| #!/usr/bin/env pwsh | ||
|
|
||
| # This script will download binary plugins from the kimageformats-binaries repository using Github's API. | ||
|
|
||
| $pluginNames = "qtapng", "kimageformats" | ||
|
|
||
| $qtVersion = ((qmake --version -split '\n')[1] -split ' ')[3] | ||
| Write-Host "Detected Qt Version $qtVersion" | ||
|
|
||
| # Qt version availability and runner names are assumed. | ||
| if ($IsWindows) { | ||
| $imageName = "windows-2019" | ||
| } elseif ($IsMacOS) { | ||
| $imageName = "macos-latest" | ||
| } else { | ||
| $imageName = "ubuntu-20.04" | ||
| } | ||
|
|
||
| $binaryBaseUrl = "https://github.com/jurplel/kimageformats-binaries/releases/download/cont" | ||
|
|
||
| if ($pluginNames.count -eq 0) { | ||
| Write-Host "the pluginNames array is empty." | ||
| } | ||
|
|
||
| foreach ($pluginName in $pluginNames) { | ||
| $arch = If (-not $env:arch -or $env:arch -eq '') { "" } Else { "-$env:arch" } | ||
| $artifactName = "$pluginName-$imageName-$qtVersion$arch.zip" | ||
| $downloadUrl = "$binaryBaseUrl/$artifactName" | ||
|
|
||
| Write-Host "Downloading $downloadUrl" | ||
| Invoke-WebRequest -URI $downloadUrl -OutFile $artifactName | ||
| Expand-Archive $artifactName -DestinationPath $pluginName | ||
| Remove-Item $artifactName | ||
| } | ||
|
|
||
|
|
||
| if ($IsWindows) { | ||
| $out_frm = "bin/" | ||
| $out_imf = "bin/imageformats" | ||
| } elseif ($IsMacOS) { | ||
| $out_frm = "bin/qView.app/Contents/Frameworks" | ||
| $out_imf = "bin/qView.app/Contents/PlugIns/imageformats" | ||
| } else { | ||
| $out_frm = "bin/appdir/usr/lib" | ||
| $out_imf = "bin/appdir/usr/plugins/imageformats" | ||
| } | ||
|
|
||
| New-Item -Type Directory -Path "$out_frm" -ErrorAction SilentlyContinue | ||
| New-Item -Type Directory -Path "$out_imf" -ErrorAction SilentlyContinue | ||
|
|
||
| # Copy QtApng | ||
| if ($pluginNames -contains 'qtapng') { | ||
| if ($IsWindows) { | ||
| cp qtapng/QtApng/plugins/imageformats/qapng.dll "$out_imf/" | ||
| } elseif ($IsMacOS) { | ||
| cp qtapng/QtApng/plugins/imageformats/libqapng.dylib "$out_imf/" | ||
| } else { | ||
| cp qtapng/QtApng/plugins/imageformats/libqapng.so "$out_imf/" | ||
| } | ||
| } | ||
|
|
||
| if ($pluginNames -contains 'kimageformats') { | ||
| if ($IsWindows) { | ||
| mv kimageformats/kimageformats/output/kimg_*.dll "$out_imf/" | ||
| # Copy karchive | ||
| if (Test-Path -Path kimageformats/kimageformats/output/KF5Archive.dll -PathType Leaf) { | ||
| cp kimageformats/kimageformats/output/zlib1.dll "$out_frm/" | ||
| cp kimageformats/kimageformats/output/KF5Archive.dll "$out_frm/" | ||
| } | ||
| # copy avif stuff | ||
| if (Test-Path -Path kimageformats/kimageformats/output/avif.dll -PathType Leaf) { | ||
| cp kimageformats/kimageformats/output/avif.dll "$out_frm/" | ||
| cp kimageformats/kimageformats/output/aom.dll "$out_frm/" | ||
| } | ||
| # 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/libx265.dll "$out_frm/" | ||
| } | ||
| # copy raw stuff | ||
| if (Test-Path -Path kimageformats/kimageformats/output/raw.dll -PathType Leaf) { | ||
| cp kimageformats/kimageformats/output/zlib1.dll "$out_frm/" | ||
| cp kimageformats/kimageformats/output/raw.dll "$out_frm/" | ||
| cp kimageformats/kimageformats/output/lcms2.dll "$out_frm/" | ||
| } | ||
| # 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_threads.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/" | ||
| 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/" | ||
| } | ||
| } elseif ($IsMacOS) { | ||
| cp kimageformats/kimageformats/output/*.so "$out_imf/" | ||
| cp kimageformats/kimageformats/output/libKF5Archive.5.dylib "$out_frm/" | ||
| } else { | ||
| cp kimageformats/kimageformats/output/kimg_*.so "$out_imf/" | ||
| cp kimageformats/kimageformats/output/libKF5Archive.so.5 "$out_frm/" | ||
| } | ||
| } |
0
ci/scripts/innomake.ps1 → dist/scripts/innomake.ps1
100644 → 100755
File renamed without changes.
0
ci/scripts/linuxdeployqt.sh → dist/scripts/linuxdeployqt.sh
100644 → 100755
File renamed without changes.
0
ci/scripts/macdeploy.sh → dist/scripts/macdeploy.sh
100644 → 100755
File renamed without changes.
0
ci/scripts/vcvars.ps1 → dist/scripts/vcvars.ps1
100644 → 100755
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.