Upgrade from Qt 5 to Qt 6
This commit is contained in:
4
debian/control
vendored
4
debian/control
vendored
@@ -3,10 +3,10 @@ Maintainer: Cameron Gutman <aicommander@gmail.com>
|
|||||||
Section: misc
|
Section: misc
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Standards-Version: 4.3.0
|
Standards-Version: 4.3.0
|
||||||
Build-Depends: debhelper (>= 10), libssl-dev, qtbase5-dev, qtquickcontrols2-5-dev, qtdeclarative5-dev, libqt5svg5-dev, libxkbcommon-dev, libopus-dev, libgbm-dev, libdrm-dev, libasound2-dev, libdbus-1-dev, libegl1-mesa-dev, libgles2-mesa-dev, libglu1-mesa-dev, libibus-1.0-dev, libpulse-dev, libudev-dev, libx11-dev, libxcursor-dev, libxext-dev, libxi-dev, libxinerama-dev, libxrandr-dev, libxss-dev, libxt-dev, libxv-dev, libxxf86vm-dev, libgl-dev, libfreetype-dev, libwayland-dev, wayland-protocols, EXTRA_BUILD_DEPS
|
Build-Depends: debhelper (>= 10), libssl-dev, qt6-base-dev, qt6-declarative-dev, libqt6svg6-dev, libxkbcommon-dev, libopus-dev, libgbm-dev, libdrm-dev, libasound2-dev, libdbus-1-dev, libegl1-mesa-dev, libgles2-mesa-dev, libglu1-mesa-dev, libibus-1.0-dev, libpulse-dev, libudev-dev, libx11-dev, libxcursor-dev, libxext-dev, libxi-dev, libxinerama-dev, libxrandr-dev, libxss-dev, libxt-dev, libxv-dev, libxxf86vm-dev, libgl-dev, libfreetype-dev, libwayland-dev, wayland-protocols, EXTRA_BUILD_DEPS
|
||||||
|
|
||||||
Package: moonlight-qt
|
Package: moonlight-qt
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qtquick-layouts, qml-module-qtquick-window2, libdecor-0-0, ${shlibs:Depends}, ${misc:Depends}, EXTRA_DEPS
|
Depends: qml6-module-qtquick-controls, qml6-module-qtquick-templates, qml6-module-qtquick-layouts, qml6-module-qtqml-workerscript, qml6-module-qtquick-window, qml6-module-qtquick, libdecor-0-0, ${shlibs:Depends}, ${misc:Depends}, EXTRA_DEPS
|
||||||
Recommends: libgl1-mesa-dri, libgles2
|
Recommends: libgl1-mesa-dri, libgles2
|
||||||
Description: NVIDIA GameStream client
|
Description: NVIDIA GameStream client
|
||||||
|
|||||||
3
debian/rules
vendored
3
debian/rules
vendored
@@ -1,10 +1,9 @@
|
|||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
export QT_SELECT := qt5
|
|
||||||
%:
|
%:
|
||||||
dh $@
|
dh $@
|
||||||
|
|
||||||
override_dh_auto_configure:
|
override_dh_auto_configure:
|
||||||
qmake PREFIX=/usr EXTRA_CONFIG moonlight-qt.pro
|
qmake6 PREFIX=/usr EXTRA_CONFIG moonlight-qt.pro
|
||||||
|
|
||||||
override_dh_shlibdeps:
|
override_dh_shlibdeps:
|
||||||
# Override package dependency error for /usr/lib/aarch64-linux-gnu/tegra/libnvbuf_utils.so
|
# Override package dependency error for /usr/lib/aarch64-linux-gnu/tegra/libnvbuf_utils.so
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ export DEBIAN_FRONTEND=noninteractive
|
|||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y curl g++ make ninja-build devscripts fakeroot debhelper git nasm libgbm-dev libdrm-dev libasound2-dev libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev cmake libgl-dev meson wayland-protocols libwayland-dev libdecor-0-dev libfreetype-dev libpipewire-0.3-dev
|
apt-get install -y curl g++ make ninja-build devscripts fakeroot debhelper git nasm libgbm-dev libdrm-dev libasound2-dev libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev cmake libgl-dev meson wayland-protocols libwayland-dev libdecor-0-dev libfreetype-dev libpipewire-0.3-dev
|
||||||
apt-get install -y --no-install-recommends libssl-dev qtbase5-dev qtquickcontrols2-5-dev qtdeclarative5-dev libqt5svg5-dev libopus-dev gnupg
|
apt-get install -y --no-install-recommends libssl-dev qt6-base-dev qt6-declarative-dev libqt6svg6-dev libopus-dev gnupg
|
||||||
|
|
||||||
# Install FFmpeg if we're using the OS-provided version
|
# Install FFmpeg if we're using the OS-provided version
|
||||||
if [ "$TARGET" == "rpi" ] || [ "$TARGET" == "rpi64" ]; then
|
if [ "$TARGET" == "rpi" ] || [ "$TARGET" == "rpi64" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user