diff options
author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2006-12-22 02:47:33 +0000 |
---|---|---|
committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2006-12-22 02:47:33 +0000 |
commit | cdcb91922078c3340e4a51d1ef396c987d8d3e9a (patch) | |
tree | 4aa3f6b6ca02223238a280d2c832529048eba771 /comms/fldigi/files | |
parent | - Update MASTER_SITES (diff) |
Add fldigi 1.11, a digital decoder for psk, cw, psk31, olivia.
Submitted by: Diane Bruce <db at db.net>
Notes
Notes:
svn path=/head/; revision=180450
Diffstat (limited to 'comms/fldigi/files')
-rw-r--r-- | comms/fldigi/files/fldigi | 18 | ||||
-rw-r--r-- | comms/fldigi/files/patch-Makefile | 53 | ||||
-rw-r--r-- | comms/fldigi/files/patch-src_include_rigclass.h | 10 | ||||
-rw-r--r-- | comms/fldigi/files/patch-src_soundcard_sound.cxx | 30 |
4 files changed, 111 insertions, 0 deletions
diff --git a/comms/fldigi/files/fldigi b/comms/fldigi/files/fldigi new file mode 100644 index 000000000000..ac779ef56c7a --- /dev/null +++ b/comms/fldigi/files/fldigi @@ -0,0 +1,18 @@ +#!/bin/sh +# +# fldigi install shell script +# loosely based on original script by Dave Freese, W1HKJ +# +# $FreeBSD$ +# + +installdir=$HOME/.fldigi +macrofile=%%DATADIR%%/macros.mdf + +if [ ! -d $installdir ]; then + mkdir $installdir + cp $macrofile $installdir + echo "You should edit $HOME/.flidi/macros.mdf" +fi +cd $installdir +fldigi.bin diff --git a/comms/fldigi/files/patch-Makefile b/comms/fldigi/files/patch-Makefile new file mode 100644 index 000000000000..b73f850c71f5 --- /dev/null +++ b/comms/fldigi/files/patch-Makefile @@ -0,0 +1,53 @@ +--- Makefile.orig Wed Dec 20 03:31:04 2006 ++++ Makefile Fri Dec 22 00:56:54 2006 +@@ -3,23 +3,19 @@ + ## Copyright (c) 2005 by Parinya Thipchart + ################################################################# + +-ifneq (,$(findstring Release, $(CFG))) +- override CFG = Release +-else +- override CFG = Debug +-endif ++CFG = Release + + PROJECT = fldigi +-CC = "/usr/bin/g++" ++CXX ?= c++ ++CC = ${CXX} + + ifeq ($(CFG),Debug) + OBJ_DIR = Debug + OUTPUT_DIR = Debug + TARGET = fldigi +- C_INCLUDE_DIRS = -I"src" -I"src/include" + C_PREPROC = +- CFLAGS = -pipe `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -ggdb2 -O0 -fno-rtti -fexceptions +- LIB_DIRS = -L"src/lib /usr/local/lib" -L"../../../../../usr/local/lib" ++ CFLAGS = -pipe -I"src" -I"src/include" `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -ggdb2 -O0 -fno-rtti -fexceptions ++ LIB_DIRS = -L"src/lib $(PREFIX)/lib" -L"$(PREFIX)/lib" + LIBS = -lhamlib -lfltk_images -ljpeg -lpng + LDFLAGS = -pipe `fltk-config --ldflags --use-images` + endif +@@ -28,10 +24,9 @@ + OBJ_DIR = Release + OUTPUT_DIR = Release + TARGET = fldigi +- C_INCLUDE_DIRS = -I"src" -I"src/include" + C_PREPROC = +- CFLAGS = -pipe `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -g0 -O2 -fno-rtti -fexceptions +- LIB_DIRS = -L"src/lib" -L"../../../../../usr/local/lib" ++ CFLAGS += -I"src" -I"src/include" `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -g0 -fno-rtti -fexceptions ++ LIB_DIRS = -L"src/lib" -L"$(PREFIX)/lib" + LIBS = -lhamlib -lfltk_images -ljpeg -lpng -lz + LDFLAGS = -pipe -s `fltk-config --ldflags --use-images` + endif +@@ -105,7 +100,7 @@ + + define compile_source + @echo Compiling $< +-@$(CC) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@" ++@$(CC) $(CFLAGS) $(C_PREPROC) -c "$<" -o "$@" + endef + + .PHONY: print_header directories diff --git a/comms/fldigi/files/patch-src_include_rigclass.h b/comms/fldigi/files/patch-src_include_rigclass.h new file mode 100644 index 000000000000..e68c4cae1f76 --- /dev/null +++ b/comms/fldigi/files/patch-src_include_rigclass.h @@ -0,0 +1,10 @@ +--- src/include/rigclass.h.orig Tue Dec 19 21:31:04 2006 ++++ src/include/rigclass.h Wed Dec 20 18:38:55 2006 +@@ -15,7 +15,6 @@ + #include <list> + + #include <hamlib/rig.h> +-#include <values.h> + #include <assert.h> + #include <errno.h> + diff --git a/comms/fldigi/files/patch-src_soundcard_sound.cxx b/comms/fldigi/files/patch-src_soundcard_sound.cxx new file mode 100644 index 000000000000..126aa00e60ae --- /dev/null +++ b/comms/fldigi/files/patch-src_soundcard_sound.cxx @@ -0,0 +1,30 @@ +--- src/soundcard/sound.cxx.orig Tue Dec 19 21:31:04 2006 ++++ src/soundcard/sound.cxx Wed Dec 20 18:46:00 2006 +@@ -16,7 +16,9 @@ + + try { + Open(O_RDONLY); ++#if 0 + getVersion(); ++#endif + getCapabilities(); + getFormats(); + Close(); +@@ -78,7 +80,7 @@ + { + int sndparam; + // Try to get ~100ms worth of samples per fragment +- sndparam = (int)log2(sample_frequency * 0.1); ++ sndparam = (int)log2((unsigned int)(sample_frequency * 0.1)); + // double since we are using 16 bit samples + sndparam += 1; + // Unlimited amount of buffers for RX, four for TX +@@ -120,7 +122,7 @@ + void cSound::getVersion() + { + version = 0; +- if (ioctl(device_fd, OSS_GETVERSION, &version) == -1) { ++ if (ioctl(device_fd, SOUND_VERSION, &version) == -1) { + version = -1; + throw SndException("OSS Version"); + } |