WIP

drawpile · Aug 4, 2024 · 63a5120 · 63a5120
1 parent 7e48c33
commit 63a5120
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 226 deletions.
diff --git a/.github/actions/restore-linux/action.yml b/.github/actions/restore-linux/action.yml
@@ -32,8 +32,8 @@ runs:
         mkdir .github/linuxdeploy-bin &&
         pushd .github/linuxdeploy-bin >/dev/null &&
         curl -L --remote-name-all
-        https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-        https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+        https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage
+        https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/1-alpha-20240109-1/linuxdeploy-plugin-qt-x86_64.AppImage
         https://github.com/linuxdeploy/linuxdeploy-plugin-gstreamer/raw/12e0e983f9e01f4e450ef2534cfec10e8aab2539/linuxdeploy-plugin-gstreamer.sh &&
         chmod u+x linuxdeploy-x86_64.AppImage linuxdeploy-plugin-qt-x86_64.AppImage linuxdeploy-plugin-gstreamer.sh &&
         popd >/dev/null
@@ -58,7 +58,7 @@ runs:
         libxkbcommon-x11-0 libdrm-amdgpu1 libdrm-common libdrm-nouveau2
         libdrm-radeon1 libdrm2 libgbm1 libgl1-mesa-dri libglapi-mesa
         libglx-mesa0 libts0 libgtk-3-bin librsvg2-common gir1.2-gtk-3.0
-        wayland-protocols libfontconfig1
+        wayland-protocols libfontconfig1 libsqlite3-dev
         libpulse0 libasound2 libcups2
         libsecret-1-0 gir1.2-secret-1
         libfuse2 appstream

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -92,229 +92,6 @@ jobs:
               sudo apt-get install --no-install-recommends
               libsecret-1-dev
 
-          - os: ubuntu-20.04
-            cross_os: Android
-            component: ''
-            qt: 5.15.14
-            arch: arm64
-            sccache_triplet: x86_64-unknown-linux-musl
-            build_type: Release
-            collect_symbols: false
-            packager: cmake --install build --config Release --prefix .
-            cross_qt_args: >-
-              "-DANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
-              "-DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT"
-              "-DANDROID_HOST_PATH=$GITHUB_WORKSPACE/.github/deps/qt"
-              -DANDROID_ABI=arm64-v8a
-            cross_ffmpeg_args: >-
-              "-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake"
-              "-DANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
-              "-DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT"
-              -DANDROID_PLATFORM=android-23
-              -DANDROID_ABI=arm64-v8a
-            cross_other_args: >-
-              "-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake"
-              "-DANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
-              "-DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT"
-              -DANDROID_PLATFORM=android-23
-              -DANDROID_ABI=arm64-v8a
-            build_flags: >-
-              "-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake"
-              -DANDROID_PLATFORM=android-23
-              -DANDROID_ABI=arm64-v8a
-              -DANDROID_SDK_PLATFORM=android-31
-              -DANDROID_SDK_BUILD_TOOLS_REVISION=34.0.0
-              -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=on
-              -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH
-              -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH
-              -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH
-            # The runner has multiple clang versions installed and CMake/Qt gets
-            # confused about which one to pick for some reason, so this also
-            # sets Clang_ROOT during the Qt build
-            qt_pre_build: >
-              sudo apt-get update &&
-              sudo apt-get install --no-install-recommends
-              libatspi2.0-dev libmtdev-dev libts-dev libgtk-3-dev
-              libgl1-mesa-dev libglu1-mesa-dev libxi-dev libdrm-dev
-              libgbm-dev libgl-dev libgles-dev libegl-dev libegl1-mesa-dev
-              libxext-dev libxfixes-dev libxrender-dev libx11-dev
-              libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev
-              libxkbcommon-dev libxkbcommon-x11-dev libxcb-keysyms1-dev
-              libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev
-              libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev
-              libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev
-              libxcb-util-dev libinput-dev libvulkan-dev
-              libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libclang-12-dev
-              libasound2-dev libpulse-dev libcups2-dev libssl-dev
-              libfontconfig1-dev &&
-              echo "Clang_ROOT=/usr/lib/llvm-12" >> $GITHUB_ENV
-            ffmpeg_pre_build: >
-              sudo apt-get update &&
-              sudo apt-get install --no-install-recommends
-              yasm
-            other_pre_build: >
-              sudo apt-get update &&
-              sudo apt-get install --no-install-recommends
-              libsecret-1-dev
-
-          - os: ubuntu-20.04
-            cross_os: Android
-            component: ''
-            qt: 5.15.14
-            arch: arm32
-            sccache_triplet: x86_64-unknown-linux-musl
-            build_type: Release
-            collect_symbols: false
-            packager: cmake --install build --config Release --prefix .
-            cross_qt_args: >-
-              "-DANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
-              "-DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT"
-              "-DANDROID_HOST_PATH=$GITHUB_WORKSPACE/.github/deps/qt"
-              -DANDROID_ABI=armeabi-v7a
-            cross_ffmpeg_args: >-
-              "-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake"
-              "-DANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
-              "-DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT"
-              -DANDROID_PLATFORM=android-23
-              -DANDROID_ABI=armeabi-v7a
-            cross_other_args: >-
-              "-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake"
-              "-DANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
-              "-DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT"
-              -DANDROID_PLATFORM=android-23
-              -DANDROID_ABI=armeabi-v7a
-            build_flags: >-
-              "-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake"
-              -DANDROID_PLATFORM=android-23
-              -DANDROID_ABI=armeabi-v7a
-              -DANDROID_SDK_PLATFORM=android-31
-              -DANDROID_SDK_BUILD_TOOLS_REVISION=34.0.0
-              -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=on
-              -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH
-              -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH
-              -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH
-            # The runner has multiple clang versions installed and CMake/Qt gets
-            # confused about which one to pick for some reason, so this also
-            # sets Clang_ROOT during the Qt build
-            qt_pre_build: >
-              sudo apt-get update &&
-              sudo apt-get install --no-install-recommends
-              libatspi2.0-dev libmtdev-dev libts-dev libgtk-3-dev
-              libgl1-mesa-dev libglu1-mesa-dev libxi-dev libdrm-dev
-              libgbm-dev libgl-dev libgles-dev libegl-dev libegl1-mesa-dev
-              libxext-dev libxfixes-dev libxrender-dev libx11-dev
-              libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev
-              libxkbcommon-dev libxkbcommon-x11-dev libxcb-keysyms1-dev
-              libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev
-              libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev
-              libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev
-              libxcb-util-dev libinput-dev libvulkan-dev
-              libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libclang-12-dev
-              libasound2-dev libpulse-dev libcups2-dev libssl-dev
-              libfontconfig1-dev &&
-              echo "Clang_ROOT=/usr/lib/llvm-12" >> $GITHUB_ENV
-            ffmpeg_pre_build: >
-              sudo apt-get update &&
-              sudo apt-get install --no-install-recommends
-              yasm
-            other_pre_build: >
-              sudo apt-get update &&
-              sudo apt-get install --no-install-recommends
-              libsecret-1-dev
-
-          - os: macos-13
-            cross_os: ''
-            component: ''
-            qt: 6.7.2
-            arch: x86_64
-            build_flags: -DBUILD_PACKAGE_SUFFIX=x86_64 -G Ninja
-            build_type: Release
-            collect_symbols: false
-            sccache_triplet: x86_64-apple-darwin
-            packager: cpack --verbose --config build/CPackConfig.cmake -C Release
-
-          - os: macos-14
-            cross_os: ''
-            component: ''
-            qt: 6.7.2
-            arch: arm64
-            build_flags: -DBUILD_PACKAGE_SUFFIX=arm64 -G Ninja
-            build_type: Release
-            collect_symbols: false
-            sccache_triplet: aarch64-apple-darwin
-            packager: cpack --verbose --config build/CPackConfig.cmake -C Release
-
-          - os: windows-latest
-            cross_os: ''
-            component: ''
-            qt: 5.15.14
-            arch: x86_64
-            sccache_triplet: x86_64-pc-windows-msvc
-            build_flags: -DBUILD_PACKAGE_SUFFIX=x86_64 -G Ninja
-            build_type: RelWithDebInfo
-            collect_symbols: true
-            qt_pre_build: >
-              choco install gperf jom winflexbison3 &&
-              New-Item -Path C:\ProgramData\Chocolatey\bin\flex.exe -ItemType SymbolicLink -Value C:\ProgramData\Chocolatey\bin\win_flex.exe &&
-              New-Item -Path C:\ProgramData\Chocolatey\bin\bison.exe -ItemType SymbolicLink -Value C:\ProgramData\Chocolatey\bin\win_bison.exe
-            ffmpeg_pre_build: >
-              choco install yasm
-            # Copying files is a disgusting hack because windeployqt does not
-            # search PATH to find DLLs and it gets confused by QtKeychain having
-            # a Qt prefix and thinks it is part of Qt and tries to process it
-            # and fails if it is not in the Qt bin directory with the rest of
-            # them
-            packager: >
-              cp .github/deps/other/bin/qt*.dll .github/deps/qt/bin &&
-              cpack --verbose --config build/CPackConfig.cmake -C RelWithDebInfo
-
-          - os: windows-latest
-            cross_os: ''
-            component: 'Tools'
-            qt: 5.15.14
-            arch: x86_64
-            sccache_triplet: x86_64-pc-windows-msvc
-            build_flags: -DBUILD_PACKAGE_SUFFIX=x86_64 -G Ninja
-            build_type: RelWithDebInfo
-            collect_symbols: false
-            qt_pre_build: >
-              choco install gperf jom winflexbison3 &&
-              New-Item -Path C:\ProgramData\Chocolatey\bin\flex.exe -ItemType SymbolicLink -Value C:\ProgramData\Chocolatey\bin\win_flex.exe &&
-              New-Item -Path C:\ProgramData\Chocolatey\bin\bison.exe -ItemType SymbolicLink -Value C:\ProgramData\Chocolatey\bin\win_bison.exe
-            ffmpeg_pre_build: >
-              choco install yasm
-            # Copying files is a disgusting hack because windeployqt does not
-            # search PATH to find DLLs and it gets confused by QtKeychain having
-            # a Qt prefix and thinks it is part of Qt and tries to process it
-            # and fails if it is not in the Qt bin directory with the rest of
-            # them
-            packager: >
-              cp .github/deps/other/bin/qt*.dll .github/deps/qt/bin &&
-              cpack --verbose --config build/CPackConfig.cmake -C RelWithDebInfo
-
-          - os: windows-latest
-            qt: 5.15.14
-            arch: x86
-            sccache_triplet: x86_64-pc-windows-msvc
-            build_flags: -DCARGO_TRIPLE=i686-pc-windows-msvc -DBUILD_PACKAGE_SUFFIX=x86 -G Ninja
-            build_type: RelWithDebInfo
-            collect_symbols: false
-            qt_pre_build: >
-              choco install gperf jom winflexbison3 &&
-              New-Item -Path C:\ProgramData\Chocolatey\bin\flex.exe -ItemType SymbolicLink -Value C:\ProgramData\Chocolatey\bin\win_flex.exe &&
-              New-Item -Path C:\ProgramData\Chocolatey\bin\bison.exe -ItemType SymbolicLink -Value C:\ProgramData\Chocolatey\bin\win_bison.exe
-            ffmpeg_pre_build: >
-              choco install yasm
-            # Copying files is a disgusting hack because windeployqt does not
-            # search PATH to find DLLs and it gets confused by QtKeychain having
-            # a Qt prefix and thinks it is part of Qt and tries to process it
-            # and fails if it is not in the Qt bin directory with the rest of
-            # them
-            packager: >
-              cp .github/deps/other/bin/qt*.dll .github/deps/qt/bin &&
-              cpack --verbose --config build/CPackConfig.cmake -C RelWithDebInfo
-
-
     steps:
       - name: Check out code
         uses: actions/checkout@v4