Compare commits
No commits in common. "debian/latest" and "upstream/latest" have entirely different histories.
debian/lat
...
upstream/l
|
|
@ -1 +0,0 @@
|
|||
.pc/
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 397 B |
|
|
@ -1,50 +0,0 @@
|
|||
qtsoundmodem (0.0.0.73~rc1-1) UNRELEASED; urgency=medium
|
||||
|
||||
* Upstream import
|
||||
* Patches refreshed
|
||||
|
||||
-- hibby <hibby@velox.lan> Tue, 29 Oct 2024 22:45:40 +0000
|
||||
|
||||
qtsoundmodem (0.0.0.72.1-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
|
||||
|
||||
* New upstream release, I was a bit hasty with that 0.72 release earlier
|
||||
this year
|
||||
|
||||
-- Dave Hibberd <hibby@debian.org> Fri, 06 Sep 2024 18:40:36 +0100
|
||||
|
||||
qtsoundmodem (0.0.0.72-1) unstable; urgency=medium
|
||||
|
||||
* New Upstream release
|
||||
* Override QA settings for function-implicit-declaration
|
||||
|
||||
-- Dave Hibberd <hibby@debian.org> Sat, 13 Apr 2024 19:01:02 +0100
|
||||
|
||||
qtsoundmodem (0.0.0.71-1) unstable; urgency=medium
|
||||
|
||||
* New Upstream Release
|
||||
|
||||
-- Dave Hibberd <d@vehibberd.com> Sun, 17 Dec 2023 14:07:52 +0000
|
||||
|
||||
qtsoundmodem (0.0.0.68-1) unstable; urgency=medium
|
||||
|
||||
* New Upstream
|
||||
|
||||
-- Dave Hibberd <d@vehibberd.com> Tue, 10 Oct 2023 23:03:20 +0100
|
||||
|
||||
qtsoundmodem (0.0.0.67-2) unstable; urgency=medium
|
||||
|
||||
* Fixing libpulse
|
||||
|
||||
-- Dave Hibberd <d@vehibberd.com> Thu, 14 Sep 2023 21:53:22 +0100
|
||||
|
||||
qtsoundmodem (0.0.0.67-1) unstable; urgency=medium
|
||||
|
||||
* New Upstream
|
||||
|
||||
-- Dave Hibberd <d@vehibberd.com> Tue, 12 Sep 2023 21:49:25 +0100
|
||||
|
||||
qtsoundmodem (0.0.0.66-1) unstable; urgency=medium
|
||||
|
||||
* Initial release.
|
||||
|
||||
-- Dave Hibberd <d@vehibberd.com> Tue, 05 Sep 2023 21:13:47 +0100
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
Source: qtsoundmodem
|
||||
Section: hamradio
|
||||
Priority: optional
|
||||
Maintainer: Dave Hibberd <d@vehibberd.com>,
|
||||
Standards-Version: 4.6.2.0
|
||||
Vcs-Browser:
|
||||
Vcs-Git:
|
||||
Homepage: https://www.cantab.net/users/john.wiseman/Documents/QtSoundModem.html
|
||||
Build-Depends: debhelper-compat (= 13), qtbase5-dev, qt5-qmake, libqt5serialport5-dev, libfftw3-dev, libpulse-dev, libasound2-dev, extra-xdg-menus
|
||||
Rules-Requires-Root: no
|
||||
|
||||
Package: qtsoundmodem
|
||||
Architecture: linux-any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Recommends: libpulse0
|
||||
Description: Qt-based Sound Modem & Terminal for packet
|
||||
QtSoundModem (QtSM) is a multi-platform port of UZ7HO's SoundModem
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: QtSoundModem
|
||||
Upstream-Contact: John Wiseman <bpq32@groups.io>
|
||||
Source: https://www.cantab.net/users/john.wiseman/Documents/QtSoundModem.html
|
||||
|
||||
Files: *
|
||||
Copyright: 2000-2023 John Wiseman <bpq32@groups.io>
|
||||
License: GPL-3
|
||||
|
||||
Files: debian/*
|
||||
Copyright: 2023 Dave Hibberd <d@vehibberd.com>
|
||||
License: GPL-3
|
||||
|
||||
License: GPL-3
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
.
|
||||
The GPL License which applies to this package can be found on your Debian
|
||||
system at /usr/share/common-licenses/GPL-3.
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[DEFAULT]
|
||||
debian-branch = debian/latest
|
||||
upstream-branch = upstream/latest
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
include:
|
||||
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
|
||||
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
|
||||
|
||||
reprotest:
|
||||
extends: .test-reprotest-diffoscope
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
QtSoundModem /usr/bin
|
||||
debian/qtsoundmodem.desktop /usr/share/applications
|
||||
debian/QtSoundModem.png /usr/share/pixmaps
|
||||
|
|
@ -1,130 +0,0 @@
|
|||
--- a/tcpCode.cpp
|
||||
+++ b/tcpCode.cpp
|
||||
@@ -775,7 +775,7 @@
|
||||
|
||||
QByteArray datas = HAMLIBsock->readAll();
|
||||
|
||||
- qDebug(datas.data());
|
||||
+ qDebug("SetPTT Error: %s", datas.data());
|
||||
|
||||
}
|
||||
|
||||
--- a/ax25.c
|
||||
+++ b/ax25.c
|
||||
@@ -1758,7 +1758,7 @@
|
||||
|
||||
|
||||
|
||||
-get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
|
||||
+void get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
|
||||
{
|
||||
Byte * digiptr = digi;
|
||||
|
||||
--- a/ax25_l2.c
|
||||
+++ b/ax25_l2.c
|
||||
@@ -374,7 +374,7 @@
|
||||
void delete_I_FRM_port(TAX25Port * AX25Sess)
|
||||
{
|
||||
string * frame;
|
||||
- string path = { 0 };
|
||||
+ Byte path[80];
|
||||
string data= { 0 };
|
||||
|
||||
Byte pid, nr, ns, f_type, f_id, rpt, cr, pf;
|
||||
@@ -386,7 +386,7 @@
|
||||
optimize = TRUE;
|
||||
frame = Strings(&AX25Sess->frame_buf, i);
|
||||
|
||||
- decode_frame(frame->Data, frame->Length, &path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
|
||||
+ decode_frame(frame->Data, frame->Length, path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
|
||||
|
||||
if (f_id == I_I)
|
||||
{
|
||||
@@ -916,7 +916,7 @@
|
||||
|
||||
while (i != AX25Sess->hi_vs)
|
||||
{
|
||||
- i = (i++) & 7;
|
||||
+ i = (i + 1) & 7;
|
||||
need_frame[index++] = i + '0';
|
||||
if (index > 10)
|
||||
{
|
||||
--- a/UZ7HOStuff.h
|
||||
+++ b/UZ7HOStuff.h
|
||||
@@ -1096,6 +1096,20 @@
|
||||
BOOL ConvToAX25(char * callsign, unsigned char * ax25call);
|
||||
void Debugprintf(const char * format, ...);
|
||||
|
||||
+// Hibby's collection for GCC14 and Hardening
|
||||
+void closeTraceLog();
|
||||
+void get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi);
|
||||
+void decode_frame(Byte * frame, int len, Byte * path, string * data, Byte * pid, Byte * nr, Byte * ns, Byte * f_type, Byte * f_id, Byte * rpt, Byte * pf, Byte * cr);
|
||||
+void Demodulator(int snd_ch, int rcvr_nr, float * src_buf, int last, int xcenter);
|
||||
+void sendSamplestoUDP(short * Samples, int nSamples, int Port);
|
||||
+void RSIDProcessSamples(short * Samples, int nSamples);
|
||||
+void ARDOPProcessNewSamples(int chan, short * Samples, int nSamples);
|
||||
+void ProcessRXFrames(int snd_ch);
|
||||
+void doWaterfall(int snd_ch);
|
||||
+void displayWaterfall();
|
||||
+void timer_event();
|
||||
+void CheckPSKWindows();
|
||||
+
|
||||
double pila(double x);
|
||||
|
||||
void AGW_Raw_monitor(int snd_ch, string * data);
|
||||
@@ -1190,4 +1204,4 @@
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
-#endif
|
||||
\ No newline at end of file
|
||||
+#endif
|
||||
--- a/SMMain.c
|
||||
+++ b/SMMain.c
|
||||
@@ -223,8 +223,9 @@
|
||||
if (using48000)
|
||||
{
|
||||
// Need to upsample to 48K. Try just duplicating sample
|
||||
-
|
||||
- uint32_t * ptr = &DMABuffer[2 * Number];
|
||||
+ // split init and initialisation for compiler cleanliness
|
||||
+ uint32_t * ptr;
|
||||
+ ptr = (uint32_t *)&DMABuffer[2 * Number];
|
||||
|
||||
*(&ptr[1]) = *(ptr);
|
||||
*(&ptr[2]) = *(ptr);
|
||||
@@ -388,7 +389,7 @@
|
||||
#endif
|
||||
|
||||
extern int blnBusyStatus;
|
||||
-BusyDet = 5;
|
||||
+int BusyDet = 5;
|
||||
|
||||
#define PLOTWATERFALL
|
||||
|
||||
--- a/sm_main.c
|
||||
+++ b/sm_main.c
|
||||
@@ -796,7 +796,8 @@
|
||||
|
||||
void runModems()
|
||||
{
|
||||
- int snd_ch, res;
|
||||
+ int snd_ch;
|
||||
+ void *res;
|
||||
pthread_t thread[4] = { 0,0,0,0 };
|
||||
|
||||
for (snd_ch = 0; snd_ch < 4; snd_ch++)
|
||||
--- a/il2p.c
|
||||
+++ b/il2p.c
|
||||
@@ -394,6 +394,11 @@
|
||||
|
||||
typedef enum cmdres_e { cr_00 = 2, cr_cmd = 1, cr_res = 0, cr_11 = 3 } cmdres_t;
|
||||
|
||||
+// Hibby: Headers for GCC14
|
||||
+
|
||||
+int set_addrs(packet_t pp, char addrs, int num_addr, cmdres_t cr);
|
||||
+static inline int ax25_get_control_offset(packet_t this_p);
|
||||
+static inline int ax25_get_num_control(packet_t this_p);
|
||||
|
||||
extern packet_t ax25_new(void);
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/tcpCode.cpp
|
||||
+++ b/tcpCode.cpp
|
||||
@@ -732,7 +732,7 @@
|
||||
|
||||
QByteArray datas = FLRigsock->readAll();
|
||||
|
||||
- qDebug(datas.data());
|
||||
+ qDebug() << "SetPTT Failed";
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
--- a/pulse.c
|
||||
+++ b/pulse.c
|
||||
@@ -67,7 +67,7 @@
|
||||
if (handle)
|
||||
return handle; // already done
|
||||
|
||||
- handle = dlopen("libpulse.so", RTLD_LAZY);
|
||||
+ handle = dlopen("libpulse.so.0", RTLD_LAZY);
|
||||
|
||||
if (!handle)
|
||||
{
|
||||
@@ -91,7 +91,7 @@
|
||||
if ((ppa_operation_unref = getModule(handle, "pa_operation_unref")) == NULL) return NULL;
|
||||
if ((ppa_operation_get_state = getModule(handle, "pa_operation_get_state")) == NULL) return NULL;
|
||||
|
||||
- shandle = dlopen("libpulse-simple.so", RTLD_LAZY);
|
||||
+ shandle = dlopen("libpulse-simple.so.0", RTLD_LAZY);
|
||||
|
||||
if (!shandle)
|
||||
{
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
fix-bookworm-build.patch
|
||||
libpulse.patch
|
||||
build-fix.patch
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
SM="/opt/oarc/QtSoundModem"
|
||||
|
||||
if [ -d $SM ]; then
|
||||
rm -rf /opt/oarc/QtSoundModem
|
||||
fi
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Name=QtSoundModem
|
||||
Comment=QtSoundModem
|
||||
Version=1.0
|
||||
Exec=/usr/bin/QtSoundModem
|
||||
GenericName=QtSoundModem
|
||||
Icon=QtSoundModem
|
||||
NoDisplay=false
|
||||
StartupNotify=true
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Education;HamRadio
|
||||
X-AppImage-Version=1
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
export QT_SELECT=5
|
||||
export DEB_BUILD_MAINT_OPTIONS=hardening=+all,qa=-bug-implicit-func
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
|
@ -1 +0,0 @@
|
|||
3.0 (quilt)
|
||||
|
|
@ -1 +0,0 @@
|
|||
debian/QtSoundModem.png
|
||||
Loading…
Reference in New Issue