1 |
commit: 6cd461df4b6a107915a66bbe4ba3752f97b4056f |
2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 25 04:31:35 2018 +0000 |
4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 25 04:31:35 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6cd461df |
7 |
|
8 |
dev-qt/qtwebengine: add USE="system-libvpx" |
9 |
|
10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
11 |
|
12 |
.../qtwebengine-5.12.0-add-libvpx-options.patch | 20 ++++++++++++++++++++ |
13 |
dev-qt/qtwebengine/metadata.xml | 2 ++ |
14 |
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 8 ++++++-- |
15 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 8 ++++++-- |
16 |
4 files changed, 34 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch |
19 |
new file mode 100644 |
20 |
index 00000000..fd278fe7 |
21 |
--- /dev/null |
22 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch |
23 |
@@ -0,0 +1,20 @@ |
24 |
+--- a/src/core/configure.json 2018-08-17 19:00:05.269528234 +0300 |
25 |
++++ b/src/core/configure.json 2018-08-17 19:01:31.444789488 +0300 |
26 |
+@@ -24,6 +24,7 @@ |
27 |
+ "webengine-geolocation": "boolean", |
28 |
+ "webengine-v8-snapshot": "boolean", |
29 |
+ "webengine-webchannel": "boolean", |
30 |
++ "webengine-libvpx": { "type": "enum", "name": "webengine-system-libvpx", "values": { "system": "yes", "qt": "no" } }, |
31 |
+ "alsa": { "type": "boolean", "name": "webengine-alsa" }, |
32 |
+ "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" }, |
33 |
+ "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, |
34 |
+@@ -33,7 +34,8 @@ |
35 |
+ "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" }, |
36 |
+ "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" }, |
37 |
+ "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" }, |
38 |
+- "webrtc": { "type": "boolean", "name": "webengine-webrtc" } |
39 |
++ "webrtc": { "type": "boolean", "name": "webengine-webrtc" }, |
40 |
++ "libvpx": { "type": "enum", "name": "webengine-system-libvpx", "values": { "system": "yes", "qt": "no" } } |
41 |
+ } |
42 |
+ }, |
43 |
+ |
44 |
|
45 |
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml |
46 |
index acca7340..429513db 100644 |
47 |
--- a/dev-qt/qtwebengine/metadata.xml |
48 |
+++ b/dev-qt/qtwebengine/metadata.xml |
49 |
@@ -16,6 +16,8 @@ |
50 |
instead of bundled.</flag> |
51 |
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> |
52 |
instead of bundled.</flag> |
53 |
+ <flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg> |
54 |
+ instead of bundled.</flag> |
55 |
<flag name="widgets">Enable QtWidgets support</flag> |
56 |
</use> |
57 |
<upstream> |
58 |
|
59 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
60 |
index 3b0d387a..63a7df36 100644 |
61 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
62 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
63 |
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
64 |
fi |
65 |
|
66 |
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio |
67 |
- +system-ffmpeg +system-icu widgets" |
68 |
+ +system-ffmpeg +system-icu +system-libvpx widgets" |
69 |
REQUIRED_USE="designer? ( widgets )" |
70 |
|
71 |
RDEPEND=" |
72 |
@@ -79,7 +79,10 @@ DEPEND="${RDEPEND} |
73 |
pax_kernel? ( sys-apps/elfix ) |
74 |
" |
75 |
|
76 |
-PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078 |
77 |
+PATCHES+=( |
78 |
+ "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078 |
79 |
+ "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" |
80 |
+) |
81 |
|
82 |
src_prepare() { |
83 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
84 |
@@ -121,6 +124,7 @@ src_configure() { |
85 |
$(usex pulseaudio '-pulseaudio' '') |
86 |
$(usex system-ffmpeg '-ffmpeg' '') |
87 |
$(usex system-icu '-webengine-icu' '') |
88 |
+ $(usex system-libvpx '-system-webengine-libvpx' '-qt-webengine-libvpx') |
89 |
) |
90 |
qt5-build_src_configure |
91 |
} |
92 |
|
93 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
94 |
index 3b0d387a..63a7df36 100644 |
95 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
96 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
97 |
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
98 |
fi |
99 |
|
100 |
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio |
101 |
- +system-ffmpeg +system-icu widgets" |
102 |
+ +system-ffmpeg +system-icu +system-libvpx widgets" |
103 |
REQUIRED_USE="designer? ( widgets )" |
104 |
|
105 |
RDEPEND=" |
106 |
@@ -79,7 +79,10 @@ DEPEND="${RDEPEND} |
107 |
pax_kernel? ( sys-apps/elfix ) |
108 |
" |
109 |
|
110 |
-PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078 |
111 |
+PATCHES+=( |
112 |
+ "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078 |
113 |
+ "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" |
114 |
+) |
115 |
|
116 |
src_prepare() { |
117 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
118 |
@@ -121,6 +124,7 @@ src_configure() { |
119 |
$(usex pulseaudio '-pulseaudio' '') |
120 |
$(usex system-ffmpeg '-ffmpeg' '') |
121 |
$(usex system-icu '-webengine-icu' '') |
122 |
+ $(usex system-libvpx '-system-webengine-libvpx' '-qt-webengine-libvpx') |
123 |
) |
124 |
qt5-build_src_configure |
125 |
} |