Skip to content

Commit fb1703f

Browse files
committed
Add QWebSockets to builds
1 parent e17451f commit fb1703f

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: ${{ matrix.language == 'cpp' }}
3737
run: |
3838
sudo apt-get update
39-
sudo apt-get install --yes git build-essential qtbase5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-image0-dev libxcb-util0-dev libxcb-shm0-dev libxcb-render0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev libftdi1-dev
39+
sudo apt-get install --yes git build-essential qtbase5-dev libqt5serialport5-dev libqt5websockets5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-image0-dev libxcb-util0-dev libxcb-shm0-dev libxcb-render0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev libftdi1-dev
4040
4141
- name: Temporarily downgrade CMake to 3.28.3 # Please remove if GitHub has updated Cmake (greater than 3.30.0)
4242
uses: jwlawson/actions-setup-cmake@v2

.github/workflows/qt5_6.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ jobs:
191191
- name: 📥 Install Qt
192192
uses: jurplel/install-qt-action@v4
193193
with:
194-
version: ${{ inputs.qt_version == '6' && '6.7' || '5.15.*' }}
194+
version: ${{ inputs.qt_version == '6' && '6.8' || '5.15.*' }}
195195
target: 'desktop'
196-
modules: ${{ inputs.qt_version == '6' && 'qtserialport' || '' }}
196+
modules: ${{ inputs.qt_version == '6' && 'qtserialport' && 'qtwebsockets' || '' }}
197197
cache: 'true'
198198
cache-key-prefix: 'cache-qt-windows'
199199

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ message(STATUS "Found Qt Version: ${QT_VERSION}")
570570
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
571571
set(QT_MIN_VERSION "6.2.2")
572572
else()
573-
set(QT_MIN_VERSION "5.5.0")
573+
set(QT_MIN_VERSION "5.9.0")
574574
endif()
575575

576576
if("${QT_VERSION}" VERSION_LESS "${QT_MIN_VERSION}")

doc/development/CompileHowto.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/
3030

3131
### Ubuntu
3232

33-
**amd64 (Jammy):**
33+
**amd64 (Noble Numbat):**
3434
```console
35-
wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh --name jammy
35+
wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh --name noble
3636
```
3737

3838
### Fedora
3939

40-
**amd64 (39):**
40+
**amd64 (41):**
4141
```console
42-
wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh --name 39
42+
wget -qN https://raw.github.com/hyperion-project/hyperion.ng/master/bin/scripts/docker-compile.sh && chmod +x *.sh && ./docker-compile.sh --name 41
4343
```
4444

4545
## Cross compilation on amd64 for developers
@@ -61,14 +61,14 @@ cd $HYPERION_HOME
6161

6262
```console
6363
sudo apt-get update
64-
sudo apt-get install git cmake build-essential qtbase5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev libftdi1-dev
64+
sudo apt-get install git cmake build-essential qtbase5-dev libqt5serialport5-dev libqt5websockets5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev libftdi1-dev
6565
```
6666

6767
**Ubuntu (22.04+) - Qt6 based**
6868

6969
```console
7070
sudo apt-get update
71-
sudo apt-get install git cmake build-essential qt6-base-dev libqt6serialport6-dev libxkbcommon-dev libvulkan-dev libgl1-mesa-dev libusb-1.0-0-dev python3-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev pkg-config libftdi1-dev
71+
sudo apt-get install git cmake build-essential qt6-base-dev libqt6serialport6-dev libqt6websockets6-dev libxkbcommon-dev libvulkan-dev libgl1-mesa-dev libusb-1.0-0-dev python3-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev pkg-config libftdi1-dev
7272
```
7373

7474
**For Linux X11/XCB grabber support**
@@ -110,7 +110,7 @@ See [AUR](https://aur.archlinux.org/packages/?O=0&SeB=nd&K=hyperion&outdated=&SB
110110
The following dependencies are needed to build hyperion.ng on fedora.
111111
```console
112112
sudo dnf -y groupinstall "Development Tools"
113-
sudo dnf install python3-devel qt-devel qt5-qtbase-devel qt5-qtserialport-devel xrandr xcb-util-image-devel qt5-qtx11extras-devel alsa-lib-devel turbojpeg-devel libusb-devel xcb-util-devel dbus-devel openssl-devel fedora-packager rpmdevtools gcc libcec-devel libftdi1-dev
113+
sudo dnf install python3-devel qt-devel qt6-qtbase-devel qt6-qtserialport-devel qt6-qtwebsockets-devel xrandr xcb-util-image-devel qt5-qtx11extras-devel alsa-lib-devel turbojpeg-devel libusb-devel xcb-util-devel dbus-devel openssl-devel fedora-packager rpmdevtools gcc libcec-devel libftdi1-dev
114114
```
115115
After installing the dependencies, you can continue with the compile instructions later on this page (the more detailed way..).
116116

0 commit comments

Comments
 (0)