mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
dev-qt/qtwebengine: fix detecting audio backends
The upstream change doesn't really work for us, so we'll make it work with us. http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=cf7d82a79dff4ea5c53e0908ed5c13ce1f87796d Closes: https://github.com/gentoo/gentoo/pull/3219 Gentoo-Bug: https://bugs.gentoo.org/603498 Package-Manager: Portage-2.3.3, Repoman-2.3.1
This commit is contained in:
committed by
Davide Pesavento
parent
cfdff89f71
commit
e146460dfd
@@ -0,0 +1,23 @@
|
||||
# dev-qt/qtwebengine: Fix detecting audio backends.
|
||||
|
||||
# The upstream change doesn't really work for us, so we'll make
|
||||
# it work with us.
|
||||
# Gentoo-Bug: https://bugs.gentoo.org/603498
|
||||
|
||||
--- /src/core/config/linux.pri 2016-12-23 00:05:41.057955774 +0200
|
||||
+++ /src/core/config/linux.pri 2016-12-23 00:09:39.000573909 +0200
|
||||
@@ -35,12 +35,12 @@
|
||||
contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
|
||||
contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
|
||||
contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
|
||||
-contains(QT_CONFIG, pulseaudio) {
|
||||
+use?(pulseaudio) {
|
||||
GYP_CONFIG += use_pulseaudio=1
|
||||
} else {
|
||||
GYP_CONFIG += use_pulseaudio=0
|
||||
}
|
||||
-contains(QT_CONFIG, alsa) {
|
||||
+use?(alsa) {
|
||||
GYP_CONFIG += use_alsa=1
|
||||
} else {
|
||||
GYP_CONFIG += use_alsa=0
|
||||
117
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
Normal file
117
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
Normal file
@@ -0,0 +1,117 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit pax-utils python-any-r1 qt5-build
|
||||
|
||||
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
|
||||
|
||||
RDEPEND="
|
||||
app-arch/snappy
|
||||
dev-libs/glib:2
|
||||
dev-libs/nspr
|
||||
dev-libs/nss
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdeclarative-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qtwebchannel-${PV}[qml]
|
||||
dev-libs/expat
|
||||
dev-libs/jsoncpp:=
|
||||
dev-libs/libevent:=
|
||||
dev-libs/libxml2
|
||||
dev-libs/libxslt
|
||||
dev-libs/protobuf:=
|
||||
media-libs/flac
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
media-libs/harfbuzz:=
|
||||
media-libs/libpng:0=
|
||||
>=media-libs/libvpx-1.5:=[svc]
|
||||
media-libs/libwebp:=
|
||||
media-libs/mesa
|
||||
media-libs/opus
|
||||
media-libs/speex
|
||||
net-libs/libsrtp:0=
|
||||
sys-apps/dbus
|
||||
sys-apps/pciutils
|
||||
sys-libs/libcap
|
||||
sys-libs/zlib[minizip]
|
||||
x11-libs/libdrm
|
||||
x11-libs/libX11
|
||||
x11-libs/libXcomposite
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXdamage
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXScrnSaver
|
||||
x11-libs/libXtst
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
geolocation? ( ~dev-qt/qtpositioning-${PV} )
|
||||
pulseaudio? ( media-sound/pulseaudio:= )
|
||||
system-ffmpeg? ( media-video/ffmpeg:0= )
|
||||
system-icu? ( dev-libs/icu:= )
|
||||
widgets? ( ~dev-qt/qtwidgets-${PV} )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
dev-util/gperf
|
||||
dev-util/ninja
|
||||
dev-util/re2c
|
||||
sys-devel/bison
|
||||
pax_kernel? ( sys-apps/elfix )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.7.1-fix-audio-detection.patch"
|
||||
"${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
|
||||
"${FILESDIR}/${PN}-5.7.0-icu58.patch"
|
||||
"${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
|
||||
|
||||
if use system-icu; then
|
||||
# ensure build against system headers - bug #601264
|
||||
rm -r src/3rdparty/chromium/third_party/icu/source || die
|
||||
fi
|
||||
|
||||
qt_use_disable_mod geolocation positioning \
|
||||
src/core/core_common.pri \
|
||||
src/core/core_gyp_generator.pro
|
||||
|
||||
qt_use_disable_mod widgets widgets src/src.pro
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export NINJA_PATH=/usr/bin/ninja
|
||||
|
||||
local myqmakeargs=(
|
||||
$(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '')
|
||||
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
|
||||
$(usex pulseaudio 'WEBENGINE_CONFIG+=use_pulseaudio' '')
|
||||
$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
|
||||
$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
|
||||
)
|
||||
qt5-build_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
qt5-build_src_install
|
||||
|
||||
pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
|
||||
}
|
||||
Reference in New Issue
Block a user