diff --git a/comms/limesuite/Makefile b/comms/limesuite/Makefile index 4f786f18ab55..dae17e16186a 100644 --- a/comms/limesuite/Makefile +++ b/comms/limesuite/Makefile @@ -1,104 +1,110 @@ PORTNAME= limesuite DISTVERSIONPREFIX= v -DISTVERSION= 20.10.0 -PORTREVISION= 4 +DISTVERSION= 22.09.0 +PORTREVISION= 0 CATEGORIES= comms astro hamradio MAINTAINER= tomek@cedro.info COMMENT= Software Defined Radio Software Suite from Lime Microsystems WWW= https://github.com/myriadrf/LimeSuite LICENSE= APACHE20 BUILD_DEPENDS= gnuplot:math/gnuplot RUN_DEPENDS= sqlite3:databases/sqlite3 USES= cmake compiler:c11 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= myriadrf 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} DOCS_CMAKE_BOOL= ENABLE_API_DOXYGEN DOCS_BUILD_DEPENDS= doxygen:devel/doxygen GUI_CMAKE_BOOL= ENABLE_GUI QUICKTEST_CMAKE_BOOL= ENABLE_QUICKTEST 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} WITH_DEBUG= yes .endif post-build: # N.B. COPYTREE_BIN here chmods 555 which breaks CMAKE_INSTALL in user mode! (cd ${BUILD_WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin) ${CHMOD} u+w ${STAGEDIR}${PREFIX}/bin/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif .if ${PORT_OPTIONS:MGUI} ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${PREFIX}/share/applications (cd ${WRKSRC}/Desktop && ${CP} *.png ${STAGEDIR}${PREFIX}/share/pixmaps/) (cd ${WRKSRC}/Desktop && ${CP} lime-suite.desktop ${STAGEDIR}${PREFIX}/share/applications/) .endif .include 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