git: c4565f1a1a23 - main - comms/quisk: Update to 4.2.36

From: Zsolt Udvari <uzsolt_at_FreeBSD.org>
Date: Mon, 26 Aug 2024 03:45:42 UTC
The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c4565f1a1a2385d706db51bdd63a5c418c9ebb67

commit c4565f1a1a2385d706db51bdd63a5c418c9ebb67
Author:     Älven <alster@vinterdalen.se>
AuthorDate: 2024-08-26 03:43:08 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-08-26 03:45:23 +0000

    comms/quisk: Update to 4.2.36
    
    Fix pkg-descr's permissions.
    
    Changelog: https://james.ahlstrom.name/quisk/CHANGELOG.txt
    
    PR:             278390
    Approved by:    maintainer timeout (2+ weeks)
---
 comms/quisk/Makefile                   |  7 +++----
 comms/quisk/distinfo                   |  6 +++---
 comms/quisk/files/patch-ac2yd_remote.c |  4 ++--
 comms/quisk/files/patch-setup.py       |  6 +++---
 comms/quisk/files/patch-sound.c        | 13 ++-----------
 comms/quisk/pkg-descr                  |  0
 6 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index e2780a5c8f89..8a80a4827f91 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	quisk
-DISTVERSION=	4.2.19
-PORTREVISION=	2
+DISTVERSION=	4.2.36
 CATEGORIES=	comms hamradio
 MASTER_SITES=	PYPI
 
@@ -11,9 +10,9 @@ 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
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,6 +1,6 @@
---- 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 <sys/socket.h>
  #include <arpa/inet.h>
  #include <netinet/ip.h>
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,7 +1,7 @@
---- 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
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,15 +1,6 @@
---- 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 <sys/socket.h>
- #include <arpa/inet.h>
--#include <netinet/ip.h>
-+#include <netinet/in.h>
- #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)
diff --git a/comms/quisk/pkg-descr b/comms/quisk/pkg-descr
old mode 100755
new mode 100644