diff options
| author | jkim <jkim@FreeBSD.org> | 2008-01-05 07:25:14 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2008-01-05 07:25:14 +0800 |
| commit | 777c45b0c8d0b8c315d040b716933aabf806bd57 (patch) | |
| tree | 9ab881d08088f2a353e46f94eac25b9d40fe578b /audio/oss/files | |
| parent | 1badf6517e9fdb74e2bfa976a4cc61eff0f511b4 (diff) | |
| download | freebsd-ports-gnome-777c45b0c8d0b8c315d040b716933aabf806bd57.tar.gz freebsd-ports-gnome-777c45b0c8d0b8c315d040b716933aabf806bd57.tar.zst freebsd-ports-gnome-777c45b0c8d0b8c315d040b716933aabf806bd57.zip | |
Update to BSD-licensed build 1012.
http://www.opensound.com/press/2008/oss-bsd.txt
http://www.4front-tech.com/forum/viewtopic.php?t=2406
Diffstat (limited to 'audio/oss/files')
| -rw-r--r-- | audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c | 15 | ||||
| -rw-r--r-- | audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c | 18 |
2 files changed, 12 insertions, 21 deletions
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 72a2c7d98168..50177823fc3f 100644 --- a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c +++ b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c @@ -1,6 +1,6 @@ ---- kernel/OS/FreeBSD/os_freebsd.c.orig 2007-11-12 15:40:51.000000000 -0500 -+++ kernel/OS/FreeBSD/os_freebsd.c 2007-11-12 15:42:12.000000000 -0500 -@@ -28,6 +28,7 @@ +--- kernel/OS/FreeBSD/os_freebsd.c.orig 2008-01-04 17:47:28.000000000 -0500 ++++ kernel/OS/FreeBSD/os_freebsd.c 2008-01-04 17:47:30.000000000 -0500 +@@ -21,6 +21,7 @@ #include <sys/proc.h> #include <sys/sx.h> #include <sys/mman.h> @@ -8,12 +8,3 @@ #include <fs/devfs/devfs.h> #include <sys/poll.h> -@@ -153,7 +154,7 @@ - return 0; - - wq->flags = 0; -- flag = msleep (wq, *mutex, PRIBIO | PCATCH, "oss", ticks); -+ flag = msleep_spin (wq, *mutex, "oss", ticks); - - if (flag == EWOULDBLOCK) /* Timeout */ - { diff --git a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c b/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c index 5f566a22d772..812441bf4df9 100644 --- a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c +++ b/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c @@ -1,19 +1,19 @@ ---- setup/FreeBSD/oss/build/osscore.c.orig 2007-12-11 15:01:24.000000000 -0500 -+++ setup/FreeBSD/oss/build/osscore.c 2007-12-11 15:06:33.000000000 -0500 -@@ -163,9 +163,13 @@ +--- setup/FreeBSD/oss/build/osscore.c.orig 2008-01-04 17:53:49.000000000 -0500 ++++ setup/FreeBSD/oss/build/osscore.c 2008-01-04 17:55:26.000000000 -0500 +@@ -163,12 +163,12 @@ return -EIO; } - intr->irq == bus_setup_intr (osdev->dip, intr->irqres, -- INTR_TYPE_AV | INTR_MPSAFE, ossintr, intr, -- &(intr->cookie)); +- INTR_TYPE_AV | INTR_MPSAFE, + intr->irq = bus_setup_intr (osdev->dip, intr->irqres, + INTR_TYPE_AV | INTR_MPSAFE, -+#if __FreeBSD_version >= 700031 + #if __FreeBSD_version >= 700031 +- NULL, + NULL, -+#endif -+ ossintr, intr, -+ &(intr->cookie)); + #endif +- ossintr, intr, &(intr->cookie)); ++ ossintr, intr, &(intr->cookie)); nintrs++; |