Date: Tue, 26 Jun 2018 15:47:51 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473391 - in head/comms/qsstv: . files Message-ID: <201806261547.w5QFlpr8096052@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Tue Jun 26 15:47:51 2018 New Revision: 473391 URL: https://svnweb.freebsd.org/changeset/ports/473391 Log: 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 Deleted: head/comms/qsstv/files/patch-qsstv_sstv_sstvrx.cpp Modified: head/comms/qsstv/Makefile head/comms/qsstv/distinfo head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html (contents, props changed) head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_qsstv.pro (contents, props changed) head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_utils_color.cpp (contents, props changed) head/comms/qsstv/files/patch-qsstv_utils_jp2io.h (contents, props changed) head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h (contents, props changed) head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp (contents, props changed) head/comms/qsstv/files/patch-qwt_qwt.pro (contents, props changed) head/comms/qsstv/pkg-plist Modified: head/comms/qsstv/Makefile ============================================================================== --- head/comms/qsstv/Makefile Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/Makefile Tue Jun 26 15:47:51 2018 (r473391) @@ -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 Modified: head/comms/qsstv/distinfo ============================================================================== --- head/comms/qsstv/distinfo Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/distinfo Tue Jun 26 15:47:51 2018 (r473391) @@ -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 Modified: head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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(); Modified: head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html ============================================================================== --- head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html Tue Jun 26 15:47:51 2018 (r473391) @@ -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> Modified: head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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> Modified: head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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 @@ Modified: head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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]; Modified: head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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> Modified: head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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 @@ Modified: head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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> Modified: head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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> Modified: head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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> Modified: head/comms/qsstv/files/patch-qsstv_qsstv.pro ============================================================================== --- head/comms/qsstv/files/patch-qsstv_qsstv.pro Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_qsstv.pro Tue Jun 26 15:47:51 2018 (r473391) @@ -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 Modified: head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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); Modified: head/comms/qsstv/files/patch-qsstv_utils_color.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_utils_color.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_utils_color.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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" Modified: head/comms/qsstv/files/patch-qsstv_utils_jp2io.h ============================================================================== --- head/comms/qsstv/files/patch-qsstv_utils_jp2io.h Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_utils_jp2io.h Tue Jun 26 15:47:51 2018 (r473391) @@ -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 Modified: head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h ============================================================================== --- head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h Tue Jun 26 15:47:51 2018 (r473391) @@ -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 Modified: head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp ============================================================================== --- head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp Tue Jun 26 15:47:51 2018 (r473391) @@ -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> Modified: head/comms/qsstv/files/patch-qwt_qwt.pro ============================================================================== --- head/comms/qsstv/files/patch-qwt_qwt.pro Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/files/patch-qwt_qwt.pro Tue Jun 26 15:47:51 2018 (r473391) @@ -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 } Modified: head/comms/qsstv/pkg-plist ============================================================================== --- head/comms/qsstv/pkg-plist Tue Jun 26 15:33:26 2018 (r473390) +++ head/comms/qsstv/pkg-plist Tue Jun 26 15:47:51 2018 (r473391) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806261547.w5QFlpr8096052>