Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Apr 2023 17:07:24 GMT
From:      =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: df46d88b7b84 - main - net-im/telegram-desktop: Improve audio options
Message-ID:  <202304151707.33FH7O0N058158@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=df46d88b7b8448290d1196ef0c3ff6acaf342b60

commit df46d88b7b8448290d1196ef0c3ff6acaf342b60
Author:     Sergey Kiselev <root@dc365.ru>
AuthorDate: 2023-04-14 08:46:12 +0000
Commit:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
CommitDate: 2023-04-15 17:02:28 +0000

    net-im/telegram-desktop: Improve audio options
    
    libtgvoip can use PulseAudio or ALSA. However, both of these libraries were
    listed as BUILD_DEPENDS and were forced to be installed on the system.
    
    PR:             270830
    Reported by:    root@dc365.ru
---
 net-im/telegram-desktop/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 0c951f46d621..cad0292d610c 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -16,9 +16,7 @@ BROKEN_i386=	does not build, webrtc related
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe
 NOT_FOR_ARCHS_REASON=	Only little endian is supported
 
-BUILD_DEPENDS=	alsa-lib>0:audio/alsa-lib \
-		microsoft-gsl>0:devel/microsoft-gsl \
-		pulseaudio>0:audio/pulseaudio \
+BUILD_DEPENDS=	microsoft-gsl>0:devel/microsoft-gsl \
 		range-v3>0:devel/range-v3 \
 		tl-expected>0:devel/tl-expected \
 		v4l_compat>0:multimedia/v4l_compat \
@@ -85,13 +83,15 @@ LDFLAGS+=	-lBlocksRuntime
 # It dynamically loads PulseAudio, and if this fails, it loads ALSA.
 # If both of them are not installed, then voice calls do not work, but other functionalities still work.
 OPTIONS_DEFAULT=	ALSA
-OPTIONS_MULTI=		AUDIO
-OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
+OPTIONS_GROUP=	AUDIO
+OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 
 AUDIO_DESC=	Audio backend for voice calls
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+ALSA_CMAKE_BOOL_OFF=	LIBTGVOIP_DISABLE_ALSA
+PULSEAUDIO_CMAKE_BOOL_OFF=	LIBTGVOIP_DISABLE_PULSEAUDIO
 
 # Telegram asks each custom build to have its own API ID and hash.
 TELEGRAM_API_HASH=	20a3432aab43f24bb4460fceac5ba38d



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304151707.33FH7O0N058158>