From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3C10138350 for ; Wed, 8 Apr 2020 12:57:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E77D2E0ACB; Wed, 8 Apr 2020 12:57:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1F40E0ACB for ; Wed, 8 Apr 2020 12:57:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4C0834EF81 for ; Wed, 8 Apr 2020 12:57:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C1F69D for ; Wed, 8 Apr 2020 12:57:06 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1586350610.9093b2fd2b0dc2b969a29f72dcdb150ba25e0dd8.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/zoom/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/zoom/metadata.xml net-im/zoom/zoom-3.5.382995.0407.ebuild X-VCS-Directories: net-im/zoom/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 9093b2fd2b0dc2b969a29f72dcdb150ba25e0dd8 X-VCS-Branch: master Date: Wed, 8 Apr 2020 12:57:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b769c322-42c0-443a-bebe-b85853b4ac68 X-Archives-Hash: 59864e9cbde8de2e31e9e1934d69ef1f commit: 9093b2fd2b0dc2b969a29f72dcdb150ba25e0dd8 Author: Ulrich Müller gentoo org> AuthorDate: Wed Apr 8 12:47:26 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Apr 8 12:56:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9093b2fd net-im/zoom: New use flag bundled-libjpeg-turbo. Bug: https://bugs.gentoo.org/715106 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Ulrich Müller gentoo.org> net-im/zoom/metadata.xml | 4 ++++ net-im/zoom/zoom-3.5.382995.0407.ebuild | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/net-im/zoom/metadata.xml b/net-im/zoom/metadata.xml index cef6d2567e1..df9fc1aee0d 100644 --- a/net-im/zoom/metadata.xml +++ b/net-im/zoom/metadata.xml @@ -10,4 +10,8 @@ mva@gentoo.org + + Use bundled libturbojpeg + instead of media-libs/libjpeg-turbo + diff --git a/net-im/zoom/zoom-3.5.382995.0407.ebuild b/net-im/zoom/zoom-3.5.382995.0407.ebuild index 15de2f97fc1..c0591aa2663 100644 --- a/net-im/zoom/zoom-3.5.382995.0407.ebuild +++ b/net-im/zoom/zoom-3.5.382995.0407.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}" LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="pulseaudio" +IUSE="bundled-libjpeg-turbo pulseaudio" RESTRICT="mirror bindist strip" RDEPEND="dev-libs/glib:2 @@ -29,7 +29,6 @@ RDEPEND="dev-libs/glib:2 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-libs/libglvnd - media-libs/libjpeg-turbo media-sound/mpg123 sys-apps/dbus sys-apps/util-linux @@ -49,6 +48,7 @@ RDEPEND="dev-libs/glib:2 x86? ( dev-qt/qtwebkit:5 ) + !bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib )" @@ -75,7 +75,13 @@ src_install() { use amd64 && doins icudtl.dat doexe zoom{,.sh,linux} zopen ZoomLauncher dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so - dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106 + + if use bundled-libjpeg-turbo; then + doexe libturbojpeg.so.0.1.0 + dosym libturbojpeg.so.0.1.0 /opt/zoom/libturbojpeg.so + else + dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106 + fi make_wrapper zoom ./zoom /opt/zoom make_desktop_entry "zoom %U" Zoom zoom-videocam "" \