Index: head/comms/qsstv/Makefile =================================================================== --- head/comms/qsstv/Makefile (revision 499329) +++ head/comms/qsstv/Makefile (revision 499330) @@ -1,51 +1,52 @@ # $FreeBSD$ PORTNAME= qsstv -PORTVERSION= 9.2.6 -PORTREVISION= 2 +PORTVERSION= 9.3.3 CATEGORIES= comms hamradio MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \ - LOCAL/db + LOCAL/shurd DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio SSTV/FAX reception program for unix LICENSE= GPLv3 LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libhamlib.so:comms/hamlib \ libopenjp2.so:graphics/openjpeg \ libpulse.so:audio/pulseaudio \ libv4l2.so:multimedia/libv4l BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat -USES= compiler:c++11-lang pkgconfig qmake qt:5 +USES= compiler:c++11-lang gl pkgconfig qmake qt:5 USE_QT= buildtools core gui network widgets xml -USE_GL+= gl +USE_GL= gl OPTIONS_DEFINE= DOCS DOCS_CXXFLAGS= -DWITH_DOCS +DOCS_QMAKE_ON= CONFIG+=dox +DOCS_BUILD_DEPENDS= doxygen:devel/doxygen post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%DOCSDIR%%|${DOCSDIR}|g' \ -e 's|%%PERL%%|${PERL}|g' \ ${WRKSRC}/qsstv/qsstv.pro ${WRKSRC}/qwt/qwt.pro \ ${WRKSRC}/qsstv/config/directoriesconfig.cpp \ ${WRKSRC}/qsstv/documentation/manual/manual.doxy \ - ${WRKSRC}/qsstv/documentation/manual/manual/gettingstarted.html \ - ${WRKSRC}/qsstv/documentation/manual/manual.txt + ${WRKSRC}/qsstv/documentation/manual/manual.txt \ + ${WRKSRC}/qsstv/documentation/api/api.doxy ${RM} ${WRKSRC}/qsstv/documentation/manual/manual.txt.* ${RM} ${WRKSRC}/qsstv/documentation/manual/manual.*.orig post-install: -${RM} ${STAGEDIR}/${DOCSDIR}/manual.doxy -${RM} ${STAGEDIR}/${DOCSDIR}/doxygen_sqlite3.db -${RM} ${STAGEDIR}/${DOCSDIR}/*.bak -${RM} ${STAGEDIR}/${DOCSDIR}/*.orig .include Index: head/comms/qsstv/distinfo =================================================================== --- head/comms/qsstv/distinfo (revision 499329) +++ head/comms/qsstv/distinfo (revision 499330) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520992341 -SHA256 (qsstv_9.2.6.tar.gz) = 080445e3ec6e492de642c0f4b2d2ab7616cda2a9ca72b9652bd82534a607a76b -SIZE (qsstv_9.2.6.tar.gz) = 11385735 +TIMESTAMP = 1555616893 +SHA256 (qsstv_9.3.3.tar.gz) = d18cb2218cb0f817c48e2af7116f9a479d70b0a2a75dff8466eb82126cd48e3e +SIZE (qsstv_9.3.3.tar.gz) = 6808672 Property changes on: head/comms/qsstv/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html =================================================================== --- head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html (nonexistent) @@ -1,11 +0,0 @@ ---- 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 -
  • TX Images: directory for images to transmit
    • -
  • Templates: directory where the template files are stored
    • -
  • Audio Records: directory for audio files (where you save/read recorded audio files)
    • --
  • Documentation: URL of the user manual (if you copied the manual locally then you can point to it with e.g. file:///usr/share/doc/qsstv/manual
    -+
  • Documentation: URL of the user manual (if you copied the manual locally then you can point to it with e.g. file:///usr/local/share/doc/qsstv/qsstv/manual
    -
    -
    • - Property changes on: head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp (revision 499330) @@ -1,14 +1,14 @@ ---- qsstv/config/directoriesconfig.cpp.orig 2017-11-16 17:14:48 UTC +--- qsstv/config/directoriesconfig.cpp.orig 2019-04-11 14:58:19 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(); +@@ -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(); + audioPath=qSettings.value("audioPath",QString(getenv("HOME"))+"/qsstv/audio/").toString(); +#ifdef WITH_DOCS -+ docURL=qSettings.value("docURL","file:///usr/local/share/doc/qsstv/manual").toString(); ++ docURL=qSettings.value("docURL","file://%%DOCSDIR%%/manual/index.html").toString(); +#else docURL=qSettings.value("docURL","http://users.telenet.be/on4qz/qsstv/manual").toString(); +#endif saveTXimages=qSettings.value("saveTXimages",false).toBool(); qSettings.endGroup(); setParams(); Property changes on: head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy =================================================================== --- head/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy (nonexistent) +++ head/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy (revision 499330) @@ -0,0 +1,11 @@ +--- 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 Property changes on: head/comms/qsstv/files/patch-qsstv_documentation_api_api.doxy ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy =================================================================== --- head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy (revision 499330) @@ -1,11 +1,11 @@ ---- qsstv/documentation/manual/manual.doxy.orig 2016-04-08 23:42:31 UTC +--- 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 Index: head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt =================================================================== --- head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt (revision 499330) @@ -1,11 +1,11 @@ ---- qsstv/documentation/manual/manual.txt.orig 2016-04-09 01:25:30 UTC +--- qsstv/documentation/manual/manual.txt.orig 2019-04-18 20:56:53 UTC +++ qsstv/documentation/manual/manual.txt -@@ -213,7 +213,7 @@ The following tabs are available - - TX Images: directory for images to transmit +@@ -317,7 +317,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 -- Documentation: URL of the user manual (if you copied the manual locally then you can point to it with e.g. file:///usr/share/doc/qsstv/manual +- Documentation: URL of the user manual (if you copied the manual locally then you can point to it with e.g. file://%%DOCSDIR%%/manual

    \li Gui Index: head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp (revision 499330) @@ -1,10 +1,10 @@ ---- qsstv/drmrx/channeldecode.cpp.orig 2016-08-23 19:39:12 UTC +--- qsstv/drmrx/channeldecode.cpp.orig 2019-03-22 10:11:58 UTC +++ qsstv/drmrx/channeldecode.cpp -@@ -29,7 +29,6 @@ +@@ -28,7 +28,6 @@ #include #include #include -#include #include #include "drmproto.h" #include "drmdefs.h" Property changes on: head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp (revision 499330) @@ -1,10 +1,10 @@ ---- qsstv/drmrx/deinterleaver.cpp.orig 2016-08-23 19:39:12 UTC +--- qsstv/drmrx/deinterleaver.cpp.orig 2019-03-22 10:11:58 UTC +++ qsstv/drmrx/deinterleaver.cpp -@@ -30,7 +30,6 @@ +@@ -29,7 +29,6 @@ #include #include -#include #include int *deinterleaver(int xinA, int tA, int xinB, int tB) { Property changes on: head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp (revision 499330) @@ -1,11 +1,11 @@ ---- qsstv/drmrx/demodulator.cpp.orig 2016-08-23 19:39:12 UTC +--- qsstv/drmrx/demodulator.cpp.orig 2019-02-26 18:17:40 UTC +++ qsstv/drmrx/demodulator.cpp -@@ -946,7 +946,7 @@ bool demodulator::channelEstimation() +@@ -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]; } - if (i != 0) delta_freq_offset = (float) atan2(temp2, temp1 + MIN_ABS_H); + if (i != 0) delta_freq_offset = atan2f(temp2, temp1 + MIN_ABS_H); for (j = 0; j < K_max - K_min + 1; j++) { Property changes on: head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp (revision 499330) @@ -1,10 +1,10 @@ ---- qsstv/drmrx/getmode.cpp.orig 2016-08-23 19:39:12 UTC +--- qsstv/drmrx/getmode.cpp.orig 2019-04-18 21:11:25 UTC +++ qsstv/drmrx/getmode.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include "structtemplates.h" #include "drmproto.h" #include "drmdefs.h" Property changes on: head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp (revision 499330) @@ -1,10 +1,10 @@ ---- qsstv/drmrx/mkfacmap.cpp.orig 2016-08-23 19:39:12 UTC +--- qsstv/drmrx/mkfacmap.cpp.orig 2019-04-18 21:11:46 UTC +++ qsstv/drmrx/mkfacmap.cpp @@ -27,7 +27,6 @@ #include #include -#include int mkfacmap(int robustness_mode, int K_dc, int K_modulo, int /*@out@ */ *FACmap) { int elem_cnt, i; Property changes on: head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp (revision 499330) @@ -1,10 +1,10 @@ ---- qsstv/drmrx/mkmscmap.cpp.orig 2016-08-23 19:39:12 UTC +--- qsstv/drmrx/mkmscmap.cpp.orig 2019-04-18 21:11:33 UTC +++ qsstv/drmrx/mkmscmap.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include "drmdefs.h" #include "structtemplates.h" #include "drmproto.h" Property changes on: head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp (revision 499330) @@ -1,10 +1,10 @@ ---- qsstv/drmrx/psdcmean.cpp.orig 2016-08-23 19:39:12 UTC +--- qsstv/drmrx/psdcmean.cpp.orig 2019-04-18 21:11:55 UTC +++ qsstv/drmrx/psdcmean.cpp @@ -36,7 +36,6 @@ #include #include #include -#include void cfft(float *, int, int); void psdcmean(float *rsbuf, float *cpsd, int lblock, int nblocks) { Property changes on: head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp (revision 499330) @@ -1,10 +1,10 @@ ---- qsstv/drmrx/psdmean.cpp.orig 2016-08-23 19:39:12 UTC +--- qsstv/drmrx/psdmean.cpp.orig 2019-04-18 21:12:04 UTC +++ qsstv/drmrx/psdmean.cpp @@ -36,7 +36,6 @@ #include #include #include -#include void rfft(float *, int, int); void psdmean(float *input, float *psd, int lblock, int nblocks) { Property changes on: head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_qsstv.pro =================================================================== --- head/comms/qsstv/files/patch-qsstv_qsstv.pro (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_qsstv.pro (revision 499330) @@ -1,20 +1,30 @@ ---- qsstv/qsstv.pro.orig 2018-06-25 14:41:05 UTC +--- qsstv/qsstv.pro.orig 2019-04-18 09:34:09 UTC +++ qsstv/qsstv.pro -@@ -523,8 +523,8 @@ PRE_TARGETDEPS += dox - message(dox will be generated) - } +@@ -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 -@@ -532,5 +532,5 @@ QMAKE_EXTRA_TARGETS += dox - RESOURCES += \ - qsstv.qrc - --target.path = /usr/bin + isEmpty(PREFIX) { + PREFIX = /usr/local + } +-target.path = $$PREFIX/bin +target.path = %%PREFIX%%/bin - INSTALLS += target dox + + shortcutfiles.files =qsstv.desktop + shortcutfiles.path = $$PREFIX/share/applications/ Property changes on: head/comms/qsstv/files/patch-qsstv_qsstv.pro ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_rig_rigcontrol.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_rig_rigcontrol.cpp (nonexistent) +++ head/comms/qsstv/files/patch-qsstv_rig_rigcontrol.cpp (revision 499330) @@ -0,0 +1,11 @@ +--- qsstv/rig/rigcontrol.cpp.orig 2019-04-19 04:54:51 UTC ++++ qsstv/rig/rigcontrol.cpp +@@ -377,7 +377,7 @@ void rigControl::activatePTT(bool b) + if (catParams.pttSerialPort.isEmpty()) return; + if(serialP==0) + { +- serialP=::open(catParams.pttSerialPort.toLatin1().data(),O_RDWR); ++ serialP=::open(catParams.pttSerialPort.toLatin1().data(),O_RDWR|O_NONBLOCK); + if (serialP<=0) + { + QMessageBox::warning(txWidgetPtr,"Serial Port Error", Property changes on: head/comms/qsstv/files/patch-qsstv_rig_rigcontrol.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp (revision 499330) @@ -1,81 +1,80 @@ ---- qsstv/sound/soundalsa.cpp.orig 2016-08-28 16:01:40 UTC +--- qsstv/sound/soundalsa.cpp.orig 2019-04-18 09:34:09 UTC +++ qsstv/sound/soundalsa.cpp @@ -64,6 +64,8 @@ void soundAlsa::prepareCapture() { int err; - + if(!soundDriverOK) return; + snd_pcm_drop(captureHandle); + snd_pcm_reset(captureHandle); if((err=snd_pcm_prepare (captureHandle)) < 0) - { - alsaErrorHandler(err,"Unable to prepare "+inputAudioDevice); -@@ -76,6 +78,8 @@ void soundAlsa::prepareCapture() - + { + alsaErrorHandler(err,"Unable to prepare "+inputAudioDevice); +@@ -77,6 +79,8 @@ void soundAlsa::prepareCapture() void soundAlsa::preparePlayback() { -+ snd_pcm_drop(playbackHandle); -+ snd_pcm_reset(playbackHandle); + if(!soundDriverOK) return; ++ snd_pcm_drop(captureHandle); ++ snd_pcm_reset(captureHandle); snd_pcm_prepare (playbackHandle); } -@@ -97,6 +101,8 @@ int soundAlsa::read(int &countAvailable) - if ( count == -EPIPE ) +@@ -99,6 +103,8 @@ int soundAlsa::read(int &countAvailable) + if ( count == -EPIPE ) + { + // Overrun ++ snd_pcm_drop(captureHandle); ++ snd_pcm_reset(captureHandle); + snd_pcm_prepare (captureHandle ); + snd_pcm_start (captureHandle); + errorOut() << "Overrun"; +@@ -153,6 +159,8 @@ int soundAlsa::write(uint numFrames) + else if ( framesWritten == -EPIPE ) { - // Overrun + /* underrun */ + snd_pcm_drop(captureHandle); + snd_pcm_reset(captureHandle); - snd_pcm_prepare (captureHandle ); - snd_pcm_start (captureHandle); - errorOut() << "Overrun"; -@@ -142,6 +148,8 @@ int soundAlsa::write(uint numFrames) - else if ( framesWritten == -EPIPE ) - { - /* underrun */ -+ snd_pcm_drop(playbackHandle); -+ snd_pcm_reset(playbackHandle); - error = snd_pcm_prepare (playbackHandle); - if ( error < 0 ) - { -@@ -360,5 +368,42 @@ void getCardList(QStringList &alsaInputL - n++; - } + error = snd_pcm_prepare (playbackHandle); + if ( error < 0 ) + { +@@ -384,5 +392,41 @@ void getCardList(QStringList &alsaInputL + n++; + } snd_device_name_free_hint(hints); + + snd_config_t *pcmc; + snd_pcm_t *pcm; + if (!snd_config) + snd_config_update(); + if(snd_config_search(snd_config, "pcm", &pcmc)==0) { + snd_config_iterator_t i, next; + snd_config_for_each(i, next, pcmc) { + snd_config_t *n = snd_config_iterator_entry(i); + if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) + continue; + const char *id; + if(snd_config_get_id(n, &id)==0) { + deviceName = QString(id); + if (deviceName == "hw" || + deviceName == "plughw" || + deviceName == "plug" || + deviceName == "dsnoop" || + deviceName == "tee" || + deviceName == "file" || + deviceName == "null" || + deviceName == "shm" || + deviceName == "cards" || + deviceName == "rate_convert") + continue; + if (snd_pcm_open(&pcm, id, SND_PCM_STREAM_PLAYBACK, 0) == 0) { + alsaOutputList.append(deviceName + " "); + snd_pcm_close(pcm); + } + if (snd_pcm_open(&pcm, id, SND_PCM_STREAM_CAPTURE, 0) == 0) { + alsaInputList.append(deviceName + " "); + snd_pcm_close(pcm); + } + } + } + } -+ } Property changes on: head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_videocapt_cameradialog.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_videocapt_cameradialog.cpp (nonexistent) +++ head/comms/qsstv/files/patch-qsstv_videocapt_cameradialog.cpp (revision 499330) @@ -0,0 +1,12 @@ +--- qsstv/videocapt/cameradialog.cpp.orig 2019-04-19 07:07:41 UTC ++++ qsstv/videocapt/cameradialog.cpp +@@ -220,7 +220,8 @@ void cameraDialog::getCameraInfo(QString + formats=getFormatList(fd); + if(ok) + { +- cameraList.append(scameraDevice(camDev,(const char *)cap.card,(const char *)cap.driver,(const char *)cap.bus_info,formats)); ++ if (formats.count() > 0) ++ cameraList.append(scameraDevice(camDev,(const char *)cap.card,(const char *)cap.driver,(const char *)cap.bus_info,formats)); + } + v4l2_close(fd); + } Property changes on: head/comms/qsstv/files/patch-qsstv_videocapt_cameradialog.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h =================================================================== --- head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h (revision 499330) @@ -1,10 +1,10 @@ ---- qsstv/videocapt/imagesettings.h.orig 2016-08-23 19:39:12 UTC +--- qsstv/videocapt/imagesettings.h.orig 2019-04-18 21:14:43 UTC +++ qsstv/videocapt/imagesettings.h @@ -41,7 +41,6 @@ #ifndef IMAGESETTINGS_H #define IMAGESETTINGS_H -#include /* for videodev2.h */ #include #include Property changes on: head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp (revision 499329) +++ head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp (revision 499330) @@ -1,11 +1,10 @@ ---- qsstv/videocapt/v4l2control.cpp.orig 2016-08-23 19:39:12 UTC +--- qsstv/videocapt/v4l2control.cpp.orig 2019-04-18 21:15:23 UTC +++ qsstv/videocapt/v4l2control.cpp -@@ -32,7 +32,7 @@ +@@ -32,7 +32,6 @@ #include #include //#include -#include /* for videodev2.h */ -+//#include /* for videodev2.h */ #include #include Property changes on: head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/files/patch-qwt_qwt.pro =================================================================== --- head/comms/qsstv/files/patch-qwt_qwt.pro (revision 499329) +++ head/comms/qsstv/files/patch-qwt_qwt.pro (revision 499330) @@ -1,11 +1,11 @@ ---- qwt/qwt.pro.orig 2016-08-23 19:39:13 UTC +--- qwt/qwt.pro.orig 2019-03-06 17:04:10 UTC +++ qwt/qwt.pro -@@ -206,6 +206,8 @@ HEADERS += \ +@@ -159,6 +159,8 @@ HEADERS += \ unix:!symbian { maemo5 { target.path = /opt/usr/lib + freebsd { + target.path = /usr/local/lib } else { target.path = /usr/lib } Property changes on: head/comms/qsstv/files/patch-qwt_qwt.pro ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Index: head/comms/qsstv/pkg-plist =================================================================== --- head/comms/qsstv/pkg-plist (revision 499329) +++ head/comms/qsstv/pkg-plist (revision 499330) @@ -1,171 +1,173 @@ bin/qsstv +share/applications/qsstv.desktop %%PORTDOCS%%%%DOCSDIR%%/images/Gallery_image_options.png %%PORTDOCS%%%%DOCSDIR%%/images/Gallery_rx.png %%PORTDOCS%%%%DOCSDIR%%/images/Gallery_template.png %%PORTDOCS%%%%DOCSDIR%%/images/Gallery_templates.png %%PORTDOCS%%%%DOCSDIR%%/images/Gallery_tx.png %%PORTDOCS%%%%DOCSDIR%%/images/Gallery_txdrm.png %%PORTDOCS%%%%DOCSDIR%%/images/binary.png %%PORTDOCS%%%%DOCSDIR%%/images/bsr_nfy.png %%PORTDOCS%%%%DOCSDIR%%/images/bsr_select.png %%PORTDOCS%%%%DOCSDIR%%/images/calibration.png %%PORTDOCS%%%%DOCSDIR%%/images/config.png %%PORTDOCS%%%%DOCSDIR%%/images/config1.png %%PORTDOCS%%%%DOCSDIR%%/images/config10.png %%PORTDOCS%%%%DOCSDIR%%/images/config11.png %%PORTDOCS%%%%DOCSDIR%%/images/config12.png %%PORTDOCS%%%%DOCSDIR%%/images/config2.png %%PORTDOCS%%%%DOCSDIR%%/images/config3.png %%PORTDOCS%%%%DOCSDIR%%/images/config4.png %%PORTDOCS%%%%DOCSDIR%%/images/config5.png %%PORTDOCS%%%%DOCSDIR%%/images/config6.png %%PORTDOCS%%%%DOCSDIR%%/images/config7.png %%PORTDOCS%%%%DOCSDIR%%/images/config8.png %%PORTDOCS%%%%DOCSDIR%%/images/config9.png %%PORTDOCS%%%%DOCSDIR%%/images/cqrlog1.png %%PORTDOCS%%%%DOCSDIR%%/images/cqrlog2.png %%PORTDOCS%%%%DOCSDIR%%/images/editor_1.png %%PORTDOCS%%%%DOCSDIR%%/images/editor_2.png %%PORTDOCS%%%%DOCSDIR%%/images/editor_3.png %%PORTDOCS%%%%DOCSDIR%%/images/editor_image_size.png %%PORTDOCS%%%%DOCSDIR%%/images/entertext.png %%PORTDOCS%%%%DOCSDIR%%/images/eraser.png %%PORTDOCS%%%%DOCSDIR%%/images/fix.png %%PORTDOCS%%%%DOCSDIR%%/images/flrig1.png %%PORTDOCS%%%%DOCSDIR%%/images/hybrid_checkbox.png %%PORTDOCS%%%%DOCSDIR%%/images/hybrid_dis_checkbox.png %%PORTDOCS%%%%DOCSDIR%%/images/multiline.png %%PORTDOCS%%%%DOCSDIR%%/images/receivedrm.png %%PORTDOCS%%%%DOCSDIR%%/images/refreshbutton.png %%PORTDOCS%%%%DOCSDIR%%/images/rxdrm_constellation.png %%PORTDOCS%%%%DOCSDIR%%/images/rxdrm_segments.png %%PORTDOCS%%%%DOCSDIR%%/images/rxdrm_status.png %%PORTDOCS%%%%DOCSDIR%%/images/rxwidget1.png -%%PORTDOCS%%%%DOCSDIR%%/images/sstvdrmselect.png %%PORTDOCS%%%%DOCSDIR%%/images/statusbar.png %%PORTDOCS%%%%DOCSDIR%%/images/statusleds.png %%PORTDOCS%%%%DOCSDIR%%/images/transmitdrm.png %%PORTDOCS%%%%DOCSDIR%%/images/tx-with-template.png %%PORTDOCS%%%%DOCSDIR%%/images/txdrm_compression.png %%PORTDOCS%%%%DOCSDIR%%/images/txdrm_options.png %%PORTDOCS%%%%DOCSDIR%%/images/txdrm_status.png %%PORTDOCS%%%%DOCSDIR%%/images/txwidget1.png %%PORTDOCS%%%%DOCSDIR%%/images/vk4aes.jpg %%PORTDOCS%%%%DOCSDIR%%/images/waterfall.png %%PORTDOCS%%%%DOCSDIR%%/images/wf_bsr_id.png %%PORTDOCS%%%%DOCSDIR%%/images/wftextpopup.png %%PORTDOCS%%%%DOCSDIR%%/manual.txt -%%PORTDOCS%%%%DOCSDIR%%/manual/Copying.html %%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_image_options.png %%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_rx.png %%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_templates.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 %%PORTDOCS%%%%DOCSDIR%%/manual/bc_s.png %%PORTDOCS%%%%DOCSDIR%%/manual/bdwn.png %%PORTDOCS%%%%DOCSDIR%%/manual/binary.png %%PORTDOCS%%%%DOCSDIR%%/manual/bsr_nfy.png %%PORTDOCS%%%%DOCSDIR%%/manual/bsr_select.png %%PORTDOCS%%%%DOCSDIR%%/manual/calibration.png %%PORTDOCS%%%%DOCSDIR%%/manual/camera.png %%PORTDOCS%%%%DOCSDIR%%/manual/changelog.html %%PORTDOCS%%%%DOCSDIR%%/manual/closed.png %%PORTDOCS%%%%DOCSDIR%%/manual/config.png %%PORTDOCS%%%%DOCSDIR%%/manual/config1.png %%PORTDOCS%%%%DOCSDIR%%/manual/config10.png %%PORTDOCS%%%%DOCSDIR%%/manual/config11.png %%PORTDOCS%%%%DOCSDIR%%/manual/config12.png %%PORTDOCS%%%%DOCSDIR%%/manual/config2.png %%PORTDOCS%%%%DOCSDIR%%/manual/config3.png %%PORTDOCS%%%%DOCSDIR%%/manual/config4.png %%PORTDOCS%%%%DOCSDIR%%/manual/config5.png %%PORTDOCS%%%%DOCSDIR%%/manual/config6.png %%PORTDOCS%%%%DOCSDIR%%/manual/config7.png %%PORTDOCS%%%%DOCSDIR%%/manual/config8.png %%PORTDOCS%%%%DOCSDIR%%/manual/config9.png %%PORTDOCS%%%%DOCSDIR%%/manual/cqrlog1.png %%PORTDOCS%%%%DOCSDIR%%/manual/cqrlog2.png %%PORTDOCS%%%%DOCSDIR%%/manual/credits.html %%PORTDOCS%%%%DOCSDIR%%/manual/doc.png %%PORTDOCS%%%%DOCSDIR%%/manual/doubletone.png %%PORTDOCS%%%%DOCSDIR%%/manual/doxygen.png %%PORTDOCS%%%%DOCSDIR%%/manual/dynsections.js %%PORTDOCS%%%%DOCSDIR%%/manual/edit.png %%PORTDOCS%%%%DOCSDIR%%/manual/editor.html %%PORTDOCS%%%%DOCSDIR%%/manual/editor_1.png %%PORTDOCS%%%%DOCSDIR%%/manual/editor_2.png %%PORTDOCS%%%%DOCSDIR%%/manual/editor_image_size.png %%PORTDOCS%%%%DOCSDIR%%/manual/entertext.png %%PORTDOCS%%%%DOCSDIR%%/manual/eraser.png %%PORTDOCS%%%%DOCSDIR%%/manual/externalprog.html %%PORTDOCS%%%%DOCSDIR%%/manual/fcircle.png %%PORTDOCS%%%%DOCSDIR%%/manual/fileopen.png %%PORTDOCS%%%%DOCSDIR%%/manual/filesave.png %%PORTDOCS%%%%DOCSDIR%%/manual/fix.png %%PORTDOCS%%%%DOCSDIR%%/manual/fixdrm.html %%PORTDOCS%%%%DOCSDIR%%/manual/flrig1.png %%PORTDOCS%%%%DOCSDIR%%/manual/folderclosed.png %%PORTDOCS%%%%DOCSDIR%%/manual/folderopen.png %%PORTDOCS%%%%DOCSDIR%%/manual/frect.png %%PORTDOCS%%%%DOCSDIR%%/manual/gallery.html %%PORTDOCS%%%%DOCSDIR%%/manual/gettingstarted.html %%PORTDOCS%%%%DOCSDIR%%/manual/hybrid_checkbox.png %%PORTDOCS%%%%DOCSDIR%%/manual/hybrid_dis_checkbox.png %%PORTDOCS%%%%DOCSDIR%%/manual/imagepopup.html %%PORTDOCS%%%%DOCSDIR%%/manual/index.html %%PORTDOCS%%%%DOCSDIR%%/manual/index.js %%PORTDOCS%%%%DOCSDIR%%/manual/installation.html %%PORTDOCS%%%%DOCSDIR%%/manual/jquery.js %%PORTDOCS%%%%DOCSDIR%%/manual/line.png +%%PORTDOCS%%%%DOCSDIR%%/manual/menu.js +%%PORTDOCS%%%%DOCSDIR%%/manual/menudata.js %%PORTDOCS%%%%DOCSDIR%%/manual/multiline.png %%PORTDOCS%%%%DOCSDIR%%/manual/nav_f.png %%PORTDOCS%%%%DOCSDIR%%/manual/nav_g.png %%PORTDOCS%%%%DOCSDIR%%/manual/nav_h.png %%PORTDOCS%%%%DOCSDIR%%/manual/navtree.css %%PORTDOCS%%%%DOCSDIR%%/manual/navtree.js %%PORTDOCS%%%%DOCSDIR%%/manual/navtreedata.js %%PORTDOCS%%%%DOCSDIR%%/manual/navtreeindex0.js %%PORTDOCS%%%%DOCSDIR%%/manual/open.png %%PORTDOCS%%%%DOCSDIR%%/manual/pages.html %%PORTDOCS%%%%DOCSDIR%%/manual/qsstv.css %%PORTDOCS%%%%DOCSDIR%%/manual/receivedrm.png %%PORTDOCS%%%%DOCSDIR%%/manual/refreshbutton.png +%%PORTDOCS%%%%DOCSDIR%%/manual/repeater.html %%PORTDOCS%%%%DOCSDIR%%/manual/replay.png %%PORTDOCS%%%%DOCSDIR%%/manual/resize.js %%PORTDOCS%%%%DOCSDIR%%/manual/rxdrm_constellation.png %%PORTDOCS%%%%DOCSDIR%%/manual/rxdrm_segments.png %%PORTDOCS%%%%DOCSDIR%%/manual/rxdrm_status.png %%PORTDOCS%%%%DOCSDIR%%/manual/rxwidget1.png %%PORTDOCS%%%%DOCSDIR%%/manual/splitbar.png %%PORTDOCS%%%%DOCSDIR%%/manual/start.png %%PORTDOCS%%%%DOCSDIR%%/manual/statusbar.html %%PORTDOCS%%%%DOCSDIR%%/manual/statusbar.png %%PORTDOCS%%%%DOCSDIR%%/manual/statusleds.png %%PORTDOCS%%%%DOCSDIR%%/manual/stop.png %%PORTDOCS%%%%DOCSDIR%%/manual/sweep.png %%PORTDOCS%%%%DOCSDIR%%/manual/sync_off.png %%PORTDOCS%%%%DOCSDIR%%/manual/sync_on.png %%PORTDOCS%%%%DOCSDIR%%/manual/tab_a.png %%PORTDOCS%%%%DOCSDIR%%/manual/tab_b.png %%PORTDOCS%%%%DOCSDIR%%/manual/tab_h.png %%PORTDOCS%%%%DOCSDIR%%/manual/tab_s.png %%PORTDOCS%%%%DOCSDIR%%/manual/tabs.css %%PORTDOCS%%%%DOCSDIR%%/manual/text.png %%PORTDOCS%%%%DOCSDIR%%/manual/todo1.html %%PORTDOCS%%%%DOCSDIR%%/manual/tone.png %%PORTDOCS%%%%DOCSDIR%%/manual/transmitdrm.png %%PORTDOCS%%%%DOCSDIR%%/manual/txdrm_compression.png %%PORTDOCS%%%%DOCSDIR%%/manual/txdrm_options.png %%PORTDOCS%%%%DOCSDIR%%/manual/txdrm_status.png %%PORTDOCS%%%%DOCSDIR%%/manual/txwidget1.png %%PORTDOCS%%%%DOCSDIR%%/manual/vk4aes.jpg %%PORTDOCS%%%%DOCSDIR%%/manual/waterfall.png %%PORTDOCS%%%%DOCSDIR%%/manual/wftextpopup.png %%PORTDOCS%%%%DOCSDIR%%/manual/whatsnew.html %%PORTDOCS%%%%DOCSDIR%%/qsstv.css +%%PORTDOCS%%@dir %%DOCSDIR%%/manual Property changes on: head/comms/qsstv/pkg-plist ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property