haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

opensound: fixes for smap

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-01-28 22:27:24 +10:00
parent 635ae302da
commit 7761932c7c
2 changed files with 66 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-sound/opensound/opensound-4.2.recipe
View File

@@ -5,7 +5,7 @@ provide a uniform API across all the major UNIX architectures."
HOMEPAGE="http://developer.opensound.com/"
COPYRIGHT="1996-2017 Hannu Savolainen and Dev Mazumdar"
LICENSE="BSD (2-clause)"
REVISION="3"
REVISION="4"
SOURCE_URI="http://www.4front-tech.com/developer/sources/stable/bsd/oss-v$portVersion-build2017-src-bsd.tar.bz2"
CHECKSUM_SHA256="8ef2b1b964719b4c356de234d4b28832302027dc23bf636820be1afe1b099972"
SOURCE_DIR="oss-v$portVersion-build2017-src-bsd"

76
media-sound/opensound/patches/opensound-4.2.patchset
View File

@@ -1,4 +1,4 @@
From 3dad68c20cee07b80ab1828cda2497bb3c2cf379 Mon Sep 17 00:00:00 2001
From 9ec580f773012eb5967145612d806bbd997d6403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 7 Aug 2014 22:20:13 +0200
Subject: Haiku: Fix physical address passing to oss_map_pci_mem()
@@ -59,7 +59,7 @@ index 1e8f0b5..f4621e1 100644
2.19.1
From 6c247dced4c756f3b73568bc5ca0b15685b358bb Mon Sep 17 00:00:00 2001
From 5e3ca845e2560e5b276c144ee24c63082fe206f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 08:52:04 +0100
Subject: Haiku: Fix mutex initialization
@@ -89,7 +89,7 @@ index f4621e1..057948e 100644
2.19.1
From 2d13191c02f54b3c8a0c5702114b10c9a8225fb6 Mon Sep 17 00:00:00 2001
From 4979434a28564b24a2f5a3f0238e5e713b1294bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 09:48:20 +0100
Subject: Haiku: Fix "decimal constant is so large that it is unsigned" warning
@@ -125,7 +125,7 @@ index a829671..90b8491 100644
2.19.1
From 82c17067b9a2b3279c33ade8d9d3b3e9dd3c3e60 Mon Sep 17 00:00:00 2001
From 87e0c6fe3c25bf35376c07e7b70bcbd01a9cd5af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 10:21:08 +0100
Subject: Haiku: Fix new type for atomics
@@ -152,7 +152,7 @@ index f29197c..3f1366b 100644
2.19.1
From a1e8ed41664838542c1ea560c204da9c53500a51 Mon Sep 17 00:00:00 2001
From c93b2e56df05a798b545ee2a1ed47c8b3fb7a1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 10:22:36 +0100
Subject: Haiku: Work around PCI->ram_address limitation
@@ -182,7 +182,7 @@ index 3f1366b..0f9f3f6 100644
2.19.1
From 16cbac9874f8bafc55e3ac4e5d35a8b6a56f2213 Mon Sep 17 00:00:00 2001
From 404b23dc5041785b4120c0b5610c05fa62c9006a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 11:21:20 +0100
Subject: Haiku: build.sh: Fix and make more flexible for packaging
@@ -299,7 +299,7 @@ index 045a599..31ae894 100644
2.19.1
From 5334f04f1ccca6d6394d3590add7774853733f25 Mon Sep 17 00:00:00 2001
From ce4a3bfa4c69a75a144ac182041ba7b1f8bf7506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 12:00:47 +0100
Subject: Haiku: Fix installing paths
@@ -325,7 +325,7 @@ index 31ae894..dba8bf5 100644
2.19.1
From 88a501aca135bfef61df9bc17a198ae15827cba9 Mon Sep 17 00:00:00 2001
From a274eb8f7d7dcbb7780f3b9c4661fe0cae1306e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 13:11:13 +0100
Subject: Haiku: make sure we preserve symlinks on installing
@@ -351,7 +351,7 @@ index ca403e9..8b8a101 100644
2.19.1
From 0589c208d0a1fa3615fd9fc9f231c8ed4879bbcf Mon Sep 17 00:00:00 2001
From 692aa9e3d4aa9869ccea1342a29af0dd1a142472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 15:58:22 +0100
Subject: Haiku: only make an osdev available when pci reservation worked
@@ -387,7 +387,7 @@ index 0f9f3f6..f7e9883 100644
2.19.1
From 42a1fdf52d43a3e29ddbd41820c94982976b0b17 Mon Sep 17 00:00:00 2001
From e3facde1491e0ee84215c777a9d55cacc2eeeea1 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 27 Jan 2019 20:32:10 +1000
Subject: Haiku: Fixes for SMAP
@@ -424,7 +424,7 @@ index f7e9883..e2d34ab 100644
2.19.1
From cec7f25ab3067627d723de8bb891b8fef38b6d07 Mon Sep 17 00:00:00 2001
From 54f405a9bf59604b33ae029a9aeceaeaf90a8569 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 27 Jan 2019 23:19:48 +1000
Subject: Haiku: Fix build for x86_64
@@ -491,3 +491,57 @@ index 8083e50..ddff290 100644
--
2.19.1
From 7c539d7a6d5572d6b1b6400eb57998812b94aef2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 28 Jan 2019 22:24:03 +1000
Subject: Haiku: use user_memcpy
diff --git a/kernel/OS/BeOS/os_beos.c b/kernel/OS/BeOS/os_beos.c
index e2d34ab..7f9a68a 100644
--- a/kernel/OS/BeOS/os_beos.c
+++ b/kernel/OS/BeOS/os_beos.c
@@ -312,13 +312,13 @@ oss_uiomove (void *address, size_t nbytes, enum uio_rw rwflag, uio_t * uio)
switch (rwflag)
{
case UIO_READ:
- //XXX:user_memcpy...
- memcpy (uio->ptr, address, nbytes);
+ if (user_memcpy (uio->ptr, address, nbytes) < B_OK)
+ return B_BAD_ADDRESS;
break;
case UIO_WRITE:
- //XXX:user_memcpy...
- memcpy (address, uio->ptr, nbytes);
+ if (user_memcpy (address, uio->ptr, nbytes) < B_OK)
+ return B_BAD_ADDRESS;
break;
}
@@ -2130,8 +2130,8 @@ ossdrv_ioctl(ossdev_cookie_t *cookie, uint32 op, void *buffer, size_t length)
if ((cmd & SIOC_IN) && len > 0)
{
- memcpy (buf, buffer, len);
- //return EFAULT;
+ if (user_memcpy (buf, buffer, len) < B_OK)
+ return B_BAD_ADDRESS;
}
}
@@ -2140,8 +2140,8 @@ ossdrv_ioctl(ossdev_cookie_t *cookie, uint32 op, void *buffer, size_t length)
if ((cmd & SIOC_OUT) && len > 0)
{
- memcpy (buffer, buf, len);
- //return EFAULT;
+ if (user_memcpy (buffer, buf, len) < B_OK)
+ return B_BAD_ADDRESS;
}
--
2.19.1