diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile index 2472674ef247..bb9f5e3c03fb 100644 --- a/comms/gqrx/Makefile +++ b/comms/gqrx/Makefile @@ -1,57 +1,61 @@ PORTNAME= gqrx -PORTVERSION= 2.16 +PORTVERSION= 2.17.2 DISTVERSIONPREFIX= v -PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= comms hamradio MAINTAINER= martymac@FreeBSD.org COMMENT= Software defined radio receiver powered by GNU Radio and Qt WWW= https://gqrx.dk LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \ libgnuradio-analog.so:comms/gnuradio \ libgnuradio-blocks.so:comms/gnuradio \ libgnuradio-filter.so:comms/gnuradio \ libgnuradio-fft.so:comms/gnuradio \ libgnuradio-digital.so:comms/gnuradio \ libgnuradio-pmt.so:comms/gnuradio \ libgnuradio-osmosdr.so:comms/gr-osmosdr \ libboost_system.so:devel/boost-libs \ liblog4cpp.so:devel/log4cpp \ libgmpxx.so:math/gmp \ libgmp.so:math/gmp \ libvolk.so:devel/volk \ libfftw3f.so:math/fftw3-float \ libfftw3f_threads.so:math/fftw3-float \ liborc-0.4.so:devel/orc \ libasound.so:audio/alsa-lib \ libjack.so:audio/jack \ libportaudio.so:audio/portaudio -USES= cmake compiler:c++11-lang gl pkgconfig qt:5 +USES= cmake compiler:c++11-lang gl pkgconfig qt:6 USE_GITHUB= yes GH_ACCOUNT= gqrx-sdr USE_GL= gl -USE_QT= core gui network svg widgets +USE_QT= base svg # XXX Use Portaudio as Gqrx is invariably linked to it # (auto-detected and used through Gnuradio CMake files) CMAKE_ARGS+= -DLINUX_AUDIO_BACKEND:STRING="Portaudio" +# XXX Work around Gnuradio 3.8 headers (gnuradio/rpcserver_aggregator.h) still +# using std::unary_function (removed with C++17). This breaks when building +# on FreeBSD 14: error: no template named 'unary_function' in namespace 'std' +CXXFLAGS+= -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION + PLIST_FILES= bin/gqrx \ share/applications/dk.gqrx.gqrx.desktop \ man/man1/gqrx.1.gz do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/gqrx ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/dk.gqrx.gqrx.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_MAN} ${WRKSRC}/resources/gqrx.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 .include diff --git a/comms/gqrx/distinfo b/comms/gqrx/distinfo index 252fd8ad2d35..fb41a187f334 100644 --- a/comms/gqrx/distinfo +++ b/comms/gqrx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682972773 -SHA256 (gqrx-sdr-gqrx-v2.16_GH0.tar.gz) = eab65f490da22c3f276366f418af37803bd0d51d8d31b1ce7fdd4cac47932456 -SIZE (gqrx-sdr-gqrx-v2.16_GH0.tar.gz) = 3608271 +TIMESTAMP = 1696914008 +SHA256 (gqrx-sdr-gqrx-v2.17.2_GH0.tar.gz) = 8d5f70390d3935278527cc7aa6344d6ec0201bce156851c610e88acd6102c356 +SIZE (gqrx-sdr-gqrx-v2.17.2_GH0.tar.gz) = 3620793 diff --git a/comms/gqrx/files/patch-CMakeLists.txt b/comms/gqrx/files/patch-CMakeLists.txt deleted file mode 100644 index d57ee9ab2b45..000000000000 --- a/comms/gqrx/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- CMakeLists.txt.orig 2023-04-28 17:35:04 UTC -+++ CMakeLists.txt -@@ -121,10 +121,7 @@ else() - endif() - - # 3rd Party Dependency Stuff --find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets) --if(NOT Qt6_FOUND) - find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets Svg) --endif() - include(FindPkgConfig) - find_package(Gnuradio-osmosdr REQUIRED) -