Accepting request 1190775 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/1190775
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csound?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2024-08-01 20:04:29 +00:00 committed by Git OBS Bridge
commit c312d9c72a
3 changed files with 38 additions and 1 deletions

31
csound-gcc14.patch Normal file
View File

@ -0,0 +1,31 @@
Index: csound-6.18.1/Opcodes/OSC.c
===================================================================
--- csound-6.18.1.orig/Opcodes/OSC.c
+++ csound-6.18.1/Opcodes/OSC.c
@@ -548,7 +548,7 @@ static int32_t OSC_handler(const char *p
case 'b':
{
int32_t len =
- lo_blobsize((lo_blob*)argv[i]);
+ lo_blobsize((lo_blob)argv[i]);
m->args[i].blob =
csound->Malloc(csound,len);
memcpy(m->args[i].blob, argv[i], len);
@@ -787,7 +787,7 @@ static int32_t OSC_list_init(CSOUND *cso
csound->UnlockMutex(p->port->mutex_);
p->c.method = lo_server_thread_add_method(p->port->thread,
p->c.saved_path, p->c.saved_types,
- OSC_handler, p->port);
+ (lo_method_handler)OSC_handler, p->port);
csound->RegisterDeinitCallback(csound, p,
(int32_t (*)(CSOUND *, void *)) OSC_listdeinit);
return OK;
@@ -1067,7 +1067,7 @@ static int32_t OSC_alist_init(CSOUND *cs
csound->UnlockMutex(p->port->mutex_);
p->c.method = lo_server_thread_add_method(p->port->thread,
p->c.saved_path, p->c.saved_types,
- OSC_ahandler, p->port);
+ (lo_method_handler)OSC_ahandler, p->port);
csound->RegisterDeinitCallback(csound, p,
(int32_t (*)(CSOUND *, void *)) OSC_listadeinit);
return OK;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 30 12:10:38 UTC 2024 - Marcus Meissner <meissner@suse.com>
- csound-gcc14.patch: fixed gcc14 build issues
-------------------------------------------------------------------
Thu Mar 21 21:09:19 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package csound
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@ -44,6 +44,7 @@ Patch2: csound-6.08-default-pulse.patch
Patch4: csound-6.08-xdg-open.patch
Patch5: csound-rename-sndinfo.patch
Patch6: csound-rename-extract.patch
Patch7: csound-gcc14.patch
BuildRequires: alsa-devel
BuildRequires: bison
BuildRequires: cmake