Date: Mon, 4 Nov 2024 02:39:26 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d7586533674c - main - comms/sdr++: update 1.0.4 =?utf-8?Q?=E2=86=92?= 20241022 Message-ID: <202411040239.4A42dQBk087554@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7586533674ce88f616e455d2bb40256439b199d commit d7586533674ce88f616e455d2bb40256439b199d Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-11-04 02:32:44 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-11-04 02:39:20 +0000 comms/sdr++: update 1.0.4 → 20241022 --- comms/sdr++/Makefile | 126 ++++++++++++++++++++++-------- comms/sdr++/distinfo | 6 +- comms/sdr++/files/patch-CMakeLists.txt | 29 ------- comms/sdr++/files/patch-core_src_core.cpp | 16 ---- comms/sdr++/pkg-plist | 57 ++++++++++---- 5 files changed, 139 insertions(+), 95 deletions(-) diff --git a/comms/sdr++/Makefile b/comms/sdr++/Makefile index ed8facd8a9d9..1fa2aa16dc1f 100644 --- a/comms/sdr++/Makefile +++ b/comms/sdr++/Makefile @@ -1,6 +1,5 @@ PORTNAME= sdr++ -DISTVERSION= 1.0.4 -PORTREVISION= 5 +DISTVERSION= 20241022 # rolling (nightly) release is the current release model (see README) CATEGORIES= comms hamradio MAINTAINER= yuri@FreeBSD.org @@ -10,18 +9,10 @@ WWW= https://github.com/AlexandreRouma/SDRPlusPlus LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/license -BROKEN_FreeBSD_15= compilation fails with clang-19, see https://github.com/AlexandreRouma/SDRPlusPlus/issues/1509 - -LIB_DEPENDS= libad9361.so:misc/libad9361-iio \ - libairspy.so:comms/airspy \ - libairspyhf.so:comms/airspyhf \ - libfftw3f.so:math/fftw3-float \ +LIB_DEPENDS= libfftw3f.so:math/fftw3-float \ libglfw.so:graphics/glfw \ - libhackrf.so:comms/hackrf \ - libiio.so:misc/libiio \ - librtlsdr.so:comms/rtl-sdr \ - libSoapySDR.so:misc/soapysdr \ - libvolk.so:devel/volk + libvolk.so:devel/volk \ + libzstd.so:archivers/zstd USES= cmake compiler:c++17-lang gl pkgconfig xorg USE_GL= gl glew glu opengl @@ -30,30 +21,103 @@ USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= AlexandreRouma GH_PROJECT= SDRPlusPlus +GH_TAGNAME= 3982db7 -PORTSCOUT= limit:^.*\.[0-9]\..*$$ # prevent tags like 'nightly' +PORTSCOUT= ignore:1 # rolling release -OPTIONS_MULTI= AUDIO_BACKEND -OPTIONS_MULTI_AUDIO_BACKEND= PORTAUDIO RTAUDIO -OPTIONS_DEFAULT= PORTAUDIO # RTAUDIO +OPTIONS_GROUP= MODULES AUDIO_SOURCE AUDIO_SINK AUDIO_DECODER # the list is defined in CMakeLists.txt, also see https://github.com/AlexandreRouma/SDRPlusPlus?tab=readme-ov-file#module-list +OPTIONS_GROUP_AUDIO_SOURCE= AIRSPY AIRSPYHF BADGESDR_SOURCE BLADERF FOBOS HACKRF LIMESDR PLUTOSDR RTAUDIO_SOURCE RTL_SDR +OPTIONS_GROUP_AUDIO_SINK= NETWORK_SINK PORTAUDIO_SINK RTAUDIO_SINK # portaudio sinks are intended for MacOS only +OPTIONS_GROUP_AUDIO_DECODER= ATV_DECODER DAB_DECODER M17_DECODER METEOR_DECODER RADIO WEATHER_SAT_DECODER OPTIONS_SUB= yes -AUDIO_BACKEND_DESC= Audio backend +AUDIO_SOURCE_DESC= Audio Sources +AUDIO_SINK_DESC= Audio Sinks +AUDIO_DECODER_DESC= Audio Decoders + +## Sources + +AIRSPY_DESC= Airspy Source Module +AIRSPY_CMAKE_BOOL= OPT_BUILD_AIRSPY_SOURCE +AIRSPY_LIB_DEPENDS= libairspy.so:comms/airspy + +AIRSPYHF_DESC= Airspy HF+ Source Module +AIRSPYHF_CMAKE_BOOL= OPT_BUILD_AIRSPYHF_SOURCE +AIRSPYHF_LIB_DEPENDS= libairspyhf.so:comms/airspyhf + +BADGESDR_SOURCE_DESC= BadgeSDR Source Module +BADGESDR_SOURCE_CMAKE_BOOL= OPT_BUILD_BADGESDR_SOURCE + +BLADERF_DESC= BladeRF Source Module +BLADERF_CMAKE_BOOL= OPT_BUILD_BLADERF_SOURCE +BLADERF_LIB_DEPENDS= libbladeRF.so:comms/bladerf + +FOBOS_DESC= FobosSDR Source Module +FOBOS_CMAKE_BOOL= OPT_BUILD_FOBOSSDR_SOURCE +FOBOS_LIB_DEPENDS= libfobos.so:comms/libfobos + +PLUTOSDR_DESC= PlutoSDR Source Module +PLUTOSDR_CMAKE_BOOL= OPT_BUILD_PLUTOSDR_SOURCE +PLUTOSDR_LIB_DEPENDS= libad9361.so:misc/libad9361-iio \ + libiio.so:misc/libiio + +LIMESDR_DESC= LimeSDR Source Module +LIMESDR_CMAKE_BOOL= OPT_BUILD_LIMESDR_SOURCE +LIMESDR_LIB_DEPENDS= libLimeSuite.so:comms/limesuite + +HACKRF_DESC= HackRF Source Module +HACKRF_CMAKE_BOOL= OPT_BUILD_HACKRF_SOURCE +HACKRF_LIB_DEPENDS= libhackrf.so:comms/hackrf + +RTAUDIO_SOURCE_DESC= RtAudio Source Module +RTAUDIO_SOURCE_CMAKE_BOOL= OPT_BUILD_AUDIO_SOURCE +RTAUDIO_SOURCE_LIB_DEPENDS= librtaudio.so:audio/rtaudio + +RTL_SDR_DESC= RTL-SDR Source Module +RTL_SDR_CMAKE_BOOL= OPT_BUILD_RTL_SDR_SOURCE +RTL_SDR_LIB_DEPENDS= librtlsdr.so:comms/rtl-sdr + +## Sinks + +NETWORK_SINK_DESC= Network Audio Sink Module +NETWORK_SINK_CMAKE_BOOL= OPT_BUILD_NETWORK_SINK + +PORTAUDIO_SINK_DESC= PortAudio Sink Module +PORTAUDIO_SINK_CMAKE_BOOL= OPT_BUILD_PORTAUDIO_SINK OPT_BUILD_NEW_PORTAUDIO_SINK +PORTAUDIO_SINK_LIB_DEPENDS= libportaudio.so:audio/portaudio + +RTAUDIO_SINK_DESC= RtAudio Sink Module +RTAUDIO_SINK_CMAKE_BOOL= OPT_BUILD_AUDIO_SINK +RTAUDIO_SINK_LIB_DEPENDS= librtaudio.so:audio/rtaudio +RTAUDIO_SINK_BROKEN= fails at run-time: Illegal Instruction + +## Decoders + +ATV_DECODER_DESC= ATV decoder +ATV_DECODER_CMAKE_BOOL= OPT_BUILD_ATV_DECODER + +DAB_DECODER_DESC= DAB/DAB+ decoder +DAB_DECODER_CMAKE_BOOL= OPT_BUILD_DAB_DECODER +DAB_DECODER_BROKEN= unfinished as per https://github.com/AlexandreRouma/SDRPlusPlus?tab=readme-ov-file#decoders + +M17_DECODER_DESC= M17 decoder module +M17_DECODER_CMAKE_BOOL= OPT_BUILD_M17_DECODER +M17_DECODER_LIB_DEPENDS= libcodec2.so:audio/codec2 -PORTAUDIO_CMAKE_BOOL= OPT_BUILD_AUDIO_SINK -PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio +METEOR_DECODER_DESC= METEOR demodulator module +METEOR_DECODER_CMAKE_BOOL= OPT_BUILD_METEOR_DEMODULATOR -RTAUDIO_DESC= RtAudio support -RTAUDIO_CMAKE_BOOL= OPT_BUILD_AUDIO_SINK -RTAUDIO_LIB_DEPENDS= librtaudio.so:audio/rtaudio -RTAUDIO_BROKEN= see https://github.com/AlexandreRouma/SDRPlusPlus/issues/1149 +RADIO_DESC= Main audio modulation decoder (AM, FM, SSB, etc...) +RADIO_CMAKE_BOOL= OPT_BUILD_RADIO -.include <bsd.port.pre.mk> +WEATHER_SAT_DECODER_DESC= HRPT decoder module +WEATHER_SAT_DECODER_CMAKE_BOOL= OPT_BUILD_WEATHER_SAT_DECODER +WEATHER_SAT_DECODER_BROKEN= unfinished as per https://github.com/AlexandreRouma/SDRPlusPlus?tab=readme-ov-file#decoders -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -PLIST_SUB+= SSE="" -.else -PLIST_SUB+= SSE="@comment " -.endif +.for o in ${OPTIONS_GROUP_AUDIO_SOURCE} ${OPTIONS_GROUP_AUDIO_SINK} ${OPTIONS_GROUP_AUDIO_DECODER} +. if "${${o}_BROKEN}" == "" +OPTIONS_DEFAULT+= ${o} +. endif +.endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/comms/sdr++/distinfo b/comms/sdr++/distinfo index 0d98d920ef15..c48ee7307af4 100644 --- a/comms/sdr++/distinfo +++ b/comms/sdr++/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656000685 -SHA256 (AlexandreRouma-SDRPlusPlus-1.0.4_GH0.tar.gz) = 251256de6725ceb4f9fb2823c7ad825068ad16cf9b5fb894259b173aae5a69ea -SIZE (AlexandreRouma-SDRPlusPlus-1.0.4_GH0.tar.gz) = 3700787 +TIMESTAMP = 1730669918 +SHA256 (AlexandreRouma-SDRPlusPlus-20241022-3982db7_GH0.tar.gz) = 1d164ae6ca03938a7c5b4fd22c26d6d6a5aa11a0f22fae942aa89ceb74ee3cd7 +SIZE (AlexandreRouma-SDRPlusPlus-20241022-3982db7_GH0.tar.gz) = 3780188 diff --git a/comms/sdr++/files/patch-CMakeLists.txt b/comms/sdr++/files/patch-CMakeLists.txt deleted file mode 100644 index d7694bd817f6..000000000000 --- a/comms/sdr++/files/patch-CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ ---- CMakeLists.txt.orig 2021-10-17 22:38:02 UTC -+++ CMakeLists.txt -@@ -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") - set(CMAKE_INSTALL_PREFIX "/usr/local") --else() -- set(CMAKE_INSTALL_PREFIX "/usr") --endif() -+#else() -+# set(CMAKE_INSTALL_PREFIX "/usr") -+#endif() - - # Compatibility Options - 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) - --if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdrpp.desktop DESTINATION /usr/share/applications) -+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdrpp.desktop DESTINATION share/applications) - endif () - - # Create uninstall target diff --git a/comms/sdr++/files/patch-core_src_core.cpp b/comms/sdr++/files/patch-core_src_core.cpp deleted file mode 100644 index aacd2c028a0a..000000000000 --- a/comms/sdr++/files/patch-core_src_core.cpp +++ /dev/null @@ -1,16 +0,0 @@ -- print glewInit() error description - ---- core/src/core.cpp.orig 2022-06-23 16:55:03 UTC -+++ core/src/core.cpp -@@ -383,8 +383,10 @@ int sdrpp_main(int argc, char *argv[]) { - free(icons[i].pixels); - } - -- if (glewInit() != GLEW_OK) { -+ GLenum err = glewInit(); -+ if (err != GLEW_OK) { - spdlog::error("Failed to initialize OpenGL loader!"); -+ spdlog::error(glewGetErrorString(err)); - return 1; - } - diff --git a/comms/sdr++/pkg-plist b/comms/sdr++/pkg-plist index 4bdcea04c8bf..113f5209cb49 100644 --- a/comms/sdr++/pkg-plist +++ b/comms/sdr++/pkg-plist @@ -1,28 +1,42 @@ bin/sdrpp -%%SSE%%include/correct-sse.h -include/correct.h -lib/libcorrect.a -lib/libcorrect.so lib/libsdrpp_core.so -lib/sdrpp/plugins/airspy_source.so -lib/sdrpp/plugins/airspyhf_source.so -%%RTAUDIO%%lib/sdrpp/plugins/audio_sink.so +%%AIRSPY%%lib/sdrpp/plugins/airspy_source.so +%%AIRSPYHF%%lib/sdrpp/plugins/airspyhf_source.so +%%ATV_DECODER%%lib/sdrpp/plugins/atv_decoder.so +%%RTAUDIO_SINK%%lib/sdrpp/plugins/audio_sink.so +%%RTAUDIO_SOURCE%%lib/sdrpp/plugins/audio_source.so +%%BADGESDR_SOURCE%%lib/sdrpp/plugins/badgesdr_source.so +%%BLADERF%%lib/sdrpp/plugins/bladerf_source.so lib/sdrpp/plugins/discord_integration.so lib/sdrpp/plugins/file_source.so +%%FOBOS%%lib/sdrpp/plugins/fobossdr_source.so lib/sdrpp/plugins/frequency_manager.so -lib/sdrpp/plugins/hackrf_source.so -lib/sdrpp/plugins/meteor_demodulator.so -lib/sdrpp/plugins/network_sink.so -lib/sdrpp/plugins/plutosdr_source.so -lib/sdrpp/plugins/radio.so +%%HACKRF%%lib/sdrpp/plugins/hackrf_source.so +lib/sdrpp/plugins/hermes_source.so +lib/sdrpp/plugins/iq_exporter.so +%%LIMESDR%%lib/sdrpp/plugins/limesdr_source.so +%%M17_DECODER%%lib/sdrpp/plugins/m17_decoder.so +%%METEOR_DECODER%%lib/sdrpp/plugins/meteor_demodulator.so +%%NETWORK_SINK%%lib/sdrpp/plugins/network_sink.so +lib/sdrpp/plugins/network_source.so +%%PORTAUDIO_SINK%%lib/sdrpp/plugins/new_portaudio_sink.so +lib/sdrpp/plugins/pager_decoder.so +%%PLUTOSDR%%lib/sdrpp/plugins/plutosdr_source.so +%%RADIO%%lib/sdrpp/plugins/radio.so lib/sdrpp/plugins/recorder.so +lib/sdrpp/plugins/rfspace_source.so +lib/sdrpp/plugins/rigctl_client.so lib/sdrpp/plugins/rigctl_server.so -lib/sdrpp/plugins/rtl_sdr_source.so +%%RTL_SDR%%lib/sdrpp/plugins/rtl_sdr_source.so lib/sdrpp/plugins/rtl_tcp_source.so -lib/sdrpp/plugins/soapy_source.so +lib/sdrpp/plugins/scanner.so +lib/sdrpp/plugins/sdrpp_server_source.so +lib/sdrpp/plugins/spectran_http_source.so lib/sdrpp/plugins/spyserver_source.so -lib/sdrpp/plugins/weather_sat_decoder.so -share/applications/sdrpp.desktop +share/sdrpp/bandplans/australia.json +share/sdrpp/bandplans/austria.json +share/sdrpp/bandplans/belgium.json +share/sdrpp/bandplans/brazil.json share/sdrpp/bandplans/canada.json share/sdrpp/bandplans/china.json share/sdrpp/bandplans/france.json @@ -30,7 +44,14 @@ share/sdrpp/bandplans/general.json share/sdrpp/bandplans/germany-mobile-lte-bands.json share/sdrpp/bandplans/germany-mobile-networks.json share/sdrpp/bandplans/germany.json +share/sdrpp/bandplans/italy.json +share/sdrpp/bandplans/netherlands.json +share/sdrpp/bandplans/qo-100.json +share/sdrpp/bandplans/republic-of-korea.json share/sdrpp/bandplans/russia.json +share/sdrpp/bandplans/slovakia.json +share/sdrpp/bandplans/turkey.json +share/sdrpp/bandplans/united-kingdom.json share/sdrpp/bandplans/usa.json share/sdrpp/colormaps/classic.json share/sdrpp/colormaps/classic_green.json @@ -40,8 +61,11 @@ share/sdrpp/colormaps/greyscale.json share/sdrpp/colormaps/inferno.json share/sdrpp/colormaps/magma.json share/sdrpp/colormaps/plasma.json +share/sdrpp/colormaps/smoke.json +share/sdrpp/colormaps/temper_colors.json share/sdrpp/colormaps/turbo.json share/sdrpp/colormaps/viridis.json +share/sdrpp/colormaps/vivid.json share/sdrpp/colormaps/websdr.json share/sdrpp/fonts/Roboto-Medium.ttf share/sdrpp/icons/center_tuning.png @@ -50,6 +74,7 @@ share/sdrpp/icons/muted.png share/sdrpp/icons/normal_tuning.png share/sdrpp/icons/play.png share/sdrpp/icons/sdrpp.ico +share/sdrpp/icons/sdrpp.macos.png share/sdrpp/icons/sdrpp.png share/sdrpp/icons/stop.png share/sdrpp/icons/unmuted.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411040239.4A42dQBk087554>