Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Apr 2016 21:54:40 +0000 (UTC)
From:      Stephen Hurd <shurd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412986 - in head/comms/qsstv: . files
Message-ID:  <201604102154.u3ALseMP069450@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: shurd
Date: Sun Apr 10 21:54:40 2016
New Revision: 412986
URL: https://svnweb.freebsd.org/changeset/ports/412986

Log:
  Update to latest release.
  
  DOCS option is back, hopefully it'll stay.
  Jasper has been switched out for OpenJPEG.

Added:
  head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp   (contents, props changed)
  head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy   (contents, props changed)
  head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt   (contents, props changed)
  head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html   (contents, props changed)
  head/comms/qsstv/files/patch-qsstv_sound_soundalsa.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/pkg-plist   (contents, props changed)
Deleted:
  head/comms/qsstv/files/patch-qsstv_configform.ui
  head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp
  head/comms/qsstv/files/patch-qsstv_sound_soundcontrol.cpp
  head/comms/qsstv/files/patch-qsstv_sound_soundcontrol.h
  head/comms/qsstv/files/patch-qsstv_sound_soundio.cpp
  head/comms/qsstv/files/patch-qsstv_widgets_freqform.ui
  head/comms/qsstv/files/patch-qsstv_widgets_sweepform.ui
Modified:
  head/comms/qsstv/Makefile
  head/comms/qsstv/distinfo
  head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp
  head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp
  head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp
  head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp
  head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp
  head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp
  head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp
  head/comms/qsstv/files/patch-qsstv_qsstv.pro
  head/comms/qsstv/files/patch-qwt_qwt.pro

Modified: head/comms/qsstv/Makefile
==============================================================================
--- head/comms/qsstv/Makefile	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/Makefile	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qsstv
-PORTVERSION=	8.2.12
+PORTVERSION=	9.1.1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://users.telenet.be/on4qz/qsstv/downloads/ \
 		LOCAL/shurd
@@ -16,11 +16,33 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libhamlib.so:comms/hamlib \
 		libasound.so:audio/alsa-lib \
-		libjasper.so:graphics/jasper
+		libpulse.so:audio/pulseaudio \
+		libopenjp2.so.7:graphics/openjpeg
 BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 
 USES=		qmake
-USE_QT4=	gui network xml moc_build rcc_build uic_build
-PLIST_FILES=	bin/qsstv
+USE_QT5=	buildtools core gui network xml
+
+OPTIONS_DEFINE=	DOCS
+DOCS_CXXFLAGS=	-DWITH_DOCS
+
+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
+	${RM} ${WRKSRC}/qsstv/documentation/manual/manual.txt.*
+	${RM} ${WRKSRC}/qsstv/documentation/manual/manual.*.orig
+
+post-stage:
+	-${RM} ${STAGEDIR}/${DOCSDIR}/manual.doxy
+	-${RM} ${STAGEDIR}/${DOCSDIR}/doxygen_sqlite3.db
+	-${RM} ${STAGEDIR}/${DOCSDIR}/*.bak
+	-${RM} ${STAGEDIR}/${DOCSDIR}/*.orig
 
 .include <bsd.port.mk>

Modified: head/comms/qsstv/distinfo
==============================================================================
--- head/comms/qsstv/distinfo	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/distinfo	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,2 +1,2 @@
-SHA256 (qsstv_8.2.12.tar.gz) = 3bb6cff072747981d387196780de4414f8766a5a620dc1629cb4ba4de1d3bc4d
-SIZE (qsstv_8.2.12.tar.gz) = 942737
+SHA256 (qsstv_9.1.1.tar.gz) = 421a937901f98f8a0008f52ce6dde286733e5fd6a381ff8db0088e885bed6909
+SIZE (qsstv_9.1.1.tar.gz) = 12829697

Added: head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/qsstv/files/patch-qsstv_config_directoriesconfig.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -0,0 +1,14 @@
+--- qsstv/config/directoriesconfig.cpp.orig	2016-04-08 23:08:29 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();
++#else
+   docURL=qSettings.value("docURL","http://users.telenet.be/on4qz/qsstv_9/manual").toString();
++#endif
+   saveTXimages=qSettings.value("saveTXimages",false).toBool();
+   qSettings.endGroup();
+   setParams();

Added: head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.doxy	Sun Apr 10 21:54:40 2016	(r412986)
@@ -0,0 +1,11 @@
+--- qsstv/documentation/manual/manual.doxy.orig	2016-04-08 23:42:31 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

Added: head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/qsstv/files/patch-qsstv_documentation_manual_manual.txt	Sun Apr 10 21:54:40 2016	(r412986)
@@ -0,0 +1,11 @@
+--- qsstv/documentation/manual/manual.txt.orig	2016-04-09 01:25:30 UTC
++++ qsstv/documentation/manual/manual.txt
+@@ -213,7 +213,7 @@ The following tabs are available
+ - 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://%%DOCSDIR%%/manual
+ <br><br>
+ 
+ \li Gui

Added: head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/qsstv/files/patch-qsstv_documentation_manual_manual_gettingstarted.html	Sun Apr 10 21:54:40 2016	(r412986)
@@ -0,0 +1,11 @@
+--- qsstv/documentation/manual/manual/gettingstarted.html.orig	2016-04-09 01:25:31 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 />
+ <br />
+ </li>
+ </ul>

Modified: head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp
==============================================================================
--- head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/files/patch-qsstv_drmrx_channeldecode.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,4 +1,4 @@
---- qsstv/drmrx/channeldecode.cpp.orig	2014-12-06 14:41:00 UTC
+--- qsstv/drmrx/channeldecode.cpp.orig	2016-04-08 23:08:29 UTC
 +++ qsstv/drmrx/channeldecode.cpp
 @@ -29,7 +29,6 @@
  #include <stdlib.h>
@@ -6,5 +6,5 @@
  #include <math.h>
 -#include <malloc.h>
  #include <float.h>
- #include "structtemplates.h"
  #include "drmproto.h"
+ #include "drmdefs.h"

Modified: head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp
==============================================================================
--- head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/files/patch-qsstv_drmrx_deinterleaver.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,4 +1,4 @@
---- qsstv/drmrx/deinterleaver.cpp.orig	2014-12-06 14:41:00 UTC
+--- qsstv/drmrx/deinterleaver.cpp.orig	2016-04-08 23:08:29 UTC
 +++ qsstv/drmrx/deinterleaver.cpp
 @@ -30,7 +30,6 @@
  

Modified: head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp
==============================================================================
--- head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/files/patch-qsstv_drmrx_getmode.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,4 +1,4 @@
---- qsstv/drmrx/getmode.cpp.orig	2014-12-06 14:41:00 UTC
+--- qsstv/drmrx/getmode.cpp.orig	2016-04-08 23:08:29 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	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/files/patch-qsstv_drmrx_mkfacmap.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,4 +1,4 @@
---- qsstv/drmrx/mkfacmap.cpp.orig	2014-12-06 14:41:00 UTC
+--- qsstv/drmrx/mkfacmap.cpp.orig	2016-04-08 23:08:29 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	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/files/patch-qsstv_drmrx_mkmscmap.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,4 +1,4 @@
---- qsstv/drmrx/mkmscmap.cpp.orig	2014-12-06 14:41:00 UTC
+--- qsstv/drmrx/mkmscmap.cpp.orig	2016-04-08 23:08:29 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	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/files/patch-qsstv_drmrx_psdcmean.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,4 +1,4 @@
---- qsstv/drmrx/psdcmean.cpp.orig	2014-12-06 14:41:00 UTC
+--- qsstv/drmrx/psdcmean.cpp.orig	2016-04-08 23:08:29 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	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/files/patch-qsstv_drmrx_psdmean.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,4 +1,4 @@
---- qsstv/drmrx/psdmean.cpp.orig	2014-12-06 14:41:00 UTC
+--- qsstv/drmrx/psdmean.cpp.orig	2016-04-08 23:08:29 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	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/files/patch-qsstv_qsstv.pro	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,28 +1,29 @@
---- qsstv/qsstv.pro.orig	2014-12-06 14:41:00 UTC
+--- qsstv/qsstv.pro.orig	2016-04-08 23:08:29 UTC
 +++ qsstv/qsstv.pro
-@@ -420,20 +420,17 @@ HEADERS  += scope/scopeoffset.h \
- FORMS   += scope/scopeoffset.ui \
- 				scope/plotform.ui
+@@ -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
  
-- INCLUDEPATH += /usr/include/qwt
-  LIBS += ../qwt/libqwt.a
- }
  
--CONFIG(debug ,debug|release){
--dox.commands = cd $$PWD/Documentation/manual ;doxygen  manual.doxy;
-+with_docs {
-+dox.commands = cd Documentation/manual ;doxygen  manual.doxy;
- dox.depends= FORCE
--PRE_TARGETDEPS       +=    dox
+ SOURCES += main.cpp\
+@@ -515,8 +515,8 @@ PRE_TARGETDEPS       +=    dox
  message(dox will be generated)
  }
+ 
 -dox.path=/usr/share/doc/$$TARGET
 -dox.files= $$PWD/manual/*
--QMAKE_EXTRA_TARGETS   +=   dox
-+dox.path=$$PREFIX/share/doc/$$TARGET
-+dox.files= manual/*
++dox.path=%%DOCSDIR%%
++dox.files= documentation/manual/*
+ QMAKE_EXTRA_TARGETS   +=   dox
+ 
+ 
+@@ -524,5 +524,5 @@ QMAKE_EXTRA_TARGETS   +=   dox
+ RESOURCES += \
+     qsstv.qrc
  
 -target.path = /usr/bin
-+target.path = $$PREFIX/bin
++target.path = %%PREFIX%%/bin
  INSTALLS += target dox
- 

Added: head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/qsstv/files/patch-qsstv_sound_soundalsa.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -0,0 +1,81 @@
+--- qsstv/sound/soundalsa.cpp.orig	2016-04-08 23:08:29 UTC
++++ qsstv/sound/soundalsa.cpp
+@@ -64,6 +64,8 @@ void soundAlsa::prepareCapture()
+ {
+   int err;
+ 
++  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()
+ 
+ void soundAlsa::preparePlayback()
+ {
++  snd_pcm_drop(playbackHandle);
++  snd_pcm_reset(playbackHandle);
+   snd_pcm_prepare (playbackHandle);
+ }
+ 
+@@ -97,6 +101,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";
+@@ -140,6 +146,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 )
+           {
+@@ -337,5 +345,42 @@ 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);
++				}
++			}
++		}
++	}
++
+ }
+ 

Added: head/comms/qsstv/files/patch-qsstv_utils_jp2io.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/qsstv/files/patch-qsstv_utils_jp2io.h	Sun Apr 10 21:54:40 2016	(r412986)
@@ -0,0 +1,10 @@
+--- qsstv/utils/jp2io.h.orig	2016-04-08 23:08:29 UTC
++++ qsstv/utils/jp2io.h
+@@ -1,6 +1,6 @@
+ #ifndef JP2READER_H
+ #define JP2READER_H
+-#include "openjpeg.h"
++#include "openjpeg-2.1/openjpeg.h"
+ 
+ #include <QString>
+ #include <QImage>

Added: head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/qsstv/files/patch-qsstv_videocapt_imagesettings.h	Sun Apr 10 21:54:40 2016	(r412986)
@@ -0,0 +1,10 @@
+--- qsstv/videocapt/imagesettings.h.orig	2016-04-08 23:08:29 UTC
++++ qsstv/videocapt/imagesettings.h
+@@ -41,7 +41,6 @@
+ #ifndef IMAGESETTINGS_H
+ #define IMAGESETTINGS_H
+ 
+-#include <linux/types.h>          /* for videodev2.h */
+ #include <linux/videodev2.h>
+ 
+ #include <QDialog>

Added: head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/qsstv/files/patch-qsstv_videocapt_v4l2control.cpp	Sun Apr 10 21:54:40 2016	(r412986)
@@ -0,0 +1,11 @@
+--- qsstv/videocapt/v4l2control.cpp.orig	2016-04-08 23:08:29 UTC
++++ qsstv/videocapt/v4l2control.cpp
+@@ -32,7 +32,7 @@
+ #include <cerrno>
+ #include <cstring>
+ //#include <libv4l2.h>
+-#include <linux/types.h>          /* for videodev2.h */
++//#include <linux/types.h>          /* for videodev2.h */
+ #include <linux/videodev2.h>
+ 
+ #include <QPushButton>

Modified: head/comms/qsstv/files/patch-qwt_qwt.pro
==============================================================================
--- head/comms/qsstv/files/patch-qwt_qwt.pro	Sun Apr 10 21:32:30 2016	(r412985)
+++ head/comms/qsstv/files/patch-qwt_qwt.pro	Sun Apr 10 21:54:40 2016	(r412986)
@@ -1,8 +1,11 @@
---- qwt/qwt.pro.orig	2014-12-06 14:41:00 UTC
+--- qwt/qwt.pro.orig	2016-04-08 23:08:29 UTC
 +++ qwt/qwt.pro
-@@ -209,5 +209,4 @@ unix:!symbian {
+@@ -206,6 +206,8 @@ HEADERS += \
+ unix:!symbian {
+     maemo5 {
+         target.path = /opt/usr/lib
++    freebsd {
++        target.path = %%PREFIX%%/lib
      } else {
          target.path = /usr/lib
      }
--    INSTALLS += target
- }

Added: head/comms/qsstv/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/qsstv/pkg-plist	Sun Apr 10 21:54:40 2016	(r412986)
@@ -0,0 +1,183 @@
+bin/qsstv
+%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_image_options.png
+%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_rx.png
+%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_template.png
+%%PORTDOCS%%%%DOCSDIR%%/images/Gallery_tx.png
+%%PORTDOCS%%%%DOCSDIR%%/images/binary.png
+%%PORTDOCS%%%%DOCSDIR%%/images/bsr_nfy.png
+%%PORTDOCS%%%%DOCSDIR%%/images/bsr_select.png
+%%PORTDOCS%%%%DOCSDIR%%/images/ca%%QT_LIBDIR%%ration.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/Gallery_image_options.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_rx.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_template.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_tx.png
+%%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/ca%%QT_LIBDIR%%ration.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/ftv2blank.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2doc.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2folderclosed.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2folderopen.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2lastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2link.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2mlastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2mnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2node.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2plastnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2pnode.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2splitbar.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ftv2vertline.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/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/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/tx-with-template.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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604102154.u3ALseMP069450>