Remove gmfsk which also depend on old/unmaintained GNOME-2 stack.
Forgot in previous...
This commit is contained in:
parent
dd46cebb1e
commit
1dc13ee6da
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.81 2021/02/24 17:26:29 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.82 2021/10/30 09:59:29 ajacoutot Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += amtterm
|
||||
@ -18,7 +18,6 @@
|
||||
SUBDIR += fldigi
|
||||
SUBDIR += flipit
|
||||
SUBDIR += gammu
|
||||
SUBDIR += gmfsk
|
||||
SUBDIR += gnuradio
|
||||
SUBDIR += gpsk31
|
||||
SUBDIR += hackrf
|
||||
|
@ -1,48 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.45 2020/06/10 07:17:32 ajacoutot Exp $
|
||||
|
||||
COMMENT= GNOME multimode HF terminal
|
||||
|
||||
GNOME_PROJECT= gmfsk
|
||||
GNOME_VERSION= 0.6
|
||||
REVISION= 28
|
||||
CATEGORIES= comms hamradio
|
||||
|
||||
HOMEPAGE= http://gmfsk.connect.fi/
|
||||
MASTER_SITES= ${HOMEPAGE} \
|
||||
http://he.fi/pub/ham/unix/linux/hfmodems/
|
||||
EXTRACT_SUFX= .tar.gz
|
||||
|
||||
# GPLv2 - FDL
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} ICE ORBit-2 SM X11 Xcomposite Xcursor
|
||||
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2
|
||||
WANTLIB += atk-1.0 bonobo-2 bonobo-activation bonoboui-2 c cairo
|
||||
WANTLIB += fftw fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
|
||||
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-2 gnomecanvas-2
|
||||
WANTLIB += gnomeui-2 gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0
|
||||
WANTLIB += hamlib harfbuzz intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += popt sndio z
|
||||
|
||||
MODULES= x11/gnome \
|
||||
devel/gconf2
|
||||
|
||||
COMPILER = base-clang ports-gcc base-gcc
|
||||
|
||||
USE_GMAKE= No
|
||||
MODGCONF2_SCHEMAS_DIR= gmfsk
|
||||
|
||||
LIB_DEPENDS= comms/hamlib \
|
||||
math/fftw \
|
||||
x11/gtk+2 \
|
||||
x11/gnome/libgnomeui
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --enable-hamlib
|
||||
CONFIGURE_ENV= LIBS="-lsndio"
|
||||
CFLAGS += -fgnu89-inline
|
||||
|
||||
pre-configure:
|
||||
ln -sf /usr/bin/true ${WRKDIR}/bin/scrollkeeper-config
|
||||
|
||||
.include <bsd.port.mk>
|
@ -1,2 +0,0 @@
|
||||
SHA256 (gmfsk-0.6.tar.gz) = dKQvMrJ2hOqhRdsykRdteAao5EauvWecarOEzugdDJU=
|
||||
SIZE (gmfsk-0.6.tar.gz) = 540765
|
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2020/06/10 22:21:47 ajacoutot Exp $
|
||||
|
||||
Index: Makefile.in
|
||||
--- Makefile.in.orig
|
||||
+++ Makefile.in
|
||||
@@ -145,7 +145,7 @@ target_alias = @target_alias@
|
||||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
-SUBDIRS = m4 src po help
|
||||
+SUBDIRS = m4 src po
|
||||
|
||||
EXTRA_DIST = \
|
||||
COPYING-DOCS \
|
||||
@@ -598,8 +598,6 @@ install-data-local:
|
||||
fi \
|
||||
done \
|
||||
fi
|
||||
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
|
||||
- $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gmfsk.schemas
|
||||
|
||||
dist-hook:
|
||||
if test -d pixmaps; then \
|
@ -1,71 +0,0 @@
|
||||
$OpenBSD: patch-gmfsk_glade,v 1.1 2010/04/26 01:47:15 jakemsr Exp $
|
||||
--- gmfsk.glade.orig Sun Apr 18 16:35:25 2010
|
||||
+++ gmfsk.glade Sun Apr 18 16:37:56 2010
|
||||
@@ -5970,33 +5970,10 @@ New parametes take effect after restarting the modem.<
|
||||
<widget class="GtkListItem" id="listitem42">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">/dev/dsp</property>
|
||||
+ <property name="label" translatable="no">default</property>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
- <child>
|
||||
- <widget class="GtkListItem" id="listitem43">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">/dev/dsp0</property>
|
||||
- </widget>
|
||||
- </child>
|
||||
-
|
||||
- <child>
|
||||
- <widget class="GtkListItem" id="listitem44">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">/dev/dsp1</property>
|
||||
- </widget>
|
||||
- </child>
|
||||
-
|
||||
- <child>
|
||||
- <widget class="GtkListItem" id="listitem45">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">/dev/dsp2</property>
|
||||
- </widget>
|
||||
- </child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
@@ -8136,31 +8113,7 @@ This druid can be run again by starting gMFSK with the
|
||||
<widget class="GtkListItem" id="listitem369">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">/dev/dsp</property>
|
||||
- </widget>
|
||||
- </child>
|
||||
-
|
||||
- <child>
|
||||
- <widget class="GtkListItem" id="listitem370">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">/dev/dsp0</property>
|
||||
- </widget>
|
||||
- </child>
|
||||
-
|
||||
- <child>
|
||||
- <widget class="GtkListItem" id="listitem371">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">/dev/dsp1</property>
|
||||
- </widget>
|
||||
- </child>
|
||||
-
|
||||
- <child>
|
||||
- <widget class="GtkListItem" id="listitem372">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="label" translatable="yes">/dev/dsp2</property>
|
||||
+ <property name="label" translatable="no">default</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-gmfsk_schemas,v 1.1 2010/04/26 01:47:15 jakemsr Exp $
|
||||
--- gmfsk.schemas.orig Sun Apr 18 16:38:33 2010
|
||||
+++ gmfsk.schemas Sun Apr 18 16:38:54 2010
|
||||
@@ -151,7 +151,7 @@
|
||||
<applyto>/apps/gmfsk/sound/dev</applyto>
|
||||
<owner>gmfsk</owner>
|
||||
<type>string</type>
|
||||
- <default>/dev/dsp</default>
|
||||
+ <default>default</default>
|
||||
<locale name="C">
|
||||
<short>Sound device</short>
|
||||
<long>Device used for sound input/output.</long>
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_conf_c,v 1.1 2010/04/26 01:47:15 jakemsr Exp $
|
||||
--- src/conf.c.orig Sun Apr 18 16:43:00 2010
|
||||
+++ src/conf.c Sun Apr 18 16:43:16 2010
|
||||
@@ -127,7 +127,7 @@ static struct conf_default conf_defs[] = {
|
||||
{ "colors/rxwin", D_STRING, { .s = "white" } },
|
||||
{ "fonts/txfont", D_STRING, { .s = "Sans 10" } },
|
||||
{ "fonts/rxfont", D_STRING, { .s = "Sans 10" } },
|
||||
- { "sound/dev", D_STRING, { .s = "/dev/dsp" } },
|
||||
+ { "sound/dev", D_STRING, { .s = "default" } },
|
||||
{ "ptt/dev", D_STRING, { .s = "none" } },
|
||||
{ "misc/datefmt", D_STRING, { .s = "%d.%m.%Y" } },
|
||||
{ "misc/timefmt", D_STRING, { .s = "%H:%M:%S %Z" } },
|
@ -1,27 +0,0 @@
|
||||
$OpenBSD: patch-src_interface_c,v 1.1 2010/04/26 01:47:15 jakemsr Exp $
|
||||
--- src/interface.c.orig Tue Jul 6 01:35:46 2004
|
||||
+++ src/interface.c Sun Apr 18 16:42:26 2010
|
||||
@@ -3078,10 +3078,7 @@ create_confdialog (void)
|
||||
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (soundcombo), 8);
|
||||
- soundcombo_items = g_list_append (soundcombo_items, (gpointer) _("/dev/dsp"));
|
||||
- soundcombo_items = g_list_append (soundcombo_items, (gpointer) _("/dev/dsp0"));
|
||||
- soundcombo_items = g_list_append (soundcombo_items, (gpointer) _("/dev/dsp1"));
|
||||
- soundcombo_items = g_list_append (soundcombo_items, (gpointer) _("/dev/dsp2"));
|
||||
+ soundcombo_items = g_list_append (soundcombo_items, (gpointer) _("default"));
|
||||
gtk_combo_set_popdown_strings (GTK_COMBO (soundcombo), soundcombo_items);
|
||||
g_list_free (soundcombo_items);
|
||||
|
||||
@@ -4236,10 +4233,7 @@ create_druidwindow (void)
|
||||
gtk_widget_show (druid_soundcombo);
|
||||
gtk_box_pack_start (GTK_BOX (hbox32), druid_soundcombo, TRUE, TRUE, 0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (druid_soundcombo), 8);
|
||||
- druid_soundcombo_items = g_list_append (druid_soundcombo_items, (gpointer) _("/dev/dsp"));
|
||||
- druid_soundcombo_items = g_list_append (druid_soundcombo_items, (gpointer) _("/dev/dsp0"));
|
||||
- druid_soundcombo_items = g_list_append (druid_soundcombo_items, (gpointer) _("/dev/dsp1"));
|
||||
- druid_soundcombo_items = g_list_append (druid_soundcombo_items, (gpointer) _("/dev/dsp2"));
|
||||
+ druid_soundcombo_items = g_list_append (druid_soundcombo_items, (gpointer) _("default"));
|
||||
gtk_combo_set_popdown_strings (GTK_COMBO (druid_soundcombo), druid_soundcombo_items);
|
||||
g_list_free (druid_soundcombo_items);
|
||||
|
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-src_misc_misc_c,v 1.1 2008/09/10 17:25:26 martynas Exp $
|
||||
--- src/misc/misc.c.orig Tue Apr 13 15:49:04 2004
|
||||
+++ src/misc/misc.c Wed Sep 10 20:23:38 2008
|
||||
@@ -103,25 +103,6 @@ unsigned char rbits8(unsigned char w)
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
/*
|
||||
- * Integer base-2 logarithm
|
||||
- */
|
||||
-int log2(unsigned int x)
|
||||
-{
|
||||
- int y = 0;
|
||||
-
|
||||
- x >>= 1;
|
||||
-
|
||||
- while (x) {
|
||||
- x >>= 1;
|
||||
- y++;
|
||||
- }
|
||||
-
|
||||
- return y;
|
||||
-}
|
||||
-
|
||||
-/* ---------------------------------------------------------------------- */
|
||||
-
|
||||
-/*
|
||||
* Gray encoding and decoding (8 bit)
|
||||
*/
|
||||
unsigned char grayencode(unsigned char data)
|
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-src_misc_misc_h,v 1.1 2008/09/10 17:25:26 martynas Exp $
|
||||
--- src/misc/misc.h.orig Tue Apr 13 15:45:19 2004
|
||||
+++ src/misc/misc.h Wed Sep 10 20:23:38 2008
|
||||
@@ -104,25 +104,6 @@ extern inline unsigned char rbits8(unsigned char w)
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
/*
|
||||
- * Integer base-2 logarithm
|
||||
- */
|
||||
-extern inline int log2(unsigned int x)
|
||||
-{
|
||||
- int y = 0;
|
||||
-
|
||||
- x >>= 1;
|
||||
-
|
||||
- while (x) {
|
||||
- x >>= 1;
|
||||
- y++;
|
||||
- }
|
||||
-
|
||||
- return y;
|
||||
-}
|
||||
-
|
||||
-/* ---------------------------------------------------------------------- */
|
||||
-
|
||||
-/*
|
||||
* Gray encoding and decoding (8 bit)
|
||||
*/
|
||||
extern inline unsigned char grayencode(unsigned char data)
|
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-src_mt63_dsp_h,v 1.2 2020/06/10 22:21:47 ajacoutot Exp $
|
||||
Index: src/mt63/dsp.h
|
||||
--- src/mt63/dsp.h.orig
|
||||
+++ src/mt63/dsp.h
|
||||
@@ -551,6 +551,7 @@ template <class typeInp, class typeOut, class typeW>
|
||||
{ double Sum, Diff;
|
||||
Sum=Mid+Out; Diff=Mid-Out; Mid+=W2*Inp-W1*Sum; Out+=W5*Diff; }
|
||||
|
||||
+#if 0
|
||||
template <class typeInp, class typeW>
|
||||
inline void LowPass2(typeInp Inp, LowPass2elem &Elem,
|
||||
typeW W1, typeW W2, typeW W5)
|
||||
@@ -564,6 +565,7 @@ template <class typeInp>
|
||||
Diff=Elem.Mid-Elem.Out;
|
||||
Elem.Mid+=Weight.W2*Inp-Weigth.W1*Sum;
|
||||
Out+=Weight.W5*Diff; }
|
||||
+#endif
|
||||
|
||||
/*
|
||||
inline void LowPass2(float Inp, double &Mid, double &Out,
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_ptt_c,v 1.1.1.1 2007/05/28 18:47:06 jason Exp $
|
||||
--- src/ptt.c.orig Sat Nov 5 13:56:29 2005
|
||||
+++ src/ptt.c Sat Nov 5 13:57:28 2005
|
||||
@@ -142,7 +142,7 @@ static gint openptt(void)
|
||||
guchar pararg;
|
||||
#endif
|
||||
|
||||
- if ((fd = open(pttpath, O_RDWR, 0)) < 0) {
|
||||
+ if ((fd = open(pttpath, O_RDWR | O_NONBLOCK, 0)) < 0) {
|
||||
errmsg("Cannot open PTT device '%s': %m", pttpath);
|
||||
return -1;
|
||||
}
|
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-src_samplerate_common_h,v 1.1.1.1 2007/05/28 18:47:06 jason Exp $
|
||||
--- src/samplerate/common.h.orig Fri Nov 4 16:35:02 2005
|
||||
+++ src/samplerate/common.h Fri Nov 4 16:35:36 2005
|
||||
@@ -22,8 +22,14 @@
|
||||
#define SRC_MAX_RATIO 12
|
||||
#define SRC_MIN_RATIO_DIFF (1e-20)
|
||||
|
||||
+#ifdef MAX
|
||||
+#undef MAX
|
||||
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
|
||||
+#endif
|
||||
+#ifdef MIN
|
||||
+#undef MIN
|
||||
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
|
||||
+#endif
|
||||
|
||||
#define MAKE_MAGIC(a,b,c,d,e,f) ((a)+((b)<<4)+((c)<<8)+((d)<<12)+((e)<<16)+((f)<<20))
|
||||
|
@ -1,352 +0,0 @@
|
||||
$OpenBSD: patch-src_snd_c,v 1.2 2010/04/26 01:47:15 jakemsr Exp $
|
||||
--- src/snd.c.orig Sat Apr 17 10:24:11 2004
|
||||
+++ src/snd.c Sun Apr 18 16:52:21 2010
|
||||
@@ -36,8 +36,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <time.h>
|
||||
|
||||
-#include <sys/soundcard.h>
|
||||
-#include <sys/ioctl.h>
|
||||
+#include <sndio.h>
|
||||
|
||||
#include "snd.h"
|
||||
#include "misc.h"
|
||||
@@ -55,6 +54,7 @@
|
||||
static snd_config_t config;
|
||||
static snd_config_t newconfig;
|
||||
|
||||
+static struct sio_hdl *hdl = NULL;
|
||||
static gint snd_fd = -1;
|
||||
static gint snd_dir = 0;
|
||||
|
||||
@@ -133,18 +133,17 @@ static void dprintf(const char *fmt, ...)
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
-static gint opensnd(gint direction)
|
||||
+static struct sio_hdl * opensnd(gint direction)
|
||||
{
|
||||
#ifdef SND_DEBUG
|
||||
- audio_buf_info info;
|
||||
gchar *str;
|
||||
#endif
|
||||
- guint sndparam, wanted;
|
||||
- gint fd;
|
||||
+ struct sio_hdl *h;
|
||||
+ struct sio_par par, gpar;
|
||||
|
||||
if (!config.device) {
|
||||
snderr("opensnd: device not set");
|
||||
- return -1;
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
#ifdef SND_DEBUG
|
||||
@@ -165,18 +164,16 @@ static gint opensnd(gint direction)
|
||||
dprintf("Opening %s for %s...\n", config.device, str);
|
||||
#endif
|
||||
|
||||
- /* non-blocking open */
|
||||
- if ((fd = open(config.device, direction | O_NONBLOCK)) < 0) {
|
||||
- snderr("opensnd: open: %s: %m", config.device);
|
||||
- return -1;
|
||||
+ if (!strncmp(config.device, "", 1) ||
|
||||
+ !strncmp(config.device, "default", 8))
|
||||
+ h = sio_open(NULL, direction, 0);
|
||||
+ else
|
||||
+ h = sio_open(config.device, direction, 0);
|
||||
+ if (!h) {
|
||||
+ snderr("opensnd: open: %s", config.device);
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
- /* make it block again - (SNDCTL_DSP_NONBLOCK ???) */
|
||||
- if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_NONBLOCK) < 0) {
|
||||
- snderr("opensnd: ioctl: SNDCTL_DSP_NONBLOCK: %m");
|
||||
- goto error;
|
||||
- }
|
||||
-
|
||||
#ifdef SND_DEBUG
|
||||
if (config.flags & SND_FLAG_8BIT)
|
||||
str = "8 bit unsigned";
|
||||
@@ -186,20 +183,15 @@ static gint opensnd(gint direction)
|
||||
dprintf("Setting sample format (%s)...\n", str);
|
||||
#endif
|
||||
|
||||
- if (config.flags & SND_FLAG_8BIT)
|
||||
- wanted = AFMT_U8; /* 8 bit unsigned */
|
||||
- else
|
||||
- wanted = AFMT_S16_NE; /* 16 bit signed, native byteorder */
|
||||
+ sio_initpar(&par);
|
||||
|
||||
- sndparam = wanted;
|
||||
- if (ioctl(fd, SNDCTL_DSP_SETFMT, &sndparam) < 0) {
|
||||
- snderr("opensnd: ioctl: SNDCTL_DSP_SETFMT: %m");
|
||||
- goto error;
|
||||
+ if (config.flags & SND_FLAG_8BIT) {
|
||||
+ par.bits = 8;
|
||||
+ par.sig = 0;
|
||||
+ } else {
|
||||
+ par.bits = 16;
|
||||
+ par.sig = 1;
|
||||
}
|
||||
- if (sndparam != wanted) {
|
||||
- snderr("opensnd: Requested sample format not supported");
|
||||
- goto error;
|
||||
- }
|
||||
|
||||
#ifdef SND_DEBUG
|
||||
dprintf("Setting %s audio...\n",
|
||||
@@ -207,85 +199,50 @@ static gint opensnd(gint direction)
|
||||
#endif
|
||||
|
||||
if (config.flags & SND_FLAG_STEREO)
|
||||
- wanted = 1; /* stereo */
|
||||
+ par.pchan = par.rchan = 2;
|
||||
else
|
||||
- wanted = 0; /* mono */
|
||||
+ par.pchan = par.rchan = 1;
|
||||
|
||||
- sndparam = wanted;
|
||||
- if (ioctl(fd, SNDCTL_DSP_STEREO, &sndparam) < 0) {
|
||||
- snderr("opensnd: ioctl: SNDCTL_DSP_STEREO: %m");
|
||||
- goto error;
|
||||
- }
|
||||
- if (sndparam != wanted) {
|
||||
- snderr("opensnd: Cannot set %s audio",
|
||||
- (config.flags & SND_FLAG_STEREO) ? "stereo" : "mono");
|
||||
- goto error;
|
||||
- }
|
||||
-
|
||||
#ifdef SND_DEBUG
|
||||
dprintf("Setting samplerate to %u...\n", config.samplerate);
|
||||
#endif
|
||||
|
||||
- sndparam = config.samplerate;
|
||||
- if (ioctl(fd, SNDCTL_DSP_SPEED, &sndparam) < 0) {
|
||||
- snderr("opensnd: ioctl: SNDCTL_DSP_SPEED: %m");
|
||||
- goto error;
|
||||
- }
|
||||
- if (sndparam != config.samplerate) {
|
||||
- g_warning("Sampling rate is %u, requested %u\n",
|
||||
- sndparam,
|
||||
- config.samplerate);
|
||||
- }
|
||||
- config.samplerate = sndparam;
|
||||
+ par.rate = config.samplerate;
|
||||
|
||||
/* Request a buffer size of 512 samples */
|
||||
- if (config.flags & SND_FLAG_8BIT)
|
||||
- sndparam = 0x00000009;
|
||||
- else
|
||||
- sndparam = 0x0000000A;
|
||||
+ par.round = 512;
|
||||
+ par.appbufsz = par.round * 4;
|
||||
|
||||
- if (config.flags & SND_FLAG_STEREO)
|
||||
- sndparam += 1;
|
||||
-
|
||||
- /* Unlimited amount of buffers for RX, four for TX */
|
||||
- if (direction == O_RDONLY)
|
||||
- sndparam |= 0x7FFF0000;
|
||||
- else
|
||||
- sndparam |= 0x00040000;
|
||||
-
|
||||
#ifdef SND_DEBUG
|
||||
- dprintf("Setting fragment size (param = 0x%08X)...\n", sndparam);
|
||||
+ dprintf("-- \n");
|
||||
#endif
|
||||
|
||||
- if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &sndparam) < 0) {
|
||||
- snderr("opensnd: ioctl: SNDCTL_DSP_SETFRAGMENT: %m");
|
||||
+ if (!sio_setpar(h, &par) || !sio_getpar(h, &gpar) ||
|
||||
+ gpar.bits != par.bits || gpar.sig != par.sig) {
|
||||
+ snderr("sndopen: could not set parameters as desired");
|
||||
goto error;
|
||||
}
|
||||
|
||||
#ifdef SND_DEBUG
|
||||
- if (direction == O_RDONLY) {
|
||||
- if (ioctl(fd, SNDCTL_DSP_GETISPACE, &info) < 0) {
|
||||
- dprintf("ioctl: SNDCTL_DSP_GETISPACE: %m");
|
||||
- }
|
||||
- } else {
|
||||
- if (ioctl(fd, SNDCTL_DSP_GETOSPACE, &info) < 0) {
|
||||
- dprintf("ioctl: SNDCTL_DSP_GETOSPACE: %m");
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- dprintf("Audio buffer size: %d bytes, number of buffers: %d\n",
|
||||
- info.fragsize, info.fragstotal);
|
||||
+ dprintf("samplerate: %u / want %u\n",
|
||||
+ gpar.rate, config.samplerate);
|
||||
+ dprintf("channels: play %u / record %u / want %u\n",
|
||||
+ gpar.pchan, gpar.rchan,
|
||||
+ (config.flags & SND_FLAG_STEREO) ? 2 : 1);
|
||||
#endif
|
||||
|
||||
-#ifdef SND_DEBUG
|
||||
- dprintf("-- \n");
|
||||
-#endif
|
||||
+ config.samplerate = gpar.rate;
|
||||
|
||||
- return fd;
|
||||
+ if (!sio_start(h)) {
|
||||
+ snderr("sndopen: could not start sndio");
|
||||
+ goto error;
|
||||
+ }
|
||||
|
||||
+ return h;
|
||||
+
|
||||
error:
|
||||
- close(fd);
|
||||
- return -1;
|
||||
+ sio_close(h);
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
@@ -307,11 +264,9 @@ gint sound_open_for_write(gint rate)
|
||||
if (config.flags & SND_FLAG_TESTMODE_MASK)
|
||||
snd_fd = 1;
|
||||
else if (!(config.flags & SND_FLAG_FULLDUP))
|
||||
- snd_fd = opensnd(O_WRONLY);
|
||||
- else if (snd_fd < 0)
|
||||
- snd_fd = opensnd(O_RDWR);
|
||||
+ hdl = opensnd(SIO_PLAY);
|
||||
|
||||
- if (snd_fd < 0)
|
||||
+ if (hdl == NULL && snd_fd != 1)
|
||||
return -1;
|
||||
|
||||
snd_dir = O_WRONLY;
|
||||
@@ -323,14 +278,14 @@ gint sound_open_for_write(gint rate)
|
||||
src_delete(tx_src_state);
|
||||
tx_src_state = NULL;
|
||||
}
|
||||
- return snd_fd;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
ratio = real_rate / rate;
|
||||
|
||||
if (tx_src_state && tx_src_data && tx_src_data->src_ratio == ratio) {
|
||||
src_reset(tx_src_state);
|
||||
- return snd_fd;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
#if SND_DEBUG
|
||||
@@ -354,7 +309,7 @@ gint sound_open_for_write(gint rate)
|
||||
|
||||
tx_src_data->src_ratio = ratio;
|
||||
|
||||
- return snd_fd;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
gint sound_open_for_read(gint rate)
|
||||
@@ -374,11 +329,9 @@ gint sound_open_for_read(gint rate)
|
||||
if (config.flags & SND_FLAG_TESTMODE_MASK)
|
||||
snd_fd = 0;
|
||||
else if (!(config.flags & SND_FLAG_FULLDUP))
|
||||
- snd_fd = opensnd(O_RDONLY);
|
||||
- else if (snd_fd < 0)
|
||||
- snd_fd = opensnd(O_RDWR);
|
||||
+ hdl = opensnd(SIO_REC);
|
||||
|
||||
- if (snd_fd < 0)
|
||||
+ if (hdl == NULL && snd_fd != 0)
|
||||
return -1;
|
||||
|
||||
snd_dir = O_RDONLY;
|
||||
@@ -390,14 +343,14 @@ gint sound_open_for_read(gint rate)
|
||||
src_delete(rx_src_state);
|
||||
rx_src_state = NULL;
|
||||
}
|
||||
- return snd_fd;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
ratio = rate / real_rate;
|
||||
|
||||
if (rx_src_state && rx_src_data && rx_src_data->src_ratio == ratio) {
|
||||
src_reset(rx_src_state);
|
||||
- return snd_fd;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
#if SND_DEBUG
|
||||
@@ -421,7 +374,7 @@ gint sound_open_for_read(gint rate)
|
||||
|
||||
rx_src_data->src_ratio = ratio;
|
||||
|
||||
- return snd_fd;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
void sound_close(void)
|
||||
@@ -451,13 +404,7 @@ void sound_close(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
- /* never close stdin/out/err */
|
||||
- if (snd_fd > 2) {
|
||||
- if (ioctl(snd_fd, SNDCTL_DSP_SYNC, 0) < 0)
|
||||
- snderr("sound_close: ioctl: SNDCTL_DSP_SYNC: %m");
|
||||
- close(snd_fd);
|
||||
- snd_fd = -1;
|
||||
- }
|
||||
+ sio_close(hdl);
|
||||
}
|
||||
|
||||
char *sound_error(void)
|
||||
@@ -477,8 +424,8 @@ gint sound_write(gfloat *buf, gint cnt)
|
||||
if ((config.flags & SND_FLAG_TESTMODE_MASK) == SND_FLAG_TESTMODE_RX)
|
||||
return cnt;
|
||||
|
||||
- if (snd_fd < 0) {
|
||||
- snderr("sound_write: fd < 0");
|
||||
+ if (hdl == NULL) {
|
||||
+ snderr("sound_write: hdl == NULL");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -539,7 +486,7 @@ static gint write_samples(gfloat *buf, gint count)
|
||||
if (config.flags & SND_FLAG_STEREO)
|
||||
count *= 2;
|
||||
|
||||
- if ((i = write(snd_fd, p, count)) < 0)
|
||||
+ if ((i = sio_write(hdl, p, count)) < 0)
|
||||
snderr("write_samples: write: %m");
|
||||
|
||||
return i;
|
||||
@@ -573,8 +520,8 @@ gint sound_read(gfloat **buffer, gint *count)
|
||||
return 0;
|
||||
}
|
||||
|
||||
- if (snd_fd < 0) {
|
||||
- snderr("sound_read: fd < 0");
|
||||
+ if (hdl == NULL) {
|
||||
+ snderr("sound_read: hdl == NULL");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -625,7 +572,7 @@ static gint read_samples(gfloat *buf, gint count)
|
||||
if (config.flags & SND_FLAG_8BIT) {
|
||||
count *= sizeof(guint8);
|
||||
|
||||
- if ((len = read(snd_fd, snd_b_buffer, count)) < 0)
|
||||
+ if ((len = sio_read(hdl, snd_b_buffer, count)) < 0)
|
||||
goto error;
|
||||
|
||||
len /= sizeof(guint8);
|
||||
@@ -641,7 +588,7 @@ static gint read_samples(gfloat *buf, gint count)
|
||||
} else {
|
||||
count *= sizeof(gint16);
|
||||
|
||||
- if ((len = read(snd_fd, snd_w_buffer, count)) < 0)
|
||||
+ if ((len = sio_read(hdl, snd_w_buffer, count)) < 0)
|
||||
goto error;
|
||||
|
||||
len /= sizeof(gint16);
|
@ -1,12 +0,0 @@
|
||||
gMFSK is a multimode HF terminal program for Linux and other unix-like
|
||||
operating systems. Despite the name, gMFSK can send and receive many
|
||||
digital conversational modes typically used by radio amateurs on HF.
|
||||
Supported modes are:
|
||||
|
||||
MFSK (MFSK16 and MFSK8)
|
||||
RTTY
|
||||
THROB (1, 2 and 4 throbs/sec)
|
||||
PSK31 (BPSK and QPSK)
|
||||
PSK63
|
||||
MT63
|
||||
Feldhell
|
@ -1,13 +0,0 @@
|
||||
@comment $OpenBSD: PLIST,v 1.10 2020/06/10 07:17:32 ajacoutot Exp $
|
||||
@bin bin/gmfsk
|
||||
share/pixmaps/gmfsk/
|
||||
share/pixmaps/gmfsk/gnome-screenshot.png
|
||||
share/pixmaps/gmfsk/mfsk.png
|
||||
share/pixmaps/gmfsk/pause.xpm
|
||||
share/pixmaps/gmfsk/rx.xpm
|
||||
share/pixmaps/gmfsk/tune.xpm
|
||||
share/pixmaps/gmfsk/tx.xpm
|
||||
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas >/dev/null 2>&1
|
||||
${SCHEMAS_INSTDIR}/
|
||||
${SCHEMAS_INSTDIR}/gmfsk.schemas
|
||||
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas >/dev/null 2>&1
|
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.1315 2021/10/30 07:19:59 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.1316 2021/10/30 09:59:29 ajacoutot Exp $
|
||||
|
||||
COMMENT = exceptions to pkg_add rules
|
||||
CATEGORIES = devel databases
|
||||
DISTFILES =
|
||||
|
||||
# API.rev
|
||||
PKGNAME = quirks-4.68
|
||||
PKGNAME = quirks-4.69
|
||||
PKG_ARCH = *
|
||||
MAINTAINER = Marc Espie <espie@openbsd.org>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#! /usr/bin/perl
|
||||
|
||||
# ex:ts=8 sw=4:
|
||||
# $OpenBSD: Quirks.pm,v 1.1331 2021/10/30 07:19:59 ajacoutot Exp $
|
||||
# $OpenBSD: Quirks.pm,v 1.1332 2021/10/30 09:59:30 ajacoutot Exp $
|
||||
#
|
||||
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
|
||||
#
|
||||
@ -1510,6 +1510,7 @@ setup_obsolete_reason(
|
||||
3 => 'gnome-mime-data',
|
||||
3 => 'libIDL',
|
||||
3 => 'chemical-mime-data',
|
||||
3 => 'gmfsk',
|
||||
);
|
||||
|
||||
# though it's not yet used, these should be pkgnames, so that eventually
|
||||
|
Loading…
Reference in New Issue
Block a user