[gentoo-commits] repo/gentoo:master commit in: net-misc/moonlight/
commit: accc934d4381a9edb46143786ec6d3b7653755b7 Author: James Le Cuirot gentoo org> AuthorDate: Sat May 4 21:19:50 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Sat May 4 21:20:20 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=accc934d net-misc/moonlight: Require libsdl2[gles2] It's needed for hardware acceleration. Closes: https://bugs.gentoo.org/930987 Signed-off-by: James Le Cuirot gentoo.org> .../{moonlight-5.0.1-r2.ebuild => moonlight-5.0.1-r3.ebuild} | 4 ++-- net-misc/moonlight/moonlight-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/moonlight/moonlight-5.0.1-r2.ebuild b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild similarity index 94% rename from net-misc/moonlight/moonlight-5.0.1-r2.ebuild rename to net-misc/moonlight/moonlight-5.0.1-r3.ebuild index a6dc05e965aa..33e79bb06086 100644 --- a/net-misc/moonlight/moonlight-5.0.1-r2.ebuild +++ b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ RDEPEND=" dev-qt/qtwidgets:5 media-libs/libglvnd media-libs/libpulse - media-libs/libsdl2[haptic,kms,joystick,sound,video] + media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video] media-libs/opus media-libs/sdl2-ttf media-video/ffmpeg:=[cuda?,libdrm?] diff --git a/net-misc/moonlight/moonlight-.ebuild b/net-misc/moonlight/moonlight-.ebuild index a6dc05e965aa..33e79bb06086 100644 --- a/net-misc/moonlight/moonlight-.ebuild +++ b/net-misc/moonlight/moonlight-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ RDEPEND=" dev-qt/qtwidgets:5 media-libs/libglvnd media-libs/libpulse - media-libs/libsdl2[haptic,kms,joystick,sound,video] + media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video] media-libs/opus media-libs/sdl2-ttf media-video/ffmpeg:=[cuda?,libdrm?]
[gentoo-commits] repo/gentoo:master commit in: net-misc/moonlight/
commit: 3de05049734208b483a27002c79bfc05a0711fe7 Author: James Le Cuirot gentoo org> AuthorDate: Fri Dec 15 22:44:52 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Feb 10 21:23:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de05049 net-misc/moonlight: Drop Raspberry Pi support in revbump media-libs/raspberrypi-userland(-bin) is being last-rited. The Linux kernel and FFmpeg now support the Pi, among other devices, natively. Enable media-video/ffmpeg's "soc" USE flag to enable that support. Signed-off-by: James Le Cuirot gentoo.org> net-misc/moonlight/metadata.xml | 1 - .../{moonlight-5.0.1-r1.ebuild => moonlight-5.0.1-r2.ebuild}| 6 +++--- net-misc/moonlight/moonlight-.ebuild| 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/net-misc/moonlight/metadata.xml b/net-misc/moonlight/metadata.xml index 7b6d9ea7ef4f..69364f1304dd 100644 --- a/net-misc/moonlight/metadata.xml +++ b/net-misc/moonlight/metadata.xml @@ -13,7 +13,6 @@ Optimize UI for fullscreen non-desktop usage Prefer direct KMS/DRM rendering over EGL/GLES rendering for better performance on some weaker GPUs Enable video rendering via x11-libs/libdrm - Enable accelerated video rendering on the Raspberry Pi Enable sound output via media-libs/libsoundio instead of media-libs/libsdl2 diff --git a/net-misc/moonlight/moonlight-5.0.1-r1.ebuild b/net-misc/moonlight/moonlight-5.0.1-r2.ebuild similarity index 91% rename from net-misc/moonlight/moonlight-5.0.1-r1.ebuild rename to net-misc/moonlight/moonlight-5.0.1-r2.ebuild index 09908df00159..a6dc05e965aa 100644 --- a/net-misc/moonlight/moonlight-5.0.1-r1.ebuild +++ b/net-misc/moonlight/moonlight-5.0.1-r2.ebuild @@ -19,7 +19,7 @@ DESCRIPTION="NVIDIA GameStream (and Sunshine) client" HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt; LICENSE="GPL-3" SLOT="0" -IUSE="cuda +libdrm embedded glslow mmal soundio +vaapi vdpau wayland X" +IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X" RDEPEND=" dev-libs/openssl:= @@ -34,7 +34,7 @@ RDEPEND=" media-libs/libsdl2[haptic,kms,joystick,sound,video] media-libs/opus media-libs/sdl2-ttf - media-video/ffmpeg:=[cuda?,libdrm?,mmal?] + media-video/ffmpeg:=[cuda?,libdrm?] libdrm? ( x11-libs/libdrm ) soundio? ( media-libs/libsoundio:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) @@ -66,7 +66,7 @@ src_configure() { eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \ $(usex cuda "" disable-cuda) \ $(usex libdrm "" disable-libdrm) \ - $(usex mmal "" disable-mmal) \ + --disable-mmal \ $(usex vaapi "" disable-libva) \ $(usex vdpau "" disable-libvdpau) \ $(usex wayland "" disable-wayland) \ diff --git a/net-misc/moonlight/moonlight-.ebuild b/net-misc/moonlight/moonlight-.ebuild index 09908df00159..a6dc05e965aa 100644 --- a/net-misc/moonlight/moonlight-.ebuild +++ b/net-misc/moonlight/moonlight-.ebuild @@ -19,7 +19,7 @@ DESCRIPTION="NVIDIA GameStream (and Sunshine) client" HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt; LICENSE="GPL-3" SLOT="0" -IUSE="cuda +libdrm embedded glslow mmal soundio +vaapi vdpau wayland X" +IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X" RDEPEND=" dev-libs/openssl:= @@ -34,7 +34,7 @@ RDEPEND=" media-libs/libsdl2[haptic,kms,joystick,sound,video] media-libs/opus media-libs/sdl2-ttf - media-video/ffmpeg:=[cuda?,libdrm?,mmal?] + media-video/ffmpeg:=[cuda?,libdrm?] libdrm? ( x11-libs/libdrm ) soundio? ( media-libs/libsoundio:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) @@ -66,7 +66,7 @@ src_configure() { eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \ $(usex cuda "" disable-cuda) \ $(usex libdrm "" disable-libdrm) \ - $(usex mmal "" disable-mmal) \ + --disable-mmal \ $(usex vaapi "" disable-libva) \ $(usex vdpau "" disable-libvdpau) \ $(usex wayland "" disable-wayland) \
[gentoo-commits] repo/gentoo:master commit in: net-misc/moonlight/
commit: 5c3407a319f2d2677364a575a75b5f3ad33d1655 Author: Serge-Yvan Gagnon github com> AuthorDate: Mon Dec 4 01:07:13 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Dec 17 22:44:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c3407a3 net-misc/moonlight: Ensure libsdl2 is built with X11 support for VDPAU Signed-off-by: Serge-Yvan Gagnon github.com> Closes: https://github.com/gentoo/gentoo/pull/34122 Signed-off-by: James Le Cuirot gentoo.org> .../moonlight/{moonlight-5.0.1.ebuild => moonlight-5.0.1-r1.ebuild} | 5 - net-misc/moonlight/moonlight-.ebuild | 5 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/net-misc/moonlight/moonlight-5.0.1.ebuild b/net-misc/moonlight/moonlight-5.0.1-r1.ebuild similarity index 96% rename from net-misc/moonlight/moonlight-5.0.1.ebuild rename to net-misc/moonlight/moonlight-5.0.1-r1.ebuild index 8b57b5053b13..09908df00159 100644 --- a/net-misc/moonlight/moonlight-5.0.1.ebuild +++ b/net-misc/moonlight/moonlight-5.0.1-r1.ebuild @@ -38,7 +38,10 @@ RDEPEND=" libdrm? ( x11-libs/libdrm ) soundio? ( media-libs/libsoundio:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) - vdpau? ( x11-libs/libvdpau ) + vdpau? ( + x11-libs/libvdpau + media-libs/libsdl2[X] + ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 ) " diff --git a/net-misc/moonlight/moonlight-.ebuild b/net-misc/moonlight/moonlight-.ebuild index 8b57b5053b13..09908df00159 100644 --- a/net-misc/moonlight/moonlight-.ebuild +++ b/net-misc/moonlight/moonlight-.ebuild @@ -38,7 +38,10 @@ RDEPEND=" libdrm? ( x11-libs/libdrm ) soundio? ( media-libs/libsoundio:= ) vaapi? ( media-libs/libva:=[wayland?,X?] ) - vdpau? ( x11-libs/libvdpau ) + vdpau? ( + x11-libs/libvdpau + media-libs/libsdl2[X] + ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 ) "
[gentoo-commits] repo/gentoo:master commit in: net-misc/moonlight/
commit: 10cbf15e05419a04a0aa530a2facb995feb79bfc Author: James Le Cuirot gentoo org> AuthorDate: Sat Nov 11 19:22:28 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Nov 11 19:25:34 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10cbf15e net-misc/moonlight: Bump to 5.0.1, drop old 5.0.0 Signed-off-by: James Le Cuirot gentoo.org> net-misc/moonlight/Manifest | 2 +- net-misc/moonlight/{moonlight-5.0.0.ebuild => moonlight-5.0.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest index 9b20b155395e..0456414d887d 100644 --- a/net-misc/moonlight/Manifest +++ b/net-misc/moonlight/Manifest @@ -1 +1 @@ -DIST MoonlightSrc-5.0.0.tar.gz 79821343 BLAKE2B 91a57f70863cd9c8a8a0cb28cc0475468485d449747fb3425dce41c046af992f9b636036cf735799042d895e69c2c88fbc48d1b1b874bd03a3b1eef97d6c98ad SHA512 067f862d2f33a7b2d47b6465951a5618a81f027219b9dcbe976154abaa7e0ba3913e59096584bbb8f86170d677804bb5e1412f7bd71727d9f8ac519adde097d3 +DIST MoonlightSrc-5.0.1.tar.gz 79820559 BLAKE2B ae67db6aab9e2104021e35b5bc4822a57a3b82a03f6b2bd1cc95e356833f163e9f6f30afc082dc8d1e4b120ef9ef7aeca2f30eec88502773020e0a6b48cbf0b1 SHA512 618d67afd4638e6c051850fc68b68fd313c9334300e35370b0b3741ec51e30da212633954b7ea47cc1f0644f5005cc06ecf861349418512919453d576f9acd60 diff --git a/net-misc/moonlight/moonlight-5.0.0.ebuild b/net-misc/moonlight/moonlight-5.0.1.ebuild similarity index 100% rename from net-misc/moonlight/moonlight-5.0.0.ebuild rename to net-misc/moonlight/moonlight-5.0.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-misc/moonlight/, net-misc/moonlight/files/
commit: be8e2de2ad1cbe3403543f2dd8181e5bbce0cbaa Author: James Le Cuirot gentoo org> AuthorDate: Sat Nov 11 19:19:57 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Nov 11 19:25:31 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8e2de2 net-misc/moonlight: Drop old 4.3.1 Signed-off-by: James Le Cuirot gentoo.org> net-misc/moonlight/Manifest| 1 - .../files/moonlight-4.3.1-automagic.patch | 136 - net-misc/moonlight/moonlight-4.3.1.ebuild | 83 - 3 files changed, 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.. --- 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 -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
[gentoo-commits] repo/gentoo:master commit in: net-misc/moonlight/
commit: ea0e1474bc83e058cd9854e424f1a2f4c7fa8c5f Author: James Le Cuirot gentoo org> AuthorDate: Wed Oct 18 21:57:47 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Wed Oct 18 21:57:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea0e1474 net-misc/moonlight: Version bump to 5.0.0 Signed-off-by: James Le Cuirot gentoo.org> net-misc/moonlight/Manifest | 1 + net-misc/moonlight/moonlight-5.0.0.ebuild | 80 +++ 2 files changed, 81 insertions(+) diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest index acf0147bd96b..32d1c784c5f7 100644 --- a/net-misc/moonlight/Manifest +++ b/net-misc/moonlight/Manifest @@ -1 +1,2 @@ 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/moonlight-5.0.0.ebuild b/net-misc/moonlight/moonlight-5.0.0.ebuild new file mode 100644 index ..8b57b5053b13 --- /dev/null +++ b/net-misc/moonlight/moonlight-5.0.0.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = * ]]; 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 glslow 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 +" + +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 glslow) \ + $(usev soundio) \ + " +} + +src_install() { + emake install INSTALL_ROOT="${D}" + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: net-misc/moonlight/files/
commit: 2a729de7fdceb4f00b81b2b059660d488ca847d9 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jun 20 10:46:59 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Jun 20 19:59:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a729de7 net-misc/moonlight: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31550 Signed-off-by: James Le Cuirot gentoo.org> .../moonlight/files/moonlight--automagic.patch | 136 - 1 file changed, 136 deletions(-) diff --git a/net-misc/moonlight/files/moonlight--automagic.patch b/net-misc/moonlight/files/moonlight--automagic.patch deleted file mode 100644 index 1a2b56ceea7a.. --- a/net-misc/moonlight/files/moonlight--automagic.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 3bd5c3728b5469e88dcba794e371e9b028c47df8 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -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 82d941e7..85f38dd4 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) { -+CONFIG += wayland -+PKGCONFIG += wayland-client -+} - } - --packagesExist(ffnvcodec) { --PKGCONFIG += ffnvcodec --CONFIG += cuda -+!disable-x11 { -+packagesExist(x11) { -+DEFINES += HAS_X11 -+PKGCONFIG += x11 -+} - } - } -- --packagesExist(wayland-client) { --CONFIG += wayland --PKGCONFIG += wayland-client --} -- --packagesExist(x11) { --DEFINES += HAS_X11 --PKGCONFIG += x11 --} - } - win32 { -
[gentoo-commits] repo/gentoo:master commit in: net-misc/moonlight/
commit: 330ff6d211b3c1cba782863a4be3b3cb089a363f Author: James Le Cuirot gentoo org> AuthorDate: Sun Jun 18 22:22:43 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Jun 18 22:23:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330ff6d2 net-misc/moonlight: My automagic patch was merged upstream Signed-off-by: James Le Cuirot gentoo.org> net-misc/moonlight/moonlight-.ebuild | 4 1 file changed, 4 deletions(-) diff --git a/net-misc/moonlight/moonlight-.ebuild b/net-misc/moonlight/moonlight-.ebuild index 906827ed9d2a..8b57b5053b13 100644 --- a/net-misc/moonlight/moonlight-.ebuild +++ b/net-misc/moonlight/moonlight-.ebuild @@ -52,10 +52,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}/${P}-automagic.patch" -) - src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: net-misc/moonlight/files/, net-misc/moonlight/
commit: d5528cd4217319515d6f2ca6a5b0676daa52f2c4 Author: James Le Cuirot gentoo org> AuthorDate: Sun Jun 4 17:09:04 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Jun 4 20:31:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5528cd4 net-misc/moonlight: New package Signed-off-by: James Le Cuirot gentoo.org> net-misc/moonlight/Manifest| 1 + .../files/moonlight-4.3.1-automagic.patch | 136 + .../moonlight/files/moonlight--automagic.patch | 136 + net-misc/moonlight/metadata.xml| 19 +++ net-misc/moonlight/moonlight-4.3.1.ebuild | 83 + net-misc/moonlight/moonlight-.ebuild | 84 + 6 files changed, 459 insertions(+) diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest new file mode 100644 index ..acf0147bd96b --- /dev/null +++ b/net-misc/moonlight/Manifest @@ -0,0 +1 @@ +DIST MoonlightSrc-4.3.1.tar.gz 71454450 BLAKE2B cd6d8d95c3d53dbf73850cd30f86bdb9837806a642472454d70f6abee20ae91bc79c0671c4da0a74fb5f43086841a8318718c4f2f4e4768b395fb4b38d1dde9e SHA512 f5f7b23929aadb87716470522a315cba40d8155be6b76297eab4107e0fef71b48f9f4c9a4cc2b58bd48579db052a8ca8ecda9b49c78c3d229863a30886cf1847 diff --git a/net-misc/moonlight/files/moonlight-4.3.1-automagic.patch b/net-misc/moonlight/files/moonlight-4.3.1-automagic.patch new file mode 100644 index ..10a6914f4dea --- /dev/null +++ b/net-misc/moonlight/files/moonlight-4.3.1-automagic.patch @@ -0,0 +1,136 @@ +From ff49dcfa47f673bcd27314b03ba68f99f7619c39 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +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) { +-