public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-im/zoom/, net-im/zoom/files/
@ 2020-03-28 12:16 Ulrich Müller
  0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2020-03-28 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8c59604601505f67e7c744a656b8a89cb55b94da
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 12:14:50 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 12:15:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c596046

net-im/zoom: Several fixes.

Fix problem that ALSA devices are not found if media-sound/apulse[sdk]
is installed.

Add missing dependency on media-libs/libjpeg-turbo and a symlink
(for dlopen?) to fix a camera problem.

Install a better icon. Generic camera icon taken from
https://github.com/google/material-design-icons/blob/master/av/svg/production/ic_videocam_24px.svg
(licensed under Apache-2.0) and locally modified.

Closes: https://bugs.gentoo.org/715106
Closes: https://bugs.gentoo.org/715088
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-im/zoom/files/zoom-videocam.svg                |  4 +++
 ....0324.ebuild => zoom-3.5.374815.0324-r1.ebuild} | 30 +++++++++++++++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/net-im/zoom/files/zoom-videocam.svg b/net-im/zoom/files/zoom-videocam.svg
new file mode 100644
index 00000000000..33e4ac77b9f
--- /dev/null
+++ b/net-im/zoom/files/zoom-videocam.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <rect width="24" height="24" rx="6" ry="6" fill="#2d8cff"/>
+  <path d="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z" fill="#ffffff"/>
+</svg>

diff --git a/net-im/zoom/zoom-3.5.374815.0324.ebuild b/net-im/zoom/zoom-3.5.374815.0324-r1.ebuild
similarity index 58%
rename from net-im/zoom/zoom-3.5.374815.0324.ebuild
rename to net-im/zoom/zoom-3.5.374815.0324-r1.ebuild
index c9475297484..4aa816a1c6a 100644
--- a/net-im/zoom/zoom-3.5.374815.0324.ebuild
+++ b/net-im/zoom/zoom-3.5.374815.0324-r1.ebuild
@@ -11,9 +11,10 @@ SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_6
 	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
 S="${WORKDIR}/${PN}"
 
-LICENSE="all-rights-reserved"
+LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
+IUSE="pulseaudio"
 RESTRICT="mirror bindist strip"
 
 RDEPEND="dev-libs/glib:2
@@ -31,6 +32,7 @@ RDEPEND="dev-libs/glib:2
 	dev-qt/qtwebengine:5
 	dev-qt/qtwidgets:5
 	media-libs/libglvnd
+	media-libs/libjpeg-turbo
 	sys-apps/dbus
 	sys-apps/util-linux
 	x11-libs/libX11
@@ -39,10 +41,24 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/libXfixes
 	x11-libs/libXtst
 	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms"
+	x11-libs/xcb-util-keysyms
+	pulseaudio? ( media-sound/pulseaudio )"
+
+BDEPEND="!pulseaudio? ( dev-util/bbe )"
 
 QA_PREBUILT="opt/zoom/*"
 
+src_prepare() {
+	default
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+}
+
 src_install() {
 	insinto /opt/zoom
 	exeinto /opt/zoom
@@ -50,9 +66,15 @@ src_install() {
 	doins *.pcm *.pem *.sh Embedded.properties version.txt
 	use amd64 && doins icudtl.dat
 	doexe zoom{,.sh,linux} zopen ZoomLauncher
+	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
+
 	make_wrapper zoom ./zoom /opt/zoom
-	make_desktop_entry "zoom %U" Zoom audio-headset "" \
-		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
+					   "MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+	# The tarball doesn't contain an icon, so take a generic camera icon
+	# from https://github.com/google/material-design-icons, modified to be
+	# white on a blue background
+	doicon "${FILESDIR}"/zoom-videocam.svg
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/zoom/, net-im/zoom/files/
@ 2020-04-01  9:53 Ulrich Müller
  0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2020-04-01  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     b815c3448ed2510aa71c76a31ae41c83a8b00236
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 09:51:57 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 09:52:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b815c344

net-im/zoom: Install XPM icon as fallback.

Bug: https://bugs.gentoo.org/715590
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-im/zoom/files/zoom-videocam.xpm                | 32 ++++++++++++++++++++++
 ...24-r2.ebuild => zoom-3.5.374815.0324-r3.ebuild} |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/net-im/zoom/files/zoom-videocam.xpm b/net-im/zoom/files/zoom-videocam.xpm
new file mode 100644
index 00000000000..380e86f2cc2
--- /dev/null
+++ b/net-im/zoom/files/zoom-videocam.xpm
@@ -0,0 +1,32 @@
+/* XPM */
+static char * zoom_videocam_xpm[] = {
+"24 24 5 1",
+" 	c None",
+".	c #2D8CFF",
+"+	c #469AFF",
+"@	c #E3F0FF",
+"#	c #FFFFFF",
+"    ................    ",
+"  ....................  ",
+" ...................... ",
+" ...................... ",
+"........................",
+"........................",
+"...##############...+...",
+"...##############..+@...",
+"...##############.+@#...",
+"...##############+@##...",
+"...##############@###...",
+"...##################...",
+"...##################...",
+"...##############@###...",
+"...##############+@##...",
+"...##############.+@#...",
+"...##############..+@...",
+"...##############...+...",
+"........................",
+"........................",
+" ...................... ",
+" ...................... ",
+"  ....................  ",
+"    ................    "};

diff --git a/net-im/zoom/zoom-3.5.374815.0324-r2.ebuild b/net-im/zoom/zoom-3.5.374815.0324-r3.ebuild
similarity index 98%
rename from net-im/zoom/zoom-3.5.374815.0324-r2.ebuild
rename to net-im/zoom/zoom-3.5.374815.0324-r3.ebuild
index fb5744a78f5..eb0827e28ae 100644
--- a/net-im/zoom/zoom-3.5.374815.0324-r2.ebuild
+++ b/net-im/zoom/zoom-3.5.374815.0324-r3.ebuild
@@ -78,7 +78,7 @@ src_install() {
 	# The tarball doesn't contain an icon, so take a generic camera icon
 	# from https://github.com/google/material-design-icons, modified to be
 	# white on a blue background
-	doicon "${FILESDIR}"/zoom-videocam.svg
+	doicon "${FILESDIR}"/zoom-videocam.{svg,xpm}
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/zoom/, net-im/zoom/files/
@ 2020-05-12  9:31 Ulrich Müller
  0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2020-05-12  9:31 UTC (permalink / raw
  To: gentoo-commits

commit:     97cbda2dbf2439bf009e5345177b12b54c941228
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 09:30:42 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 12 09:30:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97cbda2d

net-im/zoom: Add README.gentoo about display compositing.

Closes: https://bugs.gentoo.org/722430
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-im/zoom/files/README.gentoo         | 5 +++++
 net-im/zoom/zoom-5.0.403652.0509.ebuild | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/net-im/zoom/files/README.gentoo b/net-im/zoom/files/README.gentoo
new file mode 100644
index 00000000000..06f1f9b3dce
--- /dev/null
+++ b/net-im/zoom/files/README.gentoo
@@ -0,0 +1,5 @@
+Some of Zoom's screen share features (e.g., the whiteboard) require
+display compositing. If you encounter a black window when sharing
+the screen, then one of the following actions should help:
+- Enable compositing in your window manager if it is supported
+- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)

diff --git a/net-im/zoom/zoom-5.0.403652.0509.ebuild b/net-im/zoom/zoom-5.0.403652.0509.ebuild
index f2a3aea4c10..314ddbedc6b 100644
--- a/net-im/zoom/zoom-5.0.403652.0509.ebuild
+++ b/net-im/zoom/zoom-5.0.403652.0509.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils xdg-utils
+inherit desktop eutils readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -86,11 +86,18 @@ src_install() {
 	# white on a blue background
 	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
 	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
+
+	local FORCE_PRINT_ELOG v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/zoom/, net-im/zoom/files/
@ 2020-12-21 14:48 Ulrich Müller
  0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2020-12-21 14:48 UTC (permalink / raw
  To: gentoo-commits

commit:     f63d257a56b2c0dace40555cc527e77ed99c42f9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 14:47:38 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 14:48:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f63d257a

net-im/zoom: Backport ebuild changes to previous version.

zoom-5.4.53391.1108 is the last version with x86 support.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-im/zoom/files/zoom-videocam.svg                |  4 ---
 net-im/zoom/files/zoom-videocam.xpm                | 32 --------------------
 ...1.1108.ebuild => zoom-5.4.53391.1108-r1.ebuild} | 35 ++++++++++++++--------
 3 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/net-im/zoom/files/zoom-videocam.svg b/net-im/zoom/files/zoom-videocam.svg
deleted file mode 100644
index 33e4ac77b9f..00000000000
--- a/net-im/zoom/files/zoom-videocam.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <rect width="24" height="24" rx="6" ry="6" fill="#2d8cff"/>
-  <path d="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z" fill="#ffffff"/>
-</svg>

diff --git a/net-im/zoom/files/zoom-videocam.xpm b/net-im/zoom/files/zoom-videocam.xpm
deleted file mode 100644
index 380e86f2cc2..00000000000
--- a/net-im/zoom/files/zoom-videocam.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * zoom_videocam_xpm[] = {
-"24 24 5 1",
-" 	c None",
-".	c #2D8CFF",
-"+	c #469AFF",
-"@	c #E3F0FF",
-"#	c #FFFFFF",
-"    ................    ",
-"  ....................  ",
-" ...................... ",
-" ...................... ",
-"........................",
-"........................",
-"...##############...+...",
-"...##############..+@...",
-"...##############.+@#...",
-"...##############+@##...",
-"...##############@###...",
-"...##################...",
-"...##################...",
-"...##############@###...",
-"...##############+@##...",
-"...##############.+@#...",
-"...##############..+@...",
-"...##############...+...",
-"........................",
-"........................",
-" ...................... ",
-" ...................... ",
-"  ....................  ",
-"    ................    "};

diff --git a/net-im/zoom/zoom-5.4.53391.1108.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild
similarity index 69%
rename from net-im/zoom/zoom-5.4.53391.1108.ebuild
rename to net-im/zoom/zoom-5.4.53391.1108-r1.ebuild
index b6642189422..3d3b63c3854 100644
--- a/net-im/zoom/zoom-5.4.53391.1108.ebuild
+++ b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils readme.gentoo-r1 xdg-utils
+inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -11,7 +11,7 @@ SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_6
 	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
 S="${WORKDIR}/${PN}"
 
-LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libjpeg-turbo pulseaudio"
@@ -48,12 +48,18 @@ RDEPEND="!games-engines/zoom
 	pulseaudio? ( media-sound/pulseaudio )
 	!pulseaudio? ( media-libs/alsa-lib )"
 
-BDEPEND="!pulseaudio? ( dev-util/bbe )"
+BDEPEND="dev-util/bbe"
 
 QA_PREBUILT="opt/zoom/*"
 
 src_prepare() {
 	default
+
+	# The tarball doesn't contain an icon, so extract it from the binary
+	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+		>zoom-videocam.svg && [[ -s zoom-videocam.svg ]] \
+		|| die "Extraction of icon failed"
+
 	if ! use pulseaudio; then
 		# For some strange reason, zoom cannot use any ALSA sound devices if
 		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
@@ -69,23 +75,20 @@ src_install() {
 	doins -r json ringtone sip timezones translations
 	doins *.pcm *.pem *.sh Embedded.properties version.txt
 	doexe zoom zoom.sh zopen ZoomLauncher
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libquazip.so
+	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
 	else
-		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
+		dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
 	fi
 
-	make_wrapper zoom ./zoom /opt/zoom
+	make_wrapper zoom /opt/zoom{/zoom,}
 	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
 		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	# The tarball doesn't contain an icon, so take a generic camera icon
-	# from https://github.com/google/material-design-icons, modified to be
-	# white on a blue background
-	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
-	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
+	doicon zoom-videocam.svg
+	doicon -s scalable zoom-videocam.svg
 	readme.gentoo_create_doc
 }
 
@@ -98,6 +101,14 @@ pkg_postinst() {
 		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
 	done
 	readme.gentoo_print_elog
+
+	if use bundled-libjpeg-turbo; then
+		ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a"
+		ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library"
+		ewarn "bundled with the upstream package. Please report this problem"
+		ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it."
+		ewarn "See https://bugs.gentoo.org/715106 for further details."
+	fi
 }
 
 pkg_postrm() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/zoom/, net-im/zoom/files/
@ 2022-04-27 16:38 Ulrich Müller
  0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2022-04-27 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     8e83d5804fe006f3da794768b288b4091536bd1e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 16:31:33 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 16:38:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e83d580

net-im/zoom: Don't depend on glibc[-clone3]

Display an explanatory message in README.gentoo instead.

Bug: https://bugs.gentoo.org/835930
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-im/zoom/files/README.gentoo                     |  8 --------
 net-im/zoom/zoom-5.10.3.2778.ebuild                 | 21 +++++++++++++++------
 ....10.4.2845.ebuild => zoom-5.10.4.2845-r1.ebuild} | 21 +++++++++++++++------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/net-im/zoom/files/README.gentoo b/net-im/zoom/files/README.gentoo
deleted file mode 100644
index 12e5058b397a..000000000000
--- a/net-im/zoom/files/README.gentoo
+++ /dev/null
@@ -1,8 +0,0 @@
-Some of Zoom's screen share features (e.g., the whiteboard) require
-display compositing. If you encounter a black window when sharing
-the screen, then one of the following actions should help:
-- Enable compositing in your window manager if it is supported
-- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)
-
-To enable screen sharing on GNOME Wayland, edit ~/.config/zoomus.conf
-and change the value of enableWaylandShare to true.

diff --git a/net-im/zoom/zoom-5.10.3.2778.ebuild b/net-im/zoom/zoom-5.10.3.2778.ebuild
index fb4a05464d8c..6a6b21c08daf 100644
--- a/net-im/zoom/zoom-5.10.3.2778.ebuild
+++ b/net-im/zoom/zoom-5.10.3.2778.ebuild
@@ -34,7 +34,7 @@ RDEPEND="!games-engines/zoom
 	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
-	|| ( >=sys-libs/glibc-2.34[-clone3(+)] <sys-libs/glibc-2.34 )
+	sys-libs/glibc
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/libdrm
@@ -159,17 +159,26 @@ src_install() {
 			application/x-zoom)"
 	doicon videoconference-zoom.svg
 	doicon -s scalable videoconference-zoom.svg
+
+	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
+		the whiteboard) require display compositing. If you encounter
+		a black window when sharing the screen, then one of the following
+		actions should help:
+		\\n- Enable compositing in your window manager if it is supported
+		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
+	use wayland \
+		&& DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland,
+			edit ~/.config/zoomus.conf and change the value of
+			enableWaylandShare to true."
+	has_version ">=sys-libs/glibc-2.34[clone3(+)]" \
+		&& DOC_CONTENTS+="\\n\\nIf you encounter illegal instruction errors,
+			try disabling the clone3 use flag of sys-libs/glibc."
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
-
-	local FORCE_PRINT_ELOG v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1
-	done
 	readme.gentoo_print_elog
 }
 

diff --git a/net-im/zoom/zoom-5.10.4.2845.ebuild b/net-im/zoom/zoom-5.10.4.2845-r1.ebuild
similarity index 87%
rename from net-im/zoom/zoom-5.10.4.2845.ebuild
rename to net-im/zoom/zoom-5.10.4.2845-r1.ebuild
index fb4a05464d8c..6a6b21c08daf 100644
--- a/net-im/zoom/zoom-5.10.4.2845.ebuild
+++ b/net-im/zoom/zoom-5.10.4.2845-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="!games-engines/zoom
 	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
-	|| ( >=sys-libs/glibc-2.34[-clone3(+)] <sys-libs/glibc-2.34 )
+	sys-libs/glibc
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/libdrm
@@ -159,17 +159,26 @@ src_install() {
 			application/x-zoom)"
 	doicon videoconference-zoom.svg
 	doicon -s scalable videoconference-zoom.svg
+
+	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
+		the whiteboard) require display compositing. If you encounter
+		a black window when sharing the screen, then one of the following
+		actions should help:
+		\\n- Enable compositing in your window manager if it is supported
+		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
+	use wayland \
+		&& DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland,
+			edit ~/.config/zoomus.conf and change the value of
+			enableWaylandShare to true."
+	has_version ">=sys-libs/glibc-2.34[clone3(+)]" \
+		&& DOC_CONTENTS+="\\n\\nIf you encounter illegal instruction errors,
+			try disabling the clone3 use flag of sys-libs/glibc."
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
-
-	local FORCE_PRINT_ELOG v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1
-	done
 	readme.gentoo_print_elog
 }
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-04-27 16:38 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-12  9:31 [gentoo-commits] repo/gentoo:master commit in: net-im/zoom/, net-im/zoom/files/ Ulrich Müller
  -- strict thread matches above, loose matches on Subject: below --
2022-04-27 16:38 Ulrich Müller
2020-12-21 14:48 Ulrich Müller
2020-04-01  9:53 Ulrich Müller
2020-03-28 12:16 Ulrich Müller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox