1 |
commit: f124252a9473d811a57ca8dd83ea5b6c2c4a69e3 |
2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 9 23:30:48 2017 +0000 |
4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 9 23:36:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f124252a |
7 |
|
8 |
dev-qt/qtwebengine: update configure switches |
9 |
|
10 |
The WEBENGINE_CONFIG has been dropped in favour of 'qtConfig' values, |
11 |
and while more work is needed to make sure that the USE-flags |
12 |
actually disable features detected automagically, this commit will |
13 |
allow for at least some control over them. |
14 |
|
15 |
http://code.qt.io/cgit/qt/qtwebengine.git/commit/?h=v5.10.0&id=1691d2298a8adf511ed95d5aa5d4410adcbdd1e3 |
16 |
|
17 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
18 |
|
19 |
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 12 +++++++++--- |
20 |
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 12 +++++++++--- |
21 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 12 +++++++++--- |
22 |
3 files changed, 27 insertions(+), 9 deletions(-) |
23 |
|
24 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild |
25 |
index 2c0bd638..4191302a 100644 |
26 |
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild |
27 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild |
28 |
@@ -97,9 +97,15 @@ src_configure() { |
29 |
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" |
30 |
|
31 |
local myqmakeargs=( |
32 |
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') |
33 |
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') |
34 |
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') |
35 |
+ -- |
36 |
+ -opus |
37 |
+ -printing-and-pdf |
38 |
+ -webp |
39 |
+ $(usex alsa '-alsa' '') |
40 |
+ $(usex bindist '' '-proprietary-codecs') |
41 |
+ $(usex pulseaudio '-pulseaudio' '') |
42 |
+ $(usex system-ffmpeg '-ffmpeg' '') |
43 |
+ $(usex system-icu '-webengine-icu' '') |
44 |
) |
45 |
qt5-build_src_configure |
46 |
} |
47 |
|
48 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
49 |
index 2c0bd638..4191302a 100644 |
50 |
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
51 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
52 |
@@ -97,9 +97,15 @@ src_configure() { |
53 |
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" |
54 |
|
55 |
local myqmakeargs=( |
56 |
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') |
57 |
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') |
58 |
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') |
59 |
+ -- |
60 |
+ -opus |
61 |
+ -printing-and-pdf |
62 |
+ -webp |
63 |
+ $(usex alsa '-alsa' '') |
64 |
+ $(usex bindist '' '-proprietary-codecs') |
65 |
+ $(usex pulseaudio '-pulseaudio' '') |
66 |
+ $(usex system-ffmpeg '-ffmpeg' '') |
67 |
+ $(usex system-icu '-webengine-icu' '') |
68 |
) |
69 |
qt5-build_src_configure |
70 |
} |
71 |
|
72 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
73 |
index 2c0bd638..4191302a 100644 |
74 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
75 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
76 |
@@ -97,9 +97,15 @@ src_configure() { |
77 |
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" |
78 |
|
79 |
local myqmakeargs=( |
80 |
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') |
81 |
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') |
82 |
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') |
83 |
+ -- |
84 |
+ -opus |
85 |
+ -printing-and-pdf |
86 |
+ -webp |
87 |
+ $(usex alsa '-alsa' '') |
88 |
+ $(usex bindist '' '-proprietary-codecs') |
89 |
+ $(usex pulseaudio '-pulseaudio' '') |
90 |
+ $(usex system-ffmpeg '-ffmpeg' '') |
91 |
+ $(usex system-icu '-webengine-icu' '') |
92 |
) |
93 |
qt5-build_src_configure |
94 |
} |