1 |
commit: e146460dfde8972861dae5099f45e9dee5da2b6b |
2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 22 23:53:07 2016 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 31 05:13:51 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e146460d |
7 |
|
8 |
dev-qt/qtwebengine: fix detecting audio backends |
9 |
|
10 |
The upstream change doesn't really work for us, so we'll make |
11 |
it work with us. |
12 |
|
13 |
http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=cf7d82a79dff4ea5c53e0908ed5c13ce1f87796d |
14 |
|
15 |
Closes: https://github.com/gentoo/gentoo/pull/3219 |
16 |
Gentoo-Bug: https://bugs.gentoo.org/603498 |
17 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
18 |
|
19 |
.../qtwebengine-5.7.1-fix-audio-detection.patch | 23 ++++ |
20 |
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild | 117 +++++++++++++++++++++ |
21 |
2 files changed, 140 insertions(+) |
22 |
|
23 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch |
24 |
new file mode 100644 |
25 |
index 00000000..597554e |
26 |
--- /dev/null |
27 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch |
28 |
@@ -0,0 +1,23 @@ |
29 |
+# dev-qt/qtwebengine: Fix detecting audio backends. |
30 |
+ |
31 |
+# The upstream change doesn't really work for us, so we'll make |
32 |
+# it work with us. |
33 |
+# Gentoo-Bug: https://bugs.gentoo.org/603498 |
34 |
+ |
35 |
+--- /src/core/config/linux.pri 2016-12-23 00:05:41.057955774 +0200 |
36 |
++++ /src/core/config/linux.pri 2016-12-23 00:09:39.000573909 +0200 |
37 |
+@@ -35,12 +35,12 @@ |
38 |
+ contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 |
39 |
+ contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 |
40 |
+ contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 |
41 |
+-contains(QT_CONFIG, pulseaudio) { |
42 |
++use?(pulseaudio) { |
43 |
+ GYP_CONFIG += use_pulseaudio=1 |
44 |
+ } else { |
45 |
+ GYP_CONFIG += use_pulseaudio=0 |
46 |
+ } |
47 |
+-contains(QT_CONFIG, alsa) { |
48 |
++use?(alsa) { |
49 |
+ GYP_CONFIG += use_alsa=1 |
50 |
+ } else { |
51 |
+ GYP_CONFIG += use_alsa=0 |
52 |
|
53 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild |
54 |
new file mode 100644 |
55 |
index 00000000..ee09868 |
56 |
--- /dev/null |
57 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild |
58 |
@@ -0,0 +1,117 @@ |
59 |
+# Copyright 1999-2017 Gentoo Foundation |
60 |
+# Distributed under the terms of the GNU General Public License v2 |
61 |
+# $Id$ |
62 |
+ |
63 |
+EAPI=6 |
64 |
+PYTHON_COMPAT=( python2_7 ) |
65 |
+inherit pax-utils python-any-r1 qt5-build |
66 |
+ |
67 |
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
68 |
+ |
69 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
70 |
+ KEYWORDS="~amd64 ~x86" |
71 |
+fi |
72 |
+ |
73 |
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" |
74 |
+ |
75 |
+RDEPEND=" |
76 |
+ app-arch/snappy |
77 |
+ dev-libs/glib:2 |
78 |
+ dev-libs/nspr |
79 |
+ dev-libs/nss |
80 |
+ ~dev-qt/qtcore-${PV} |
81 |
+ ~dev-qt/qtdeclarative-${PV} |
82 |
+ ~dev-qt/qtgui-${PV} |
83 |
+ ~dev-qt/qtnetwork-${PV} |
84 |
+ ~dev-qt/qtwebchannel-${PV}[qml] |
85 |
+ dev-libs/expat |
86 |
+ dev-libs/jsoncpp:= |
87 |
+ dev-libs/libevent:= |
88 |
+ dev-libs/libxml2 |
89 |
+ dev-libs/libxslt |
90 |
+ dev-libs/protobuf:= |
91 |
+ media-libs/flac |
92 |
+ media-libs/fontconfig |
93 |
+ media-libs/freetype |
94 |
+ media-libs/harfbuzz:= |
95 |
+ media-libs/libpng:0= |
96 |
+ >=media-libs/libvpx-1.5:=[svc] |
97 |
+ media-libs/libwebp:= |
98 |
+ media-libs/mesa |
99 |
+ media-libs/opus |
100 |
+ media-libs/speex |
101 |
+ net-libs/libsrtp:0= |
102 |
+ sys-apps/dbus |
103 |
+ sys-apps/pciutils |
104 |
+ sys-libs/libcap |
105 |
+ sys-libs/zlib[minizip] |
106 |
+ x11-libs/libdrm |
107 |
+ x11-libs/libX11 |
108 |
+ x11-libs/libXcomposite |
109 |
+ x11-libs/libXcursor |
110 |
+ x11-libs/libXdamage |
111 |
+ x11-libs/libXext |
112 |
+ x11-libs/libXfixes |
113 |
+ x11-libs/libXi |
114 |
+ x11-libs/libXrandr |
115 |
+ x11-libs/libXrender |
116 |
+ x11-libs/libXScrnSaver |
117 |
+ x11-libs/libXtst |
118 |
+ alsa? ( media-libs/alsa-lib ) |
119 |
+ geolocation? ( ~dev-qt/qtpositioning-${PV} ) |
120 |
+ pulseaudio? ( media-sound/pulseaudio:= ) |
121 |
+ system-ffmpeg? ( media-video/ffmpeg:0= ) |
122 |
+ system-icu? ( dev-libs/icu:= ) |
123 |
+ widgets? ( ~dev-qt/qtwidgets-${PV} ) |
124 |
+" |
125 |
+DEPEND="${RDEPEND} |
126 |
+ ${PYTHON_DEPS} |
127 |
+ dev-util/gperf |
128 |
+ dev-util/ninja |
129 |
+ dev-util/re2c |
130 |
+ sys-devel/bison |
131 |
+ pax_kernel? ( sys-apps/elfix ) |
132 |
+" |
133 |
+ |
134 |
+PATCHES=( |
135 |
+ "${FILESDIR}/${PN}-5.7.1-fix-audio-detection.patch" |
136 |
+ "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch" |
137 |
+ "${FILESDIR}/${PN}-5.7.0-icu58.patch" |
138 |
+ "${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch" |
139 |
+) |
140 |
+ |
141 |
+src_prepare() { |
142 |
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" ) |
143 |
+ |
144 |
+ if use system-icu; then |
145 |
+ # ensure build against system headers - bug #601264 |
146 |
+ rm -r src/3rdparty/chromium/third_party/icu/source || die |
147 |
+ fi |
148 |
+ |
149 |
+ qt_use_disable_mod geolocation positioning \ |
150 |
+ src/core/core_common.pri \ |
151 |
+ src/core/core_gyp_generator.pro |
152 |
+ |
153 |
+ qt_use_disable_mod widgets widgets src/src.pro |
154 |
+ |
155 |
+ qt5-build_src_prepare |
156 |
+} |
157 |
+ |
158 |
+src_configure() { |
159 |
+ export NINJA_PATH=/usr/bin/ninja |
160 |
+ |
161 |
+ local myqmakeargs=( |
162 |
+ $(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '') |
163 |
+ $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs') |
164 |
+ $(usex pulseaudio 'WEBENGINE_CONFIG+=use_pulseaudio' '') |
165 |
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '') |
166 |
+ $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '') |
167 |
+ ) |
168 |
+ qt5-build_src_configure |
169 |
+} |
170 |
+ |
171 |
+src_install() { |
172 |
+ qt5-build_src_install |
173 |
+ |
174 |
+ pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess |
175 |
+} |