diff options
| author | nia <nia@pkgsrc.org> | 2022-09-20 06:30:48 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-09-20 06:30:48 +0000 |
| commit | da24295976489c6893a3369b4983ca3285f4b20d (patch) | |
| tree | af6789c3bf018788044a8d850ba9e665ebd6c8a0 | |
| parent | 4dcf856d77c12d698b1736b6d4eaeb771e26ed0d (diff) | |
| download | pkgsrc-da24295976489c6893a3369b4983ca3285f4b20d.tar.gz | |
wmsmixer: Simplify OSS header inclusion situation.
Should help Solaris. I don't trust Linux to install the OSS header
in a sensible place any more, so that's the only one that's still
special-cased.
| -rw-r--r-- | audio/wmsmixer/distinfo | 4 | ||||
| -rw-r--r-- | audio/wmsmixer/patches/patch-ab | 13 | ||||
| -rw-r--r-- | audio/wmsmixer/patches/patch-mixctl.h | 23 |
3 files changed, 25 insertions, 15 deletions
diff --git a/audio/wmsmixer/distinfo b/audio/wmsmixer/distinfo index 47afdaaa6de..89602bd93e5 100644 --- a/audio/wmsmixer/distinfo +++ b/audio/wmsmixer/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2021/10/26 09:59:35 nia Exp $ +$NetBSD: distinfo,v 1.9 2022/09/20 06:30:48 nia Exp $ BLAKE2s (wmsmixer-0.5.1.tar.gz) = 93f9149904deff7b9addadda90a4350e4e30a86de7fac2bd8e422a0ec08823d9 SHA512 (wmsmixer-0.5.1.tar.gz) = 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299 Size (wmsmixer-0.5.1.tar.gz) = 33350 bytes SHA1 (patch-aa) = 0db2abe3d917778545e420fe61e4cefce03ce0c6 -SHA1 (patch-ab) = 78ede51033648a4a79d884ebb3d5c6b0b5e9ba86 +SHA1 (patch-mixctl.h) = 1d239e7b2f5c16045fdd59546547cc8ab93b06d2 diff --git a/audio/wmsmixer/patches/patch-ab b/audio/wmsmixer/patches/patch-ab deleted file mode 100644 index d743287caa5..00000000000 --- a/audio/wmsmixer/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2005/12/11 20:51:07 joerg Exp $ - ---- mixctl.h.orig 2005-12-11 20:44:55.000000000 +0000 -+++ mixctl.h -@@ -18,7 +18,7 @@ - #ifdef __NetBSD__ - #include <soundcard.h> - #endif --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - #include <machine/soundcard.h> - #endif - #ifdef __linux__ diff --git a/audio/wmsmixer/patches/patch-mixctl.h b/audio/wmsmixer/patches/patch-mixctl.h new file mode 100644 index 00000000000..53b8928e7b3 --- /dev/null +++ b/audio/wmsmixer/patches/patch-mixctl.h @@ -0,0 +1,23 @@ +$NetBSD: patch-mixctl.h,v 1.1 2022/09/20 06:30:48 nia Exp $ + +Simplify OSS header inclusion situation. Should help DragonFly, Solaris... + +--- mixctl.h.orig 2001-03-02 10:32:05.000000000 +0000 ++++ mixctl.h +@@ -15,14 +15,10 @@ + #include <sys/stat.h> + #include <fcntl.h> + #include <unistd.h> +-#ifdef __NetBSD__ +-#include <soundcard.h> +-#endif +-#ifdef __FreeBSD__ +-#include <machine/soundcard.h> +-#endif + #ifdef __linux__ + #include <linux/soundcard.h> ++#else ++#include <sys/soundcard.h> + #endif + + class MixCtl |