diff options
Diffstat (limited to 'comms/qsstv/files')
22 files changed, 44 insertions, 171 deletions
diff --git a/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp b/comms/qsstv/files/patch-config_directoriesconfig.cpp index da561d063a53..5aa53a359a98 100644 --- a/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp +++ b/comms/qsstv/files/patch-config_directoriesconfig.cpp @@ -1,5 +1,5 @@ ---- qsstv/config/directoriesconfig.cpp.orig 2019-04-11 14:58:19 UTC -+++ qsstv/config/directoriesconfig.cpp +--- config/directoriesconfig.cpp.orig 2020-06-11 15:15:15 UTC ++++ config/directoriesconfig.cpp @@ -64,7 +64,11 @@ void directoriesConfig::readSettings() txStockImagesPath=qSettings.value("txStockImagesPath",QString(getenv("HOME"))+"/qsstv/tx_stock/").toString(); templatesPath=qSettings.value("templatesPath",QString(getenv("HOME"))+"/qsstv/templates/").toString(); diff --git a/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt b/comms/qsstv/files/patch-documentation_manual_manual.txt index 786f2ad4f413..d0c0930ad23b 100644 --- a/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt +++ b/comms/qsstv/files/patch-documentation_manual_manual.txt @@ -1,6 +1,6 @@ ---- qsstv/documentation/manual/manual.txt.orig 2019-04-18 20:56:53 UTC -+++ qsstv/documentation/manual/manual.txt -@@ -317,7 +317,7 @@ The following tabs are available +--- documentation/manual/manual.txt.orig 2021-08-03 16:19:15 UTC ++++ documentation/manual/manual.txt +@@ -410,7 +410,7 @@ The following tabs are available - Templates: directory where the template files are stored - Audio Records: directory for audio files (where you save/read recorded audio files) - Save TX images in TX SSTV or TX DRM directory: if selected the TX image will be saved diff --git a/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp b/comms/qsstv/files/patch-drmrx_demodulator.cpp index f2a98e45fca0..623d45d1298a 100644 --- a/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp +++ b/comms/qsstv/files/patch-drmrx_demodulator.cpp @@ -1,5 +1,5 @@ ---- qsstv/drmrx/demodulator.cpp.orig 2019-02-26 18:17:40 UTC -+++ qsstv/drmrx/demodulator.cpp +--- drmrx/demodulator.cpp.orig 2019-02-26 18:17:40 UTC ++++ drmrx/demodulator.cpp @@ -947,7 +947,7 @@ bool demodulator::channelEstimation() temp2 += actual_pilots[2 * j] * next_pilots[2 * j + 1] -actual_pilots[2 * j + 1] * next_pilots[2 * j]; diff --git a/comms/qsstv/files/patch-qsstv.pro b/comms/qsstv/files/patch-qsstv.pro new file mode 100644 index 000000000000..d3852f275732 --- /dev/null +++ b/comms/qsstv/files/patch-qsstv.pro @@ -0,0 +1,27 @@ +--- qsstv.pro.orig 2021-07-31 20:57:03 UTC ++++ qsstv.pro +@@ -517,13 +517,13 @@ contains(QMAKE_HOST.arch, arm.*):{ + + + +-dox.path=/usr/share/doc/$$TARGET ++dox.path=%%PREFIX%%/share/doc/$$TARGET + dox.files= $$PWD/manual/* + QMAKE_EXTRA_TARGETS += dox + + + isEmpty(PREFIX) { +- PREFIX = /usr/local ++ PREFIX = %%PREFIX%% + } + target.path = $$PREFIX/bin + +@@ -605,6 +605,6 @@ FORMS += scope/scopeoffset.ui \ + + FORMS += scope/scopeoffset.ui \ + scope/plotform.ui +-INCLUDEPATH += /usr/include/qwt /usr/include/qt5/qwt +-LIBS += -lqwt-qt5 ++INCLUDEPATH += %%PREFIX%%/include/qt5/qwt6 ++LIBS += -L%%PREFIX%%/lib/qt5 -lqwt6 + } diff --git a/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy b/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy deleted file mode 100644 index cf4cf416251f..000000000000 --- a/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy +++ /dev/null @@ -1,11 +0,0 @@ ---- qsstv/documentation/api/api.doxy.orig 2019-04-18 21:02:45 UTC -+++ qsstv/documentation/api/api.doxy -@@ -2170,7 +2170,7 @@ EXTERNAL_PAGES = YES - # interpreter (i.e. the result of 'which perl'). - # The default file (with absolute path) is: /usr/bin/perl. - --PERL_PATH = /usr/bin/perl -+PERL_PATH = %%PERL%% - - #--------------------------------------------------------------------------- - # Configuration options related to the dot tool diff --git a/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy b/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy deleted file mode 100644 index 7e16a05edde2..000000000000 --- a/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy +++ /dev/null @@ -1,11 +0,0 @@ ---- qsstv/documentation/manual/manual.doxy.orig 2019-04-18 21:02:35 UTC -+++ qsstv/documentation/manual/manual.doxy -@@ -1549,7 +1549,7 @@ EXTERNAL_GROUPS = YES - # The PERL_PATH should be the absolute path and name of the perl script - # interpreter (i.e. the result of `which perl'). - --PERL_PATH = /usr/bin/perl -+PERL_PATH = %%PERL%% - - #--------------------------------------------------------------------------- - # Configuration options related to the dot tool diff --git a/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp b/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp deleted file mode 100644 index 5df4f015f840..000000000000 --- a/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- qsstv/drmrx/channeldecode.cpp.orig 2019-03-22 10:11:58 UTC -+++ qsstv/drmrx/channeldecode.cpp -@@ -28,7 +28,6 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <math.h> --#include <malloc.h> - #include <float.h> - #include "drmproto.h" - #include "drmdefs.h" diff --git a/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp b/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp deleted file mode 100644 index 031877f79932..000000000000 --- a/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- qsstv/drmrx/deinterleaver.cpp.orig 2019-03-22 10:11:58 UTC -+++ qsstv/drmrx/deinterleaver.cpp -@@ -29,7 +29,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <malloc.h> - #include <math.h> - int *deinterleaver(int xinA, int tA, int xinB, int tB) - { diff --git a/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp b/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp deleted file mode 100644 index 5b85c9013145..000000000000 --- a/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- qsstv/drmrx/getmode.cpp.orig 2019-04-18 21:11:25 UTC -+++ qsstv/drmrx/getmode.cpp -@@ -34,7 +34,6 @@ - #include <stdlib.h> - #include <math.h> - #include <sys/types.h> --#include <malloc.h> - #include "structtemplates.h" - #include "drmproto.h" - #include "drmdefs.h" diff --git a/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp deleted file mode 100644 index bedee0f9c0c2..000000000000 --- a/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- qsstv/drmrx/mkfacmap.cpp.orig 2019-04-18 21:11:46 UTC -+++ qsstv/drmrx/mkfacmap.cpp -@@ -27,7 +27,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <malloc.h> - int mkfacmap(int robustness_mode, int K_dc, int K_modulo, int /*@out@ */ *FACmap) - { - int elem_cnt, i; diff --git a/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp deleted file mode 100644 index 15545545b48f..000000000000 --- a/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- qsstv/drmrx/mkmscmap.cpp.orig 2019-04-18 21:11:33 UTC -+++ qsstv/drmrx/mkmscmap.cpp -@@ -32,7 +32,6 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <math.h> --#include <malloc.h> - #include "drmdefs.h" - #include "structtemplates.h" - #include "drmproto.h" diff --git a/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp deleted file mode 100644 index 0fed855d4106..000000000000 --- a/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- qsstv/drmrx/psdcmean.cpp.orig 2019-04-18 21:11:55 UTC -+++ qsstv/drmrx/psdcmean.cpp -@@ -36,7 +36,6 @@ - #include <stdlib.h> - #include <math.h> - #include <sys/types.h> --#include <malloc.h> - void cfft(float *, int, int); - void psdcmean(float *rsbuf, float *cpsd, int lblock, int nblocks) - { diff --git a/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp deleted file mode 100644 index 2d794e96216a..000000000000 --- a/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- qsstv/drmrx/psdmean.cpp.orig 2019-04-18 21:12:04 UTC -+++ qsstv/drmrx/psdmean.cpp -@@ -36,7 +36,6 @@ - #include <stdlib.h> - #include <math.h> - #include <sys/types.h> --#include <malloc.h> - void rfft(float *, int, int); - void psdmean(float *input, float *psd, int lblock, int nblocks) - { diff --git a/comms/qsstv/files/patch-qsstv_qsstv.pro b/comms/qsstv/files/patch-qsstv_qsstv.pro deleted file mode 100644 index 59eebdad82ea..000000000000 --- a/comms/qsstv/files/patch-qsstv_qsstv.pro +++ /dev/null @@ -1,30 +0,0 @@ ---- qsstv/qsstv.pro.orig 2019-04-18 09:34:09 UTC -+++ qsstv/qsstv.pro -@@ -523,7 +523,7 @@ contains(QMAKE_HOST.arch, arm.*):{ - } - else { - message(not arm) -- CONFIG(debug ,debug|release){ -+ CONFIG(dox){ - dox.commands = cd $$PWD/documentation/manual ;doxygen manual.doxy; cd $$PWD/documentation/api ;doxygen api.doxy; - dox.depends= FORCE - PRE_TARGETDEPS += dox -@@ -535,15 +535,15 @@ contains(QMAKE_HOST.arch, arm.*):{ - - - --dox.path=/usr/share/doc/$$TARGET --dox.files= $$PWD/manual/* -+dox.path=%%DOCSDIR%% -+dox.files= documentation/manual/* - QMAKE_EXTRA_TARGETS += dox - - - isEmpty(PREFIX) { - PREFIX = /usr/local - } --target.path = $$PREFIX/bin -+target.path = %%PREFIX%%/bin - - shortcutfiles.files =qsstv.desktop - shortcutfiles.path = $$PREFIX/share/applications/ diff --git a/comms/qsstv/files/patch-qsstv_utils_color.cpp b/comms/qsstv/files/patch-qsstv_utils_color.cpp deleted file mode 100644 index 2a073fa6b798..000000000000 --- a/comms/qsstv/files/patch-qsstv_utils_color.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- qsstv/utils/color.cpp.orig 2017-11-16 17:14:48 UTC -+++ qsstv/utils/color.cpp -@@ -41,7 +41,7 @@ - #include <math.h> - #include <assert.h> - --#include "openjpeg.h" -+#include "openjpeg-2.4/openjpeg.h" - #include "color.h" - - diff --git a/comms/qsstv/files/patch-qsstv_utils_jp2io.h b/comms/qsstv/files/patch-qsstv_utils_jp2io.h deleted file mode 100644 index 25823b7d4e9e..000000000000 --- a/comms/qsstv/files/patch-qsstv_utils_jp2io.h +++ /dev/null @@ -1,10 +0,0 @@ ---- qsstv/utils/jp2io.h.orig 2016-08-23 19:39:12 UTC -+++ qsstv/utils/jp2io.h -@@ -1,6 +1,6 @@ - #ifndef JP2READER_H - #define JP2READER_H --#include "openjpeg.h" -+#include "openjpeg-2.4/openjpeg.h" - - #include <QString> - #include <QImage> diff --git a/comms/qsstv/files/patch-qwt_qwt.pro b/comms/qsstv/files/patch-qwt_qwt.pro deleted file mode 100644 index e39f63cc8ccf..000000000000 --- a/comms/qsstv/files/patch-qwt_qwt.pro +++ /dev/null @@ -1,11 +0,0 @@ ---- qwt/qwt.pro.orig 2019-03-06 17:04:10 UTC -+++ qwt/qwt.pro -@@ -159,6 +159,8 @@ HEADERS += \ - unix:!symbian { - maemo5 { - target.path = /opt/usr/lib -+ freebsd { -+ target.path = /usr/local/lib - } else { - target.path = /usr/lib - } diff --git a/comms/qsstv/files/patch-qsstv_rig_rigcontrol.cpp b/comms/qsstv/files/patch-rig_rigcontrol.cpp index 61c817c55869..e0af8c6b362b 100644 --- a/comms/qsstv/files/patch-qsstv_rig_rigcontrol.cpp +++ b/comms/qsstv/files/patch-rig_rigcontrol.cpp @@ -1,5 +1,5 @@ ---- qsstv/rig/rigcontrol.cpp.orig 2019-04-19 04:54:51 UTC -+++ qsstv/rig/rigcontrol.cpp +--- rig/rigcontrol.cpp.orig 2019-04-19 04:54:51 UTC ++++ rig/rigcontrol.cpp @@ -377,7 +377,7 @@ void rigControl::activatePTT(bool b) if (catParams.pttSerialPort.isEmpty()) return; if(serialP==0) diff --git a/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp b/comms/qsstv/files/patch-sound_soundalsa.cpp index 496ad76fe6e2..10768b88f714 100644 --- a/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp +++ b/comms/qsstv/files/patch-sound_soundalsa.cpp @@ -1,5 +1,5 @@ ---- qsstv/sound/soundalsa.cpp.orig 2019-04-18 09:34:09 UTC -+++ qsstv/sound/soundalsa.cpp +--- sound/soundalsa.cpp.orig 2019-04-18 09:34:09 UTC ++++ sound/soundalsa.cpp @@ -64,6 +64,8 @@ void soundAlsa::prepareCapture() { int err; diff --git a/comms/qsstv/files/patch-qsstv_videocapt_cameradialog.cpp b/comms/qsstv/files/patch-videocapt_cameradialog.cpp index 17cd1e7072e3..8bd4682d6051 100644 --- a/comms/qsstv/files/patch-qsstv_videocapt_cameradialog.cpp +++ b/comms/qsstv/files/patch-videocapt_cameradialog.cpp @@ -1,5 +1,5 @@ ---- qsstv/videocapt/cameradialog.cpp.orig 2019-04-19 07:07:41 UTC -+++ qsstv/videocapt/cameradialog.cpp +--- videocapt/cameradialog.cpp.orig 2019-04-19 07:07:41 UTC ++++ videocapt/cameradialog.cpp @@ -220,7 +220,8 @@ void cameraDialog::getCameraInfo(QString formats=getFormatList(fd); if(ok) diff --git a/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h b/comms/qsstv/files/patch-videocapt_imagesettings.h index e77dffd3109a..c8ddd9332e9f 100644 --- a/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h +++ b/comms/qsstv/files/patch-videocapt_imagesettings.h @@ -1,5 +1,5 @@ ---- qsstv/videocapt/imagesettings.h.orig 2019-04-18 21:14:43 UTC -+++ qsstv/videocapt/imagesettings.h +--- videocapt/imagesettings.h.orig 2019-04-18 21:14:43 UTC ++++ videocapt/imagesettings.h @@ -41,7 +41,6 @@ #ifndef IMAGESETTINGS_H #define IMAGESETTINGS_H diff --git a/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp b/comms/qsstv/files/patch-videocapt_v4l2control.cpp index 98fca437cc8a..7d38ac9f6851 100644 --- a/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp +++ b/comms/qsstv/files/patch-videocapt_v4l2control.cpp @@ -1,5 +1,5 @@ ---- qsstv/videocapt/v4l2control.cpp.orig 2019-04-18 21:15:23 UTC -+++ qsstv/videocapt/v4l2control.cpp +--- videocapt/v4l2control.cpp.orig 2019-04-18 21:15:23 UTC ++++ videocapt/v4l2control.cpp @@ -32,7 +32,6 @@ #include <cerrno> #include <cstring> |