net-misc/moonlight: Bump to 6.0.1, drop old 5.0.1-r3

This adds Qt6 support alongside Qt5. If both are enabled, Qt6 is chosen.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This commit is contained in:
James Le Cuirot
2024-08-21 23:10:48 +01:00
parent e723e48c30
commit e6d17df946
4 changed files with 78 additions and 43 deletions

View File

@@ -1 +1 @@
DIST MoonlightSrc-5.0.1.tar.gz 79820559 BLAKE2B ae67db6aab9e2104021e35b5bc4822a57a3b82a03f6b2bd1cc95e356833f163e9f6f30afc082dc8d1e4b120ef9ef7aeca2f30eec88502773020e0a6b48cbf0b1 SHA512 618d67afd4638e6c051850fc68b68fd313c9334300e35370b0b3741ec51e30da212633954b7ea47cc1f0644f5005cc06ecf861349418512919453d576f9acd60
DIST MoonlightSrc-6.0.1.tar.gz 83786545 BLAKE2B b227780264965b8e455e6a12dde9244325b7799737c44fffbe9219651c9390223bd13956de82af31c1f5483327d9398ff8fc9724d7466353ced415ebf2ed3fd7 SHA512 44b7c77a438c46f0374d4289203518f4468b10a5e388ae4a928845825886b8b3abd975f9ca6ddf4eaf94eb80667650520a1522292a91f88ec0f6d7396570b8ef

View File

@@ -14,5 +14,6 @@
<flag name="glslow">Prefer direct KMS/DRM rendering over EGL/GLES rendering for better performance on some weaker GPUs</flag>
<flag name="libdrm">Enable video rendering via <pkg>x11-libs/libdrm</pkg></flag>
<flag name="soundio">Enable sound output via <pkg>media-libs/libsoundio</pkg> instead of <pkg>media-libs/libsdl2</pkg></flag>
<flag name="vkslow">Prefer hardware YUV-RGB conversion and scaling over Vulkan for better performance on some weaker GPUs</flag>
</use>
</pkgmetadata>

View File

@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/moonlight-stream/moonlight-qt.git"
EGIT_SUBMODULES=( '*' -libs -soundio )
EGIT_SUBMODULES=( '*' -libs -soundio/libsoundio )
inherit git-r3
else
SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz"
@@ -19,23 +19,30 @@ DESCRIPTION="NVIDIA GameStream (and Sunshine) client"
HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt"
LICENSE="GPL-3"
SLOT="0"
IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X"
IUSE="cuda +libdrm embedded glslow qt5 qt6 soundio +vaapi vdpau vkslow wayland X"
REQUIRED_USE="|| ( qt6 qt5 )"
RDEPEND="
dev-libs/openssl:=
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtquickcontrols2:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
media-libs/libglvnd
media-libs/libpulse
media-libs/libplacebo:=
media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video]
media-libs/opus
media-libs/sdl2-ttf
media-video/ffmpeg:=[cuda?,libdrm?]
libdrm? ( x11-libs/libdrm )
qt6? (
dev-qt/qtbase:6[gui,network]
dev-qt/qtdeclarative:6[svg]
)
!qt6? ( qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtquickcontrols2:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
) )
soundio? ( media-libs/libsoundio:= )
vaapi? ( media-libs/libva:=[wayland?,X?] )
vdpau? (
@@ -63,18 +70,28 @@ src_prepare() {
}
src_configure() {
eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \
$(usex cuda "" disable-cuda) \
$(usex libdrm "" disable-libdrm) \
--disable-mmal \
$(usex vaapi "" disable-libva) \
$(usex vdpau "" disable-libvdpau) \
$(usex wayland "" disable-wayland) \
$(usex X "" disable-x11) \
$(usev embedded) \
$(usev glslow) \
$(usev soundio) \
"
local qmake_args=(
PREFIX="${EPREFIX}/usr"
CONFIG+="
disable-mmal
$(usex cuda "" disable-cuda)
$(usex libdrm "" disable-libdrm)
$(usex vaapi "" disable-libva)
$(usex vdpau "" disable-libvdpau)
$(usex wayland "" disable-wayland)
$(usex X "" disable-x11)
$(usev embedded)
$(usev glslow)
$(usev soundio)
$(usev vkslow)
"
)
if use qt6; then
eqmake6 "${qmake_args[@]//$'\n'}"
else
eqmake5 "${qmake_args[@]//$'\n'}"
fi
}
src_install() {

View File

@@ -5,7 +5,7 @@ EAPI=8
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/moonlight-stream/moonlight-qt.git"
EGIT_SUBMODULES=( '*' -libs -soundio )
EGIT_SUBMODULES=( '*' -libs -soundio/libsoundio )
inherit git-r3
else
SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz"
@@ -19,23 +19,30 @@ DESCRIPTION="NVIDIA GameStream (and Sunshine) client"
HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt"
LICENSE="GPL-3"
SLOT="0"
IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X"
IUSE="cuda +libdrm embedded glslow qt5 qt6 soundio +vaapi vdpau vkslow wayland X"
REQUIRED_USE="|| ( qt6 qt5 )"
RDEPEND="
dev-libs/openssl:=
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtquickcontrols2:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
media-libs/libglvnd
media-libs/libpulse
media-libs/libplacebo:=
media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video]
media-libs/opus
media-libs/sdl2-ttf
media-video/ffmpeg:=[cuda?,libdrm?]
libdrm? ( x11-libs/libdrm )
qt6? (
dev-qt/qtbase:6[gui,network]
dev-qt/qtdeclarative:6[svg]
)
!qt6? ( qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtquickcontrols2:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
) )
soundio? ( media-libs/libsoundio:= )
vaapi? ( media-libs/libva:=[wayland?,X?] )
vdpau? (
@@ -63,18 +70,28 @@ src_prepare() {
}
src_configure() {
eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \
$(usex cuda "" disable-cuda) \
$(usex libdrm "" disable-libdrm) \
--disable-mmal \
$(usex vaapi "" disable-libva) \
$(usex vdpau "" disable-libvdpau) \
$(usex wayland "" disable-wayland) \
$(usex X "" disable-x11) \
$(usev embedded) \
$(usev glslow) \
$(usev soundio) \
"
local qmake_args=(
PREFIX="${EPREFIX}/usr"
CONFIG+="
disable-mmal
$(usex cuda "" disable-cuda)
$(usex libdrm "" disable-libdrm)
$(usex vaapi "" disable-libva)
$(usex vdpau "" disable-libvdpau)
$(usex wayland "" disable-wayland)
$(usex X "" disable-x11)
$(usev embedded)
$(usev glslow)
$(usev soundio)
$(usev vkslow)
"
)
if use qt6; then
eqmake6 "${qmake_args[@]//$'\n'}"
else
eqmake5 "${qmake_args[@]//$'\n'}"
fi
}
src_install() {