diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile index e2780a5c8f89..8a80a4827f91 100644 --- a/comms/quisk/Makefile +++ b/comms/quisk/Makefile @@ -1,36 +1,35 @@ PORTNAME= quisk -DISTVERSION= 4.2.19 -PORTREVISION= 2 +DISTVERSION= 4.2.36 CATEGORIES= comms hamradio MASTER_SITES= PYPI MAINTAINER= fbsd@thesoo.org COMMENT= Software Defined Radio (SDR) WWW= https://james.ahlstrom.name/quisk/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license.txt -LIB_DEPENDS= libfftw3.so:math/fftw3 \ +LIB_DEPENDS= libasound.so:audio/alsa-lib \ + libfftw3.so:math/fftw3 \ libportaudio.so:audio/portaudio \ - libasound.so:audio/alsa-lib \ libpulse.so:audio/pulseaudio USES= python USE_PYTHON= autoplist distutils noflavors USE_WX= 3.2 WX_COMPS= python post-extract: @${RM} ${WRKSRC}/_quisk.so ${WRKSRC}/sdriqpkg/sdriq.so \ ${WRKSRC}/freedvpkg/libcodec2_32.so \ ${WRKSRC}/freedvpkg/libcodec2_64.so post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py post-stage: @${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD} .include diff --git a/comms/quisk/distinfo b/comms/quisk/distinfo index 7f9681474e85..6fc0944674a8 100644 --- a/comms/quisk/distinfo +++ b/comms/quisk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687973631 -SHA256 (quisk-4.2.19.tar.gz) = 8946b29894eee88db4faceda82fe3f0878f45429a13083e77f4b3c9e132c8cd2 -SIZE (quisk-4.2.19.tar.gz) = 4805584 +TIMESTAMP = 1723034330 +SHA256 (quisk-4.2.36.tar.gz) = 4e7e7d1a004fc17e787555c7178d358632fc4b87eb819cd387f6456f297755ca +SIZE (quisk-4.2.36.tar.gz) = 5151025 diff --git a/comms/quisk/files/patch-ac2yd_remote.c b/comms/quisk/files/patch-ac2yd_remote.c index eef5199f5a2f..229719557a49 100644 --- a/comms/quisk/files/patch-ac2yd_remote.c +++ b/comms/quisk/files/patch-ac2yd_remote.c @@ -1,10 +1,10 @@ ---- ac2yd/remote.c.orig 2022-11-30 19:10:07 UTC +--- ac2yd/remote.c.orig 2023-12-12 20:34:47 UTC +++ ac2yd/remote.c -@@ -20,6 +20,7 @@ +@@ -28,6 +28,7 @@ #include #include #include +#include #include #endif diff --git a/comms/quisk/files/patch-setup.py b/comms/quisk/files/patch-setup.py index fdb7c4652a2f..1aeb71e45e45 100644 --- a/comms/quisk/files/patch-setup.py +++ b/comms/quisk/files/patch-setup.py @@ -1,18 +1,18 @@ ---- setup.py.orig 2022-11-19 21:34:46 UTC +--- setup.py.orig 2024-05-10 17:22:55 UTC +++ setup.py -@@ -48,6 +48,15 @@ if sys.platform == "darwin": # Build for Macintosh - define_macros.append(("QUISK_HAVE_PULSEAUDIO", None)) +@@ -54,6 +54,15 @@ elif "freebsd" in sys.platform: #Build for FreeBSD + define_macros = [("QUISK_HAVE_PULSEAUDIO", None)] # Pulseaudio is in FreeBSD base Modules = [Extension ('quisk._quisk', include_dirs=['.', base_dir + '/include'], library_dirs=['.', base_dir + '/lib'], libraries=libraries, sources=sources, define_macros=define_macros)] +if "freebsd" in sys.platform: #Build for FreeBSD + define_macros = [("QUISK_HAVE_PORTAUDIO", None)] # PortAudio is always available + libraries = ['portaudio', 'fftw3', 'm'] + base_dir = '%%LOCALBASE%%' + if os.path.isfile(base_dir + "/include/pulse/pulseaudio.h"): + libraries.append('pulse') + define_macros.append(("QUISK_HAVE_PULSEAUDIO", None)) + Modules = [Extension ('quisk._quisk', include_dirs=['.', base_dir + '/include'], library_dirs=['.', base_dir + '/lib'], + libraries=libraries, sources=sources, define_macros=define_macros)] else: # Linux define_macros = [("QUISK_HAVE_ALSA", None), ("QUISK_HAVE_PULSEAUDIO", None)] libraries = ['asound', 'pulse', 'fftw3', 'm'] diff --git a/comms/quisk/files/patch-sound.c b/comms/quisk/files/patch-sound.c index 335e4db9a755..62c93fa01cca 100644 --- a/comms/quisk/files/patch-sound.c +++ b/comms/quisk/files/patch-sound.c @@ -1,20 +1,11 @@ ---- sound.c.orig 2022-11-01 15:27:27 UTC +--- sound.c.orig 2024-05-20 18:01:18 UTC +++ sound.c -@@ -15,7 +15,7 @@ - #else - #include - #include --#include -+#include - #endif - - #include "quisk.h" -@@ -596,7 +596,7 @@ void play_sound_interface(struct sound_dev* dev, int n +@@ -604,7 +604,7 @@ void play_sound_interface(struct sound_dev* dev, int n else dev->cr_correction = (0.5 - dev->cr_average_fill) * dev->play_buf_size; if (dev->cr_correction != 0) - dev->cr_correct_time = abs(dev->sample_rate * AVG_SEC / dev->cr_correction); + dev->cr_correct_time = fabs(dev->sample_rate * AVG_SEC / dev->cr_correction); if (quisk_sound_state.verbose_sound > 1) QuiskPrintf("%s: Buffer average %5.2lf cr_correction %5d\n", dev->stream_description, dev->cr_average_fill * 100, dev->cr_correction); diff --git a/comms/quisk/pkg-descr b/comms/quisk/pkg-descr old mode 100755 new mode 100644