From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] hamlib, revdeps: update
Date: Tue, 10 May 2022 02:52:46 +0200 [thread overview]
Message-ID: <20220510005246.tDly_nulTM0AkDXagHvS9dSjYkAhsy6sVwMXAJudiIQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37045@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2022-05-10 0:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
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
2022-05-09 15:13 ` classabbyamp
2022-05-10 0:52 ` classabbyamp [this message]
2022-05-10 1:17 ` classabbyamp
2022-05-10 1:27 ` classabbyamp
2022-05-10 18:21 ` [PR PATCH] [Updated] " classabbyamp
2022-05-10 18:23 ` classabbyamp
2022-05-11 19:37 ` [PR PATCH] [Updated] " classabbyamp
2022-05-17 17:06 ` classabbyamp
2022-05-28 6:56 ` classabbyamp
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220510005246.tDly_nulTM0AkDXagHvS9dSjYkAhsy6sVwMXAJudiIQ@z \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).