Index: head/comms/fldigi/Makefile =================================================================== --- head/comms/fldigi/Makefile (revision 508974) +++ head/comms/fldigi/Makefile (revision 508975) @@ -1,68 +1,68 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 4.1.07 +PORTVERSION= 4.1.08 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 xrender CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \ EXTRA_LIBS="-lexecinfo" OPTIONS_DEFINE= NATIVE_OPT FLARQ OSS PULSEAUDIO HAMLIB NLS DOCS NATIVE_OPT_DESC= Enable Native Optimizations FLARQ_DESC= Compile flarq OSS_DESC= Support OSS PULSEAUDIO_DESC= PulseAudio support HAMLIB_DESC= Support rig control via 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 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 # Always need soundfile CONFIGURE_ARGS+=--with-sndfile 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 508974) +++ head/comms/fldigi/distinfo (revision 508975) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565013442 -SHA256 (fldigi-4.1.07.tar.gz) = dc4864b6e63c688b9dd932587bdaf7becfa17558380f7deff1236eb6b66921f0 -SIZE (fldigi-4.1.07.tar.gz) = 4632923 +TIMESTAMP = 1565818622 +SHA256 (fldigi-4.1.08.tar.gz) = 004b54fa4ff03c85e088bf1706270db5f3976afcaaf1003b4d6d3b0ef8007349 +SIZE (fldigi-4.1.08.tar.gz) = 4633597 Index: head/comms/fldigi/files/patch-src_waterfall_raster.cxx =================================================================== --- head/comms/fldigi/files/patch-src_waterfall_raster.cxx (revision 508974) +++ head/comms/fldigi/files/patch-src_waterfall_raster.cxx (nonexistent) @@ -1,13 +0,0 @@ ---- 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, 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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx =================================================================== --- head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx (revision 508974) +++ head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx (nonexistent) @@ -1,49 +0,0 @@ ---- src/soundcard/soundconf.cxx.orig 2019-03-18 15:12:35 UTC -+++ src/soundcard/soundconf.cxx -@@ -53,6 +53,11 @@ double std_sample_rates[] = { 8000.0, 9600.0, 11025.0, - static void init_oss(void) - { - #if USE_OSS -+#ifdef __FreeBSD__ -+ char *last = NULL; -+ char *curr = NULL; -+ char *p; -+#endif - glob_t gbuf; - glob("/dev/dsp*", 0, NULL, &gbuf); - if (gbuf.gl_pathc == 0) { -@@ -61,8 +66,33 @@ static void init_oss(void) - menuOSSDev->deactivate(); - return; - } -- for (size_t i = 0; i < gbuf.gl_pathc; i++) -+ for (size_t i = 0; i < gbuf.gl_pathc; i++) { -+#ifdef __FreeBSD__ -+ if (curr) -+ free(curr); -+ curr = strdup(gbuf.gl_pathv[i]); -+ p = strrchr(curr, '.'); -+ if (p) -+ *p = '\0'; -+ if (last != NULL) { -+ if (strcmp(last, curr) == 0) -+ continue; -+ } -+ menuOSSDev->add(curr); -+ if (last) -+ free(last); -+ last = curr; -+ curr = NULL; -+#else - menuOSSDev->add(gbuf.gl_pathv[i]); -+#endif -+ } -+#ifdef __FreeBSD__ -+ if (last) -+ free(last); -+ if (curr) -+ free(curr); -+#endif - if (progdefaults.OSSdevice.length() == 0 && gbuf.gl_pathc) - progdefaults.OSSdevice = gbuf.gl_pathv[0]; - menuOSSDev->value(progdefaults.OSSdevice.c_str()); Property changes on: head/comms/fldigi/files/patch-src_soundcard_soundconf.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/fldigi/files/patch-src_soundcard_sound.cxx =================================================================== --- head/comms/fldigi/files/patch-src_soundcard_sound.cxx (revision 508974) +++ head/comms/fldigi/files/patch-src_soundcard_sound.cxx (nonexistent) @@ -1,43 +0,0 @@ ---- src/soundcard/sound.cxx.orig 2019-05-25 01:35:59 UTC -+++ src/soundcard/sound.cxx -@@ -651,7 +651,26 @@ 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 = strchr(fixed_name, '.'); -+ if(p != NULL) -+ *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 +696,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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property