aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorChris Rees <crees@FreeBSD.org>2019-12-24 13:36:50 +0000
committerChris Rees <crees@FreeBSD.org>2019-12-24 13:36:50 +0000
commit39a7764d840f877cd5ed3e30c3ce8cde5a8c6128 (patch)
treec4cd67aa019029765c2a6dbb5ea75eb3547bdbf3 /audio
parent86d2798c02fdc18b56f50feb37412f4fac7f2496 (diff)
audio/oss: Silence further compiler warning; perhaps this will help.
Notes
Notes: svn path=/head/; revision=520805
Diffstat (limited to 'audio')
-rw-r--r--audio/oss/Makefile6
-rw-r--r--audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index f89d78e7a107..1b040ccdf1cd 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -65,6 +65,12 @@ post-patch:
-name make.local -or -name soundoff -or -name soundon | \
${XARGS} ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g'
+pre-build:
+ ${MAKE_CMD} -C ${BUILD_WRKSRC}/kernel/OS/FreeBSD \
+ -f /usr/share/mk/bsd.kmod.mk \
+ KMOD=osscore SRCS=os_freebsd.c \
+ device_if.h bus_if.h pci_if.h
+
do-install:
${INSTALL_PROGRAM} ${PROTO_BINDIR}/* ${STAGEDIR}${PREFIX}/bin/
# @${ECHO_CMD} "OSSLIBDIR=${PREFIX}/lib/oss" > ${PROTO_ETCDIR}/oss.conf
diff --git a/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c b/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c
index f801c411a17c..bab87efcef77 100644
--- a/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c
+++ b/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c
@@ -1,10 +1,11 @@
--- kernel/OS/FreeBSD/os_freebsd.c.orig 2019-03-06 07:52:21 UTC
+++ kernel/OS/FreeBSD/os_freebsd.c
-@@ -15,6 +15,8 @@
+@@ -15,6 +15,9 @@
#include "oss_config.h"
#include "midi_core.h"
#include <oss_pci.h>
+#include <sys/param.h>
++#include <sys/bus.h>
+#include <sys/types.h>
#include <sys/conf.h>
#include <sys/module.h>
@@ -17,7 +18,7 @@
/* Function prototypes */
static d_open_t oss_open;
-@@ -920,15 +923,9 @@ oss_poll (struct cdev *bsd_dev, int events, struct thr
+@@ -920,15 +924,9 @@ oss_poll (struct cdev *bsd_dev, int events, struct thr
return ev.revents;
}