* Re: [PR PATCH] [Updated] hamlib: update to 4.4.
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
@ 2022-05-08 16:17 ` classabbyamp
2022-05-08 20:50 ` classabbyamp
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-08 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib: update to 4.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 1859 bytes --]
From e6a0d5dd9bf98dee35592c3442858c28276e4d18 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH] hamlib: update to 4.4.
---
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..0efb9d2bdb69 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib: update to 4.4.
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
2022-05-08 16:17 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-05-08 20:50 ` classabbyamp
2022-05-08 21:09 ` [PR PATCH] [Updated] hamlib, revdeps: update classabbyamp
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-08 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib: update to 4.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 30411 bytes --]
From a5a1ebe73f55ce1064be4ab458b957c78f73ac84 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/5] hamlib: update to 4.4.
---
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..0efb9d2bdb69 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From ce74f792a5f5511e0697dcd781b3c909e5d8d257 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/5] qsstv: update to 9.5.8.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 6 +++---
2 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..3719096687a2 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,8 +1,8 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From 1e724b48ea69c4e5541a34cfee059abb154c41f6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 3/5] liquid-dsp: update to 1.4.0.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 6 +--
4 files changed, 21 insertions(+), 65 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..fefc7d703dbf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3613,7 +3613,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..c08736f3c4c9 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
maintainer="bra1nwave <brainwave@openmailbox.org>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From a77172ba970c8133f070a7a0e24b7adaf4b64144 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 4/5] CubicSDR: update to 0.2.7.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 6 +-
4 files changed, 230 insertions(+), 51 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..d7a9e64bf2a6 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
From ed1584f748768d98772b59d96fa97bcdea11fd84 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 5/5] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
2022-05-08 16:17 ` [PR PATCH] [Updated] " classabbyamp
2022-05-08 20:50 ` classabbyamp
@ 2022-05-08 21:09 ` classabbyamp
2022-05-09 15:13 ` classabbyamp
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-08 21:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 31379 bytes --]
From a5a1ebe73f55ce1064be4ab458b957c78f73ac84 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/6] hamlib: update to 4.4.
---
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..0efb9d2bdb69 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From ce74f792a5f5511e0697dcd781b3c909e5d8d257 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/6] qsstv: update to 9.5.8.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 6 +++---
2 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..3719096687a2 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,8 +1,8 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From 1e724b48ea69c4e5541a34cfee059abb154c41f6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 3/6] liquid-dsp: update to 1.4.0.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 6 +--
4 files changed, 21 insertions(+), 65 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..fefc7d703dbf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3613,7 +3613,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..c08736f3c4c9 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
maintainer="bra1nwave <brainwave@openmailbox.org>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From a77172ba970c8133f070a7a0e24b7adaf4b64144 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 4/6] CubicSDR: update to 0.2.7.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 6 +-
4 files changed, 230 insertions(+), 51 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..d7a9e64bf2a6 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
From ed1584f748768d98772b59d96fa97bcdea11fd84 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 5/6] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From 99b5b4a29fd599a7b32869444a260dfc1205a79b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 6/6] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (2 preceding siblings ...)
2022-05-08 21:09 ` [PR PATCH] [Updated] hamlib, revdeps: update classabbyamp
@ 2022-05-09 15:13 ` classabbyamp
2022-05-10 0:52 ` classabbyamp
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-09 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 32008 bytes --]
From a5a1ebe73f55ce1064be4ab458b957c78f73ac84 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/6] hamlib: update to 4.4.
---
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..0efb9d2bdb69 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From ce74f792a5f5511e0697dcd781b3c909e5d8d257 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/6] qsstv: update to 9.5.8.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 6 +++---
2 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..3719096687a2 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,8 +1,8 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From 1e724b48ea69c4e5541a34cfee059abb154c41f6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 3/6] liquid-dsp: update to 1.4.0.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 6 +--
4 files changed, 21 insertions(+), 65 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..fefc7d703dbf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3613,7 +3613,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..c08736f3c4c9 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
maintainer="bra1nwave <brainwave@openmailbox.org>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From a77172ba970c8133f070a7a0e24b7adaf4b64144 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 4/6] CubicSDR: update to 0.2.7.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 6 +-
4 files changed, 230 insertions(+), 51 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..d7a9e64bf2a6 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
From ed1584f748768d98772b59d96fa97bcdea11fd84 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 5/6] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From b1166a39e9b3d1f86212d9c2d83595e0df7161fd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 6/6] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 14 ++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..6fbfddc01a17
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,14 @@
+unused, causes fail on musl
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (3 preceding siblings ...)
2022-05-09 15:13 ` classabbyamp
@ 2022-05-10 0:52 ` classabbyamp
2022-05-10 1:17 ` classabbyamp
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-10 0:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 33498 bytes --]
From d05f930c7e6aa968715a207e28e25bd75292bad5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/7] hamlib: update to 4.4.
---
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..0efb9d2bdb69 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From 89241e2f0406a5ec2b88f87eecced390e501871e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/7] qsstv: update to 9.5.8.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 6 +++---
2 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..3719096687a2 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,8 +1,8 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From a8e767ae33c6c7eb052a8a765931f8b85d0d95d1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 3/7] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 14 ++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..6fbfddc01a17
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,14 @@
+unused, causes fail on musl
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
From 9047107e454a31a723526d2a511fb234b62c154b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:46:42 -0400
Subject: [PATCH 4/7] wsjtx: update to 2.5.4.
---
srcpkgs/wsjtx/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 15b25e7a6f32..9870ee0efae1 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,11 +1,10 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.4.0
+version=2.5.4
revision=1
-build_wrksrc="wsjtx"
+build_wrksrc=wsjtx
build_style=cmake
-configure_args="-Dhamlib_LIBRARY_DIRS=/usr/lib -DRIGCTLCOM_EXE=
- -DRIGCTL_EXE= -DRIGCTLD_EXE="
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
@@ -16,7 +15,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
+checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
From e84a6dba47fa5030d0bd4254c95d2a6bbbd4fe8e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 5/7] liquid-dsp: update to 1.4.0.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 6 +--
4 files changed, 21 insertions(+), 65 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d75ecdda38dc..b67f9e62a7fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3612,7 +3612,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..c08736f3c4c9 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
maintainer="bra1nwave <brainwave@openmailbox.org>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From 8a310e5d74bd4ea5e32c52554ab9b82a7e40370b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 6/7] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From c2a4c50c308e45246937d699d604ff4a1be82a6a Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 7/7] CubicSDR: update to 0.2.7.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 6 +-
4 files changed, 230 insertions(+), 51 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..d7a9e64bf2a6 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (4 preceding siblings ...)
2022-05-10 0:52 ` classabbyamp
@ 2022-05-10 1:17 ` classabbyamp
2022-05-10 1:27 ` classabbyamp
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-10 1:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 33575 bytes --]
From d05f930c7e6aa968715a207e28e25bd75292bad5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/7] hamlib: update to 4.4.
---
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..0efb9d2bdb69 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From 89241e2f0406a5ec2b88f87eecced390e501871e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/7] qsstv: update to 9.5.8.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 6 +++---
2 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..3719096687a2 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,8 +1,8 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From 83c402570fb4968e77f835a4c113aa82615eb1e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 3/7] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 16 ++++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..29f43e1439a9
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,16 @@
+unused, causes fail on musl
+
+upstreamed in https://sourceforge.net/p/fldigi/fldigi/merge-requests/5/
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
From 65df0723687b0abf86c3191e45df916c297dc784 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:46:42 -0400
Subject: [PATCH 4/7] wsjtx: update to 2.5.4.
---
srcpkgs/wsjtx/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 15b25e7a6f32..9870ee0efae1 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,11 +1,10 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.4.0
+version=2.5.4
revision=1
-build_wrksrc="wsjtx"
+build_wrksrc=wsjtx
build_style=cmake
-configure_args="-Dhamlib_LIBRARY_DIRS=/usr/lib -DRIGCTLCOM_EXE=
- -DRIGCTL_EXE= -DRIGCTLD_EXE="
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
@@ -16,7 +15,7 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
+checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
From 642af5d8042667dffa6e3deef936924cf33b55ed Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 5/7] liquid-dsp: update to 1.4.0.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 6 +--
4 files changed, 21 insertions(+), 65 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d75ecdda38dc..b67f9e62a7fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3612,7 +3612,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..c08736f3c4c9 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
maintainer="bra1nwave <brainwave@openmailbox.org>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From 0f2bdc4647b654ddf680de7bbd47abf143e494bf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 6/7] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From 67bf33b830020b82156675df32260dacdfa1d8a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 7/7] CubicSDR: update to 0.2.7.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 6 +-
4 files changed, 230 insertions(+), 51 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..d7a9e64bf2a6 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -14,7 +14,7 @@ maintainer="bra1nwave <brainwave@openmailbox.org>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (5 preceding siblings ...)
2022-05-10 1:17 ` classabbyamp
@ 2022-05-10 1:27 ` classabbyamp
2022-05-10 18:21 ` [PR PATCH] [Updated] " classabbyamp
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-10 1:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/37045#issuecomment-1121769150
Comment:
cc @bra1nwave (maintainer of most of these templates)
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (6 preceding siblings ...)
2022-05-10 1:27 ` classabbyamp
@ 2022-05-10 18:21 ` classabbyamp
2022-05-10 18:23 ` classabbyamp
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-10 18:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 706 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
- hamlib: update to 4.4.
- qsstv: update to 9.5.8.
- fldigi: update to 4.1.22.
- wsjtx: update to 2.5.4.
- liquid-dsp: update to 1.4.0.
- inspectrum: rebuild for liquid-dsp-1.4.0
- CubicSDR: update to 0.2.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 34567 bytes --]
From 2d6a56356d68406c3d0446d9689f6dcca28a6f2a Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/7] hamlib: update to 4.4, adopt.
---
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 8 ++++----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..3e9e84512853 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -10,11 +10,11 @@ makedepends="gettext-devel libusb-devel libxml2-devel python3-devel readline-dev
tcl-devel"
depends="perl"
short_desc="Library to control radio transceivers and receivers"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From 21349870670687f0969a3ea75af74c047e8ce887 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/7] qsstv: update to 9.5.8, adopt.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 8 ++++----
2 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..39825eef160e 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,19 +1,19 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
qt5-devel v4l-utils-devel"
short_desc="Qt-based slow-scan TV and fax"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From 82d5550dc337d25c37ddfd58362003cf70d3c602 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 3/7] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 16 ++++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..29f43e1439a9
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,16 @@
+unused, causes fail on musl
+
+upstreamed in https://sourceforge.net/p/fldigi/fldigi/merge-requests/5/
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
From 99d06d0a23b69126dd3418fd105e8676adcf5a19 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:46:42 -0400
Subject: [PATCH 4/7] wsjtx: update to 2.5.4, adopt.
---
srcpkgs/wsjtx/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 15b25e7a6f32..b798d0a21208 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,22 +1,21 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.4.0
+version=2.5.4
revision=1
-build_wrksrc="wsjtx"
+build_wrksrc=wsjtx
build_style=cmake
-configure_args="-Dhamlib_LIBRARY_DIRS=/usr/lib -DRIGCTLCOM_EXE=
- -DRIGCTL_EXE= -DRIGCTLD_EXE="
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
depends="qt5-plugin-sqlite"
short_desc="Weak-signal Amateur Radio communication program"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
+checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
From 51dd6da7b8e4bd9fabe8f6c22c426d5d8f9e657f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 5/7] liquid-dsp: update to 1.4.0, adopt.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 8 ++--
4 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d75ecdda38dc..b67f9e62a7fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3612,7 +3612,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..79b964a52d74 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From 076e1b6d6220fec7ecf63cb7158b7849ea19cb82 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 6/7] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From 81ea99c562c7a3c9df04bb5d27d91896abcf1a52 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 7/7] CubicSDR: update to 0.2.7, adopt.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 8 +-
4 files changed, 231 insertions(+), 52 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..49b9b7b6ed46 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -10,11 +10,11 @@ makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel haml
$(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if jack jack-devel)"
short_desc="Cross-Platform Software-Defined Radio (SDR) Application"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (7 preceding siblings ...)
2022-05-10 18:21 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-05-10 18:23 ` classabbyamp
2022-05-11 19:37 ` [PR PATCH] [Updated] " classabbyamp
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-10 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/37045#issuecomment-1122725357
Comment:
@bra1nwave, mind if I adopt these from you?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (8 preceding siblings ...)
2022-05-10 18:23 ` classabbyamp
@ 2022-05-11 19:37 ` classabbyamp
2022-05-17 17:06 ` classabbyamp
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-11 19:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
- hamlib: update to 4.4, adopt.
- qsstv: update to 9.5.8, adopt.
- fldigi: update to 4.1.22.
- wsjtx: update to 2.5.4, adopt.
- liquid-dsp: update to 1.4.0, adopt.
- inspectrum: rebuild for liquid-dsp-1.4.0
- CubicSDR: update to 0.2.7, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 35155 bytes --]
From 25e650659edb9a6c76c65aa0b90ef8c7dbb4d4ae Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/7] hamlib: update to 4.4, adopt.
---
common/shlibs | 4 ++--
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 8 ++++----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d75ecdda38dc..3b27c97e5d2c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3549,8 +3549,8 @@ libfstrcmp.so.0 libfstrcmp-0.7.D001_1
libUMP.so.3 libump-git-20181122_2
libdri2.so.1 libdri2-git-20140317_2
libpst.so.4 libpst-0.6.72_1
-libhamlib.so.4 hamlib-4.2_1
-libhamlib++.so.4 hamlib-4.2_1
+libhamlib.so.4 hamlib-4.4_1
+libhamlib++.so.4 hamlib-4.4_1
libnss_mdns_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns4_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns6_minimal.so.2 nss-mdns-0.14.1_1
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..3e9e84512853 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -10,11 +10,11 @@ makedepends="gettext-devel libusb-devel libxml2-devel python3-devel readline-dev
tcl-devel"
depends="perl"
short_desc="Library to control radio transceivers and receivers"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From c6d5b2e817cdeedc27dec55dceddbed943ee5082 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/7] qsstv: update to 9.5.8, adopt.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 8 ++++----
2 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..39825eef160e 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,19 +1,19 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
qt5-devel v4l-utils-devel"
short_desc="Qt-based slow-scan TV and fax"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From 69610242551258a9111c9eefed9dcca6d460593b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 3/7] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 16 ++++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..29f43e1439a9
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,16 @@
+unused, causes fail on musl
+
+upstreamed in https://sourceforge.net/p/fldigi/fldigi/merge-requests/5/
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
From bf6bfb49295518233d7bb511294c94d4225cf1f7 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:46:42 -0400
Subject: [PATCH 4/7] wsjtx: update to 2.5.4, adopt.
---
srcpkgs/wsjtx/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 15b25e7a6f32..b798d0a21208 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,22 +1,21 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.4.0
+version=2.5.4
revision=1
-build_wrksrc="wsjtx"
+build_wrksrc=wsjtx
build_style=cmake
-configure_args="-Dhamlib_LIBRARY_DIRS=/usr/lib -DRIGCTLCOM_EXE=
- -DRIGCTL_EXE= -DRIGCTLD_EXE="
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
depends="qt5-plugin-sqlite"
short_desc="Weak-signal Amateur Radio communication program"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
+checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
From bd06c4217f010a46636a835f89e2f818a50db9aa Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 5/7] liquid-dsp: update to 1.4.0, adopt.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 8 ++--
4 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3b27c97e5d2c..1e5193be9c65 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3612,7 +3612,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..79b964a52d74 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From d3b4f5d70495274bc96b66ad816a66b35c1adea0 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 6/7] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From 7011e20f89e2ddad0b062a9c1e7f94e9396e0de5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 7/7] CubicSDR: update to 0.2.7, adopt.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 8 +-
4 files changed, 231 insertions(+), 52 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..49b9b7b6ed46 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -10,11 +10,11 @@ makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel haml
$(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if jack jack-devel)"
short_desc="Cross-Platform Software-Defined Radio (SDR) Application"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (9 preceding siblings ...)
2022-05-11 19:37 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-05-17 17:06 ` classabbyamp
2022-05-28 6:56 ` classabbyamp
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-17 17:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
- hamlib: update to 4.4, adopt.
- qsstv: update to 9.5.8, adopt.
- fldigi: update to 4.1.22.
- wsjtx: update to 2.5.4, adopt.
- liquid-dsp: update to 1.4.0, adopt.
- inspectrum: rebuild for liquid-dsp-1.4.0
- CubicSDR: update to 0.2.7, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 35155 bytes --]
From 06f530680113b83053166a8a5971f4cd0919ba4e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/7] hamlib: update to 4.4, adopt.
---
common/shlibs | 4 ++--
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 8 ++++----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7f3e1458f7a6..562aeca72a41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3550,8 +3550,8 @@ libfstrcmp.so.0 libfstrcmp-0.7.D001_1
libUMP.so.3 libump-git-20181122_2
libdri2.so.1 libdri2-git-20140317_2
libpst.so.4 libpst-0.6.72_1
-libhamlib.so.4 hamlib-4.2_1
-libhamlib++.so.4 hamlib-4.2_1
+libhamlib.so.4 hamlib-4.4_1
+libhamlib++.so.4 hamlib-4.4_1
libnss_mdns_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns4_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns6_minimal.so.2 nss-mdns-0.14.1_1
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..3e9e84512853 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -10,11 +10,11 @@ makedepends="gettext-devel libusb-devel libxml2-devel python3-devel readline-dev
tcl-devel"
depends="perl"
short_desc="Library to control radio transceivers and receivers"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From 0a9a917e9aca0b5d3d5cf81b4772b58037977b73 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/7] qsstv: update to 9.5.8, adopt.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 8 ++++----
2 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..39825eef160e 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,19 +1,19 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
qt5-devel v4l-utils-devel"
short_desc="Qt-based slow-scan TV and fax"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From b1329ca536c412c7c34ee32be948d4181c9c2806 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 3/7] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 16 ++++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..29f43e1439a9
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,16 @@
+unused, causes fail on musl
+
+upstreamed in https://sourceforge.net/p/fldigi/fldigi/merge-requests/5/
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
From 823c50a5918b4c0001e478d847aad5141262e3de Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:46:42 -0400
Subject: [PATCH 4/7] wsjtx: update to 2.5.4, adopt.
---
srcpkgs/wsjtx/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 15b25e7a6f32..b798d0a21208 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,22 +1,21 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.4.0
+version=2.5.4
revision=1
-build_wrksrc="wsjtx"
+build_wrksrc=wsjtx
build_style=cmake
-configure_args="-Dhamlib_LIBRARY_DIRS=/usr/lib -DRIGCTLCOM_EXE=
- -DRIGCTL_EXE= -DRIGCTLD_EXE="
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
depends="qt5-plugin-sqlite"
short_desc="Weak-signal Amateur Radio communication program"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
+checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
From 008c722e3966a63a7b9f37c75e18085127f567c8 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 5/7] liquid-dsp: update to 1.4.0, adopt.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 8 ++--
4 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 562aeca72a41..ac164fab8e3a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3613,7 +3613,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..79b964a52d74 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From e6412f717e130269dcde336b13d1fe92e88855b1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 6/7] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From f041813d2b37d09474ef37ea6cdd2413cb23975f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 7/7] CubicSDR: update to 0.2.7, adopt.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 8 +-
4 files changed, 231 insertions(+), 52 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..49b9b7b6ed46 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -10,11 +10,11 @@ makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel haml
$(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if jack jack-devel)"
short_desc="Cross-Platform Software-Defined Radio (SDR) Application"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (10 preceding siblings ...)
2022-05-17 17:06 ` classabbyamp
@ 2022-05-28 6:56 ` classabbyamp
2022-06-01 20:04 ` classabbyamp
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-05-28 6:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
- hamlib: update to 4.4, adopt.
- qsstv: update to 9.5.8, adopt.
- fldigi: update to 4.1.22.
- wsjtx: update to 2.5.4, adopt.
- liquid-dsp: update to 1.4.0, adopt.
- inspectrum: rebuild for liquid-dsp-1.4.0
- CubicSDR: update to 0.2.7, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 35155 bytes --]
From 90b98cb8d425b478e4bdc5dba2ec0111639dbe30 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/7] hamlib: update to 4.4, adopt.
---
common/shlibs | 4 ++--
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 8 ++++----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 74c27e6730a9..096850c755e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3550,8 +3550,8 @@ libfstrcmp.so.0 libfstrcmp-0.7.D001_1
libUMP.so.3 libump-git-20181122_2
libdri2.so.1 libdri2-git-20140317_2
libpst.so.4 libpst-0.6.72_1
-libhamlib.so.4 hamlib-4.2_1
-libhamlib++.so.4 hamlib-4.2_1
+libhamlib.so.4 hamlib-4.4_1
+libhamlib++.so.4 hamlib-4.4_1
libnss_mdns_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns4_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns6_minimal.so.2 nss-mdns-0.14.1_1
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..3e9e84512853 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -10,11 +10,11 @@ makedepends="gettext-devel libusb-devel libxml2-devel python3-devel readline-dev
tcl-devel"
depends="perl"
short_desc="Library to control radio transceivers and receivers"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From 99d0c32b6b0adcdc4f1ae3909704fbc3e024e663 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/7] qsstv: update to 9.5.8, adopt.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 8 ++++----
2 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..39825eef160e 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,19 +1,19 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
qt5-devel v4l-utils-devel"
short_desc="Qt-based slow-scan TV and fax"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From 2f8dd9515a95a9699c58ea06429a1feba60d6ccf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 3/7] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 16 ++++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..29f43e1439a9
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,16 @@
+unused, causes fail on musl
+
+upstreamed in https://sourceforge.net/p/fldigi/fldigi/merge-requests/5/
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
From 18f483fd010f9dd2638824e6451a755ee0af5047 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:46:42 -0400
Subject: [PATCH 4/7] wsjtx: update to 2.5.4, adopt.
---
srcpkgs/wsjtx/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 15b25e7a6f32..b798d0a21208 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,22 +1,21 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.4.0
+version=2.5.4
revision=1
-build_wrksrc="wsjtx"
+build_wrksrc=wsjtx
build_style=cmake
-configure_args="-Dhamlib_LIBRARY_DIRS=/usr/lib -DRIGCTLCOM_EXE=
- -DRIGCTL_EXE= -DRIGCTLD_EXE="
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
depends="qt5-plugin-sqlite"
short_desc="Weak-signal Amateur Radio communication program"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
+checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
From 0108bc96b0711a041fb0e7425d6896117ba9c730 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 5/7] liquid-dsp: update to 1.4.0, adopt.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 8 ++--
4 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 096850c755e3..28a691da6f78 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3613,7 +3613,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..79b964a52d74 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From ccfdad7a9337947567ffc14a57749692167d7839 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 6/7] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From 925272da079bd9a8da79e01b3e9f6f35590d3b1a Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 7/7] CubicSDR: update to 0.2.7, adopt.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 8 +-
4 files changed, 231 insertions(+), 52 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..49b9b7b6ed46 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -10,11 +10,11 @@ makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel haml
$(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if jack jack-devel)"
short_desc="Cross-Platform Software-Defined Radio (SDR) Application"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (11 preceding siblings ...)
2022-05-28 6:56 ` classabbyamp
@ 2022-06-01 20:04 ` classabbyamp
2022-06-07 15:29 ` classabbyamp
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-06-01 20:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
- hamlib: update to 4.4, adopt.
- qsstv: update to 9.5.8, adopt.
- fldigi: update to 4.1.22.
- wsjtx: update to 2.5.4, adopt.
- liquid-dsp: update to 1.4.0, adopt.
- inspectrum: rebuild for liquid-dsp-1.4.0
- CubicSDR: update to 0.2.7, adopt.
- cqrlog: update to 2.5.2, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 37004 bytes --]
From a7408d7a8ba178c65f06287d36adcc34a0029ba5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/8] hamlib: update to 4.4, adopt.
---
common/shlibs | 4 ++--
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 8 ++++----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0541c2dea7e8..cb494b5729d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3550,8 +3550,8 @@ libfstrcmp.so.0 libfstrcmp-0.7.D001_1
libUMP.so.3 libump-git-20181122_2
libdri2.so.1 libdri2-git-20140317_2
libpst.so.4 libpst-0.6.72_1
-libhamlib.so.4 hamlib-4.2_1
-libhamlib++.so.4 hamlib-4.2_1
+libhamlib.so.4 hamlib-4.4_1
+libhamlib++.so.4 hamlib-4.4_1
libnss_mdns_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns4_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns6_minimal.so.2 nss-mdns-0.14.1_1
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..3e9e84512853 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -10,11 +10,11 @@ makedepends="gettext-devel libusb-devel libxml2-devel python3-devel readline-dev
tcl-devel"
depends="perl"
short_desc="Library to control radio transceivers and receivers"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From 86943f0316bb1767441a75678e307d716ca956c5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/8] qsstv: update to 9.5.8, adopt.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 8 ++++----
2 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..39825eef160e 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,19 +1,19 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
qt5-devel v4l-utils-devel"
short_desc="Qt-based slow-scan TV and fax"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From 858b0accac74668b7194c22bbdb430ef94f1583d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 3/8] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 16 ++++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..29f43e1439a9
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,16 @@
+unused, causes fail on musl
+
+upstreamed in https://sourceforge.net/p/fldigi/fldigi/merge-requests/5/
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
From ac5f1739a60138353b2235100e3e0c28c3dea75b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:46:42 -0400
Subject: [PATCH 4/8] wsjtx: update to 2.5.4, adopt.
---
srcpkgs/wsjtx/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 15b25e7a6f32..b798d0a21208 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,22 +1,21 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.4.0
+version=2.5.4
revision=1
-build_wrksrc="wsjtx"
+build_wrksrc=wsjtx
build_style=cmake
-configure_args="-Dhamlib_LIBRARY_DIRS=/usr/lib -DRIGCTLCOM_EXE=
- -DRIGCTL_EXE= -DRIGCTLD_EXE="
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
depends="qt5-plugin-sqlite"
short_desc="Weak-signal Amateur Radio communication program"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
+checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
From 8e3ca979f9eae8a2d34188a5b698db583e89f8ab Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 5/8] liquid-dsp: update to 1.4.0, adopt.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 8 ++--
4 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cb494b5729d2..8b3a97db6489 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3613,7 +3613,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..79b964a52d74 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From c7771f57064ea0e042041588ca7cf6df3746ab4e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 6/8] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From 48abc6e46c0a936d8ff880512ba9ca78c7fa55d1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 7/8] CubicSDR: update to 0.2.7, adopt.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 8 +-
4 files changed, 231 insertions(+), 52 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..49b9b7b6ed46 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -10,11 +10,11 @@ makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel haml
$(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if jack jack-devel)"
short_desc="Cross-Platform Software-Defined Radio (SDR) Application"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
From b89e3b357bf71cad46134b30a058218bb876b53b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 1 Jun 2022 16:02:57 -0400
Subject: [PATCH 8/8] cqrlog: update to 2.5.2, adopt.
---
srcpkgs/cqrlog/INSTALL.msg | 10 ----------
srcpkgs/cqrlog/template | 9 +++++----
2 files changed, 5 insertions(+), 14 deletions(-)
delete mode 100644 srcpkgs/cqrlog/INSTALL.msg
diff --git a/srcpkgs/cqrlog/INSTALL.msg b/srcpkgs/cqrlog/INSTALL.msg
deleted file mode 100644
index ef42cd8a3d16..000000000000
--- a/srcpkgs/cqrlog/INSTALL.msg
+++ /dev/null
@@ -1,10 +0,0 @@
-Depending on which database server you (want to) use, you must install
-the following packages:
-
-For mysql:
-
- * mysql libmysqlclient-devel
-
-For mariadb:
-
- * mariadb libmariadbclient-devel
diff --git a/srcpkgs/cqrlog/template b/srcpkgs/cqrlog/template
index 103d813374ee..da5a1d66a7dc 100644
--- a/srcpkgs/cqrlog/template
+++ b/srcpkgs/cqrlog/template
@@ -1,19 +1,20 @@
# Template file for 'cqrlog'
pkgname=cqrlog
-version=2.4.0
+version=2.5.2
revision=1
archs="x86_64 i686" # Lazarus only supports these platforms
build_style=gnu-makefile
make_use_env=yes
hostmakedepends="lazarus"
makedepends="gtk+-devel"
-depends="xdg-utils"
+depends="xdg-utils mariadb libmariadbclient-devel hamlib"
short_desc="Logging program for amateur radio operators"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://www.cqrlog.com"
+changelog="https://raw.githubusercontent.com/ok2cqr/cqrlog/master/CHANGELOG"
distfiles="https://github.com/ok2cqr/cqrlog/archive/v${version}.tar.gz"
-checksum=f492839803f7fdbaed873308c169ae251e7b9e6c3eb232a20a5773fd0d9acecd
+checksum=82837455dc9f44f43dc7658d330c71cf09c38d794addacab1da936fdcdbefdca
nopie=yes
pre_configure() {
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (12 preceding siblings ...)
2022-06-01 20:04 ` classabbyamp
@ 2022-06-07 15:29 ` classabbyamp
2022-06-12 5:00 ` classabbyamp
2022-06-13 0:33 ` [PR PATCH] [Merged]: " classabbyamp
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-06-07 15:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
- hamlib: update to 4.4, adopt.
- qsstv: update to 9.5.8, adopt.
- fldigi: update to 4.1.22.
- wsjtx: update to 2.5.4, adopt.
- liquid-dsp: update to 1.4.0, adopt.
- inspectrum: rebuild for liquid-dsp-1.4.0
- CubicSDR: update to 0.2.7, adopt.
- cqrlog: update to 2.5.2, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 37004 bytes --]
From bad8f03f2a06d8fc2fa910d241ce1bd1ad33f5df Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/8] hamlib: update to 4.4, adopt.
---
common/shlibs | 4 ++--
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 8 ++++----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e04037a9f2f0..2002408b07ef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3544,8 +3544,8 @@ libfstrcmp.so.0 libfstrcmp-0.7.D001_1
libUMP.so.3 libump-git-20181122_2
libdri2.so.1 libdri2-git-20140317_2
libpst.so.4 libpst-0.6.72_1
-libhamlib.so.4 hamlib-4.2_1
-libhamlib++.so.4 hamlib-4.2_1
+libhamlib.so.4 hamlib-4.4_1
+libhamlib++.so.4 hamlib-4.4_1
libnss_mdns_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns4_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns6_minimal.so.2 nss-mdns-0.14.1_1
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..3e9e84512853 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -10,11 +10,11 @@ makedepends="gettext-devel libusb-devel libxml2-devel python3-devel readline-dev
tcl-devel"
depends="perl"
short_desc="Library to control radio transceivers and receivers"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From 13bc8cb490e0c66f5ecf8282cf95548d2760980b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/8] qsstv: update to 9.5.8, adopt.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 8 ++++----
2 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..39825eef160e 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,19 +1,19 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
qt5-devel v4l-utils-devel"
short_desc="Qt-based slow-scan TV and fax"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From f3e90f24b0284aae9d28e4f3aa0c80da38efa28c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 3/8] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 16 ++++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..29f43e1439a9
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,16 @@
+unused, causes fail on musl
+
+upstreamed in https://sourceforge.net/p/fldigi/fldigi/merge-requests/5/
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
From 3f6f5b9e159f0e264701b8099c56645998981686 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:46:42 -0400
Subject: [PATCH 4/8] wsjtx: update to 2.5.4, adopt.
---
srcpkgs/wsjtx/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 15b25e7a6f32..b798d0a21208 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,22 +1,21 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.4.0
+version=2.5.4
revision=1
-build_wrksrc="wsjtx"
+build_wrksrc=wsjtx
build_style=cmake
-configure_args="-Dhamlib_LIBRARY_DIRS=/usr/lib -DRIGCTLCOM_EXE=
- -DRIGCTL_EXE= -DRIGCTLD_EXE="
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
depends="qt5-plugin-sqlite"
short_desc="Weak-signal Amateur Radio communication program"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
+checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
From 12a525ca6c91cc0ed1e9e2cc72be29671104df08 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 5/8] liquid-dsp: update to 1.4.0, adopt.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 8 ++--
4 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2002408b07ef..633fc7d2011c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3607,7 +3607,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..79b964a52d74 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From 92aa2501fd39ee1a643d0b85c685b6d62ccd5918 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 6/8] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From 90df73e68399df295725f88cea1a86a555c911c3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 7/8] CubicSDR: update to 0.2.7, adopt.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 8 +-
4 files changed, 231 insertions(+), 52 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..49b9b7b6ed46 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -10,11 +10,11 @@ makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel haml
$(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if jack jack-devel)"
short_desc="Cross-Platform Software-Defined Radio (SDR) Application"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
From 4f4282b43e379a184d41d9f505a534a51652f3b0 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 1 Jun 2022 16:02:57 -0400
Subject: [PATCH 8/8] cqrlog: update to 2.5.2, adopt.
---
srcpkgs/cqrlog/INSTALL.msg | 10 ----------
srcpkgs/cqrlog/template | 9 +++++----
2 files changed, 5 insertions(+), 14 deletions(-)
delete mode 100644 srcpkgs/cqrlog/INSTALL.msg
diff --git a/srcpkgs/cqrlog/INSTALL.msg b/srcpkgs/cqrlog/INSTALL.msg
deleted file mode 100644
index ef42cd8a3d16..000000000000
--- a/srcpkgs/cqrlog/INSTALL.msg
+++ /dev/null
@@ -1,10 +0,0 @@
-Depending on which database server you (want to) use, you must install
-the following packages:
-
-For mysql:
-
- * mysql libmysqlclient-devel
-
-For mariadb:
-
- * mariadb libmariadbclient-devel
diff --git a/srcpkgs/cqrlog/template b/srcpkgs/cqrlog/template
index 103d813374ee..da5a1d66a7dc 100644
--- a/srcpkgs/cqrlog/template
+++ b/srcpkgs/cqrlog/template
@@ -1,19 +1,20 @@
# Template file for 'cqrlog'
pkgname=cqrlog
-version=2.4.0
+version=2.5.2
revision=1
archs="x86_64 i686" # Lazarus only supports these platforms
build_style=gnu-makefile
make_use_env=yes
hostmakedepends="lazarus"
makedepends="gtk+-devel"
-depends="xdg-utils"
+depends="xdg-utils mariadb libmariadbclient-devel hamlib"
short_desc="Logging program for amateur radio operators"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://www.cqrlog.com"
+changelog="https://raw.githubusercontent.com/ok2cqr/cqrlog/master/CHANGELOG"
distfiles="https://github.com/ok2cqr/cqrlog/archive/v${version}.tar.gz"
-checksum=f492839803f7fdbaed873308c169ae251e7b9e6c3eb232a20a5773fd0d9acecd
+checksum=82837455dc9f44f43dc7658d330c71cf09c38d794addacab1da936fdcdbefdca
nopie=yes
pre_configure() {
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (13 preceding siblings ...)
2022-06-07 15:29 ` classabbyamp
@ 2022-06-12 5:00 ` classabbyamp
2022-06-13 0:33 ` [PR PATCH] [Merged]: " classabbyamp
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-06-12 5:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/hamlib-4.4
https://github.com/void-linux/void-packages/pull/37045
hamlib, revdeps: update
- hamlib: update to 4.4, adopt.
- qsstv: update to 9.5.8, adopt.
- fldigi: update to 4.1.22.
- wsjtx: update to 2.5.4, adopt.
- liquid-dsp: update to 1.4.0, adopt.
- inspectrum: rebuild for liquid-dsp-1.4.0
- CubicSDR: update to 0.2.7, adopt.
- cqrlog: update to 2.5.2, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/37045.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/hamlib-4.4-37045.patch --]
[-- Type: text/x-diff, Size: 37004 bytes --]
From 04b667d444eab3961a1c28833715fccc47d7ae7c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:13:28 -0400
Subject: [PATCH 1/8] hamlib: update to 4.4, adopt.
---
common/shlibs | 4 ++--
srcpkgs/hamlib/patches/fix-musl.patch | 11 ++++++-----
srcpkgs/hamlib/template | 8 ++++----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 098f15bbf3e5..8d5f49df2ece 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3540,8 +3540,8 @@ libfstrcmp.so.0 libfstrcmp-0.7.D001_1
libUMP.so.3 libump-git-20181122_2
libdri2.so.1 libdri2-git-20140317_2
libpst.so.4 libpst-0.6.72_1
-libhamlib.so.4 hamlib-4.2_1
-libhamlib++.so.4 hamlib-4.2_1
+libhamlib.so.4 hamlib-4.4_1
+libhamlib++.so.4 hamlib-4.4_1
libnss_mdns_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns4_minimal.so.2 nss-mdns-0.14.1_1
libnss_mdns6_minimal.so.2 nss-mdns-0.14.1_1
diff --git a/srcpkgs/hamlib/patches/fix-musl.patch b/srcpkgs/hamlib/patches/fix-musl.patch
index 9dfbb72e821e..4d057e5d0392 100644
--- a/srcpkgs/hamlib/patches/fix-musl.patch
+++ b/srcpkgs/hamlib/patches/fix-musl.patch
@@ -1,11 +1,12 @@
-Index: rigs/prm80/prm80.h
-===================================================================
+upstreamed in Hamlib/Hamlib#1024
+
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@
#define _PRM80_H 1
-
+
#include <hamlib/rig.h>
-+#include <sys/time.h> /* for timeval */
-
++#include <sys/time.h>
+ #include "misc.h"
+
#define BACKEND_VER "20210416"
diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template
index 1296fad6081d..3e9e84512853 100644
--- a/srcpkgs/hamlib/template
+++ b/srcpkgs/hamlib/template
@@ -1,7 +1,7 @@
# Template file for 'hamlib'
pkgname=hamlib
-version=4.2
-revision=2
+version=4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-static --with-perl-binding --with-python-binding
--with-tcl-binding --with-xml-support"
@@ -10,11 +10,11 @@ makedepends="gettext-devel libusb-devel libxml2-devel python3-devel readline-dev
tcl-devel"
depends="perl"
short_desc="Library to control radio transceivers and receivers"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
-checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
+checksum=8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
From 2921574666ebace41cc7149c70ffe8dadcf86bc7 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:46:17 -0400
Subject: [PATCH 2/8] qsstv: update to 9.5.8, adopt.
---
srcpkgs/qsstv/patches/hamlib42.patch | 24 ------------------------
srcpkgs/qsstv/template | 8 ++++----
2 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/qsstv/patches/hamlib42.patch
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
deleted file mode 100644
index f12b1414ade6..000000000000
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rig/rigcontrol.cpp
-===================================================================
---- a/rig/rigcontrol.cpp
-+++ b/rig/rigcontrol.cpp
-@@ -34,6 +34,10 @@
-
- #define MAXCONFLEN 128
-
-+#ifndef HAMLIB_FILPATHLEN
-+#define HAMLIB_FILPATHLEN FILEPATHLEN
-+#endif
-+
-
- QList<const rig_caps *> capsList;
- bool radiolistLoaded=false;
-@@ -87,7 +91,7 @@ bool rigControl::init()
- }
- if(!catParams.serialPort.isEmpty())
- {
-- strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN-1);
-+ strncpy(my_rig->state.rigport.pathname,(const char *)catParams.serialPort.toLatin1().data(),HAMLIB_FILPATHLEN-1);
- }
- // strncpy(my_rig->state.pttport.pathname,(const char *)catParams.serialPort.toLatin1().data(),FILPATHLEN);
- my_rig->state.rigport.parm.serial.rate = catParams.baudrate;
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 73c1080fcadc..39825eef160e 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -1,19 +1,19 @@
# Template file for 'qsstv'
pkgname=qsstv
-version=9.5.3
+version=9.5.8
revision=1
-wrksrc="${pkgname}_${version}"
+wrksrc="${pkgname}"
build_style=qmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools unzip"
makedepends="alsa-lib-devel fftw-devel hamlib-devel libopenjpeg2-devel pulseaudio-devel
qt5-devel v4l-utils-devel"
short_desc="Qt-based slow-scan TV and fax"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="http://users.telenet.be/on4qz/qsstv/"
changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
-checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
+checksum=c03f7fa5c680ced8fd331c25ff3e47440c9aedb48ec7b66255c6aa0ed88e7a68
post_install() {
vinstall icons/qsstv.png 644 usr/share/pixmaps
From 6459cc76a7f3474022c60f868d88fee8ac2b519d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 17:00:07 -0400
Subject: [PATCH 3/8] fldigi: update to 4.1.22.
---
srcpkgs/fldigi/patches/no-error-h.patch | 16 ++++++++++++++++
srcpkgs/fldigi/template | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/fldigi/patches/no-error-h.patch
diff --git a/srcpkgs/fldigi/patches/no-error-h.patch b/srcpkgs/fldigi/patches/no-error-h.patch
new file mode 100644
index 000000000000..29f43e1439a9
--- /dev/null
+++ b/srcpkgs/fldigi/patches/no-error-h.patch
@@ -0,0 +1,16 @@
+unused, causes fail on musl
+
+upstreamed in https://sourceforge.net/p/fldigi/fldigi/merge-requests/5/
+
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-# ifndef __APPLE__
+-# include <error.h>
+-# endif
+ #endif
+
+ #include "config.h"
diff --git a/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
index 7a46fdec280c..5a17b19142ee 100644
--- a/srcpkgs/fldigi/template
+++ b/srcpkgs/fldigi/template
@@ -1,6 +1,6 @@
# Template file for 'fldigi'
pkgname=fldigi
-version=4.1.18
+version=4.1.22
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://www.w1hkj.com"
distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
-checksum=3c7fd84ab3a84ba4525b251e9d56120daee626a3831684a974fdad476f90270d
+checksum=0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe
From 9e0997403a4db053a7bf965916d936bbf3c68320 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 12:46:42 -0400
Subject: [PATCH 4/8] wsjtx: update to 2.5.4, adopt.
---
srcpkgs/wsjtx/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index 15b25e7a6f32..b798d0a21208 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,22 +1,21 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.4.0
+version=2.5.4
revision=1
-build_wrksrc="wsjtx"
+build_wrksrc=wsjtx
build_style=cmake
-configure_args="-Dhamlib_LIBRARY_DIRS=/usr/lib -DRIGCTLCOM_EXE=
- -DRIGCTL_EXE= -DRIGCTLD_EXE="
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
depends="qt5-plugin-sqlite"
short_desc="Weak-signal Amateur Radio communication program"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=2e97c6cc8fc7a6ca7bfcad1966ed8415596f59c374727010d51340c4232e81c8
+checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-qmake qt5-host-tools"
From b145ba5aa3fd615d7dd7eac5415294894ed83f29 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:10:32 -0400
Subject: [PATCH 5/8] liquid-dsp: update to 1.4.0, adopt.
---
common/shlibs | 2 +-
.../liquid-dsp/patches/define-soname.patch | 40 ++++++++-----------
.../liquid-dsp/patches/fix-make-install.patch | 38 ------------------
srcpkgs/liquid-dsp/template | 8 ++--
4 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8d5f49df2ece..c1ed4862ae90 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3603,7 +3603,7 @@ libkodiplatform.so.19.0 kodi-platform-20180302_1
libQuotient.so.0.6 libQuotient-0.6.11_1
libipset.so.13 libipset-7.9_1
libmp3splt.so.0 libmp3splt-0.9.2_1
-libliquid.so.1 liquid-dsp-1.3.1_1
+libliquid.so.1 liquid-dsp-1.4.0_1
libsnore-qt5.so.0.7 snorenotify-0.7.0_1
libsnoresettings-qt5.so.0.7 snorenotify-0.7.0_1
libTECkit.so.0 libteckit-2.5.8_1
diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch
index 425ea08ead00..5d7a293b51d2 100644
--- a/srcpkgs/liquid-dsp/patches/define-soname.patch
+++ b/srcpkgs/liquid-dsp/patches/define-soname.patch
@@ -1,39 +1,33 @@
Description: Add versioned soname to library
Upstream has no versioned soname yet, so this patch adds a Debian
specific soname version until something is added upstream.
-Author: Andreas Bombe <aeb@debian.org>
-Last-Update: 2016-12-11
+
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: git/makefile.in
-===================================================================
---- a/makefile.in 2017-10-28 20:23:47.395786766 +0200
-+++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200
-@@ -1167,7 +1167,7 @@
- $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS)
+--- a/makefile.in
++++ b/makefile.in
+@@ -1221,7 +1221,7 @@
+ ${AR} r $@ $^
+ ${RANLIB} $@
- # linux, et al
-libliquid.so: libliquid.a
+$(SHARED_LIB): libliquid.a
$(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS)
- all: libliquid.a $(SHARED_LIB)
-@@ -1191,6 +1191,7 @@
- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
+ # static archive and library objects
+@@ -1247,6 +1247,7 @@
mkdir -p $(DESTDIR)$(prefix)/include/liquid
- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 644 -p ${ARCHIVE_LIB} ${SHARED_LIB} $(DESTDIR)$(libdir)
++ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
@echo ""
@echo "---------------------------------------------------------"
-Index: git/configure.ac
-===================================================================
---- a/configure.ac 2017-10-28 20:23:47.395786766 +0200
-+++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200
-@@ -242,7 +242,7 @@
- REBIND=""
- ;;
- *)
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,7 +270,7 @@
+ AC_PROG_AR
+
+ AR_LIB=libliquid.a
- SH_LIB=libliquid.so
+ SH_LIB=libliquid.so.1
REBIND=ldconfig
diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
index 61048e6fd9b5..ec9aa6482b45 100644
--- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch
+++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch
@@ -2,33 +2,6 @@ Index: makefile.in
===================================================================
--- a/makefile.in
+++ b/makefile.in
-@@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@
- BUGREPORT := @PACKAGE_BUGREPORT@
-
- # paths
--srcdir := @srcdir@
--libdir := @libdir@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
-+srcdir := @srcdir@
-+libdir := @libdir@
- include_dirs := . include
-
- # programs
-@@ -1188,10 +1188,10 @@ help:
- install: all
- @echo "installing..."
- @echo ""
-- mkdir -p $(DESTDIR)$(exec_prefix)$(libdir)
-+ mkdir -p $(DESTDIR)$(libdir)
- mkdir -p $(DESTDIR)$(prefix)/include/liquid
-- install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(exec_prefix)$(libdir)
-- ln -s $(SHARED_LIB) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.so
-+ install -m 644 -p $(SHARED_LIB) libliquid.a $(DESTDIR)$(libdir)
-+ ln -s $(SHARED_LIB) $(DESTDIR)$(libdir)/libliquid.so
- install -m 644 -p $(addprefix include/,$(headers_install)) $(DESTDIR)$(prefix)/include/liquid
- @echo ""
- @echo "---------------------------------------------------------"
@@ -1201,7 +1201,7 @@ install: all
@echo " libraries by running 'ldconfig' to make the shared"
@echo " object available. You might also need to modify your"
@@ -38,14 +11,3 @@ Index: makefile.in
@echo ""
@echo " Please report bugs to $(BUGREPORT)"
@echo "---------------------------------------------------------"
-@@ -1214,8 +1214,8 @@ install: all
- uninstall:
- @echo "uninstalling..."
- $(RM) $(addprefix $(DESTDIR)$(prefix)/include/liquid/, $(headers_install))
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/libliquid.a
-- $(RM) $(DESTDIR)$(exec_prefix)$(libdir)/$(SHARED_LIB)
-+ $(RM) $(DESTDIR)$(libdir)/libliquid.a
-+ $(RM) $(DESTDIR)$(libdir)/$(SHARED_LIB)
- @echo "done."
-
- ##
diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template
index 432adac62cf7..79b964a52d74 100644
--- a/srcpkgs/liquid-dsp/template
+++ b/srcpkgs/liquid-dsp/template
@@ -1,16 +1,16 @@
# Template file for 'liquid-dsp'
pkgname=liquid-dsp
-version=1.3.1
+version=1.4.0
revision=1
build_style=gnu-configure
-hostmakedepends="automake"
+hostmakedepends="automake libtool"
makedepends="fftw-devel"
short_desc="Signal processing library for software-defined radios (SDR)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="MIT"
homepage="http://liquidsdr.org/"
distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz"
-checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73
+checksum=66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333
pre_configure() {
autoreconf -fi
From 744f9a774b56c444f2dd03c013c94878d8791888 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:28:27 -0400
Subject: [PATCH 6/8] inspectrum: rebuild for liquid-dsp-1.4.0
---
srcpkgs/inspectrum/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template
index 83ba7b100956..ebd8d2318abc 100644
--- a/srcpkgs/inspectrum/template
+++ b/srcpkgs/inspectrum/template
@@ -1,7 +1,7 @@
# Template file for 'inspectrum'
pkgname=inspectrum
version=0.2.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fftw-devel qt5-devel liquid-dsp-devel"
From 5a0cf334e7e707707b9c25557ba74877647dbb04 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 8 May 2022 16:20:34 -0400
Subject: [PATCH 7/8] CubicSDR: update to 0.2.7, adopt.
---
srcpkgs/CubicSDR/patches/fix-build.patch | 24 ++
srcpkgs/CubicSDR/patches/hamlib42.patch | 36 ---
.../patches/revert-migration-to-wx3.1.patch | 215 +++++++++++++++++-
srcpkgs/CubicSDR/template | 8 +-
4 files changed, 231 insertions(+), 52 deletions(-)
create mode 100644 srcpkgs/CubicSDR/patches/fix-build.patch
delete mode 100644 srcpkgs/CubicSDR/patches/hamlib42.patch
diff --git a/srcpkgs/CubicSDR/patches/fix-build.patch b/srcpkgs/CubicSDR/patches/fix-build.patch
new file mode 100644
index 000000000000..5bc4715c8c03
--- /dev/null
+++ b/srcpkgs/CubicSDR/patches/fix-build.patch
@@ -0,0 +1,24 @@
+upstreamed in cjcliffe/CubicSDR#950
+
+--- a/src/visual/WaterfallCanvas.cpp
++++ b/src/visual/WaterfallCanvas.cpp
+@@ -482,7 +482,7 @@
+ }
+
+ }
+-void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
++void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
+ processInputQueue();
+ Refresh();
+ event.RequestMore();
+--- a/src/visual/TuningCanvas.cpp
++++ b/src/visual/TuningCanvas.cpp
+@@ -269,7 +269,7 @@
+ }
+ }
+
+-void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
++void TuningCanvas::OnIdle(wxIdleEvent & event) {
+ if (mouseTracker.mouseDown()) {
+ if (downState != TUNING_HOVER_NONE) {
+ dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch
deleted file mode 100644
index 8e38d8c04073..000000000000
--- a/srcpkgs/CubicSDR/patches/hamlib42.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: external/hamlib/hamlib/rig.h
-===================================================================
---- a/external/hamlib/hamlib/rig.h
-+++ b/external/hamlib/hamlib/rig.h
-@@ -147,7 +147,7 @@ typedef struct rig RIG;
-
- #define RIGNAMSIZ 30
- #define RIGVERSIZ 8
--#define FILPATHLEN 100
-+#define HAMLIB_FILPATHLEN 100
- #define FRQRANGESIZ 30
- #define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
- #define TSLSTSIZ 20 /* max tuning step list size, zero ended */
-@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
- int timeout; /*!< Timeout, in mS */
- int retry; /*!< Maximum number of retries, 0 to disable */
-
-- char pathname[FILPATHLEN]; /*!< Port pathname */
-+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
-
- union {
- struct {
-
-Index: src/rig/RigThread.cpp
-===================================================================
---- a/src/rig/RigThread.cpp
-+++ b/src/rig/RigThread.cpp
-@@ -114,7 +114,7 @@ void RigThread::run() {
- std::cout << "Rig thread starting." << std::endl;
-
- rig = rig_init(rigModel);
-- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
-+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
- rig->state.rigport.parm.serial.rate = serialRate;
- retcode = rig_open(rig);
-
diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
index 6f57501e2647..72ceb980931a 100644
--- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
+++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch
@@ -1,3 +1,5 @@
+updated for 0.2.7.
+
From 531b4ef88b0e7f705c80272328d8588b916f9958 Mon Sep 17 00:00:00 2001
From: Andreas Bombe <aeb@debian.org>
Date: Mon, 11 Jun 2018 23:10:26 +0200
@@ -79,8 +81,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
PrimaryGLContext& CubicSDR::GetContext(wxGLCanvas *canvas) {
PrimaryGLContext *glContext;
if (!m_glContext) {
-- m_glContext = new PrimaryGLContext(canvas, NULL, GetContextAttributes());
-+ m_glContext = new PrimaryGLContext(canvas, NULL);
+- m_glContext = new PrimaryGLContext(canvas, nullptr, GetContextAttributes());
++ m_glContext = new PrimaryGLContext(canvas, nullptr);
}
glContext = m_glContext;
@@ -146,7 +148,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~UITestCanvas();
+ ~UITestCanvas() override;
private:
--- a/src/ui/UITestContext.cpp
@@ -208,7 +210,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ GainCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~GainCanvas();
+ ~GainCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/InteractiveCanvas.cpp
@@ -234,7 +236,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ InteractiveCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- virtual ~InteractiveCanvas();
+ ~InteractiveCanvas() override;
long long getFrequencyAt(float x);
--- a/src/visual/MeterCanvas.cpp
@@ -260,7 +262,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ MeterCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~MeterCanvas();
+ ~MeterCanvas() override;
void setLevel(float level_in);
--- a/src/visual/MeterContext.cpp
@@ -310,7 +312,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ ModeSelectorCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~ModeSelectorCanvas();
+ ~ModeSelectorCanvas() override;
int getHoveredSelection();
--- a/src/visual/ModeSelectorContext.cpp
@@ -370,8 +372,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE()
--ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
-+ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+-ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
++ScopeCanvas::ScopeCanvas(wxWindow *parent, std::vector<int> dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0) {
- glContext = new ScopeContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
@@ -421,7 +423,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
- InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
+ InteractiveCanvas(parent, dispAttrs), waterfallCanvas(nullptr) {
- glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this), wxGetApp().GetContextAttributes());
+ glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
@@ -436,7 +438,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
public:
- SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ SpectrumCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~SpectrumCanvas();
+ ~SpectrumCanvas() override;
//This is public because it is indeed forwarded from
--- a/src/visual/TuningCanvas.cpp
@@ -470,7 +472,7 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
};
- TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
+ TuningCanvas(wxWindow *parent, std::vector<int> dispAttrs);
- ~TuningCanvas();
+ ~TuningCanvas() override;
void setHelpTip(std::string tip);
--- a/src/visual/TuningContext.cpp
@@ -532,3 +534,192 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void setup(unsigned int fft_size_in, int waterfall_lines_in);
void setFFTSize(unsigned int fft_size_in);
~WaterfallCanvas();
+
+--- a/src/AppFrame.h
++++ b/src/AppFrame.h
+@@ -206,22 +206,22 @@
+ /**
+ * UI init functions
+ */
+- ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList);
+- TuningCanvas *makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList);
+- SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- WaterfallCanvas *makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList);
+- MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList);
+- ScopeCanvas *makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList);
+- ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList);
++ ModeSelectorCanvas *makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSignalMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList);
++ TuningCanvas *makeModemTuner(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeModemGainMeter(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeSoloModeButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemMuteButton(wxWindow *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makePeakHoldButton(wxWindow *parent, std::vector<int> attribList);
++ SpectrumCanvas *makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList);
++ WaterfallCanvas *makeWaterfall(wxWindow *parent, std::vector<int> attribList);
++ MeterCanvas *makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList);
++ ScopeCanvas *makeScopeCanvas(wxPanel *parent, std::vector<int> attribList);
++ ModeSelectorCanvas *makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList);
+ ModemProperties *makeModemProperties(wxPanel *parent);
+
+ void initConfigurationSettings();
+@@ -386,4 +386,4 @@
+ #define wxID_RIG_FOLLOW_MODEM 11906
+ #define wxID_RIG_SERIAL_BASE 11950
+ #define wxID_RIG_MODEL_BASE 12000
+-#endif
+\ No newline at end of file
++#endif
+--- a/src/AppFrame.cpp
++++ b/src/AppFrame.cpp
+@@ -461,7 +461,7 @@
+ return pProperties;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemAdvSelectorPanel(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice("ASK");
+ pCanvas->addChoice("APSK");
+@@ -577,7 +577,7 @@
+ #endif
+
+
+-ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, const wxGLAttributes &attribList) {
++ScopeCanvas *AppFrame::makeScopeCanvas(wxPanel *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ScopeCanvas(parent, attribList);
+ pCanvas->setHelpTip("Audio Visuals, drag left/right to toggle Scope or Spectrum, 'B' to toggle decibels display.");
+ pCanvas->SetMinSize(wxSize(128, -1));
+@@ -672,7 +672,7 @@
+ return pMenu;
+ }
+
+-MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeWaterfallSpeedMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
+ pCanvas->setMax(sqrt(1024));
+@@ -682,13 +682,13 @@
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfall(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_FFT_SIZE, DEFAULT_MAIN_WATERFALL_LINES_NB);
+ return pCanvas;
+ }
+
+-MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas * AppFrame::makeSpectrumAvgMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setHelpTip("Spectrum averaging speed, click or drag to adjust.");
+ pCanvas->setMax(1.0);
+@@ -698,7 +698,7 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setShowDb(true);
+ pCanvas->setUseDBOfs(true);
+@@ -706,7 +706,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makePeakHoldButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "P");
+ pCanvas->setPadding(-1, -1);
+@@ -718,7 +718,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemMuteButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "M");
+ pCanvas->setPadding(-1, -1);
+@@ -730,7 +730,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeSoloModeButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "S");
+ pCanvas->setPadding(-1, -1);
+@@ -742,7 +742,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeModemGainMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(2.0);
+ pCanvas->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level.");
+@@ -751,13 +751,13 @@
+ return pCanvas;
+ }
+
+-TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, const wxGLAttributes &attribList) {
++TuningCanvas *AppFrame::makeModemTuner(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new TuningCanvas(parent, attribList);
+ pCanvas->SetMinClientSize(wxSize(200, 28));
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas * AppFrame::makeDeltaLockButton(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new ModeSelectorCanvas(parent, attribList);
+ pCanvas->addChoice(1, "V");
+ pCanvas->setPadding(-1, -1);
+@@ -769,7 +769,7 @@
+ return pCanvas;
+ }
+
+-MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, const wxGLAttributes &attribList) {
++MeterCanvas *AppFrame::makeSignalMeter(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new MeterCanvas(parent, attribList);
+ pCanvas->setMax(DEMOD_SIGNAL_MAX);
+ pCanvas->setMin(DEMOD_SIGNAL_MIN);
+@@ -780,13 +780,13 @@
+ return pCanvas;
+ }
+
+-SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++SpectrumCanvas *AppFrame::makeDemodSpectrumCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new SpectrumCanvas(parent, attribList);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+ return pCanvas;
+ }
+
+-WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttributes &attribList) {
++WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, std::vector<int> attribList) {
+ auto *pCanvas = new WaterfallCanvas(parent, attribList);
+ pCanvas->setup(DEFAULT_DMOD_FFT_SIZE, DEFAULT_DEMOD_WATERFALL_LINES_NB);
+ pCanvas->setView(wxGetApp().getConfig()->getCenterFreq(), 300000);
+@@ -796,7 +796,7 @@
+ return pCanvas;
+ }
+
+-ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
++ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, std::vector<int> attribList) {
+ vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
+
+ #ifdef CUBICSDR_MODEM_EXCLUDE
diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template
index f2eb67e7f9b5..49b9b7b6ed46 100644
--- a/srcpkgs/CubicSDR/template
+++ b/srcpkgs/CubicSDR/template
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
-version=0.2.5
-revision=3
+version=0.2.7
+revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
@@ -10,11 +10,11 @@ makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel haml
$(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if jack jack-devel)"
short_desc="Cross-Platform Software-Defined Radio (SDR) Application"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
-checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
+checksum=790f851e08f1068081a8593dfd4a149c7414e7d70c1f5cafd287331df493b811
build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio"
From 0be9740e87a9865926551a1fef006533baae7f17 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 1 Jun 2022 16:02:57 -0400
Subject: [PATCH 8/8] cqrlog: update to 2.5.2, adopt.
---
srcpkgs/cqrlog/INSTALL.msg | 10 ----------
srcpkgs/cqrlog/template | 9 +++++----
2 files changed, 5 insertions(+), 14 deletions(-)
delete mode 100644 srcpkgs/cqrlog/INSTALL.msg
diff --git a/srcpkgs/cqrlog/INSTALL.msg b/srcpkgs/cqrlog/INSTALL.msg
deleted file mode 100644
index ef42cd8a3d16..000000000000
--- a/srcpkgs/cqrlog/INSTALL.msg
+++ /dev/null
@@ -1,10 +0,0 @@
-Depending on which database server you (want to) use, you must install
-the following packages:
-
-For mysql:
-
- * mysql libmysqlclient-devel
-
-For mariadb:
-
- * mariadb libmariadbclient-devel
diff --git a/srcpkgs/cqrlog/template b/srcpkgs/cqrlog/template
index 103d813374ee..da5a1d66a7dc 100644
--- a/srcpkgs/cqrlog/template
+++ b/srcpkgs/cqrlog/template
@@ -1,19 +1,20 @@
# Template file for 'cqrlog'
pkgname=cqrlog
-version=2.4.0
+version=2.5.2
revision=1
archs="x86_64 i686" # Lazarus only supports these platforms
build_style=gnu-makefile
make_use_env=yes
hostmakedepends="lazarus"
makedepends="gtk+-devel"
-depends="xdg-utils"
+depends="xdg-utils mariadb libmariadbclient-devel hamlib"
short_desc="Logging program for amateur radio operators"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-or-later"
homepage="https://www.cqrlog.com"
+changelog="https://raw.githubusercontent.com/ok2cqr/cqrlog/master/CHANGELOG"
distfiles="https://github.com/ok2cqr/cqrlog/archive/v${version}.tar.gz"
-checksum=f492839803f7fdbaed873308c169ae251e7b9e6c3eb232a20a5773fd0d9acecd
+checksum=82837455dc9f44f43dc7658d330c71cf09c38d794addacab1da936fdcdbefdca
nopie=yes
pre_configure() {
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Merged]: hamlib, revdeps: update
2022-05-08 16:15 [PR PATCH] hamlib: update to 4.4 classabbyamp
` (14 preceding siblings ...)
2022-06-12 5:00 ` classabbyamp
@ 2022-06-13 0:33 ` classabbyamp
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-06-13 0:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
There's a merged pull request on the void-packages repository
hamlib, revdeps: update
https://github.com/void-linux/void-packages/pull/37045
Description:
- hamlib: update to 4.4, adopt.
- qsstv: update to 9.5.8, adopt.
- fldigi: update to 4.1.22.
- wsjtx: update to 2.5.4, adopt.
- liquid-dsp: update to 1.4.0, adopt.
- inspectrum: rebuild for liquid-dsp-1.4.0
- CubicSDR: update to 0.2.7, adopt.
- cqrlog: update to 2.5.2, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
^ permalink raw reply [flat|nested] 17+ messages in thread