Index: head/comms/qsstv/Makefile =================================================================== --- head/comms/qsstv/Makefile (revision 413094) +++ head/comms/qsstv/Makefile (revision 413095) @@ -1,48 +1,49 @@ # $FreeBSD$ PORTNAME= qsstv -PORTVERSION= 9.1.1 +PORTVERSION= 9.1.3 CATEGORIES= comms hamradio MASTER_SITES= http://users.telenet.be/on4qz/qsstv/downloads/ \ LOCAL/shurd DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio SSTV/FAX reception program for unix LICENSE= GPLv3 -LIB_DEPENDS= libfftw3.so:math/fftw3 \ +LIB_DEPENDS= libasound.so:audio/alsa-lib \ + libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libhamlib.so:comms/hamlib \ - libasound.so:audio/alsa-lib \ + libopenjp2.so.7:graphics/openjpeg \ libpulse.so:audio/pulseaudio \ - libopenjp2.so.7:graphics/openjpeg + libv4l2.so:multimedia/libv4l BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat USES= qmake -USE_QT5= buildtools core gui network xml +USE_QT5= buildtools core gui network widgets 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 Index: head/comms/qsstv/distinfo =================================================================== --- head/comms/qsstv/distinfo (revision 413094) +++ head/comms/qsstv/distinfo (revision 413095) @@ -1,2 +1,2 @@ -SHA256 (qsstv_9.1.1.tar.gz) = 421a937901f98f8a0008f52ce6dde286733e5fd6a381ff8db0088e885bed6909 -SIZE (qsstv_9.1.1.tar.gz) = 12829697 +SHA256 (qsstv_9.1.3.tar.gz) = 1be5e97acde00affa3d2dd08c24174b34c38b40b6d1a246797db5de198ff1ddb +SIZE (qsstv_9.1.3.tar.gz) = 12374404 Index: head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp =================================================================== --- head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp (nonexistent) +++ head/comms/qsstv/files/patch-qsstv_drmrx_demodulator.cpp (revision 413095) @@ -0,0 +1,11 @@ +--- qsstv/drmrx/demodulator.cpp.orig 2016-04-08 23:08:29 UTC ++++ qsstv/drmrx/demodulator.cpp +@@ -946,7 +946,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 ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/comms/qsstv/pkg-plist (revision 413094) +++ head/comms/qsstv/pkg-plist (revision 413095) @@ -1,183 +1,169 @@ 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