diff options
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/moonlight/Manifest | 1 | ||||
-rw-r--r-- | net-misc/moonlight/files/moonlight-4.3.1-automagic.patch | 136 | ||||
-rw-r--r-- | net-misc/moonlight/moonlight-4.3.1.ebuild | 83 |
3 files changed, 0 insertions, 220 deletions
diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest index 32d1c784c5f7..9b20b155395e 100644 --- a/net-misc/moonlight/Manifest +++ b/net-misc/moonlight/Manifest @@ -1,2 +1 @@ -DIST MoonlightSrc-4.3.1.tar.gz 71454450 BLAKE2B cd6d8d95c3d53dbf73850cd30f86bdb9837806a642472454d70f6abee20ae91bc79c0671c4da0a74fb5f43086841a8318718c4f2f4e4768b395fb4b38d1dde9e SHA512 f5f7b23929aadb87716470522a315cba40d8155be6b76297eab4107e0fef71b48f9f4c9a4cc2b58bd48579db052a8ca8ecda9b49c78c3d229863a30886cf1847 DIST MoonlightSrc-5.0.0.tar.gz 79821343 BLAKE2B 91a57f70863cd9c8a8a0cb28cc0475468485d449747fb3425dce41c046af992f9b636036cf735799042d895e69c2c88fbc48d1b1b874bd03a3b1eef97d6c98ad SHA512 067f862d2f33a7b2d47b6465951a5618a81f027219b9dcbe976154abaa7e0ba3913e59096584bbb8f86170d677804bb5e1412f7bd71727d9f8ac519adde097d3 diff --git a/net-misc/moonlight/files/moonlight-4.3.1-automagic.patch b/net-misc/moonlight/files/moonlight-4.3.1-automagic.patch deleted file mode 100644 index 10a6914f4dea..000000000000 --- a/net-misc/moonlight/files/moonlight-4.3.1-automagic.patch +++ /dev/null @@ -1,136 +0,0 @@ -From ff49dcfa47f673bcd27314b03ba68f99f7619c39 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Sat, 3 Jun 2023 17:51:00 +0100 -Subject: [PATCH] Allow forced disabling of features instead of relying on - pkg-config - -So-called "automagic" behaviour is considered unhelpful by -distributions. A user may unintentionally build Moonlight with VDPAU -support simply because they had that library installed, only for the -whole application to break when they uninstall the library later. This -could happen on any distribution, but it should especially be avoided on -source-based distributions, where the user would not expect the package -manager to encounter such issues. - -This commit is best viewed without whitespace changes. ---- - app/app.pro | 92 +++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 57 insertions(+), 35 deletions(-) - -diff --git a/app/app.pro b/app/app.pro -index dc21b854..45ee1f89 100644 ---- a/app/app.pro -+++ b/app/app.pro -@@ -65,52 +65,74 @@ unix:!macx { - CONFIG += link_pkgconfig - PKGCONFIG += openssl sdl2 SDL2_ttf opus - -- packagesExist(libavcodec) { -- PKGCONFIG += libavcodec libavutil -- CONFIG += ffmpeg -- -- packagesExist(libva) { -- packagesExist(libva-x11) { -- CONFIG += libva-x11 -+ !disable-ffmpeg { -+ packagesExist(libavcodec) { -+ PKGCONFIG += libavcodec libavutil -+ CONFIG += ffmpeg -+ -+ !disable-libva { -+ packagesExist(libva) { -+ !disable-x11 { -+ packagesExist(libva-x11) { -+ CONFIG += libva-x11 -+ } -+ } -+ !disable-wayland { -+ packagesExist(libva-wayland) { -+ CONFIG += libva-wayland -+ } -+ } -+ !disable-libdrm { -+ packagesExist(libva-drm) { -+ CONFIG += libva-drm -+ } -+ } -+ CONFIG += libva -+ } - } -- packagesExist(libva-wayland) { -- CONFIG += libva-wayland -+ -+ !disable-libvdpau { -+ packagesExist(vdpau) { -+ CONFIG += libvdpau -+ } - } -- packagesExist(libva-drm) { -- CONFIG += libva-drm -+ -+ !disable-mmal { -+ packagesExist(mmal) { -+ PKGCONFIG += mmal -+ CONFIG += mmal -+ } - } -- CONFIG += libva -- } - -- packagesExist(vdpau) { -- CONFIG += libvdpau -- } -+ !disable-libdrm { -+ packagesExist(libdrm) { -+ PKGCONFIG += libdrm -+ CONFIG += libdrm -+ } -+ } - -- packagesExist(mmal) { -- PKGCONFIG += mmal -- CONFIG += mmal -+ !disable-cuda { -+ packagesExist(ffnvcodec) { -+ PKGCONFIG += ffnvcodec -+ CONFIG += cuda -+ } -+ } - } - -- packagesExist(libdrm) { -- PKGCONFIG += libdrm -- CONFIG += libdrm -+ !disable-wayland { -+ packagesExist(wayland-client) { -+ DEFINES += HAS_WAYLAND -+ PKGCONFIG += wayland-client -+ } - } - -- packagesExist(ffnvcodec) { -- PKGCONFIG += ffnvcodec -- CONFIG += cuda -+ !disable-x11 { -+ packagesExist(x11) { -+ DEFINES += HAS_X11 -+ PKGCONFIG += x11 -+ } - } - } -- -- packagesExist(wayland-client) { -- DEFINES += HAS_WAYLAND -- PKGCONFIG += wayland-client -- } -- -- packagesExist(x11) { -- DEFINES += HAS_X11 -- PKGCONFIG += x11 -- } - } - win32 { - LIBS += -llibssl -llibcrypto -lSDL2 -lSDL2_ttf -lavcodec -lavutil -lopus -ldxgi -ld3d11 --- -2.40.1 - diff --git a/net-misc/moonlight/moonlight-4.3.1.ebuild b/net-misc/moonlight/moonlight-4.3.1.ebuild deleted file mode 100644 index 382261a3d519..000000000000 --- a/net-misc/moonlight/moonlight-4.3.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/moonlight-stream/moonlight-qt.git" - EGIT_SUBMODULES=( '*' -libs -soundio ) - inherit git-r3 -else - SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm64" - S="${WORKDIR}" -fi - -inherit qmake-utils xdg - -DESCRIPTION="NVIDIA GameStream (and Sunshine) client" -HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt" -LICENSE="GPL-3" -SLOT="0" -IUSE="cuda +libdrm embedded mmal soundio +vaapi vdpau wayland X" - -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/libsdl2[haptic,kms,joystick,sound,video] - media-libs/opus - media-libs/sdl2-ttf - media-video/ffmpeg:=[cuda?,libdrm?,mmal?] - libdrm? ( x11-libs/libdrm ) - soundio? ( media-libs/libsoundio:= ) - vaapi? ( media-libs/libva:=[wayland?,X?] ) - vdpau? ( x11-libs/libvdpau ) - wayland? ( dev-libs/wayland ) - X? ( x11-libs/libX11 ) -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - dev-qt/qtcore - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-automagic.patch" -) - -src_prepare() { - default - - # Force system libsoundio over bundled version. - rm -r soundio/ || die -} - -src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \ - $(usex cuda "" disable-cuda) \ - $(usex libdrm "" disable-libdrm) \ - $(usex mmal "" disable-mmal) \ - $(usex vaapi "" disable-libva) \ - $(usex vdpau "" disable-libvdpau) \ - $(usex wayland "" disable-wayland) \ - $(usex X "" disable-x11) \ - $(usev embedded) \ - $(usev soundio) \ - " -} - -src_install() { - emake install INSTALL_ROOT="${D}" - einstalldocs -} |