aboutsummaryrefslogtreecommitdiffstats
path: root/audio/oss
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2012-02-21 04:41:26 +0800
committerjkim <jkim@FreeBSD.org>2012-02-21 04:41:26 +0800
commitd19af5c87d9827d21dadf2d08b294594d0a1f4c8 (patch)
tree332d40d5bbfbef69c58ed705e63801bcb03885ba /audio/oss
parentc84a3833b8a9e573d7393d353d1391bd52cb7e02 (diff)
downloadfreebsd-ports-gnome-d19af5c87d9827d21dadf2d08b294594d0a1f4c8.tar.gz
freebsd-ports-gnome-d19af5c87d9827d21dadf2d08b294594d0a1f4c8.tar.zst
freebsd-ports-gnome-d19af5c87d9827d21dadf2d08b294594d0a1f4c8.zip
Do not ignore hardwired device unit number.
Tested by: rank1seeker at gmail dot com
Diffstat (limited to 'audio/oss')
-rw-r--r--audio/oss/Makefile1
-rw-r--r--audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c14
2 files changed, 9 insertions, 6 deletions
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index cc5743ab0944..d82f3b218d9c 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -7,6 +7,7 @@
PORTNAME= oss
DISTVERSION= 4.2-build2006
+PORTREVISION= 1
CATEGORIES= audio kld
MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/
DISTNAME= ${PORTNAME}-v${DISTVERSION}-src-bsd
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 fab182a1ec73..f04747027dc7 100644
--- a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
+++ b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
@@ -1,5 +1,5 @@
---- kernel/OS/FreeBSD/os_freebsd.c.orig 2011-08-11 19:51:27.000000000 -0400
-+++ kernel/OS/FreeBSD/os_freebsd.c 2012-01-31 15:16:58.000000000 -0500
+--- kernel/OS/FreeBSD/os_freebsd.c 2012-02-02 17:46:03.000000000 -0500
++++ kernel/OS/FreeBSD/os_freebsd.c 2012-02-20 12:58:46.000000000 -0500
@@ -16,6 +16,7 @@
#include "midi_core.h"
#include <oss_pci.h>
@@ -17,13 +17,15 @@
if (cards[cardnum]->nick != NULL)
strncpy (ci->shortname, cards[cardnum]->nick, 16);
-@@ -413,8 +414,17 @@
+@@ -413,8 +414,19 @@
if (!(flags & CHDEV_VIRTUAL) && (name != NULL))
{
+#if __FreeBSD_version >= 900023
-+ if (make_dev_p (MAKEDEV_CHECKNAME, &bsd_cdev, &oss_cdevsw, NULL,
-+ UID_ROOT, GID_WHEEL, 0666, name, 0))
++ bsd_cdev =
++ make_dev_credf (MAKEDEV_CHECKNAME, &oss_cdevsw, num, NULL,
++ UID_ROOT, GID_WHEEL, 0666, name, 0);
++ if (bsd_cdev == NULL)
+ {
+ cmn_err (CE_WARN, "Cannot allocate device node /dev/%s\n", name);
+ return;
@@ -35,7 +37,7 @@
cdev->info = bsd_cdev;
}
}
-@@ -604,6 +614,12 @@
+@@ -604,6 +616,12 @@
{
oss_device_t *osdev;