commit: 335e511b88543c3a11c441244eafe7197d7b7bca Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Mon Feb 6 15:23:03 2017 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Mon Feb 6 15:23:03 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=335e511b
dev-qt/qtwebengine: Version bump to 5.7.1-r1 dev-qt/qtwebengine/Manifest | 3 ++- .../qtwebengine-5.7.1-fix-audio-detection.patch | 23 ++++++++++++++++++++++ ...ne-5.7.1.ebuild => qtwebengine-5.7.1-r1.ebuild} | 10 +++++++--- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 4a3f03f..c441af2 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -12,11 +12,12 @@ AUX qtwebengine-5.7.0-musl-mallinfo.patch 1522 SHA256 aa151b81bc4b744b9b8d9fae7f AUX qtwebengine-5.7.0-musl-pthread-setname.patch 1173 SHA256 a18740a277fd9379ee57da1af203248efb23c429173d6ffad486da699fcbfc8c SHA512 da3baa6981b8897cf7dd30dc8d8889d2e3d23dc85bf4c27f9ea43c978be74ea380dba1362a3e131d810bd120013c8c6652cba0c5a56537b4a5aa89f7bec2479c WHIRLPOOL 21fbb93fef680b4c8610fb2de843f51274dc198714e12102f706db6f98e3cfb9f760001bf06a1bafa0fe3441849dce1b39553fbc85d6767be4a4c2ff496242a0 AUX qtwebengine-5.7.0-musl-resolver.patch 2568 SHA256 07a3ee87d509e8dc963b8d60c5168a8dd615be7488c5aa23c1f993922ff38b96 SHA512 8913b0daf060f9f3ed7fb3e69f3108992d078394e9a3e1a02f0d7668bcbb8cb7f8df715b7b3463f2ac35765a2fafe2ae8407669ecdf84405b9a3cc90bf845891 WHIRLPOOL df4ed38e8dfe407c430ce58a2006192345b35952be209ef51fb6661070ba96f86a9b60c180ac7374beb4780546c230b2d7dbbb59cc054c2d34fb0d33f9d8b42a AUX qtwebengine-5.7.0-musl-sandbox.patch 3185 SHA256 b4e616a6159a237e4ee0455e45e75c95702314f1ae42bfd3068a92ba1575ac01 SHA512 80a3c5eddf29cdf9beac3cd4e0c3d450ab32d85dbe794d2055d0abe0e1242db0fc69a44df7cf250d3ecf9a93a7e1d15d460a1d2409e65ceae1ac5c189f055918 WHIRLPOOL 6d4e1b055ce739e5b9f7d0235a7b628a52aebe03014e8f09e83968b2d1ddbb614ee00e4f8ffa792c6305822e759bd24265f1b63c5fae78834da6c1dcbb123305 +AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 SHA256 3cc298a3fdeecf4a339bad39ac9bc63201c02b87fceb32e4c06e3004a6197103 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c WHIRLPOOL 41dd2c3b574939d2a3b25f1758502cb473dd29f3046360c4ff38098246c959f95d6628ab832b318874d7cbe3a088ca119e2c03cd1dd04009fab75ec3bb1f51c0 AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256 540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 WHIRLPOOL d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb DIST qtwebengine-opensource-src-5.6.1-1.tar.xz 143729228 SHA256 c80e90237bb7bd52a3fa843415c17a8e8e6d779b65efd1393472f24f8642e04c SHA512 4612221fafd16c2d5ce38965bb264d2577b20b1c342792f34729e8a26978e9e430dc1425291530dfad254be5b3b42ebdafdec084c5d25edb23fc61bb3f71ac6f WHIRLPOOL dc05495c1afe755e51961c314b3305b43add7eee149816a0be3ab22b9a2ae10b54ebf5ca2861eaf8768e619c44533b35bd94645e12f94eb39cb5b9c8b19c1667 DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104 EBUILD qtwebengine-5.6.1.ebuild 2399 SHA256 cf87e113dd9b731ab1a2c7ab6e2b94bf54a041d0d890725a7c48c0073447442c SHA512 f31ea3257a6153bfbd9a3ab9ed2ad7b4703ab7c76305be6b41451123b02537aaab07ca13967c586cbb76e1c9f989c03ec50c774443be8a6acd6d0ac37ea6fa32 WHIRLPOOL 14f86450d5c323d12592876bd9e7fc9c8cdfced1473415c41e17e15c89a3ed43818aa9db9ec49486bfbfb600c8ab03bf4a7333445a359b124ece4fcd6146f1a5 EBUILD qtwebengine-5.6.2.ebuild 2777 SHA256 07361fec84110219e75705e7ff956c3af2b00d2c8497a5abe1bb3b120d39b713 SHA512 b05bc93a46830581ce6b4ad7a37186211ba60fd1a54419fadab1918ebd4e988cc0caf68f2bd48f4fc3d6967a9665663453e644ee3d7e8cfff7f4ccc6063ac482 WHIRLPOOL 0664cab57e74c79688899c91e8d682161199ae74c266b17f3ecc94df56e6954ae45808c773259c9e1d9feaa4858627c3c8a0827fbcea8627ffab0538d1c66c68 -EBUILD qtwebengine-5.7.1.ebuild 2960 SHA256 8ac92f83542209773a821f696bfaf2f60406d5c300d7f2b58124902e02472bac SHA512 dc42e272f3db72c1e2b8db228cf00c5d83c3ff4f2d5e9e4296f1ad5551a499bdc1ec672815ff1f03ac02e575babe7d1d45f8db8d82f13eafff96efb87e5b2d50 WHIRLPOOL 923a4a68cc95b6c11ea3bf3dd74d47cc6a08980a999acd98d08320028b743f63145d80edd6f2906c878b5a65c521a42ab4b7caf40d006a522ce76812989f9cb2 +EBUILD qtwebengine-5.7.1-r1.ebuild 3187 SHA256 6c44469f721ae0bfe2aebff143b647cbf3cbab19d26136e41f8373a4bfa51858 SHA512 b4685c605b30d5b6848edd800bea0dc7da2f23e5c6d479a936beb58142c30a7098e365996e73564be96dff40d0e6369a597562e4a782f4c4320831542ad86475 WHIRLPOOL 4aebc905fd19e37c9b58dffe384221e571387e723e1646e5d30a28fc80405fc2eecb3ebd28b40be4f8f8b3cd8c017d09d124aab803b996e62db607647ecb9bf8 MISC metadata.xml 947 SHA256 15083351c49bbcf033829248688471002ca7990644535e1228c5f29396839026 SHA512 a53fa56d2922b8abb2b10193ebc3cb61923697d9c1ddbb583f0d06886dc357604c192cbbbc2849a976be189a41473069b1931434d057b9c9d5b91c7333680224 WHIRLPOOL 7db472885a977071531059312cb171ceffe119900e68bf20a6de6aca9d90336b21067a47e71e80e2d79fc54193b0aa276d74e96b98d3001e58be3c7d0840f8a8 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 0000000..597554e --- /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.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild similarity index 88% rename from dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild rename to dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild index 875f5b3..60a818c 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,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 @@ -30,7 +30,6 @@ RDEPEND=" dev-libs/libxml2 dev-libs/libxslt dev-libs/protobuf:= - media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype @@ -58,7 +57,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} ) @@ -73,6 +74,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" @@ -109,7 +111,9 @@ 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' '') )
