commit: 72e078089f97f5aabec840c840c875af22d345ad Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Jun 4 05:10:00 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Jun 4 05:10:11 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=72e07808
dev-qt/qtwebengine: port fix detecting audio backends from main repo e146460dfde8972861dae5099f45e9dee5da2b6b by Jimi Huotari <chiitoo <AT> gentoo.org> Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../qtwebengine-5.7.1-fix-audio-detection.patch | 23 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 8 ++++++-- dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 8 ++++++-- dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 8 ++++++-- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 8 ++++++-- 5 files changed, 47 insertions(+), 8 deletions(-) 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 new file mode 100644 index 00000000..597554e6 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch @@ -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 diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild index 601e8685..487e68d8 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" RDEPEND=" app-arch/snappy @@ -29,7 +29,6 @@ RDEPEND=" dev-libs/libxml2 dev-libs/libxslt dev-libs/protobuf:= - media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype @@ -57,7 +56,9 @@ RDEPEND=" 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} ) @@ -72,6 +73,7 @@ DEPEND="${RDEPEND} " 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" @@ -99,7 +101,9 @@ src_configure() { export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)" 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' '') ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild index 473bf57a..f4fb9799 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" RDEPEND=" app-arch/snappy @@ -29,7 +29,6 @@ RDEPEND=" dev-libs/libxml2 dev-libs/libxslt dev-libs/protobuf:= - media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype @@ -57,7 +56,9 @@ RDEPEND=" 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} ) @@ -74,6 +75,9 @@ DEPEND="${RDEPEND} src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) + qt_use_disable_config alsa alsa src/core/config/linux.pri + qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri + qt_use_disable_mod geolocation positioning \ mkspecs/features/configure.prf \ src/core/core_chromium.pri \ diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild index 473bf57a..f4fb9799 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" RDEPEND=" app-arch/snappy @@ -29,7 +29,6 @@ RDEPEND=" dev-libs/libxml2 dev-libs/libxslt dev-libs/protobuf:= - media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype @@ -57,7 +56,9 @@ RDEPEND=" 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} ) @@ -74,6 +75,9 @@ DEPEND="${RDEPEND} src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) + qt_use_disable_config alsa alsa src/core/config/linux.pri + qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri + qt_use_disable_mod geolocation positioning \ mkspecs/features/configure.prf \ src/core/core_chromium.pri \ diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 473bf57a..f4fb9799 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~x86" fi -IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" RDEPEND=" app-arch/snappy @@ -29,7 +29,6 @@ RDEPEND=" dev-libs/libxml2 dev-libs/libxslt dev-libs/protobuf:= - media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype @@ -57,7 +56,9 @@ RDEPEND=" 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} ) @@ -74,6 +75,9 @@ DEPEND="${RDEPEND} src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) + qt_use_disable_config alsa alsa src/core/config/linux.pri + qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri + qt_use_disable_mod geolocation positioning \ mkspecs/features/configure.prf \ src/core/core_chromium.pri \
