Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F163235087
D35308.id106322.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
4 KB
Referenced Files
None
Subscribers
None
D35308.id106322.diff
View Options
Index: comms/qsstv/Makefile
===================================================================
--- comms/qsstv/Makefile
+++ comms/qsstv/Makefile
@@ -24,6 +24,18 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
+PLIST_FILES= bin/qsstv \
+ share/applications/qsstv.desktop \
+ share/pixmaps/qsstv.png
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_DEBUG)
+BUILD_DEPENDS+= doxygen:devel/doxygen
+LIB_DEPENDS+= libqwt6.so:x11-toolkits/qwt6
+PLIST_FILES+= bin/qsstv.debug
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
Index: comms/qsstv/files/patch-config_directoriesconfig.cpp
===================================================================
--- comms/qsstv/files/patch-config_directoriesconfig.cpp
+++ comms/qsstv/files/patch-config_directoriesconfig.cpp
@@ -1,4 +1,4 @@
---- config/directoriesconfig.cpp.orig 2020-06-11 15:15:15 UTC
+--- config/directoriesconfig.cpp.orig 2020-06-11 15:15:15 UTC
+++ config/directoriesconfig.cpp
@@ -64,7 +64,11 @@ void directoriesConfig::readSettings()
txStockImagesPath=qSettings.value("txStockImagesPath",QString(getenv("HOME"))+"/qsstv/tx_stock/").toString();
Index: comms/qsstv/files/patch-drmrx_demodulator.cpp
===================================================================
--- comms/qsstv/files/patch-drmrx_demodulator.cpp
+++ comms/qsstv/files/patch-drmrx_demodulator.cpp
@@ -1,6 +1,6 @@
---- drmrx/demodulator.cpp.orig 2019-02-26 18:17:40 UTC
+--- drmrx/demodulator.cpp.orig 2021-08-02 11:34:40 UTC
+++ drmrx/demodulator.cpp
-@@ -947,7 +947,7 @@ bool demodulator::channelEstimation()
+@@ -950,7 +950,7 @@ bool demodulator::channelEstimation()
temp2 += actual_pilots[2 * j] * next_pilots[2 * j + 1] -actual_pilots[2 * j + 1] * next_pilots[2 * j];
}
Index: comms/qsstv/files/patch-qsstv.pro
===================================================================
--- comms/qsstv/files/patch-qsstv.pro
+++ comms/qsstv/files/patch-qsstv.pro
@@ -1,6 +1,13 @@
--- qsstv.pro.orig 2021-07-31 20:57:03 UTC
+++ qsstv.pro
-@@ -523,7 +523,7 @@ QMAKE_EXTRA_TARGETS += dox
+@@ -517,13 +517,13 @@ contains(QMAKE_HOST.arch, arm.*):{
+
+
+
+-dox.path=/usr/share/doc/$$TARGET
++dox.path=%%PREFIX%%/share/doc/$$TARGET
+ dox.files= $$PWD/manual/*
+ QMAKE_EXTRA_TARGETS += dox
isEmpty(PREFIX) {
@@ -9,3 +16,12 @@
}
target.path = $$PREFIX/bin
+@@ -605,6 +605,6 @@ FORMS += scope/scopeoffset.ui \
+
+ FORMS += scope/scopeoffset.ui \
+ scope/plotform.ui
+-INCLUDEPATH += /usr/include/qwt /usr/include/qt5/qwt
+-LIBS += -lqwt-qt5
++INCLUDEPATH += %%PREFIX%%/include/qt5/qwt6
++LIBS += -L%%PREFIX%%/lib/qt5 -lqwt6
+ }
Index: comms/qsstv/files/patch-rig_rigcontrol.cpp
===================================================================
--- comms/qsstv/files/patch-rig_rigcontrol.cpp
+++ comms/qsstv/files/patch-rig_rigcontrol.cpp
@@ -1,6 +1,6 @@
---- rig/rigcontrol.cpp.orig 2019-04-19 04:54:51 UTC
+--- rig/rigcontrol.cpp.orig 2021-08-02 09:40:15 UTC
+++ rig/rigcontrol.cpp
-@@ -377,7 +377,7 @@ void rigControl::activatePTT(bool b)
+@@ -381,7 +381,7 @@ void rigControl::activatePTT(bool b)
if (catParams.pttSerialPort.isEmpty()) return;
if(serialP==0)
{
Index: comms/qsstv/files/patch-utils_color.cpp
===================================================================
--- comms/qsstv/files/patch-utils_color.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/color.cpp.orig 2017-11-16 17:14:48 UTC
-+++ utils/color.cpp
-@@ -41,7 +41,7 @@
- #include <math.h>
- #include <assert.h>
-
--#include "openjpeg.h"
-+#include "openjpeg-2.4/openjpeg.h"
- #include "color.h"
-
-
Index: comms/qsstv/files/patch-utils_jp2io.h
===================================================================
--- comms/qsstv/files/patch-utils_jp2io.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/jp2io.h.orig 2016-08-23 19:39:12 UTC
-+++ utils/jp2io.h
-@@ -1,6 +1,6 @@
- #ifndef JP2READER_H
- #define JP2READER_H
--#include "openjpeg.h"
-+#include "openjpeg-2.4/openjpeg.h"
-
- #include <QString>
- #include <QImage>
Index: comms/qsstv/pkg-plist
===================================================================
--- comms/qsstv/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/qsstv
-share/applications/qsstv.desktop
-share/pixmaps/qsstv.png
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Jul 22, 7:24 AM (11 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35353830
Default Alt Text
D35308.id106322.diff (4 KB)
Attached To
Mode
D35308: comms/qsstv: fix build with graphics/openjpeg 2.5 by removing unnecessary patches
Attached
Detach File
Event Timeline
Log In to Comment