Index: head/comms/fldigi/Makefile =================================================================== --- head/comms/fldigi/Makefile (revision 491674) +++ head/comms/fldigi/Makefile (revision 491675) @@ -1,68 +1,75 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 4.0.18 -PORTREVISION= 2 +PORTVERSION= 4.1.00 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= hamradio@FreeBSD.org COMMENT= Digital decoder for psk, cw, psk31, olivia LICENSE= GPLv3 BUILD_DEPENDS= asciidoc:textproc/asciidoc\ docbook-xsl>=1.0:textproc/docbook-xsl\ xsltproc:textproc/libxslt LIB_DEPENDS= libboost_system.so:devel/boost-libs\ libpng.so:graphics/png \ libfltk.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig \ libportaudio.so:audio/portaudio \ libsndfile.so:audio/libsndfile \ libsamplerate.so:audio/libsamplerate USES= autoreconf compiler:c++11-lib jpeg gmake perl5 pkgconfig shebangfix + USE_CXXSTD= gnu++0x GNU_CONFIGURE= yes USE_XORG= x11 xft xext xfixes xcursor xinerama CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \ EXTRA_LIBS="-lexecinfo" -OPTIONS_DEFINE= NATIVE_OPT FLARQ PULSEAUDIO HAMLIB NLS DOCS +OPTIONS_DEFINE= NATIVE_OPT FLARQ OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS DOCS NATIVE_OPT_DESC= Enable Native Optimizations FLARQ_DESC= Compile flarq +OSS_DESC= Support OSS +SNDFILE_DESC= Support for libsndfile +PORTAUDIO_DESC= PortAudio support PULSEAUDIO_DESC= PulseAudio support HAMLIB_DESC= Support rig control via hamlib -OPTIONS_DEFAULT= FLARQ HAMLIB +OPTIONS_DEFAULT= FLARQ OSS HAMLIB OPTIONS_SUB= yes NATIVE_OPT_CONFIGURE_ON= --enable-optimizations=native NATIVE_OPT_CONFIGURE_OFF= --enable-optimizations=none FLARQ_CONFIGURE_ENABLE= flarq OSS_CONFIGURE_ENABLE= oss +SNDFILE_CONFIGURE_WITH= sndfile +SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile +PORTAUDIO_CONFIGURE_WITH= portaudio +PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PULSEAUDIO_CONFIGURE_WITH= pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio HAMLIB_CONFIGURE_WITH= hamlib HAMLIB_LIB_DEPENDS= libhamlib.so:comms/hamlib NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext # Always need asciidoc for man pages CONFIGURE_ARGS+=--with-asciidoc # Upstream as of 4.0.5 always uses portaudio and sndfile now # Which makes fldigi configure options portaudio & oss useless CONFIGURE_ARGS+=--with-portaudio --disable-oss post-configure: # force rebuild of man pages ${RM} ${WRKSRC}/doc/*.1 post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR} .include Index: head/comms/fldigi/distinfo =================================================================== --- head/comms/fldigi/distinfo (revision 491674) +++ head/comms/fldigi/distinfo (revision 491675) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534289571 -SHA256 (fldigi-4.0.18.tar.gz) = e71e317f6b1ed63094193e953a4d096639cc2708244515a77646e997644f7f28 -SIZE (fldigi-4.0.18.tar.gz) = 3757912 +TIMESTAMP = 1548774122 +SHA256 (fldigi-4.1.00.tar.gz) = 1ab857ee163843e9a7c8f9fc81bea9c1ebf7ff70fcbf1f6712a0b53b2eb1a2c2 +SIZE (fldigi-4.1.00.tar.gz) = 3916169 Index: head/comms/fldigi/files/patch-src_misc_newinstall.cxx =================================================================== --- head/comms/fldigi/files/patch-src_misc_newinstall.cxx (revision 491674) +++ head/comms/fldigi/files/patch-src_misc_newinstall.cxx (revision 491675) @@ -1,20 +1,20 @@ ---- src/misc/newinstall.cxx.orig 2017-10-28 00:24:34 UTC +--- src/misc/newinstall.cxx.orig 2018-02-24 13:42:49 UTC +++ src/misc/newinstall.cxx -@@ -67,7 +67,7 @@ text[3] = " btu de \n\ Web: \n\ Email: "; Index: head/comms/fldigi/files/patch-src_soundcard_sound.cxx =================================================================== --- head/comms/fldigi/files/patch-src_soundcard_sound.cxx (nonexistent) +++ head/comms/fldigi/files/patch-src_soundcard_sound.cxx (revision 491675) @@ -0,0 +1,44 @@ +--- src/soundcard/sound.cxx.orig 2018-12-06 14:41:46 UTC ++++ src/soundcard/sound.cxx +@@ -651,7 +651,27 @@ int SoundOSS::Open(int md, int freq) + oflags = oflags | O_CLOEXEC; + # endif + ++#ifdef __FreeBSD__ ++/* ++ * In FreeBSD sound devices e.g. /dev/dsp0.0 can only be open once ++ * whereas /dev/dsp0 can be open multiple times. fldigi tries ++ * to open /dev/dsp0.0 multiple times which fails. Also see man 4 sound. ++ * "For specific sound card access, please instead use /dev/dsp or /dev/dsp%d" ++ * This is a hack. XXX - db VA3DB ++ */ ++ char *fixed_name; ++ char *p; ++ /* Look for a '.' if found, blow it away */ ++ fixed_name = strdup(device.c_str()); ++ p = fixed_name; ++ while (*p++) ++ if(*p == '.') ++ *p = '\0'; ++ device_fd = fl_open(fixed_name, oflags, 0); ++ free(fixed_name); ++#else + device_fd = fl_open(device.c_str(), oflags, 0); ++#endif + if (device_fd == -1) + throw SndException(errno); + +@@ -677,12 +697,11 @@ void SoundOSS::Close(unsigned dir) + void SoundOSS::getVersion() + { + version = 0; +-#ifndef __FreeBSD__ ++ + if (ioctl(device_fd, OSS_GETVERSION, &version) == -1) { + version = -1; + throw SndException("OSS Version"); + } +-#endif + } + + void SoundOSS::getCapabilities() Property changes on: head/comms/fldigi/files/patch-src_soundcard_sound.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ 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/fldigi/files/patch-src_waterfall_raster.cxx =================================================================== --- head/comms/fldigi/files/patch-src_waterfall_raster.cxx (revision 491674) +++ head/comms/fldigi/files/patch-src_waterfall_raster.cxx (revision 491675) @@ -1,13 +1,13 @@ ---- src/waterfall/raster.cxx.orig 2018-08-11 23:26:43 UTC +--- src/waterfall/raster.cxx.orig 2018-02-24 13:42:49 UTC +++ src/waterfall/raster.cxx -@@ -169,6 +169,10 @@ void Raster::resize(int x, int y, int w, +@@ -169,6 +169,10 @@ void Raster::resize(int x, int y, int w, int h) while ((Ndest * rhs) < Hdest) Ndest++; Ndest--; + if (Wdest < 0) + Wdest = 0; + if (Hdest < 0) + Hdest = 0; unsigned char *tempbuf = new unsigned char [Wdest * Hdest]; unsigned char *oldbuf = vidbuf; Property changes on: head/comms/fldigi/files/patch-src_waterfall_raster.cxx ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property