From 1b43867bc9afb4fc558a9dfbeaeeefb38c90e8b3 Mon Sep 17 00:00:00 2001 From: kenmays Date: Fri, 7 Aug 2020 07:08:27 -0700 Subject: [PATCH] opensound: fix build for R1B2 (#5236) --- media-sound/opensound/opensound-4.2.recipe | 12 ++-- .../opensound/patches/opensound-4.2.patchset | 58 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/media-sound/opensound/opensound-4.2.recipe b/media-sound/opensound/opensound-4.2.recipe index 90f30fe8f..6795dc900 100644 --- a/media-sound/opensound/opensound-4.2.recipe +++ b/media-sound/opensound/opensound-4.2.recipe @@ -1,14 +1,14 @@ -SUMMARY="An open sound system" +SUMMARY="Open Sound System audio architecture" DESCRIPTION="Open Sound System (OSS) is the first attempt in unifying the \ digital audio architecture for UNIX. OSS is a set of device drivers that \ provide a uniform API across all the major UNIX architectures." HOMEPAGE="http://developer.opensound.com/" -COPYRIGHT="1996-2017 Hannu Savolainen and Dev Mazumdar" +COPYRIGHT="1996-2019 Hannu Savolainen and Dev Mazumdar" LICENSE="BSD (2-clause)" -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" +REVISION="5" +SOURCE_URI="http://www.4front-tech.com/developer/sources/stable/bsd/oss-v$portVersion-build2019-src-bsd.tar.bz2" +CHECKSUM_SHA256="3eaa2f66cc5f9cc66843eae9ae4601cf7206d00e7229d1f3144a122adea4e7c9" +SOURCE_DIR="oss-v$portVersion-build2019-src-bsd" PATCHES="opensound-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/media-sound/opensound/patches/opensound-4.2.patchset b/media-sound/opensound/patches/opensound-4.2.patchset index 1851646f7..faf79037c 100644 --- a/media-sound/opensound/patches/opensound-4.2.patchset +++ b/media-sound/opensound/patches/opensound-4.2.patchset @@ -1,4 +1,4 @@ -From 9ec580f773012eb5967145612d806bbd997d6403 Mon Sep 17 00:00:00 2001 +From 461ff269e878414ecd80f9bebb1217b3625c2610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 7 Aug 2014 22:20:13 +0200 Subject: Haiku: Fix physical address passing to oss_map_pci_mem() @@ -56,10 +56,10 @@ index 1e8f0b5..f4621e1 100644 #define MAP_PCI_IOADDR(osdev, nr, io) (oss_native_word)io #define MAP_PCI_MEM(osdev, ix, phaddr, size) oss_map_pci_mem(osdev, ix, phaddr, size) -- -2.19.1 +2.28.0 -From 5e3ca845e2560e5b276c144ee24c63082fe206f5 Mon Sep 17 00:00:00 2001 +From 278de2194c9b9117d2376692049383f10facdff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 21 Nov 2017 08:52:04 +0100 Subject: Haiku: Fix mutex initialization @@ -86,10 +86,10 @@ index f4621e1..057948e 100644 #define MUTEX_ENTER_IRQDISABLE(mutex, flags) \ { \ -- -2.19.1 +2.28.0 -From 4979434a28564b24a2f5a3f0238e5e713b1294bf Mon Sep 17 00:00:00 2001 +From 7950419bfde04b59a6014df825c1e05bb90ae9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 21 Nov 2017 09:48:20 +0100 Subject: Haiku: Fix "decimal constant is so large that it is unsigned" warning @@ -109,7 +109,7 @@ int main() { } diff --git a/setup/srcconf.c b/setup/srcconf.c -index a829671..90b8491 100644 +index 3a5b866..f4f93ac 100644 --- a/setup/srcconf.c +++ b/setup/srcconf.c @@ -1379,7 +1379,7 @@ produce_errno_h(void) @@ -122,10 +122,10 @@ index a829671..90b8491 100644 fprintf (f, "#ifndef OSS_ERRNO_H\n"); fprintf (f, "#define OSS_ERRNO_H\n"); -- -2.19.1 +2.28.0 -From 87e0c6fe3c25bf35376c07e7b70bcbd01a9cd5af Mon Sep 17 00:00:00 2001 +From 5d6cc2882cdd28c60c0f1f429c67ef10b178c205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 21 Nov 2017 10:21:08 +0100 Subject: Haiku: Fix new type for atomics @@ -149,10 +149,10 @@ index f29197c..3f1366b 100644 volatile int oss_open_devices = 0; #define MAX_CARDS 16 -- -2.19.1 +2.28.0 -From c93b2e56df05a798b545ee2a1ed47c8b3fb7a1ae Mon Sep 17 00:00:00 2001 +From 2ef868ddaa5567f04f149cb6433b722a3a6ed727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 21 Nov 2017 10:22:36 +0100 Subject: Haiku: Work around PCI->ram_address limitation @@ -179,10 +179,10 @@ index 3f1366b..0f9f3f6 100644 -- -2.19.1 +2.28.0 -From 404b23dc5041785b4120c0b5610c05fa62c9006a Mon Sep 17 00:00:00 2001 +From 229fab972fd0eb02c2d7b816f69aefd8d8415d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 21 Nov 2017 11:21:20 +0100 Subject: Haiku: build.sh: Fix and make more flexible for packaging @@ -296,10 +296,10 @@ index 045a599..31ae894 100644 #shortver="${longver%% *}" #appver="${shortver:0:1} ${shortver:0:1} 0 b ${shortver##*[a-z]}" -- -2.19.1 +2.28.0 -From ce4a3bfa4c69a75a144ac182041ba7b1f8bf7506 Mon Sep 17 00:00:00 2001 +From 1aa7f5bb51967c3be718c695480436a4a3e76def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 21 Nov 2017 12:00:47 +0100 Subject: Haiku: Fix installing paths @@ -322,10 +322,10 @@ index 31ae894..dba8bf5 100644 # the path to the kernel binary we can link to if [ $OSTYPE = "haiku" ]; then -- -2.19.1 +2.28.0 -From a274eb8f7d7dcbb7780f3b9c4661fe0cae1306e4 Mon Sep 17 00:00:00 2001 +From ba350dce45a1433a814272d8eb28e87a177ac323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 21 Nov 2017 13:11:13 +0100 Subject: Haiku: make sure we preserve symlinks on installing @@ -348,10 +348,10 @@ index ca403e9..8b8a101 100644 package: build sh setup/BeOS/mkpkg.sh -- -2.19.1 +2.28.0 -From 692aa9e3d4aa9869ccea1342a29af0dd1a142472 Mon Sep 17 00:00:00 2001 +From 5ddcfac32cc10f8f5cbc0c7d70512fdc30b1d2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 21 Nov 2017 15:58:22 +0100 Subject: Haiku: only make an osdev available when pci reservation worked @@ -384,17 +384,17 @@ index 0f9f3f6..f7e9883 100644 * Create the device handle */ -- -2.19.1 +2.28.0 -From e3facde1491e0ee84215c777a9d55cacc2eeeea1 Mon Sep 17 00:00:00 2001 +From 84f9db3d55f32ab50e434027aa3e9f9bc954d6ed 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 diff --git a/kernel/OS/BeOS/os_beos.c b/kernel/OS/BeOS/os_beos.c -index f7e9883..e2d34ab 100644 +index f7e9883..8a08a4e 100644 --- a/kernel/OS/BeOS/os_beos.c +++ b/kernel/OS/BeOS/os_beos.c @@ -134,8 +134,8 @@ oss_contig_malloc (oss_device_t * osdev, int size, oss_uint64_t memlimit, @@ -404,7 +404,7 @@ index f7e9883..e2d34ab 100644 - if ((err = id = create_area(OSS_CONTIG_AREA_NAME, &p, B_ANY_KERNEL_ADDRESS, - size, lock, 0)) < B_OK) + if ((err = id = create_area(OSS_CONTIG_AREA_NAME, &p, B_ANY_KERNEL_ADDRESS, \ -+ size, lock, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA | B_USER_CLONEABLE_AREA )) < B_OK) ++ size, lock, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA | B_CLONEABLE_AREA )) < B_OK) { cmn_err (CE_WARN, "create_area() failed\n"); return NULL; @@ -416,15 +416,15 @@ index f7e9883..e2d34ab 100644 - B_ANY_KERNEL_BLOCK_ADDRESS, 0, &va); + err = map_physical_memory(OSS_PCI_AREA_NAME, phaddr, size, \ + B_ANY_KERNEL_BLOCK_ADDRESS, \ -+ B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA | B_USER_CLONEABLE_AREA, &va); ++ B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA | B_CLONEABLE_AREA, &va); if (err < B_OK) va = NULL; FEXITR((uint32)va); -- -2.19.1 +2.28.0 -From 54f405a9bf59604b33ae029a9aeceaeaf90a8569 Mon Sep 17 00:00:00 2001 +From 0d4f21ee77eb7b2f956ebc104aa627befd7c21d0 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 @@ -489,17 +489,17 @@ index 8083e50..ddff290 100644 + -finline -fno-builtin -ffreestanding -fno-exceptions -fno-omit-frame-pointer\n"); } -- -2.19.1 +2.28.0 -From 7c539d7a6d5572d6b1b6400eb57998812b94aef2 Mon Sep 17 00:00:00 2001 +From e6cd3d6fbdafed0f040295e54018d526db90bdd4 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 +index 8a08a4e..0a6abc9 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) @@ -543,5 +543,5 @@ index e2d34ab..7f9a68a 100644 -- -2.19.1 +2.28.0