commit: 6cd461df4b6a107915a66bbe4ba3752f97b4056f
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 04:31:35 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 04:31:35 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6cd461df
dev-qt/qtwebengine: add USE="system-libvpx"
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../qtwebengine-5.12.0-add-libvpx-options.patch | 20 ++++++++++++++++++++
dev-qt/qtwebengine/metadata.xml | 2 ++
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 8 ++++++--
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 8 ++++++--
4 files changed, 34 insertions(+), 4 deletions(-)
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
new file mode 100644
index 00000000..fd278fe7
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch
@@ -0,0 +1,20 @@
+--- a/src/core/configure.json 2018-08-17 19:00:05.269528234 +0300
++++ b/src/core/configure.json 2018-08-17 19:01:31.444789488 +0300
+@@ -24,6 +24,7 @@
+ "webengine-geolocation": "boolean",
+ "webengine-v8-snapshot": "boolean",
+ "webengine-webchannel": "boolean",
++ "webengine-libvpx": { "type": "enum", "name":
"webengine-system-libvpx", "values": { "system": "yes", "qt": "no" } },
+ "alsa": { "type": "boolean", "name": "webengine-alsa" },
+ "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio"
},
+ "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg",
"values": { "system": "yes", "qt": "no" } },
+@@ -33,7 +34,8 @@
+ "printing-and-pdf": { "type": "boolean", "name":
"webengine-printing-and-pdf" },
+ "proprietary-codecs": { "type": "boolean", "name":
"webengine-proprietary-codecs" },
+ "spellchecker": { "type": "boolean", "name":
"webengine-spellchecker" },
+- "webrtc": { "type": "boolean", "name": "webengine-webrtc" }
++ "webrtc": { "type": "boolean", "name": "webengine-webrtc" },
++ "libvpx": { "type": "enum", "name": "webengine-system-libvpx",
"values": { "system": "yes", "qt": "no" } }
+ }
+ },
+
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index acca7340..429513db 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -16,6 +16,8 @@
instead of bundled.</flag>
<flag name="system-icu">Use the system-wide
<pkg>dev-libs/icu</pkg>
instead of bundled.</flag>
+ <flag name="system-libvpx">Use the system-wide
<pkg>media-libs/libvpx</pkg>
+ instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
</use>
<upstream>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 3b0d387a..63a7df36 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+ +system-ffmpeg +system-icu +system-libvpx widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -79,7 +79,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug
653078
+PATCHES+=(
+ "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078
+ "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch"
+)
src_prepare() {
use pax_kernel && PATCHES+=(
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
@@ -121,6 +124,7 @@ src_configure() {
$(usex pulseaudio '-pulseaudio' '')
$(usex system-ffmpeg '-ffmpeg' '')
$(usex system-icu '-webengine-icu' '')
+ $(usex system-libvpx '-system-webengine-libvpx'
'-qt-webengine-libvpx')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 3b0d387a..63a7df36 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+ +system-ffmpeg +system-icu +system-libvpx widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -79,7 +79,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug
653078
+PATCHES+=(
+ "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078
+ "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch"
+)
src_prepare() {
use pax_kernel && PATCHES+=(
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
@@ -121,6 +124,7 @@ src_configure() {
$(usex pulseaudio '-pulseaudio' '')
$(usex system-ffmpeg '-ffmpeg' '')
$(usex system-icu '-webengine-icu' '')
+ $(usex system-libvpx '-system-webengine-libvpx'
'-qt-webengine-libvpx')
)
qt5-build_src_configure
}
