From nobody Tue Nov 05 18:06:34 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjbrB5jgyz5cPh8; Tue, 05 Nov 2024 18:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjbrB3WVnz4FqN; Tue, 5 Nov 2024 18:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730829994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpci12cwj8mOQCKCijf1LrWBUEvotElXjA9ywk2qiyY=; b=lJie4ad3vXfL9y6iRl5tktMojZT1pbh9jasgts0o+NwJiIx9oQ0QgBgYLG27uGPakm5i+Z c8RtaZTumB1blVPZhGR8uZR6HH4bzgUChj8UbOoQBT4MxhYJ0SOEDvIhfAEDQgNSuLriF7 Vxbqy3HgMLe3Xb0aUTx4CZ/9EmIWyy9l32AZKaWWe4yiXAKEtgd87ipNFukG7Iuea+J+fW 3slJdlt3WO8kZaz9Bsi+9hbYbxHI85KcLbLxTrWTCQWsMUVTQzq1axKlSLOCrMye4gR7od u6qapB4QYxKaPJ3mEpU5msnXRp4YigZgeYgqcLgwZZ6BCmwqYofMa9GcExokLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730829994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dpci12cwj8mOQCKCijf1LrWBUEvotElXjA9ywk2qiyY=; b=vCdfovXmwf4VdSquf92Q44cbrbMAEo0if2M6UBqVD+CfykLaFPCsfY1RbDyJGs45vnZ8y2 6CQP84GRnJn2DZM+XFuWC78cNurfAtrhlAIC4QWs81pRLnPIoeWOJbSiAVDeJM8K4NWDU7 bXCoIu6R5Xfqlf98Jh1BJOine4zGgIQ6NMmqb+1eTOMoBcPjJSPS04m5k+rM/wO2hIBuPP yL3iWhnS3N1IbciW3tG6w7cVXhIcSJzjSyNT+o2P6/MLBIvhMey5mUe14QeLvq883rMLSh OuTuBMOlBDFha2Pfbp55LnL0CknV2yZpNN3+w+dA7dZLC+CgBryCH9O+xdPGVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730829994; a=rsa-sha256; cv=none; b=hlfGjtQi5Lpp4HQlirCbsfQE95NlA6z78SJtZPOYQOQGWaTfubLltHgdWNK23cqauM4+cP 0hu5beh5lwX9PoNMBqFIApmIaZnJvHUtBz7oyeJRMFZo39V2GbM9kG86yJbvZ1tY++wXS3 K53Tqif9Z8eaSQrOMH0WXHTj/u+tigUHdg8rYrTkFtZf2yxl5dydp3DjVNgzaZeYhxQSzz BUKExL7c0rxPaPHrBROa7L8p59RhuuZSY7VNGcHp9QdX3enSatem8a1Wcq9XudD/aPfhEj A4zDsyOG4obEryoB64Z2odRmdzEF9GXDCfoGwDGJ7hNla4MqSyd48Vt0Orn52A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjbrB37dlzRmS; Tue, 5 Nov 2024 18:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5I6YjF087658; Tue, 5 Nov 2024 18:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5I6YqO087655; Tue, 5 Nov 2024 18:06:34 GMT (envelope-from git) Date: Tue, 5 Nov 2024 18:06:34 GMT Message-Id: <202411051806.4A5I6YqO087655@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 0d0c98e2c6f2 - main - net-im/telegram-desktop: add ability to build TD without X11 or Wayland (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d0c98e2c6f25d3532045f90d5def8dbe1c2318a Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d0c98e2c6f25d3532045f90d5def8dbe1c2318a commit 0d0c98e2c6f25d3532045f90d5def8dbe1c2318a Author: Dima Panov AuthorDate: 2024-11-05 16:40:11 +0000 Commit: Dima Panov CommitDate: 2024-11-05 18:06:12 +0000 net-im/telegram-desktop: add ability to build TD without X11 or Wayland (+) Bring on two new OPTIONs here: X11 and WAYLAND which enable corresponding dependencies. Set both ON by default to mimics previous behaviour. PR: 277344 (based on) --- net-im/telegram-desktop/Makefile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index b8f908512a12..b5b9eb8e0fd9 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -40,8 +40,6 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libqrcodegencpp.so:graphics/qr-code-generator \ librnnoise.so:audio/rnnoise \ libsrtp2.so:net/libsrtp2 \ - libxcb-keysyms.so:x11/xcb-util-keysyms \ - libxkbcommon.so:x11/libxkbcommon \ libxxhash.so:devel/xxhash \ libvpx.so:multimedia/libvpx @@ -53,7 +51,7 @@ qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} USES= cmake compiler:c++20-lang desktop-file-utils gl gnome jpeg localbase \ - minizip openal pkgconfig python:build ssl xorg + minizip openal pkgconfig python:build ssl USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop @@ -62,24 +60,22 @@ GH_PROJECT= tdesktop .if ${FLAVOR} == qt5 USES+= kde:5 qt:5 USE_QT= buildtools:build core dbus declarative gui imageformats network qmake:build \ - svg wayland widgets + svg widgets USE_KDE= coreaddons kimageformats .else USES+= kde:6 qt:6 -USE_QT= 5compat base declarative imageformats lottie shadertools svg tools:build wayland +USE_QT= 5compat base declarative imageformats lottie shadertools svg tools:build USE_KDE= coreaddons kimageformats .endif USE_GL= gl USE_GNOME= glib20 glibmm26 introspection -USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \ -DQT_VERSION_MAJOR=${FLAVOR:S/qt//} CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ DESKTOP_APP_DISABLE_JEMALLOC \ - DESKTOP_APP_DISABLE_SCUDO \ - DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION + DESKTOP_APP_DISABLE_SCUDO # Since cmake 3.25.0, BSDs are no longer recognised as Linux (in this port). CMAKE_ARGS+= -DLINUX=true @@ -91,11 +87,14 @@ 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_DEFINE= SYSTEM_FONTS -OPTIONS_DEFAULT= ALSA +OPTIONS_DEFAULT= ALSA X11 WAYLAND OPTIONS_GROUP= AUDIO +OPTIONS_MULTI= DESKTOP OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO +OPTIONS_MULTI_DESKTOP= X11 WAYLAND AUDIO_DESC= Audio backend for voice calls +DESKTOP_DESC= Desktop integration SYSTEM_FONTS_DESC= Use system fonts instead of bundled patched ones ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib @@ -103,6 +102,13 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio ALSA_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_ALSA PULSEAUDIO_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_PULSEAUDIO SYSTEM_FONTS_CMAKE_BOOL_OFF= DESKTOP_APP_USE_PACKAGED_FONTS +WAYLAND_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION +WAYLAND_USE= qt=wayland +X11_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_X11_INTEGRATION +X11_USES= xorg +X11_USE= xorg=x11,xcb,xcomposite,xdamage,xext,xfixes,xrandr,xrender,xtst +X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms \ + libxkbcommon.so:x11/libxkbcommon # Telegram asks each custom build to have its own API ID and hash. TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d