Update to 2.14.2

- Switch to CMake (qmake support dropped upstream)
- Always use Portaudio as gqrx is always linked to it
  (dependency brought by Gnuradio-audio)
This commit is contained in:
Ganael LAPLANCHE 2020-12-05 17:10:27 +00:00
parent 6224a711de
commit ddeb5a7e44
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=557070
5 changed files with 61 additions and 31 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gqrx
PORTVERSION= 2.13.5
PORTVERSION= 2.14.2
DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= comms hamradio
@ -25,34 +25,31 @@ LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \
liblog4cpp.so:devel/log4cpp \
libgmpxx.so:math/gmp \
libgmp.so:math/gmp \
libvolk.so:devel/volk
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= compiler:c++11-lang gl pkgconfig qmake qt:5
USES= cmake compiler:c++11-lang gl pkgconfig qt:5
USE_GITHUB= yes
GH_ACCOUNT= csete
USE_GL= gl
USE_QT= buildtools_build core gui svg network widgets
USE_QT= core gui network svg widgets
OPTIONS_RADIO= AUDIO
AUDIO_DESC= Audio backend
OPTIONS_RADIO_AUDIO= PULSEAUDIO PORTAUDIO GRAUDIO
OPTIONS_DEFAULT= AUDIO PULSEAUDIO
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio \
libpulse-simple.so:audio/pulseaudio
PULSEAUDIO_QMAKE_ON= AUDIO_BACKEND=pulseaudio
PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
PORTAUDIO_QMAKE_ON= AUDIO_BACKEND=portaudio
GRAUDIO_LIB_DEPENDS= libgnuradio-audio.so:comms/gnuradio
GRAUDIO_QMAKE_ON= AUDIO_BACKEND=gr-audio
GRAUDIO_DESC= GNU Radio audio library support
# 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"
PLIST_FILES= bin/gqrx \
share/applications/gqrx.desktop \
man/man1/gqrx.1.gz
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gqrx ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/gqrx ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/gqrx.desktop \
${STAGEDIR}${PREFIX}/share/applications
${INSTALL_MAN} ${WRKSRC}/resources/gqrx.1 \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1604868230
SHA256 (csete-gqrx-v2.13.5_GH0.tar.gz) = 79287ba694a7d0506393d2c18cc02fc5c736d00119e0ad7fa1ebc67bbb1059c8
SIZE (csete-gqrx-v2.13.5_GH0.tar.gz) = 1346546
TIMESTAMP = 1607113991
SHA256 (csete-gqrx-v2.14.2_GH0.tar.gz) = ec5cf2eab77e1e42931e5397e664cf167b45241f9e2ddecfef1ebae802bbc9bf
SIZE (csete-gqrx-v2.14.2_GH0.tar.gz) = 1343715

View file

@ -0,0 +1,33 @@
--- CMakeLists.txt.orig 2020-11-28 03:29:48 UTC
+++ CMakeLists.txt
@@ -137,12 +137,13 @@ if(Gnuradio_VERSION VERSION_LESS "3.8")
find_package(Boost COMPONENTS system REQUIRED)
endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
if(NOT LINUX_AUDIO_BACKEND)
set(LINUX_AUDIO_BACKEND Pulseaudio CACHE STRING "Choose the audio backend, options are: Pulseaudio, Portaudio, Gr-audio" FORCE)
endif()
if(${LINUX_AUDIO_BACKEND} MATCHES "Pulseaudio")
+ message(STATUS "Pulseaudio backend enabled")
find_package(PulseAudio REQUIRED)
# there is a defect in the pulse audio cmake file that does not include this library. So we add it here.
find_library(PULSE-SIMPLE NAMES pulse-simple REQUIRED)
@@ -150,6 +151,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
unset(PORTAUDIO_INCLUDE_DIRS CACHE)
unset(PORTAUDIO_LIBRARIES CACHE)
elseif(${LINUX_AUDIO_BACKEND} MATCHES "Portaudio")
+ message(STATUS "Portaudio backend enabled")
if(Gnuradio_VERSION VERSION_LESS "3.8")
find_package(Portaudio REQUIRED)
else()
@@ -164,6 +166,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
unset(PULSEAUDIO_INCLUDE_DIR CACHE)
unset(PULSEAUDIO_MAINLOOP_LIBRARY CACHE)
elseif(${LINUX_AUDIO_BACKEND} MATCHES "Gr-audio")
+ message(STATUS "Gr-audio backend enabled")
unset(PULSEAUDIO_FOUND CACHE)
unset(PULSEAUDIO_INCLUDE_DIR CACHE)
unset(PULSEAUDIO_LIBRARY CACHE)

View file

@ -1,11 +0,0 @@
--- gqrx.pro.orig 2020-11-01 13:40:49 UTC
+++ gqrx.pro
@@ -294,7 +294,7 @@ INCPATH += src/
unix:!macx {
LIBS += -lboost_system$$BOOST_SUFFIX
- LIBS += -lrt # need to include on some distros
+ LIBS += -llog4cpp
}
macx {

View file

@ -0,0 +1,11 @@
--- src/CMakeLists.txt.orig 2020-11-20 02:58:00 UTC
+++ src/CMakeLists.txt
@@ -13,7 +13,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_subdirectory(osxaudio)
endif()
add_definitions(-DGQRX_OS_MACX)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD")
if(${LINUX_AUDIO_BACKEND} MATCHES "Pulseaudio")
add_subdirectory(pulseaudio)
elseif(${LINUX_AUDIO_BACKEND} MATCHES "Portaudio")