blob: 1a2b56ceea7a1c5d3297bde770613ccc4232c952 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
From 3bd5c3728b5469e88dcba794e371e9b028c47df8 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 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
|
