From e0df0b6d741233d262bbedc61b899f8c280da1a0 Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Fri, 3 Feb 2023 18:38:20 -0500
Subject: [PATCH] oss: Remove use of the soundcard.h header, OpenBSD no longer
uses OSS
---
src/lib/oss/meson.build | 2 +-
src/mixer/plugins/OssMixerPlugin.cxx | 6 +-----
src/output/plugins/OssOutputPlugin.cxx | 6 +-----
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/lib/oss/meson.build b/src/lib/oss/meson.build
index 9dbc2cc1e..f58afe527 100644
--- a/src/lib/oss/meson.build
+++ b/src/lib/oss/meson.build
@@ -4,7 +4,7 @@ if enable_oss.disabled()
elif enable_oss.auto() and alsa_dep.found()
# don't bother auto-enabling OSS if ALSA is available
enable_oss = false
-elif compiler.has_header('sys/soundcard.h') or compiler.has_header('soundcard.h')
+elif compiler.has_header('sys/soundcard.h')
enable_oss = true
elif enable_oss.auto()
enable_oss = false
diff --git a/src/mixer/plugins/OssMixerPlugin.cxx b/src/mixer/plugins/OssMixerPlugin.cxx
index df8a5ee43..0447f3148 100644
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@@ -35,11 +35,7 @@
#include <stdlib.h>
#include <unistd.h>
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-# include <soundcard.h>
-#else /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
-# include <sys/soundcard.h>
-#endif /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
+#include <sys/soundcard.h>
#define VOLUME_MIXER_OSS_DEFAULT "/dev/mixer"
diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx
index 9b111dc14..b34e5f2bb 100644
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -39,11 +39,7 @@
#include <stdlib.h>
#include <unistd.h>
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-# include <soundcard.h>
-#else /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
-# include <sys/soundcard.h>
-#endif /* !(defined(__OpenBSD__) || defined(__NetBSD__) */
+#include <sys/soundcard.h>
/* We got bug reports from FreeBSD users who said that the two 24 bit
formats generate white noise on FreeBSD, but 32 bit works. This is