xoscope is a digital oscilloscope that uses a sound card (via ALSA or EsounD) and/or a data acquisition card (via COMEDI) as the signal input.

[Hauke Fath <hauke%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Tue Nov 23 18:29:20 2021 +0100
Changeset:	b1c2cad24d05ccf3cb8b85af9bd64036fa401c0d

Modified Files:
	Makefile
Added Files:
	xoscope/DESCR
	xoscope/Makefile
	xoscope/PLIST
	xoscope/distinfo
	xoscope/files/asound.conf.sample
	xoscope/patches/patch-Makefile.in
	xoscope/patches/patch-alsa.c
	xoscope/patches/patch-configure

Log Message:
xoscope is a digital oscilloscope that uses a sound card
(via ALSA or EsounD) and/or a data acquisition card (via COMEDI)
as the signal input.

You will need to set up the sound library used.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b1c2cad24d05ccf3cb8b85af9bd64036fa401c0d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                          |  1 +
 xoscope/DESCR                     |  5 +++++
 xoscope/Makefile                  | 36 ++++++++++++++++++++++++++++++++++++
 xoscope/PLIST                     |  7 +++++++
 xoscope/distinfo                  |  8 ++++++++
 xoscope/files/asound.conf.sample  | 15 +++++++++++++++
 xoscope/patches/patch-Makefile.in | 15 +++++++++++++++
 xoscope/patches/patch-alsa.c      | 20 ++++++++++++++++++++
 xoscope/patches/patch-configure   | 15 +++++++++++++++
 9 files changed, 122 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 091bd5b21a..16ccf21cee 100644
--- a/Makefile
+++ b/Makefile
@@ -5973,6 +5973,7 @@ SUBDIR+=	xmms2
 SUBDIR+=	xmoto
 SUBDIR+=	xnedit
 SUBDIR+=	xnee
+SUBDIR+=	xoscope
 SUBDIR+=	xoo
 SUBDIR+=	xoreos
 SUBDIR+=	xoreos-tools
diff --git a/xoscope/DESCR b/xoscope/DESCR
new file mode 100644
index 0000000000..fbc9ae3cbd
--- /dev/null
+++ b/xoscope/DESCR
@@ -0,0 +1,5 @@
+xoscope is a digital oscilloscope that uses a sound card
+(via ALSA or EsounD) and/or a data acquisition card (via COMEDI)
+as the signal input.
+
+You will need to set up the sound library used.
diff --git a/xoscope/Makefile b/xoscope/Makefile
new file mode 100644
index 0000000000..92b58ee8c7
--- /dev/null
+++ b/xoscope/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD$
+
+DISTNAME=	xoscope-2.3
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xoscope/}
+
+MAINTAINER=	hauke%NetBSD.org@localhost
+HOMEPAGE=	https://xoscope.sourceforge.net/
+COMMENT=	Sound card oscilloscope
+LICENSE=	gnu-gpl-v2
+
+DEPENDS+=	alsa-plugins-oss-[0-9]*:../../audio/alsa-plugins-oss
+
+USE_TOOLS+=	pkg-config gmake perl
+
+GNU_CONFIGURE=	yes
+
+EGDIR=		share/examples/xoscope
+
+INSTALLATION_DIRS+=	bin man/man1 ${EGDIR}
+INSTALLATION_DIRS+=	share/applications share/metainfo share/pixmaps
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/asound.conf.sample \
+		${DESTDIR}${PREFIX}/${EGDIR}
+
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/gtkdatabox/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
+.include "../../audio/alsa-lib/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/xoscope/PLIST b/xoscope/PLIST
new file mode 100644
index 0000000000..d66d66c46f
--- /dev/null
+++ b/xoscope/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD$
+bin/xoscope
+man/man1/xoscope.1
+share/applications/net.sourceforge.xoscope.desktop
+share/examples/xoscope/asound.conf.sample
+share/metainfo/net.sourceforge.xoscope.appdata.xml
+share/pixmaps/xoscope.png
diff --git a/xoscope/distinfo b/xoscope/distinfo
new file mode 100644
index 0000000000..077bc85410
--- /dev/null
+++ b/xoscope/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+BLAKE2s (xoscope-2.3.tar.gz) = d47a7acae9f768535c1a3aefae410d368868ef6887fd00e81ac9dec8b6712745
+SHA512 (xoscope-2.3.tar.gz) = 9f1c15a240644027927e1bc39d2a0204d03b8dbe9d1d2aed974d062777562c6877d46f6e3768cf506799d902373fd26a090d94821b0f791f8f3151f7bb2e7eee
+Size (xoscope-2.3.tar.gz) = 390105 bytes
+SHA1 (patch-Makefile.in) = f2e394fb0fa5f1e06b5046b69b7d22534d2f329c
+SHA1 (patch-alsa.c) = 9bf98d7ea4db0c5612139a703739f26a81c7df9a
+SHA1 (patch-configure) = d55d6ebf2163c0c94d9b9f6da0121b968d609ee2
diff --git a/xoscope/files/asound.conf.sample b/xoscope/files/asound.conf.sample
new file mode 100644
index 0000000000..9a297047c7
--- /dev/null
+++ b/xoscope/files/asound.conf.sample
@@ -0,0 +1,15 @@
+# $NetBSD$
+
+# Use with audio/alsa-plugins-oss
+# Install as {PKG_SYSCONFDIR}/asound.conf (global setting),
+# or as ~/.asoundrc (personal setting)
+
+pcm.!default {
+        type oss
+        device /dev/audio
+}
+
+ctl.!default {
+        type oss
+        device /dev/mixer
+}
diff --git a/xoscope/patches/patch-Makefile.in b/xoscope/patches/patch-Makefile.in
new file mode 100644
index 0000000000..0aa11fb8ff
--- /dev/null
+++ b/xoscope/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Remove bogus install(1) option
+
+--- Makefile.in.orig	2021-04-16 20:43:03.000000000 +0000
++++ Makefile.in
+@@ -1011,7 +1011,7 @@ xoscope_gtk.o: builtins.h
+ 
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+-	$(INSTALL_DATA) -D xoscope.png $(DESTDIR)$(datadir)/pixmaps/xoscope.png
++	$(INSTALL_DATA) xoscope.png $(DESTDIR)$(datadir)/pixmaps/xoscope.png
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/xoscope/patches/patch-alsa.c b/xoscope/patches/patch-alsa.c
new file mode 100644
index 0000000000..edcd6bf2d2
--- /dev/null
+++ b/xoscope/patches/patch-alsa.c
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Deal with location of soundcard.h header.
+
+--- alsa.c.orig	2020-03-22 17:43:50.000000000 +0000
++++ alsa.c
+@@ -17,7 +17,13 @@
+ #include <stdlib.h>             /* for abs() */
+ #include <sys/ioctl.h>
+ #include <alsa/asoundlib.h>
++
++#if defined(__linux__)
+ #include <linux/soundcard.h>
++#elif defined(FreeBSD) || defined(__DragonFly__) || defined (__NetBSD__)
++#include <soundcard.h>
++#endif
++
+ #include "xoscope.h"            /* program defaults */
+ 
+ char    alsaDevice[32] = "\0";
diff --git a/xoscope/patches/patch-configure b/xoscope/patches/patch-configure
new file mode 100644
index 0000000000..b1022a47b9
--- /dev/null
+++ b/xoscope/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Remove GNU man specific option
+
+--- configure.orig	2021-04-16 20:38:19.000000000 +0000
++++ configure
+@@ -7929,7 +7929,7 @@ $as_echo "#define MSECREFRESH 30" >>conf
+ 
+ 
+ 
+-$as_echo "#define HELPCOMMAND \"man -Tutf8 xoscope 2>&1\"" >>confdefs.h
++$as_echo "#define HELPCOMMAND \"man xoscope 2>&1\"" >>confdefs.h
+ 
+ 
+