From nobody Sat Sep 10 07:31:38 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 4MPl0q0c4Bz4cZXJ; Sat, 10 Sep 2022 07:31:39 +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 4MPl0q0RqDz3HHt; Sat, 10 Sep 2022 07:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662795099; 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=sjSqlMHRlkRelNPnTjked/H8B2fPFrd/8UCcUz/yqs8=; b=aZxBc6JEf5jlt802xJCxRHGYyXEWrt14QoOI2so5+7fy3stkoNVDh8A+vp0L1xaWf7scG2 ClSwgcNiMABjibSuAlzZUDgI6gPRNLoryqv7jTFixbuqXQ5Pi4yY5s8oii6Dp4RtZxaGmK E1eL5DXG8us/2xNfz53kvwE15HdFyx/9VY2O8bFgWPj5tTGxhRLaT2x5/SVCL2qjFl4pa1 KX80VSgzLjrRL3tAdkKjwsw/GF1BwJynbtSafCvGhbHFEgUS3QJuyVmFtNYuHJe8b2K7OD BvNrKd6UQFKXPoWZXupkoUyX1n4/bLS+V2aDwaS6iHxB335YoPmmmn68UgyrSA== 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 4MPl0p6cclzF63; Sat, 10 Sep 2022 07:31:38 +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 28A7Vcva013839; Sat, 10 Sep 2022 07:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28A7VcRj013838; Sat, 10 Sep 2022 07:31:38 GMT (envelope-from git) Date: Sat, 10 Sep 2022 07:31:38 GMT Message-Id: <202209100731.28A7VcRj013838@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: a69f092f0d9b - main - comms/limesuite: update 20.10.0 -> 22.09.0 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: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a69f092f0d9b1012bbc10dbe5546bc8f6ed989bd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662795099; 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=sjSqlMHRlkRelNPnTjked/H8B2fPFrd/8UCcUz/yqs8=; b=uVkM2rL5vE26rtztLbKd4yDlStpYt8IJy3adoz8gIEppQa3Zl1UM/lfLypEgduvE1vi7Vm 2w0FPiTfer1gpZa/b4mCrnswPW7+iYXYhmKFCqS7/5fSoc+yUlRyrKh+KiUGTOwn6GW5Es V06pOz29bDO4tQ1q04ElGeqRxFoPKKODo92tpxb8ya8wdPPhudK72fi0LXOIPvlvycndwQ ZjHsmeOGkFgl3zEnzE8zYciKcnH2Yy80XCgiCHNqRNIQuwjtS4gIziQjvy76mJfchqRhyQ ob/GOPuTK0F916HiTduS1mjluAhX5Y2Ow1LmcoQjWYZrYg1euK/ynZXCINrjnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662795099; a=rsa-sha256; cv=none; b=AeStqizZhJoIy0972I1JmwM2ihlUBvfYvrwWzPuXezyHdLibcPvlcMOwSCyh86dvVMiSX+ fQp0U2p/DriUI0MXsApcLK/+1fsPGX+sth3VxZAYEIn56oT+9ZHLHJkWSseE4dUot6CGsn VlVenB6huNv1SFSRHenO9ooBj/W5CP9nJ+X/uu7c07tBwWEJlwDELyP0/gCcDe+JruMrw1 xdbNFiBSCntIPU3Pa2stbH/M2KC7SKr+rjyvucoUayTMAFzX6hEXPQzuOiHuV5jrabt3v2 Z1W4kE25OHmI3IIY9Zp9dJ3pERl15w7H8xIk23Xk/0kkbmwX0eaQCi6ejAcELA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=a69f092f0d9b1012bbc10dbe5546bc8f6ed989bd commit a69f092f0d9b1012bbc10dbe5546bc8f6ed989bd Author: Tomasz "CeDeROM" CEDRO AuthorDate: 2022-09-10 07:28:25 +0000 Commit: Kurt Jaeger CommitDate: 2022-09-10 07:28:25 +0000 comms/limesuite: update 20.10.0 -> 22.09.0 - REMOTE option has been removed, because upstream dropped the feature (https://github.com/myriadrf/LimeSuite/issues/366) PR: 266307 Changes: https://github.com/myriadrf/LimeSuite/blob/master/Changelog.txt --- comms/limesuite/Makefile | 48 ++++++----- comms/limesuite/distinfo | 6 +- comms/limesuite/files/patch-CMakeLists.txt | 14 ---- comms/limesuite/files/patch-Desktop_CMakeLists.txt | 19 ----- ...patch-src_ConnectionRemote_ConnectionRemote.cpp | 13 --- ...ectionSTREAM__UNITE_ConnectionSTREAM__UNITE.cpp | 10 --- ...nSTREAM__UNITE_ConnectionSTREAM__UNITEEntry.cpp | 11 --- ...src_FPGAcontrols__wxgui_FPGAcontrols__wxgui.cpp | 11 --- comms/limesuite/pkg-plist | 96 ++++++---------------- 9 files changed, 55 insertions(+), 173 deletions(-) diff --git a/comms/limesuite/Makefile b/comms/limesuite/Makefile index 4f786f18ab55..dae17e16186a 100644 --- a/comms/limesuite/Makefile +++ b/comms/limesuite/Makefile @@ -1,7 +1,7 @@ PORTNAME= limesuite DISTVERSIONPREFIX= v -DISTVERSION= 20.10.0 -PORTREVISION= 4 +DISTVERSION= 22.09.0 +PORTREVISION= 0 CATEGORIES= comms astro hamradio MAINTAINER= tomek@cedro.info @@ -23,26 +23,31 @@ GH_PROJECT= LimeSuite CMAKE_ARGS= -DENABLE_SIMD_FLAGS:STRING="none" # DESKTOP IS LINUX ONLY. # SPI IS LINUX ONLY. -# STREAM UNITE BROKEN UPSTREAM CMAKE_OFF= ENABLE_DESKTOP \ - ENABLE_SPI \ - ENABLE_STREAM \ - ENABLE_STREAM_UNITE + ENABLE_SPI -CMAKE_ON= ENABLE_LIBRARY \ - ENABLE_LIME_UTIL \ +CMAKE_ON= ENABLE_EVB7COM \ ENABLE_EXAMPLES \ + ENABLE_STREAM \ + ENABLE_STREAM_UNITE \ + ENABLE_FTDI \ + ENABLE_FX3 \ + ENABLE_HEADERS \ + ENABLE_LIBRARY \ ENABLE_LIMERFE \ - ENABLE_EVB7COM + ENABLE_LIME_UTIL \ + ENABLE_MCU_TESTBENCH \ + ENABLE_NEW_GAIN_BEHAVIOUR \ + ENABLE_PCIE_XILLYBUS -OPTIONS_DEFINE= DOCS GUI QUICKTEST OCTAVE REMOTE SOAPYSDR DEBUG -OPTIONS_DEFAULT= GUI QUICKTEST SOAPYSDR DEBUG +OPTIONS_DEFINE= DOCS GUI QUICKTEST OCTAVE SOAPYSDR UTILITIES DEBUG +OPTIONS_DEFAULT= GUI QUICKTEST SOAPYSDR UTILITIES DEBUG OPTIONS_UNSET= DOCS OPTIONS_SUB= yes QUICKTEST_DESC= Build QuickTest Self-Test suite OCTAVE_DESC= Enable Octave integration -REMOTE_DESC= Enable remote testing operations SOAPYSDR_DESC= Build LMS7 SoapySDR bindings +UTILITIES_DESC= Build the Utilities PLIST_SUB= PORTVERSION=${PORTVERSION} @@ -57,28 +62,29 @@ QUICKTEST_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk OCTAVE_CMAKE_BOOL= ENABLE_OCTAVE OCTAVE_BUILD_DEPENDS= octave:math/octave -REMOTE_CMAKE_BOOL= ENABLE_REMOTE - SOAPYSDR_CMAKE_BOOL= ENABLE_SOAPY_LMS7 SOAPYSDR_LIB_DEPENDS= libSoapySDR.so:misc/soapysdr +UTILITIES_CMAKE_BOOL= ENABLE_UTILITIES + .include .if ${PORT_OPTIONS:MGUI} USES+= gl xorg USE_XORG+= x11 ice sm xcursor xext xfixes xinerama xft xrender -USE_GL+= gl glu -USE_WX+= 3.1 +USE_GL+= gl glu +USE_WX+= 3.1 WX_COMPS+= wx:lib LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig .endif .if ${PORT_OPTIONS:MOCTAVE} -.include "${.CURDIR}/../../math/octave/Makefile.version" -OCTAVE_OCT_SITE_DIR= "lib/octave/${OCTAVE_VERSION}/site/oct/${CONFIGURE_TARGET}/" -PLIST_SUB+= OCTAVE_OCT_SITE_DIR=${OCTAVE_OCT_SITE_DIR} -OCTAVE_M_SITE_DIR= "share/octave/${OCTAVE_VERSION}/site/m/" -PLIST_SUB+= OCTAVE_M_SITE_DIR=${OCTAVE_M_SITE_DIR} +# Use octave-config to obtain paths from installed and working Octave. +# Paths from Makefile will cause problems when using Port and Pkg builds. +OCTAVE_OCT_SITE_DIR= (octave-config --oct-site-dir) +OCTAVE_M_SITE_DIR= (octave-config --m-site-dir) +PLIST_SUB+= OCTAVE_OCT_SITE_DIR=${OCTAVE_OCT_SITE_DIR:sh}/ +PLIST_SUB+= OCTAVE_M_SITE_DIR=${OCTAVE_M_SITE_DIR:sh}/ .endif .if ${PORT_OPTIONS:MDEBUG} diff --git a/comms/limesuite/distinfo b/comms/limesuite/distinfo index 37c999e9813c..f54f73f8f694 100644 --- a/comms/limesuite/distinfo +++ b/comms/limesuite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608434916 -SHA256 (myriadrf-LimeSuite-v20.10.0_GH0.tar.gz) = f6d79dc67cb52a5aea839d1dc00e65f85367cb2c275d77f149833d32cf79b467 -SIZE (myriadrf-LimeSuite-v20.10.0_GH0.tar.gz) = 5421065 +TIMESTAMP = 1662669378 +SHA256 (myriadrf-LimeSuite-v22.09.0_GH0.tar.gz) = 521e45298e1ffd0fd65006598e1edf37bd92a13667afaab262582fc681f1cf16 +SIZE (myriadrf-LimeSuite-v22.09.0_GH0.tar.gz) = 5198877 diff --git a/comms/limesuite/files/patch-CMakeLists.txt b/comms/limesuite/files/patch-CMakeLists.txt deleted file mode 100644 index 25f259a7848a..000000000000 --- a/comms/limesuite/files/patch-CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- CMakeLists.txt.orig 2020-10-29 09:52:56 UTC -+++ CMakeLists.txt -@@ -171,6 +171,11 @@ if (ENABLE_NEW_GAIN_BEHAVIOUR) - add_definitions(-DNEW_GAIN_BEHAVIOUR) - endif() - -+if (CMAKE_SYSTEM_NAME MATCHES "BSD") -+ include_directories("/usr/local/include") -+ add_definitions(-D__unix__=1) #we use this for unix detection, but clang does not define it -+endif() -+ - ######################################################################## - # rpath setup - http://www.cmake.org/Wiki/CMake_RPATH_handling - ######################################################################## diff --git a/comms/limesuite/files/patch-Desktop_CMakeLists.txt b/comms/limesuite/files/patch-Desktop_CMakeLists.txt deleted file mode 100644 index c1a8629431ce..000000000000 --- a/comms/limesuite/files/patch-Desktop_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- Desktop/CMakeLists.txt.orig 2020-10-29 09:52:56 UTC -+++ Desktop/CMakeLists.txt -@@ -1,13 +1,13 @@ - ######################################################################## - ## Feature registration - ######################################################################## --if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -- set(LINUX TRUE) -+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR "FreeBSD") -+ set(UNIX TRUE) - endif() - - include(FeatureSummary) - include(CMakeDependentOption) --cmake_dependent_option(ENABLE_DESKTOP "Enable LimeSuite launcher and icons" ON "ENABLE_GUI;LINUX" OFF) -+cmake_dependent_option(ENABLE_DESKTOP "Enable LimeSuite launcher and icons" ON "ENABLE_GUI;UNIX" OFF) - add_feature_info(LimeSuiteDesktop ENABLE_DESKTOP "LimeSuite freedesktop integration") - if (NOT ENABLE_DESKTOP) - return() diff --git a/comms/limesuite/files/patch-src_ConnectionRemote_ConnectionRemote.cpp b/comms/limesuite/files/patch-src_ConnectionRemote_ConnectionRemote.cpp deleted file mode 100644 index 57f9999a5f63..000000000000 --- a/comms/limesuite/files/patch-src_ConnectionRemote_ConnectionRemote.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/ConnectionRemote/ConnectionRemote.cpp.orig 2020-10-29 09:52:56 UTC -+++ src/ConnectionRemote/ConnectionRemote.cpp -@@ -31,6 +31,10 @@ - #include - #endif // LINUX - -+#if defined(__FreeBSD__) -+#include -+#endif -+ - using namespace std; - using namespace lime; - diff --git a/comms/limesuite/files/patch-src_ConnectionSTREAM__UNITE_ConnectionSTREAM__UNITE.cpp b/comms/limesuite/files/patch-src_ConnectionSTREAM__UNITE_ConnectionSTREAM__UNITE.cpp deleted file mode 100644 index b2825828fd6e..000000000000 --- a/comms/limesuite/files/patch-src_ConnectionSTREAM__UNITE_ConnectionSTREAM__UNITE.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/ConnectionSTREAM_UNITE/ConnectionSTREAM_UNITE.cpp.orig 2020-10-29 09:52:56 UTC -+++ src/ConnectionSTREAM_UNITE/ConnectionSTREAM_UNITE.cpp -@@ -5,7 +5,6 @@ - */ - - #include "ConnectionSTREAM_UNITE.h" --#include "ErrorReporting.h" - using namespace std; - namespace lime - { diff --git a/comms/limesuite/files/patch-src_ConnectionSTREAM__UNITE_ConnectionSTREAM__UNITEEntry.cpp b/comms/limesuite/files/patch-src_ConnectionSTREAM__UNITE_ConnectionSTREAM__UNITEEntry.cpp deleted file mode 100644 index 14a06cc7d569..000000000000 --- a/comms/limesuite/files/patch-src_ConnectionSTREAM__UNITE_ConnectionSTREAM__UNITEEntry.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ConnectionSTREAM_UNITE/ConnectionSTREAM_UNITEEntry.cpp.orig 2020-10-29 09:52:56 UTC -+++ src/ConnectionSTREAM_UNITE/ConnectionSTREAM_UNITEEntry.cpp -@@ -16,7 +16,7 @@ static ConnectionSTREAM_UNITEEntry STREAM_UNITEEntry; - } - - ConnectionSTREAM_UNITEEntry::ConnectionSTREAM_UNITEEntry(void): -- ConnectionFX3Entry("STREAM+UNITE") -+ ConnectionFX3Entry() - { - - } diff --git a/comms/limesuite/files/patch-src_FPGAcontrols__wxgui_FPGAcontrols__wxgui.cpp b/comms/limesuite/files/patch-src_FPGAcontrols__wxgui_FPGAcontrols__wxgui.cpp deleted file mode 100644 index 075f2e069b37..000000000000 --- a/comms/limesuite/files/patch-src_FPGAcontrols__wxgui_FPGAcontrols__wxgui.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/FPGAcontrols_wxgui/FPGAcontrols_wxgui.cpp.orig 2020-10-29 09:52:56 UTC -+++ src/FPGAcontrols_wxgui/FPGAcontrols_wxgui.cpp -@@ -166,7 +166,7 @@ int ReadWFM(const wxString filename, std::vector