Updated to 9.2.6

    20170817 QSSTV 9.2.6
        Changed the .pro file for autodetecing correct libopenjpg2 (DL1JBE -Tom)
        ftp transfer - initialize bug fix (VK6MN- Mike)
        Help manual -> path correction and corrected some typo's (DJ0MBA- Marinus)
        SSTV initialize bug fix (Adrian)
        Camera support for Raspberry PI Cam
        fixed audio loopback use
        fixed transmission after stop, image was not restarted at top

    20161022 QSSTV 9.2.5
        Screen size reduced for use with smaller screens-fixed.
        rig control - added capabilities test.

PR:		ports/229140
Submitted by:	takefu@airport.fm

21 files changed, 33 insertions, 60 deletions

diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index b2d4e0196f34..eeac7cc66b5f 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qsstv
-PORTVERSION=	9.2.4
-PORTREVISION=	3
+PORTVERSION=	9.2.6
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://users.telenet.be/on4qz/qsstv/downloads/ \
 		LOCAL/db
@@ -22,7 +21,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libv4l2.so:multimedia/libv4l
 BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 
-USES=		qmake
+USES=		qmake pkgconfig
 USE_QT5=	buildtools core gui network widgets xml
 USE_GL+=	gl
 
diff --git a/comms/qsstv/distinfo b/comms/qsstv/distinfo
index 14c5f21fb8c4..f0989382fe19 100644
--- a/comms/qsstv/distinfo
+++ b/comms/qsstv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482443425
-SHA256 (qsstv_9.2.4.tar.gz) = 509c01e0d966ce622478d89cc168acb66327af452d2ef593731c23f35c8db3c5
-SIZE (qsstv_9.2.4.tar.gz) = 11883587
+TIMESTAMP = 1520992341
+SHA256 (qsstv_9.2.6.tar.gz) = 080445e3ec6e492de642c0f4b2d2ab7616cda2a9ca72b9652bd82534a607a76b
+SIZE (qsstv_9.2.6.tar.gz) = 11385735
diff --git a/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp b/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp
index d19b824f3d98..d788b5507590 100644
--- a/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp
+++ b/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp
@@ -1,13 +1,13 @@
---- qsstv/config/directoriesconfig.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/config/directoriesconfig.cpp.orig	2017-11-16 17:14:48 UTC
 +++ qsstv/config/directoriesconfig.cpp
 @@ -43,7 +43,11 @@ void directoriesConfig::readSettings()
    txStockImagesPath=qSettings.value("txStockImagesPath",QString(getenv("HOME"))+"/tx_stock/").toString();
    templatesPath=qSettings.value("templatesPath",QString(getenv("HOME"))+"/templates/").toString();
    audioPath=qSettings.value("audioPath",QString(getenv("HOME"))+"/audio/").toString();
 +#ifdef WITH_DOCS
-+  docURL=qSettings.value("docURL","file://%%DOCSDIR%%/manual").toString();
++  docURL=qSettings.value("docURL","file:///usr/local/share/doc/qsstv/manual").toString();
 +#else
-   docURL=qSettings.value("docURL","http://users.telenet.be/on4qz/qsstv_9/manual").toString();
+   docURL=qSettings.value("docURL","http://users.telenet.be/on4qz/qsstv/manual").toString();
 +#endif
    saveTXimages=qSettings.value("saveTXimages",false).toBool();
    qSettings.endGroup();
diff --git a/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html b/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html
index 98f7e21e5f12..f9f67604f674 100644
--- a/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html
+++ b/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html
@@ -1,11 +1,11 @@
---- qsstv/documentation/manual/manual/gettingstarted.html.orig	2016-04-09 01:25:31 UTC
+--- qsstv/documentation/manual/manual/gettingstarted.html.orig	2016-10-22 14:05:51 UTC
 +++ qsstv/documentation/manual/manual/gettingstarted.html
 @@ -107,7 +107,7 @@ This information can also be used in tem
  <li>TX Images: directory for images to transmit</li>
  <li>Templates: directory where the template files are stored</li>
  <li>Audio Records: directory for audio files (where you save/read recorded audio files)</li>
 -<li>Documentation: URL of the user manual (if you copied the manual locally then you can point to it with e.g. <a href="file:///usr/share/doc/qsstv/manual">file:///usr/share/doc/qsstv/manual</a> <br />
-+<li>Documentation: URL of the user manual (if you copied the manual locally then you can point to it with e.g. <a href="file://%%DOCSDIR%%/manual">file://%%DOCSDIR%%/qsstv/manual</a> <br />
++<li>Documentation: URL of the user manual (if you copied the manual locally then you can point to it with e.g. <a href="file:///usr/local/share/doc/qsstv/manual">file:///usr/local/share/doc/qsstv/qsstv/manual</a> <br />
  <br />
  </li>
  </ul>
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp b/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp
index f08472d1e2a3..4263284ab43b 100644
--- a/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp
@@ -1,4 +1,4 @@
---- qsstv/drmrx/channeldecode.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/drmrx/channeldecode.cpp.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/drmrx/channeldecode.cpp
 @@ -29,7 +29,6 @@
  #include <stdlib.h>
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp b/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp
index 924dd457e1d7..5f7f27b1b513 100644
--- a/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp
@@ -1,4 +1,4 @@
---- qsstv/drmrx/deinterleaver.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/drmrx/deinterleaver.cpp.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/drmrx/deinterleaver.cpp
 @@ -30,7 +30,6 @@
  
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp b/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp
index e4f1e3945761..26516f0ba6bd 100644
--- a/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp
@@ -1,4 +1,4 @@
---- qsstv/drmrx/demodulator.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/drmrx/demodulator.cpp.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/drmrx/demodulator.cpp
 @@ -946,7 +946,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_drmrx_getmode.cpp b/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp
index ee5215b6cbbf..74921f0436f9 100644
--- a/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp
@@ -1,4 +1,4 @@
---- qsstv/drmrx/getmode.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/drmrx/getmode.cpp.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/drmrx/getmode.cpp
 @@ -34,7 +34,6 @@
  #include <stdlib.h>
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp
index 78abf53439de..47578644b487 100644
--- a/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp
@@ -1,4 +1,4 @@
---- qsstv/drmrx/mkfacmap.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/drmrx/mkfacmap.cpp.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/drmrx/mkfacmap.cpp
 @@ -27,7 +27,6 @@
  
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp
index 5e0750ef646e..883fc78c85cc 100644
--- a/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp
@@ -1,4 +1,4 @@
---- qsstv/drmrx/mkmscmap.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/drmrx/mkmscmap.cpp.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/drmrx/mkmscmap.cpp
 @@ -32,7 +32,6 @@
  #include <stdlib.h>
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp
index ee2e703609fb..ad0ffd88e0b4 100644
--- a/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp
@@ -1,4 +1,4 @@
---- qsstv/drmrx/psdcmean.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/drmrx/psdcmean.cpp.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/drmrx/psdcmean.cpp
 @@ -36,7 +36,6 @@
  #include <stdlib.h>
diff --git a/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp
index 535d316bf79f..a60822631d6d 100644
--- a/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp
+++ b/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp
@@ -1,4 +1,4 @@
---- qsstv/drmrx/psdmean.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/drmrx/psdmean.cpp.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/drmrx/psdmean.cpp
 @@ -36,7 +36,6 @@
  #include <stdlib.h>
diff --git a/comms/qsstv/files/patch-qsstv_qsstv.pro b/comms/qsstv/files/patch-qsstv_qsstv.pro
index f85a7b32a5f1..affcaa1af969 100644
--- a/comms/qsstv/files/patch-qsstv_qsstv.pro
+++ b/comms/qsstv/files/patch-qsstv_qsstv.pro
@@ -1,15 +1,6 @@
---- qsstv/qsstv.pro.orig	2016-04-08 23:08:29 UTC
+--- qsstv/qsstv.pro.orig	2018-06-25 14:41:05 UTC
 +++ qsstv/qsstv.pro
-@@ -15,7 +15,7 @@ QMAKE_CXXFLAGS_RELEASE += -O3
- 
- TARGET = qsstv
- TEMPLATE = app
--INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc  /usr/include/openjpeg-2.1
-+INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc  %%LOCALBASE%%/include/openjpeg-2.1
- 
- 
- SOURCES += main.cpp\
-@@ -515,8 +515,8 @@ PRE_TARGETDEPS       +=    dox
+@@ -523,8 +523,8 @@ PRE_TARGETDEPS       +=    dox
  message(dox will be generated)
  }
  
@@ -20,7 +11,7 @@
  QMAKE_EXTRA_TARGETS   +=   dox
  
  
-@@ -524,5 +524,5 @@ QMAKE_EXTRA_TARGETS   +=   dox
+@@ -532,5 +532,5 @@ QMAKE_EXTRA_TARGETS   +=   dox
  RESOURCES += \
      qsstv.qrc
  
diff --git a/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp b/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp
index 37ed8a83b959..4a0a9adc3fa6 100644
--- a/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp
+++ b/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp
@@ -1,4 +1,4 @@
---- qsstv/sound/soundalsa.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/sound/soundalsa.cpp.orig	2016-08-28 16:01:40 UTC
 +++ qsstv/sound/soundalsa.cpp
 @@ -64,6 +64,8 @@ void soundAlsa::prepareCapture()
  {
@@ -27,7 +27,7 @@
            snd_pcm_prepare (captureHandle );
            snd_pcm_start (captureHandle);
            errorOut() << "Overrun";
-@@ -140,6 +146,8 @@ int soundAlsa::write(uint numFrames)
+@@ -142,6 +148,8 @@ int soundAlsa::write(uint numFrames)
       else if ( framesWritten == -EPIPE )
        {
          /* underrun */
@@ -36,7 +36,7 @@
          error = snd_pcm_prepare (playbackHandle);
          if ( error < 0 )
            {
-@@ -337,5 +345,42 @@ void getCardList(QStringList &alsaInputL
+@@ -360,5 +368,42 @@ void getCardList(QStringList &alsaInputL
      n++;
    }
    snd_device_name_free_hint(hints);
diff --git a/comms/qsstv/files/patch-qsstv_sstv_sstvrx.cpp b/comms/qsstv/files/patch-qsstv_sstv_sstvrx.cpp
deleted file mode 100644
index a1aaa043e75b..000000000000
--- a/comms/qsstv/files/patch-qsstv_sstv_sstvrx.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- qsstv/sstv/sstvrx.cpp.orig	2017-06-26 08:50:09.939282000 -0700
-+++ qsstv/sstv/sstvrx.cpp	2017-06-26 08:50:22.482587000 -0700
-@@ -35,6 +35,7 @@
- {
-   syncFilterPtr=NULL;
-   videoFilterPtr=NULL;
-+  syncProcPtr=NULL;
- #ifndef QT_NO_DEBUG
-   scopeViewerData=new scopeView("Data Scope");
-   scopeViewerSyncNarrow=new scopeView("Sync Scope Narrow");
diff --git a/comms/qsstv/files/patch-qsstv_utils_color.cpp b/comms/qsstv/files/patch-qsstv_utils_color.cpp
index d4e8c2e505e5..c09f150e3130 100644
--- a/comms/qsstv/files/patch-qsstv_utils_color.cpp
+++ b/comms/qsstv/files/patch-qsstv_utils_color.cpp
@@ -1,10 +1,10 @@
---- qsstv/utils/color.cpp.orig	2016-08-23 19:39:12 UTC
+--- qsstv/utils/color.cpp.orig	2017-11-16 17:14:48 UTC
 +++ qsstv/utils/color.cpp
-@@ -42,7 +42,7 @@
+@@ -41,7 +41,7 @@
+ #include <math.h>
  #include <assert.h>
  
- //#include "opj_apps_config.h"
--#include "openjpeg-2.1/openjpeg.h"
+-#include "openjpeg.h"
 +#include "openjpeg-2.3/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
index 6990c4c8630d..bee3505487af 100644
--- a/comms/qsstv/files/patch-qsstv_utils_jp2io.h
+++ b/comms/qsstv/files/patch-qsstv_utils_jp2io.h
@@ -1,4 +1,4 @@
---- qsstv/utils/jp2io.h.orig	2016-04-08 23:08:29 UTC
+--- qsstv/utils/jp2io.h.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/utils/jp2io.h
 @@ -1,6 +1,6 @@
  #ifndef JP2READER_H
diff --git a/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h b/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h
index 2bed913086b1..4a34289685a2 100644
--- a/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h
+++ b/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h
@@ -1,4 +1,4 @@
---- qsstv/videocapt/imagesettings.h.orig	2016-04-08 23:08:29 UTC
+--- qsstv/videocapt/imagesettings.h.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/videocapt/imagesettings.h
 @@ -41,7 +41,6 @@
  #ifndef IMAGESETTINGS_H
diff --git a/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp b/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp
index 02f8d99cdf7f..008c8c0722f9 100644
--- a/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp
+++ b/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp
@@ -1,4 +1,4 @@
---- qsstv/videocapt/v4l2control.cpp.orig	2016-04-08 23:08:29 UTC
+--- qsstv/videocapt/v4l2control.cpp.orig	2016-08-23 19:39:12 UTC
 +++ qsstv/videocapt/v4l2control.cpp
 @@ -32,7 +32,7 @@
  #include <cerrno>
diff --git a/comms/qsstv/files/patch-qwt_qwt.pro b/comms/qsstv/files/patch-qwt_qwt.pro
index 00f628eb8d2c..784c174c0d7e 100644
--- a/comms/qsstv/files/patch-qwt_qwt.pro
+++ b/comms/qsstv/files/patch-qwt_qwt.pro
@@ -1,11 +1,11 @@
---- qwt/qwt.pro.orig	2016-04-08 23:08:29 UTC
+--- qwt/qwt.pro.orig	2016-08-23 19:39:13 UTC
 +++ qwt/qwt.pro
 @@ -206,6 +206,8 @@ HEADERS += \
  unix:!symbian {
      maemo5 {
          target.path = /opt/usr/lib
 +    freebsd {
-+        target.path = %%PREFIX%%/lib
++        target.path = /usr/local/lib
      } else {
          target.path = /usr/lib
      }
diff --git a/comms/qsstv/pkg-plist b/comms/qsstv/pkg-plist
index a752ad8ecce5..edf1ad676a52 100644
--- a/comms/qsstv/pkg-plist
+++ b/comms/qsstv/pkg-plist
@@ -58,19 +58,12 @@ bin/qsstv
 %%PORTDOCS%%%%DOCSDIR%%/manual/Copying.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_image_options.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_rx.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_template.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_templates.png
-%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_tx.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_txdrm.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/RXDRM.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/RXSSTV.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/TXDRM.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/TXSSTV.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/_copying.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/_r_x_d_r_m.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/_r_x_s_s_t_v.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/_t_x_d_r_m.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/_t_x_s_s_t_v.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/arrow.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/arrowdown.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/arrowright.png