From nobody Thu Jun 23 22:48:09 2022 X-Original-To: dev-commits-ports-main@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 F105F85DFA3; Thu, 23 Jun 2022 22:48:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LTb4n5L1gz3D46; Thu, 23 Jun 2022 22:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656024489; 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=+Ki74qSq+fEneom5p2DJ8Q1SCQL5Yqgax9YYLP6RJ1E=; b=OvGwAkfbjwaVUm33p/WjlbdznIWlaXSiAjcQO9dMBKfXxGjFWrW/BMJJhW1RyiySeYGEAN Qrql0/uZTvaz+BF4m7KMWHoURMBaIEWotg91AXjd1kcsFQye21HFF3mGKM7nk7/UWwdiJ2 bRlL14SXQ1LY9WrvaJimhoNETrn3CBfSP4PB9HzszRWnpY08UaC5uToHZyFHbNSgCEtSrw 1AdskfkD6f1JfaiFDJ6E4xLoEKIcF+oqySK2mFFM4eBSOKE74PqkKAHZlT9lWWmxNKvuWu hu66tyA3r2A+2F8ds8QqqR9kF/gITM/xUc/AZAiRY28E9vaN4KtJJMRQZxz0iQ== 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 96032240B4; Thu, 23 Jun 2022 22:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25NMm97a082061; Thu, 23 Jun 2022 22:48:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25NMm9bY082060; Thu, 23 Jun 2022 22:48:09 GMT (envelope-from git) Date: Thu, 23 Jun 2022 22:48:09 GMT Message-Id: <202206232248.25NMm9bY082060@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: 3575e3dddb95 - main - comms/sdr++: Add Airspy HF+ support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3575e3dddb95bbab51f45ec2e9201f0ac7501023 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656024489; 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=+Ki74qSq+fEneom5p2DJ8Q1SCQL5Yqgax9YYLP6RJ1E=; b=FdCKL7Y0wOG8LuQoibsXQuiSvDZAHsPHVMh2XtIB45seLWKFh/hPR+xJVeVS31G8+Q/Gq9 v5EzM1XPviWq794ycbr8DeE3VjLanvmxYX+1sKZkcGih+og8vSVD8eD2Si5AYEKPyAxSDh G0QHwExkATgSfQjgxC6rRTZ+U2QX5n9HhcXTQa7QjwypMgw0S7lbZSBqC9HX/NjDKsDJjP Odcww+iBjG4Pun15ebdAKsLOMwLgxE1QajODsGwe+3/OvcegOKs396zj9h5awvVttzxh89 8kDtNrhB4FZJY9YiCcZA1ClRdAYZrkEqV6QGeJsfFNbmw8ED418L61M4/JX/yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656024489; a=rsa-sha256; cv=none; b=TvnVNDYgpP2hCyVIIBNOV4jXV9N2T+eeeyrSfsK1cpYVp3q3DrLbkpjnlVwrGDKDz9HTpy n99CTc8HyjKyFYQA/PzDUYNKNy2zTaAbiQylgxzeOXViZwv9gxSVhNEx1EzSX6vt6v7oqR 2J0CdHefNvChh/8Gl++FqPHCUCp1k9z/+1tYpwPR6ept8Q6bo74zOpO5SQMxMVgz7cbMPT FHJ8BPHveqfu3bGQiv8+P/Pt35JWOlHnSYMN7/Pl1DZosvjXP8jAODOgZ0vJo+UGI4geNc q2m6XGqZeulxbnIXZFq64IS7H7Z3sdgSqr64A2ZyaQ+/QWG4896SkCrRa0LJqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=3575e3dddb95bbab51f45ec2e9201f0ac7501023 commit 3575e3dddb95bbab51f45ec2e9201f0ac7501023 Author: Dmitri Goutnik AuthorDate: 2022-06-23 22:44:12 +0000 Commit: Dmitri Goutnik CommitDate: 2022-06-23 22:47:51 +0000 comms/sdr++: Add Airspy HF+ support Approved by: yuri (maintainer) --- comms/sdr++/Makefile | 5 ++++- comms/sdr++/files/patch-CMakeLists.txt | 15 ++++++++++----- comms/sdr++/pkg-message | 8 ++++++++ comms/sdr++/pkg-plist | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/comms/sdr++/Makefile b/comms/sdr++/Makefile index 5e30e8c278a1..70037a94159c 100644 --- a/comms/sdr++/Makefile +++ b/comms/sdr++/Makefile @@ -1,5 +1,6 @@ PORTNAME= sdr++ DISTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= comms hamradio MAINTAINER= yuri@FreeBSD.org @@ -10,6 +11,7 @@ LICENSE_FILE= ${WRKSRC}/license LIB_DEPENDS= libad9361.so:misc/libad9361-iio \ libairspy.so:comms/airspy \ + libairspyhf.so:comms/airspyhf \ libfftw3f.so:math/fftw3-float \ libglfw.so:graphics/glfw \ libhackrf.so:comms/hackrf \ @@ -27,6 +29,7 @@ USE_GITHUB= yes GH_ACCOUNT= AlexandreRouma GH_PROJECT= SDRPlusPlus -CMAKE_OFF= OPT_BUILD_AIRSPYHF_SOURCE # dependency isn't ported yet +# Broken with clang 14 +CMAKE_OFF= OPT_BUILD_DISCORD_PRESENCE .include diff --git a/comms/sdr++/files/patch-CMakeLists.txt b/comms/sdr++/files/patch-CMakeLists.txt index 479c84390851..d7694bd817f6 100644 --- a/comms/sdr++/files/patch-CMakeLists.txt +++ b/comms/sdr++/files/patch-CMakeLists.txt @@ -1,17 +1,22 @@ ---- CMakeLists.txt.orig 2022-06-23 16:25:30 UTC +--- CMakeLists.txt.orig 2021-10-17 22:38:02 UTC +++ CMakeLists.txt -@@ -3,8 +3,8 @@ project(sdrpp) +@@ -1,11 +1,11 @@ project(sdrpp) + cmake_minimum_required(VERSION 3.13) + project(sdrpp) - if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++#if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_INSTALL_PREFIX "/usr/local") -else() - set(CMAKE_INSTALL_PREFIX "/usr") +-endif() +#else() +# set(CMAKE_INSTALL_PREFIX "/usr") - endif() ++#endif() # Compatibility Options -@@ -206,8 +206,8 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/root/res/icons D + option(OPT_OVERRIDE_STD_FILESYSTEM "Use a local version of std::filesystem on systems that don't have it yet" OFF) +@@ -206,8 +206,8 @@ configure_file(${CMAKE_SOURCE_DIR}/sdrpp.desktop ${CMA install(DIRECTORY ${CMAKE_SOURCE_DIR}/root/res/themes DESTINATION share/sdrpp) configure_file(${CMAKE_SOURCE_DIR}/sdrpp.desktop ${CMAKE_CURRENT_BINARY_DIR}/sdrpp.desktop @ONLY) diff --git a/comms/sdr++/pkg-message b/comms/sdr++/pkg-message new file mode 100644 index 000000000000..3e90c198aefc --- /dev/null +++ b/comms/sdr++/pkg-message @@ -0,0 +1,8 @@ +[ +{ type: install + message: <