diff options
Diffstat (limited to 'comms/qsstv')
19 files changed, 52 insertions, 55 deletions
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile index d8fba3e5a6d9..c28eb26c2453 100644 --- a/comms/qsstv/Makefile +++ b/comms/qsstv/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= qsstv -PORTVERSION= 8.2.11 -PORTREVISION= 1 +PORTVERSION= 8.2.12 CATEGORIES= comms hamradio MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \ LOCAL/shurd @@ -22,7 +21,6 @@ BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat USES= qmake USE_QT4= gui network xml moc_build rcc_build uic_build - -.include <bsd.port.options.mk> +PLIST_FILES= bin/qsstv .include <bsd.port.mk> diff --git a/comms/qsstv/distinfo b/comms/qsstv/distinfo index 709c55765069..a7991c9aa02f 100644 --- a/comms/qsstv/distinfo +++ b/comms/qsstv/distinfo @@ -1,2 +1,2 @@ -SHA256 (qsstv_8.2.11.tar.gz) = c948c104e58664f4da8001f7a14c76cfeb46664ae0bbdfb7f5e22cac9de1aa77 -SIZE (qsstv_8.2.11.tar.gz) = 1055598 +SHA256 (qsstv_8.2.12.tar.gz) = 3bb6cff072747981d387196780de4414f8766a5a620dc1629cb4ba4de1d3bc4d +SIZE (qsstv_8.2.12.tar.gz) = 942737 diff --git a/comms/qsstv/files/patch-qsstv_configform.ui b/comms/qsstv/files/patch-qsstv_configform.ui index f92c80446b12..8fd395056c2f 100644 --- a/comms/qsstv/files/patch-qsstv_configform.ui +++ b/comms/qsstv/files/patch-qsstv_configform.ui @@ -1,6 +1,6 @@ ---- qsstv/configform.ui.orig 2014-04-10 15:00:46.000000000 -0700 -+++ qsstv/configform.ui 2014-04-10 15:00:52.000000000 -0700 -@@ -2293,7 +2293,6 @@ +--- qsstv/configform.ui.orig 2014-12-06 14:41:00 UTC ++++ qsstv/configform.ui +@@ -2611,7 +2611,6 @@ </layout> </widget> <layoutdefault spacing="6" margin="11"/> diff --git a/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp b/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp index a24f8a88ee7d..395160e7f891 100644 --- a/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp +++ b/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp @@ -1,5 +1,5 @@ ---- qsstv/drmrx/channeldecode.cpp.orig 2014-04-08 02:02:06.000000000 -0700 -+++ qsstv/drmrx/channeldecode.cpp 2014-04-08 02:03:28.000000000 -0700 +--- qsstv/drmrx/channeldecode.cpp.orig 2014-12-06 14:41:00 UTC ++++ qsstv/drmrx/channeldecode.cpp @@ -29,7 +29,6 @@ #include <stdlib.h> #include <sys/types.h> diff --git a/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp b/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp index 9531cf89dae6..bb96933c7088 100644 --- a/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp +++ b/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp @@ -1,5 +1,5 @@ ---- qsstv/drmrx/deinterleaver.cpp.orig 2014-04-08 02:02:11.000000000 -0700 -+++ qsstv/drmrx/deinterleaver.cpp 2014-04-08 02:03:30.000000000 -0700 +--- qsstv/drmrx/deinterleaver.cpp.orig 2014-12-06 14:41:00 UTC ++++ qsstv/drmrx/deinterleaver.cpp @@ -30,7 +30,6 @@ #include <stdio.h> diff --git a/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp b/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp index 74da8d116282..a83b6ea661d0 100644 --- a/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp +++ b/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp @@ -1,6 +1,6 @@ ---- qsstv/drmrx/demodulator.cpp.orig 2014-04-10 14:48:35.000000000 -0700 -+++ qsstv/drmrx/demodulator.cpp 2014-04-10 14:49:48.000000000 -0700 -@@ -941,7 +941,7 @@ +--- qsstv/drmrx/demodulator.cpp.orig 2014-12-06 14:41:00 UTC ++++ qsstv/drmrx/demodulator.cpp +@@ -941,7 +941,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 bcb03af46faa..b2d54d0a6e33 100644 --- a/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp +++ b/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp @@ -1,5 +1,5 @@ ---- qsstv/drmrx/getmode.cpp.orig 2014-04-08 02:02:16.000000000 -0700 -+++ qsstv/drmrx/getmode.cpp 2014-04-08 02:03:32.000000000 -0700 +--- qsstv/drmrx/getmode.cpp.orig 2014-12-06 14:41:00 UTC ++++ qsstv/drmrx/getmode.cpp @@ -34,7 +34,6 @@ #include <stdlib.h> #include <math.h> diff --git a/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp index 3be531632fa2..dc28bd1580ba 100644 --- a/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp +++ b/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp @@ -1,5 +1,5 @@ ---- qsstv/drmrx/mkfacmap.cpp.orig 2014-04-08 02:02:22.000000000 -0700 -+++ qsstv/drmrx/mkfacmap.cpp 2014-04-08 02:03:34.000000000 -0700 +--- qsstv/drmrx/mkfacmap.cpp.orig 2014-12-06 14:41:00 UTC ++++ qsstv/drmrx/mkfacmap.cpp @@ -27,7 +27,6 @@ #include <stdio.h> diff --git a/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp b/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp index 3c425a9511ac..2b75ad4d9fa8 100644 --- a/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp +++ b/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp @@ -1,5 +1,5 @@ ---- qsstv/drmrx/mkmscmap.cpp.orig 2014-04-08 02:02:32.000000000 -0700 -+++ qsstv/drmrx/mkmscmap.cpp 2014-04-08 02:03:36.000000000 -0700 +--- qsstv/drmrx/mkmscmap.cpp.orig 2014-12-06 14:41:00 UTC ++++ qsstv/drmrx/mkmscmap.cpp @@ -32,7 +32,6 @@ #include <stdlib.h> #include <sys/types.h> diff --git a/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp index 6dce444fecc3..e1ec371fcef4 100644 --- a/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp +++ b/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp @@ -1,5 +1,5 @@ ---- qsstv/drmrx/psdcmean.cpp.orig 2014-04-08 02:02:38.000000000 -0700 -+++ qsstv/drmrx/psdcmean.cpp 2014-04-08 02:03:38.000000000 -0700 +--- qsstv/drmrx/psdcmean.cpp.orig 2014-12-06 14:41:00 UTC ++++ qsstv/drmrx/psdcmean.cpp @@ -36,7 +36,6 @@ #include <stdlib.h> #include <math.h> diff --git a/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp b/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp index 5c83ebb4ed6f..64727de4ac60 100644 --- a/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp +++ b/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp @@ -1,5 +1,5 @@ ---- qsstv/drmrx/psdmean.cpp.orig 2014-04-08 02:02:47.000000000 -0700 -+++ qsstv/drmrx/psdmean.cpp 2014-04-08 02:03:40.000000000 -0700 +--- qsstv/drmrx/psdmean.cpp.orig 2014-12-06 14:41:00 UTC ++++ qsstv/drmrx/psdmean.cpp @@ -36,7 +36,6 @@ #include <stdlib.h> #include <math.h> diff --git a/comms/qsstv/files/patch-qsstv_qsstv.pro b/comms/qsstv/files/patch-qsstv_qsstv.pro index 73f48e147e4e..0efdbd76eeca 100644 --- a/comms/qsstv/files/patch-qsstv_qsstv.pro +++ b/comms/qsstv/files/patch-qsstv_qsstv.pro @@ -1,6 +1,6 @@ ---- qsstv/qsstv.pro.orig 2014-12-06 06:41:00.000000000 -0800 -+++ qsstv/qsstv.pro 2014-12-07 16:17:46.000000000 -0800 -@@ -420,20 +420,17 @@ +--- qsstv/qsstv.pro.orig 2014-12-06 14:41:00 UTC ++++ qsstv/qsstv.pro +@@ -420,20 +420,17 @@ HEADERS += scope/scopeoffset.h \ FORMS += scope/scopeoffset.ui \ scope/plotform.ui diff --git a/comms/qsstv/files/patch-qsstv_sound_soundcontrol.cpp b/comms/qsstv/files/patch-qsstv_sound_soundcontrol.cpp index 6bf794e58a94..d6ba809ac1d9 100644 --- a/comms/qsstv/files/patch-qsstv_sound_soundcontrol.cpp +++ b/comms/qsstv/files/patch-qsstv_sound_soundcontrol.cpp @@ -1,6 +1,6 @@ ---- qsstv/sound/soundcontrol.cpp.orig 2014-04-09 10:27:08.000000000 -0700 -+++ qsstv/sound/soundcontrol.cpp 2014-04-09 10:27:28.000000000 -0700 -@@ -53,8 +53,8 @@ +--- qsstv/sound/soundcontrol.cpp.orig 2014-12-06 14:41:00 UTC ++++ qsstv/sound/soundcontrol.cpp +@@ -53,8 +53,8 @@ void soundControl::readSettings() txClock=qSettings.value("txclock",BASESAMPLERATE).toDouble(); if(fabs(1-rxClock/BASESAMPLERATE)>0.002) rxClock=BASESAMPLERATE; if(fabs(1-txClock/BASESAMPLERATE)>0.002) txClock=BASESAMPLERATE; @@ -11,7 +11,7 @@ soundIOPtr->soundRoutingInput= (soundIO::edataSrc)qSettings.value("soundRoutingInput", 0 ).toInt(); soundIOPtr->soundRoutingOutput= (soundIO::edataDst)qSettings.value("soundRoutingOutput", 0 ).toInt(); soundIOPtr->recordingSize= qSettings.value("recordingSize", 100 ).toInt(); -@@ -69,8 +69,8 @@ +@@ -69,8 +69,8 @@ void soundControl::writeSettings() qSettings.beginGroup("Sound"); qSettings.setValue("rxclock",rxClock); qSettings.setValue("txclock",txClock); @@ -22,7 +22,7 @@ qSettings.setValue ("soundRoutingInput", soundIOPtr->soundRoutingInput ); qSettings.setValue ("soundRoutingOutput",soundIOPtr->soundRoutingOutput ); qSettings.setValue ("recordingSize",soundIOPtr->recordingSize ); -@@ -82,8 +82,8 @@ +@@ -82,8 +82,8 @@ void soundControl::setParams() { setValue(rxClock,ui->inputClockLineEdit,9); setValue(txClock,ui->outputClockLineEdit,9); @@ -33,7 +33,7 @@ soundIOPtr->inputAudioDevice=ui->inputPCMNameComboBox->currentText(); soundIOPtr->outputAudioDevice=ui->outputPCMNameComboBox->currentText(); -@@ -99,13 +99,13 @@ +@@ -99,13 +99,13 @@ void soundControl::setParams() void soundControl::getParams() { changed=false; @@ -51,7 +51,7 @@ if (ui->inFromCard->isChecked()) soundIOPtr->soundRoutingInput=soundIO::SNDINCARD; else if(ui->inFromFile->isChecked()) soundIOPtr->soundRoutingInput=soundIO::SNDINFILE; -@@ -114,7 +114,7 @@ +@@ -114,7 +114,7 @@ void soundControl::getParams() if (ui->outToCard->isChecked()) soundIOPtr->soundRoutingOutput=soundIO::SNDOUTCARD; else soundIOPtr->soundRoutingOutput=soundIO::SNDOUTTOFILE; getValue(soundIOPtr->recordingSize,ui->mbSpinBox); diff --git a/comms/qsstv/files/patch-qsstv_sound_soundcontrol.h b/comms/qsstv/files/patch-qsstv_sound_soundcontrol.h index 024f2f7d9635..4c85ac5bd802 100644 --- a/comms/qsstv/files/patch-qsstv_sound_soundcontrol.h +++ b/comms/qsstv/files/patch-qsstv_sound_soundcontrol.h @@ -1,6 +1,6 @@ ---- qsstv/sound/soundcontrol.h.orig 2014-04-09 10:27:16.000000000 -0700 -+++ qsstv/sound/soundcontrol.h 2014-04-09 10:27:28.000000000 -0700 -@@ -22,8 +22,8 @@ +--- qsstv/sound/soundcontrol.h.orig 2014-12-06 14:41:00 UTC ++++ qsstv/sound/soundcontrol.h +@@ -22,8 +22,8 @@ public: private: Ui::soundControl *ui; diff --git a/comms/qsstv/files/patch-qsstv_sound_soundio.cpp b/comms/qsstv/files/patch-qsstv_sound_soundio.cpp index 7f2823ffb94c..6b5c868f4220 100644 --- a/comms/qsstv/files/patch-qsstv_sound_soundio.cpp +++ b/comms/qsstv/files/patch-qsstv_sound_soundio.cpp @@ -1,6 +1,6 @@ ---- qsstv/sound/soundio.cpp.orig 2014-04-03 11:15:08.000000000 -0700 -+++ qsstv/sound/soundio.cpp 2014-04-09 21:47:59.000000000 -0700 -@@ -328,7 +328,9 @@ +--- qsstv/sound/soundio.cpp.orig 2015-02-28 15:05:28 UTC ++++ qsstv/sound/soundio.cpp +@@ -328,7 +328,9 @@ int soundIO::capture() if ( count == -EPIPE ) { // Overrun @@ -11,7 +11,7 @@ snd_pcm_start (captureHandle); qDebug()<< "Overrun"; } -@@ -573,8 +575,6 @@ +@@ -573,8 +575,6 @@ bool soundIO::listCards() // int totalDevices; snd_pcm_info_t *pcmInfo; snd_ctl_t *cardHandle; @@ -20,7 +20,7 @@ // No cards found yet totalCards = 0; -@@ -582,6 +582,11 @@ +@@ -582,6 +582,11 @@ bool soundIO::listCards() // Start with first card cardNum = -1; @@ -32,7 +32,7 @@ for (;;) { -@@ -599,8 +604,6 @@ +@@ -599,8 +604,6 @@ bool soundIO::listCards() qDebug() << "Can't open card "<< cardNum << snd_strerror(err); continue; } @@ -41,7 +41,7 @@ // Tell ALSA to fill in our snd_ctl_card_info_t with info about this card if ((err = snd_ctl_card_info(cardHandle, cardInfo)) >= 0) -@@ -619,9 +622,6 @@ +@@ -619,9 +622,6 @@ bool soundIO::listCards() // NOTE: It's possible that this sound card may have no wave devices on it // at all, for example if it's only a MIDI card if (devNum < 0) break; @@ -51,7 +51,7 @@ memset(pcmInfo, 0, snd_pcm_info_sizeof()); // Tell ALSA which device (number) we want info about -@@ -636,6 +636,22 @@ +@@ -636,6 +636,22 @@ bool soundIO::listCards() // qDebug() << "Found:" << totalDevices << " digital audio devices on card " << cardNum; } diff --git a/comms/qsstv/files/patch-qsstv_widgets_freqform.ui b/comms/qsstv/files/patch-qsstv_widgets_freqform.ui index f16e91f75b37..0a5c1cf589e7 100644 --- a/comms/qsstv/files/patch-qsstv_widgets_freqform.ui +++ b/comms/qsstv/files/patch-qsstv_widgets_freqform.ui @@ -1,5 +1,5 @@ ---- qsstv/widgets/freqform.ui.orig 2014-04-10 14:59:37.000000000 -0700 -+++ qsstv/widgets/freqform.ui 2014-04-10 14:59:45.000000000 -0700 +--- qsstv/widgets/freqform.ui.orig 2014-12-06 14:41:00 UTC ++++ qsstv/widgets/freqform.ui @@ -242,7 +242,6 @@ </layout> </widget> diff --git a/comms/qsstv/files/patch-qsstv_widgets_sweepform.ui b/comms/qsstv/files/patch-qsstv_widgets_sweepform.ui index fb9dae7225c2..926e6686df05 100644 --- a/comms/qsstv/files/patch-qsstv_widgets_sweepform.ui +++ b/comms/qsstv/files/patch-qsstv_widgets_sweepform.ui @@ -1,5 +1,5 @@ ---- qsstv/widgets/sweepform.ui.orig 2014-04-10 15:00:13.000000000 -0700 -+++ qsstv/widgets/sweepform.ui 2014-04-10 15:00:18.000000000 -0700 +--- qsstv/widgets/sweepform.ui.orig 2014-12-06 14:41:00 UTC ++++ qsstv/widgets/sweepform.ui @@ -248,7 +248,6 @@ </layout> </widget> diff --git a/comms/qsstv/files/patch-qwt_qwt.pro b/comms/qsstv/files/patch-qwt_qwt.pro index a0740b77ae28..28e5e9326196 100644 --- a/comms/qsstv/files/patch-qwt_qwt.pro +++ b/comms/qsstv/files/patch-qwt_qwt.pro @@ -1,6 +1,6 @@ ---- qwt/qwt.pro.orig 2014-11-22 18:51:18.000000000 -0800 -+++ qwt/qwt.pro 2014-11-22 18:51:34.000000000 -0800 -@@ -209,5 +209,4 @@ +--- qwt/qwt.pro.orig 2014-12-06 14:41:00 UTC ++++ qwt/qwt.pro +@@ -209,5 +209,4 @@ unix:!symbian { } else { target.path = /usr/lib } diff --git a/comms/qsstv/pkg-plist b/comms/qsstv/pkg-plist deleted file mode 100644 index 002010389614..000000000000 --- a/comms/qsstv/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -bin/qsstv |