| 1 |
commit: 051281dc93732bac602ed34ce5742798840ec639 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 29 07:38:41 2020 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 29 07:38:41 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051281dc |
| 7 |
|
| 8 |
net-im/zoom: Re-add bundled-libjpeg-turbo flag. |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/715106#c49 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 12 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 13 |
|
| 14 |
...om-5.4.53350.1027.ebuild => zoom-5.4.53350.1027-r1.ebuild} | 11 ++++++++--- |
| 15 |
1 file changed, 8 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-im/zoom/zoom-5.4.53350.1027.ebuild b/net-im/zoom/zoom-5.4.53350.1027-r1.ebuild |
| 18 |
similarity index 91% |
| 19 |
rename from net-im/zoom/zoom-5.4.53350.1027.ebuild |
| 20 |
rename to net-im/zoom/zoom-5.4.53350.1027-r1.ebuild |
| 21 |
index 3081591a3d7..b6642189422 100644 |
| 22 |
--- a/net-im/zoom/zoom-5.4.53350.1027.ebuild |
| 23 |
+++ b/net-im/zoom/zoom-5.4.53350.1027-r1.ebuild |
| 24 |
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}" |
| 25 |
LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon |
| 26 |
SLOT="0" |
| 27 |
KEYWORDS="-* ~amd64 ~x86" |
| 28 |
-IUSE="pulseaudio" |
| 29 |
+IUSE="bundled-libjpeg-turbo pulseaudio" |
| 30 |
RESTRICT="mirror bindist strip" |
| 31 |
|
| 32 |
RDEPEND="!games-engines/zoom |
| 33 |
@@ -33,7 +33,6 @@ RDEPEND="!games-engines/zoom |
| 34 |
dev-qt/qtscript:5 |
| 35 |
dev-qt/qtsvg:5 |
| 36 |
dev-qt/qtwidgets:5 |
| 37 |
- media-libs/libjpeg-turbo |
| 38 |
media-sound/mpg123 |
| 39 |
sys-apps/dbus |
| 40 |
sys-apps/util-linux |
| 41 |
@@ -45,6 +44,7 @@ RDEPEND="!games-engines/zoom |
| 42 |
x11-libs/libXtst |
| 43 |
x11-libs/xcb-util-image |
| 44 |
x11-libs/xcb-util-keysyms |
| 45 |
+ !bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo ) |
| 46 |
pulseaudio? ( media-sound/pulseaudio ) |
| 47 |
!pulseaudio? ( media-libs/alsa-lib )" |
| 48 |
|
| 49 |
@@ -71,7 +71,12 @@ src_install() { |
| 50 |
doexe zoom zoom.sh zopen ZoomLauncher |
| 51 |
dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so |
| 52 |
dosym {"../../usr/$(get_libdir)",/opt/zoom}/libquazip.so |
| 53 |
- dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106 |
| 54 |
+ |
| 55 |
+ if use bundled-libjpeg-turbo; then |
| 56 |
+ doexe libturbojpeg.so |
| 57 |
+ else |
| 58 |
+ dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106 |
| 59 |
+ fi |
| 60 |
|
| 61 |
make_wrapper zoom ./zoom /opt/zoom |
| 62 |
make_desktop_entry "zoom %U" Zoom zoom-videocam "" \ |
Archives