Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 73683a4
Author: ServiusHack <[email protected]>
Date:   Tue Jun 11 13:30:07 2024 +0200

    Fix malformed color command CasparCG#293 (CasparCG#314)

commit bb65df8
Author: ServiusHack <[email protected]>
Date:   Tue Jun 11 09:11:31 2024 +0200

    chore: Document Qt requirements (CasparCG#313)

commit e0642dc
Author: Julian Waller <[email protected]>
Date:   Wed Apr 17 17:43:28 2024 +0100

    chore: update github workflows

commit 8d29b4f
Author: Julian Waller <[email protected]>
Date:   Wed Mar 6 09:52:00 2024 +0000

    fix: add missing formats to sql schema

commit 6d74aa3
Author: Julian Waller <[email protected]>
Date:   Wed Feb 21 17:50:26 2024 +0000

    fix: clip time not showing CasparCG/server#1521

commit 028261f
Author: Julian Waller <[email protected]>
Date:   Wed Feb 21 17:27:47 2024 +0000

    fix: target dropdown showing empty when unknown item was selected

commit 58e2267
Author: Julian Waller <[email protected]>
Date:   Tue Jan 9 21:56:41 2024 +0000

    fix: typo in CasparCG#310

commit 5118b0a
Author: Julian Waller <[email protected]>
Date:   Tue Jan 9 21:43:11 2024 +0000

    fix: typo in CasparCG#310

commit 43fab80
Merge: 21cbf4b e128c87
Author: Julian Waller <[email protected]>
Date:   Tue Jan 9 21:35:04 2024 +0000

    Merge pull request CasparCG#310 from amwtech/main

commit 21cbf4b
Author: Julian Waller <[email protected]>
Date:   Tue Jan 9 21:10:30 2024 +0000

    chore: macos code signing

commit e128c87
Author: amwtech <[email protected]>
Date:   Sun Jan 7 15:34:11 2024 +0000

    Add files via upload

commit 67a5c58
Author: Julian Waller <[email protected]>
Date:   Thu Dec 14 00:00:15 2023 +0000

    fix: Playout Command Pause or Resume does not operate CasparCG#301

commit cb28e23
Author: Julian Waller <[email protected]>
Date:   Wed Dec 13 23:58:45 2023 +0000

    fix: OSC control of client Pause/Resume does not function CasparCG#304

commit c79c5ff
Author: Julian Waller <[email protected]>
Date:   Wed Dec 13 23:55:55 2023 +0000

    fix: GPO saved rising/falling configuration does not correctly recall settings at startup CasparCG#305

commit df81415
Author: Julian Waller <[email protected]>
Date:   Wed Dec 13 23:06:15 2023 +0000

    feat: qt6 and update build tooling CasparCG#307

commit 5b5743a
Author: Julian Waller <[email protected]>
Date:   Wed Dec 13 23:21:42 2023 +0000

    wip: delete committed libraries and binaries
  • Loading branch information
@inkvolcano
inkvolcano committed Sep 22, 2024
1 parent 1bca33b commit 4bd8ec4
Show file tree
Hide file tree
Showing 12,564 changed files with 4,194 additions and 2,127,072 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
65 changes: 65 additions & 0 deletions .github/workflows/linux.yaml
View file
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@v4
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@v4
with:
name: upload-artifact
path: ${{ steps.rename-build.outputs.artifactname }}

- name: Copy single file to remote
uses: garygrossgarten/[email protected]
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 }}

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

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

jobs:
build:
runs-on: macos-11

strategy:
fail-fast: false
matrix:
arch: [arm64, x86_64]

steps:
- uses: actions/checkout@v4
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: Install the Apple certificate and provisioning profile
env:
APPLE_CERTIFICATE_BASE64: ${{ secrets.APPLE_CERTIFICATE_BASE64 }}
APPLE_P12_PASSWORD: ${{ secrets.APPLE_P12_PASSWORD }}
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
run: |
if [[ -n "$APPLE_CERTIFICATE_BASE64" ]]; then
# create variables
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
# import certificate and provisioning profile from secrets
echo -n "$APPLE_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
# create temporary keychain
security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
# import certificate to keychain
security import $CERTIFICATE_PATH -P "$APPLE_P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH
# list signing identities
# security find-identity -v -p codesigning
fi
- 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
MACOS_SIGN_NAME: ${{ secrets.MACOS_SIGN_NAME }}
APPLEID: ${{ secrets.APPLEID }}
APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
APPLEIDTEAM: ${{ secrets.APPLEIDTEAM }}

- 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@v4
with:
name: casparcg-client-macos-${{ matrix.arch }}
path: ${{ steps.rename-build.outputs.artifactname }}

- name: Copy single file to remote
uses: garygrossgarten/[email protected]
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
View file
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@v4
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@v4
with:
name: upload-artifact
path: ${{ steps.rename-build.outputs.artifactname }}

- name: Copy single file to remote
uses: garygrossgarten/[email protected]
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
View file
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
View file
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
View file
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
View file
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
View file
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 4bd8ec4

Please sign in to comment.