Skip to content

Commit

Permalink
feat: qt6 and update build tooling CasparCG#307
Browse files Browse the repository at this point in the history
  • Loading branch information
Julusian committed Dec 13, 2023
1 parent 5b5743a commit df81415
Show file tree
Hide file tree
Showing 488 changed files with 3,990 additions and 33,062 deletions.
65 changes: 65 additions & 0 deletions .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Build Linux

on:
push:
# branches: [ "main" ]
pull_request:
branches: ["main"]

jobs:
build-deb:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Prepare dependencies
run: |
sudo apt update
sudo apt install cmake libboost-thread-dev libasio-dev qt6-base-dev libqt6websockets6-dev libqt6gui6 libqt6widgets6 libqt6core5compat6-dev libgl1-mesa-dev libvlc-dev libvlccore-dev
env:
CI: 1

- name: Run build
run: |
./tools/build-linux.sh
env:
CI: 1

- name: Rename build
id: "rename-build"
shell: bash
run: |
TARGET=casparcg-client-${{ github.sha }}-ubuntu22.deb
mv build/CasparCG*.deb "$TARGET"
echo "artifactname=$TARGET" >> $GITHUB_OUTPUT
# check if a release branch, or main, or a tag
if [[ "${{ github.ref_name }}" == "main" || "${{ github.ref_name }}" == "2.3.x-lts" ]]
then
# Only proceed if we have an sftp password
if [ -n "${{ secrets.SFTP_PASSWORD }}" ]
then
echo "uploadname=$TARGET" >> $GITHUB_OUTPUT
fi
fi
- uses: actions/upload-artifact@v3
with:
name: upload-artifact
path: ${{ steps.rename-build.outputs.artifactname }}

- name: Copy single file to remote
uses: garygrossgarten/github-action-scp@v0.8.0
if: ${{ steps.rename-build.outputs.uploadname }}
with:
local: "${{ steps.rename-build.outputs.uploadname }}"
remote: "${{ secrets.SFTP_ROOT }}/${{ github.ref_name }}/${{ steps.rename-build.outputs.uploadname }}"
host: ${{ secrets.SFTP_HOST }}
username: ${{ secrets.SFTP_USERNAME }}
password: ${{ secrets.SFTP_PASSWORD }}

69 changes: 69 additions & 0 deletions .github/workflows/macos.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: Build macos

on:
push:
# branches: [ "main" ]
pull_request:
branches: ["main"]

jobs:
build:
runs-on: macos-11

strategy:
matrix:
arch: [arm64, x86_64]

steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: 6.5.3
tools: 'tools_ifw tools_cmake'
modules: 'qtwebsockets qt5compat'

- name: Run build
run: |
./tools/build-macos.sh ${{ matrix.arch }}
env:
CI: 1
BUILD_QT_PATH: ${{ github.workspace }}/Qt/6.5.3/macos
BUILD_PARALLEL_THREADS: 2

- name: Rename build
id: "rename-build"
shell: bash
run: |
TARGET=casparcg-client-${{ github.sha }}-${{ matrix.arch }}.dmg
mv build/CasparCG*.dmg "$TARGET"
echo "artifactname=$TARGET" >> $GITHUB_OUTPUT
# check if a release branch, or main, or a tag
if [[ "${{ github.ref_name }}" == "main" || "${{ github.ref_name }}" == "2.3.x-lts" ]]
then
# Only report if we have an sftp password
if [ -n "${{ secrets.SFTP_PASSWORD }}" ]
then
echo "uploadname=$TARGET" >> $GITHUB_OUTPUT
fi
fi
- uses: actions/upload-artifact@v3
with:
name: casparcg-client-macos-${{ matrix.arch }}
path: ${{ steps.rename-build.outputs.artifactname }}

- name: Copy single file to remote
uses: garygrossgarten/github-action-scp@v0.8.0
if: ${{ steps.rename-build.outputs.uploadname }}
with:
local: "${{ steps.rename-build.outputs.uploadname }}"
remote: "${{ secrets.SFTP_ROOT }}/${{ github.ref_name }}/${{ steps.rename-build.outputs.uploadname }}"
host: ${{ secrets.SFTP_HOST }}
username: ${{ secrets.SFTP_USERNAME }}
password: ${{ secrets.SFTP_PASSWORD }}
66 changes: 66 additions & 0 deletions .github/workflows/windows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Build Windows

on:
push:
# branches: [ "main" ]
pull_request:
branches: ["main"]

jobs:
build:
runs-on: windows-2022

steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: 6.5.3
arch: win64_msvc2019_64
tools: 'tools_ifw tools_cmake'
modules: 'qtwebsockets qt5compat'

- name: Run build
run: |
cd tools
./build-windows.bat
env:
CI: 1
BUILD_QT_PATH: ${{ github.workspace }}/Qt/6.5.3

- name: Rename build
id: "rename-build"
shell: bash
run: |
TARGET=casparcg-client-${{ github.sha }}-windows.zip
mv build/casparcg_client.zip "$TARGET"
echo "artifactname=$TARGET" >> $GITHUB_OUTPUT
# check if a release branch, or main, or a tag
if [[ "${{ github.ref_name }}" == "main" || "${{ github.ref_name }}" == "2.3.x-lts" ]]
then
# Only report if we have an sftp password
if [ -n "${{ secrets.SFTP_PASSWORD }}" ]
then
echo "uploadname=$TARGET" >> $GITHUB_OUTPUT
fi
fi
- uses: actions/upload-artifact@v3
with:
name: upload-artifact
path: ${{ steps.rename-build.outputs.artifactname }}

- name: Copy single file to remote
uses: garygrossgarten/github-action-scp@v0.8.0
if: ${{ steps.rename-build.outputs.uploadname }}
with:
local: "${{ steps.rename-build.outputs.uploadname }}"
remote: "${{ secrets.SFTP_ROOT }}/${{ github.ref_name }}/${{ steps.rename-build.outputs.uploadname }}"
host: ${{ secrets.SFTP_HOST }}
username: ${{ secrets.SFTP_USERNAME }}
password: ${{ secrets.SFTP_PASSWORD }}
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# /
/bin/
/build/

# /lib/
/lib/libvlc/lib/win32/plugins/plugins.dat
/lib/libvlc/lib/macx/lib/plugins/plugins.dat
/lib/libvlc/lib/linux/plugins/plugins.dat
/build-*
/.DS_Store

# /src/
/src/Solution.pro.user
/src/CMakeSettings.json
/src/out
/src/.vs
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lib/oscpack"]
path = lib/oscpack
url = https://github.com/RossBencina/oscpack.git
87 changes: 87 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
{
"files.associations": {
"functional": "cpp",
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"*.ipp": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"hash_map": "cpp",
"strstream": "cpp",
"bit": "cpp",
"*.tcc": "cpp",
"bitset": "cpp",
"chrono": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"coroutine": "cpp",
"cstdint": "cpp",
"deque": "cpp",
"forward_list": "cpp",
"list": "cpp",
"map": "cpp",
"set": "cpp",
"string": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"iterator": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"source_location": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"rope": "cpp",
"slist": "cpp",
"fstream": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"ostream": "cpp",
"semaphore": "cpp",
"shared_mutex": "cpp",
"span": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"thread": "cpp",
"cfenv": "cpp",
"cinttypes": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"valarray": "cpp",
"variant": "cpp"
}
}
8 changes: 8 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
CasparCG Client 2.3.0-Dev
==============================
- Update to Qt6
- Remove atem, panasonic, spyder, sony and tricaster integrations
- Update other dependencies
- Rework build system to use updated tooling


CasparCG Client 2.2.0-20200520
==============================
- FIX: Disable app nap on macOS. (grahamspr86)
Expand Down
6 changes: 3 additions & 3 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ No extra installations required.
SYSTEM REQUIREMENTS FOR MAC
---------------------------

The Mac version has been tested on 10.15.
The Mac version has been tested on 11.
No extra installations required.


SYSTEM REQUIREMENTS FOR LINUX
-----------------------------

The Linux version has been tested on Ubuntu 19.10 64-bit.
The Linux version has been tested on Ubuntu 22.04 64-bit.
Requires that you install VLC.


Expand All @@ -47,7 +47,7 @@ folder.
INSTALLATION LINUX
------------------

Unpack the tar file and run the run.sh.
Install the deb file, and launch 'CasparCG Client'


DOCUMENTATION
Expand Down
Loading

0 comments on commit df81415

Please sign in to comment.