Attachment #194388 for bug #229140

View | Details | Raw Unified | Return to bug 229140
Collapse All | Expand All

Lines 1-8 Link Here

(-)./Makefile (-2 / +1 lines)
1	# $FreeBSD: head/comms/qsstv/Makefile 444376 2017-06-26 16:19:17Z adrian $	1	# $FreeBSD: head/comms/qsstv/Makefile 444376 2017-06-26 16:19:17Z adrian $
2		2
3	PORTNAME= qsstv	3	PORTNAME= qsstv
4	PORTVERSION= 9.2.4	4	PORTVERSION= 9.2.6
5	PORTREVISION= 3
6	CATEGORIES= comms hamradio	5	CATEGORIES= comms hamradio
7	MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \	6	MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \
8	LOCAL/db	7	LOCAL/db

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1482443425	1	TIMESTAMP = 1520992341
2	SHA256 (qsstv_9.2.4.tar.gz) = 509c01e0d966ce622478d89cc168acb66327af452d2ef593731c23f35c8db3c5	2	SHA256 (qsstv_9.2.6.tar.gz) = 080445e3ec6e492de642c0f4b2d2ab7616cda2a9ca72b9652bd82534a607a76b
3	SIZE (qsstv_9.2.4.tar.gz) = 11883587	3	SIZE (qsstv_9.2.6.tar.gz) = 11385735

Lines 1-4 Link Here

(-)./files/patch-qsstv_config_directoriesconfig.cpp (-2 / +2 lines)
1	--- qsstv/config/directoriesconfig.cpp.orig 2016-04-08 23:08:29 UTC	1	--- qsstv/config/directoriesconfig.cpp.orig 2017-11-16 17:14:48 UTC
2	+++ qsstv/config/directoriesconfig.cpp	2	+++ qsstv/config/directoriesconfig.cpp
3	@@ -43,7 +43,11 @@ void directoriesConfig::readSettings()	3	@@ -43,7 +43,11 @@ void directoriesConfig::readSettings()
4	txStockImagesPath=qSettings.value("txStockImagesPath",QString(getenv("HOME"))+"/tx_stock/").toString();	4	txStockImagesPath=qSettings.value("txStockImagesPath",QString(getenv("HOME"))+"/tx_stock/").toString();
Lines 7-13 Link Here
7	+#ifdef WITH_DOCS	7	+#ifdef WITH_DOCS
8	+ docURL=qSettings.value("docURL","file://%%DOCSDIR%%/manual").toString();	8	+ docURL=qSettings.value("docURL","file://%%DOCSDIR%%/manual").toString();
9	+#else	9	+#else
10	docURL=qSettings.value("docURL","http://users.telenet.be/on4qz/qsstv_9/manual").toString();	10	docURL=qSettings.value("docURL","http://users.telenet.be/on4qz/qsstv/manual").toString();
11	+#endif	11	+#endif
12	saveTXimages=qSettings.value("saveTXimages",false).toBool();	12	saveTXimages=qSettings.value("saveTXimages",false).toBool();
13	qSettings.endGroup();	13	qSettings.endGroup();




--- qsstv/qsstv.pro.orig	2017-11-16 17:14:48 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
+INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc %%LOCALBASE%%/include/openjpeg-2.1
 
 
 CONFIG += link_pkgconfig
 PKGCONFIG += libopenjp2
@@ -523,8 +523,8 @@ PRE_TARGETDEPS       +=    dox
 message(dox will be generated)
 }
 

 QMAKE_EXTRA_TARGETS   +=   dox
 
 
@@ -532,5 +532,5 @@ QMAKE_EXTRA_TARGETS   +=   dox
 RESOURCES += \
     qsstv.qrc
 

Lines 1-10 Link Here

(-)./files/patch-qsstv_sstv_sstvrx.cpp (-10 lines)
1	--- qsstv/sstv/sstvrx.cpp.orig 2017-06-26 08:50:09.939282000 -0700
2	+++ qsstv/sstv/sstvrx.cpp 2017-06-26 08:50:22.482587000 -0700
3	@@ -35,6 +35,7 @@
4	{
5	syncFilterPtr=NULL;
6	videoFilterPtr=NULL;
7	+ syncProcPtr=NULL;
8	#ifndef QT_NO_DEBUG
9	scopeViewerData=new scopeView("Data Scope");
10	scopeViewerSyncNarrow=new scopeView("Sync Scope Narrow");

Lines 1-10 Link Here

(-)./files/patch-qsstv_utils_color.cpp (-4 / +4 lines)
1	--- qsstv/utils/color.cpp.orig 2016-08-23 19:39:12 UTC	1	--- qsstv/utils/color.cpp.orig 2017-11-16 17:14:48 UTC
2	+++ qsstv/utils/color.cpp	2	+++ qsstv/utils/color.cpp
3	@@ -42,7 +42,7 @@	3	@@ -41,7 +41,7 @@
		4	#include <math.h>
4	#include <assert.h>	5	#include <assert.h>
5		6
6	//#include "opj_apps_config.h"	7	-#include "openjpeg.h"
7	-#include "openjpeg-2.1/openjpeg.h"
8	+#include "openjpeg-2.3/openjpeg.h"	8	+#include "openjpeg-2.3/openjpeg.h"
9	#include "color.h"	9	#include "color.h"
10		10




%%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

Return to bug 229140

Lines 1-15 Link Here

(-)./files/patch-qsstv_qsstv.pro (-7 / +7 lines)
1	--- qsstv/qsstv.pro.orig 2016-04-08 23:08:29 UTC	1	--- qsstv/qsstv.pro.orig 2017-11-16 17:14:48 UTC
2	+++ qsstv/qsstv.pro	2	+++ qsstv/qsstv.pro
3	@@ -15,7 +15,7 @@ QMAKE_CXXFLAGS_RELEASE += -O3	3	@@ -15,7 +15,7 @@ QMAKE_CXXFLAGS_RELEASE += -O3
4		4
5	TARGET = qsstv	5	TARGET = qsstv
6	TEMPLATE = app	6	TEMPLATE = app
7	-INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc /usr/include/openjpeg-2.1	7	-INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc
8	+INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc %%LOCALBASE%%/include/openjpeg-2.1	8	+INCLUDEPATH += config utils sound widgets dsp dispatch logbook mainwidgets rig sstv videocapt drmrx drmtx xmlrpc %%LOCALBASE%%/include/openjpeg-2.1
9
10		9
11	SOURCES += main.cpp\	10	CONFIG += link_pkgconfig
12	@@ -515,8 +515,8 @@ PRE_TARGETDEPS += dox	11	PKGCONFIG += libopenjp2
		12	@@ -523,8 +523,8 @@ PRE_TARGETDEPS += dox
13	message(dox will be generated)	13	message(dox will be generated)
14	}	14	}
15		15
Lines 20-26 Link Here
20	QMAKE_EXTRA_TARGETS += dox	20	QMAKE_EXTRA_TARGETS += dox
21		21
22		22
23	@@ -524,5 +524,5 @@ QMAKE_EXTRA_TARGETS += dox	23	@@ -532,5 +532,5 @@ QMAKE_EXTRA_TARGETS += dox
24	RESOURCES += \	24	RESOURCES += \
25	qsstv.qrc	25	qsstv.qrc
26		26

Lines 58-76 bin/qsstv Link Here

(-)./pkg-plist (-7 lines)
58	%%PORTDOCS%%%%DOCSDIR%%/manual/Copying.html	58	%%PORTDOCS%%%%DOCSDIR%%/manual/Copying.html
59	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_image_options.png	59	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_image_options.png
60	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_rx.png	60	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_rx.png
61	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_template.png
62	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_templates.png	61	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_templates.png
63	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_tx.png
64	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_txdrm.png	62	%%PORTDOCS%%%%DOCSDIR%%/manual/Gallery_txdrm.png
65	%%PORTDOCS%%%%DOCSDIR%%/manual/RXDRM.html	63	%%PORTDOCS%%%%DOCSDIR%%/manual/RXDRM.html
66	%%PORTDOCS%%%%DOCSDIR%%/manual/RXSSTV.html	64	%%PORTDOCS%%%%DOCSDIR%%/manual/RXSSTV.html
67	%%PORTDOCS%%%%DOCSDIR%%/manual/TXDRM.html	65	%%PORTDOCS%%%%DOCSDIR%%/manual/TXDRM.html
68	%%PORTDOCS%%%%DOCSDIR%%/manual/TXSSTV.html	66	%%PORTDOCS%%%%DOCSDIR%%/manual/TXSSTV.html
69	%%PORTDOCS%%%%DOCSDIR%%/manual/_copying.html
70	%%PORTDOCS%%%%DOCSDIR%%/manual/_r_x_d_r_m.html
71	%%PORTDOCS%%%%DOCSDIR%%/manual/_r_x_s_s_t_v.html
72	%%PORTDOCS%%%%DOCSDIR%%/manual/_t_x_d_r_m.html
73	%%PORTDOCS%%%%DOCSDIR%%/manual/_t_x_s_s_t_v.html
74	%%PORTDOCS%%%%DOCSDIR%%/manual/arrow.png	67	%%PORTDOCS%%%%DOCSDIR%%/manual/arrow.png
75	%%PORTDOCS%%%%DOCSDIR%%/manual/arrowdown.png	68	%%PORTDOCS%%%%DOCSDIR%%/manual/arrowdown.png
76	%%PORTDOCS%%%%DOCSDIR%%/manual/arrowright.png	69	%%PORTDOCS%%%%DOCSDIR%%/manual/arrowright.png