From 7d4e34d0bcf06b357fd09a059a02687acf335132 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 21 Jun 2023 01:17:50 +0100 Subject: gentoo auto-resync : 21:06:2023 - 01:17:50 --- net-misc/Manifest.gz | Bin 54080 -> 54081 bytes net-misc/moonlight/Manifest | 1 - .../moonlight/files/moonlight-9999-automagic.patch | 136 --------------------- 3 files changed, 137 deletions(-) delete mode 100644 net-misc/moonlight/files/moonlight-9999-automagic.patch (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 48532dea83c3..3db8e9982ed0 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest index a6836cbd7d18..de5405748e51 100644 --- a/net-misc/moonlight/Manifest +++ b/net-misc/moonlight/Manifest @@ -1,5 +1,4 @@ AUX moonlight-4.3.1-automagic.patch 4101 BLAKE2B fcba8951d179d350b2898bb7c124eb615c308d1b1e7435d971dafab9466f71f55e2e8a4e3897bfedf69e5e6ae7e0d50f105b4556de3da627220915096ec9c2dd SHA512 1b8485e60a8b93505a77b6937b060992046003a2cce16f8b3f32aa3dd9c7b4c8a49c500d1167ac821c80a621237fb66efa273b0e7ce270c1337a1cd87d23459f -AUX moonlight-9999-automagic.patch 4091 BLAKE2B 9d8d458e6a55163e720ca8012be86f612ae8a44ee001868c03f1731871c4bddd4cdd840dc34d239a32bcf6accc0a11f21ff20e77189ebf6021a50f4aac62b4fc SHA512 b07e56a26c65d2f3b3e0aa83a743a03fcbbb6912cc1e317ccb48bd9c71afae5f221d7e89ae8dce5f238c592d5f6702dcc66f5d2be0d2b1a47909617e0a2adf54 DIST MoonlightSrc-4.3.1.tar.gz 71454450 BLAKE2B cd6d8d95c3d53dbf73850cd30f86bdb9837806a642472454d70f6abee20ae91bc79c0671c4da0a74fb5f43086841a8318718c4f2f4e4768b395fb4b38d1dde9e SHA512 f5f7b23929aadb87716470522a315cba40d8155be6b76297eab4107e0fef71b48f9f4c9a4cc2b58bd48579db052a8ca8ecda9b49c78c3d229863a30886cf1847 EBUILD moonlight-4.3.1.ebuild 1823 BLAKE2B df9ab934ba25025c13eb47babef1661b2c705c41b1db212cc007885bd3061365a3959357308562b3f7401e5dd057ec78458c140de2a995704ef26a7aae194051 SHA512 e1ccf4673243fae8ce35f5274221241f7b906c8936f24c20042cde1452b4122af6255bcc6aec703df1a016426fd2367df9a1bd85ebcc730fc398c867d9fa8dd2 EBUILD moonlight-9999.ebuild 1800 BLAKE2B 895be9ffee1cd497c3ef1a0ed1512d0ff889716ec72ba56272fc1227cfd0ff0429159a0c00086d1401633f85db439299ec67d0fff697f4a89b6c8057960cc767 SHA512 5fd13cf57cc8f704d2260c86a0b254839b32ace9f23b4f9947d5237429d2960869ac53d9163b56a8bcbba84a2093bd89226ec61ec5ffda604acec7cc4dd81567 diff --git a/net-misc/moonlight/files/moonlight-9999-automagic.patch b/net-misc/moonlight/files/moonlight-9999-automagic.patch deleted file mode 100644 index 1a2b56ceea7a..000000000000 --- a/net-misc/moonlight/files/moonlight-9999-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 { - LIBS += -llibssl -llibcrypto -lSDL2 -lSDL2_ttf -lavcodec -lavutil -lopus -ldxgi -ld3d11 --- -2.40.1 - -- cgit v1.2.3