commit: 051281dc93732bac602ed34ce5742798840ec639 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Thu Oct 29 07:38:41 2020 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Thu Oct 29 07:38:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051281dc
net-im/zoom: Re-add bundled-libjpeg-turbo flag. Bug: https://bugs.gentoo.org/715106#c49 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> ...om-5.4.53350.1027.ebuild => zoom-5.4.53350.1027-r1.ebuild} | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net-im/zoom/zoom-5.4.53350.1027.ebuild b/net-im/zoom/zoom-5.4.53350.1027-r1.ebuild similarity index 91% rename from net-im/zoom/zoom-5.4.53350.1027.ebuild rename to net-im/zoom/zoom-5.4.53350.1027-r1.ebuild index 3081591a3d7..b6642189422 100644 --- a/net-im/zoom/zoom-5.4.53350.1027.ebuild +++ b/net-im/zoom/zoom-5.4.53350.1027-r1.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="!games-engines/zoom @@ -33,7 +33,6 @@ RDEPEND="!games-engines/zoom dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 - media-libs/libjpeg-turbo media-sound/mpg123 sys-apps/dbus sys-apps/util-linux @@ -45,6 +44,7 @@ RDEPEND="!games-engines/zoom x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms + !bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib )" @@ -71,7 +71,12 @@ src_install() { doexe zoom zoom.sh zopen ZoomLauncher dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so dosym {"../../usr/$(get_libdir)",/opt/zoom}/libquazip.so - dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106 + + if use bundled-libjpeg-turbo; then + doexe 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 "" \
