pool/audacity
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 1286499 from multimedia:apps

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1286499
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=130
This commit is contained in:
Ana Guerrero
2025-06-18 13:57:58 +00:00
committed by Git OBS Bridge
parent fac833078f aa814d6200
commit 0bb91d7b28
3 changed files with 105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
Use-full-function-prototypes-in-libnyquist.patch Normal file
View File

@@ -0,0 +1,97 @@
From f2085f63327507c586ed8cb42c2ea15c16359129 Mon Sep 17 00:00:00 2001
From: Dmitry Makarenko <kryksyh@gmail.com>
Date: Sun, 15 Jun 2025 19:54:09 +0300
Subject: [PATCH] Use full function prototypes in libnyquist
Fixes compilation on GCC15.1
---
lib-src/libnyquist/nyquist/cmt/midifile.c | 40 ++---------------------
1 file changed, 2 insertions(+), 38 deletions(-)
diff --git a/lib-src/libnyquist/nyquist/cmt/midifile.c b/lib-src/libnyquist/nyquist/cmt/midifile.c
index 878441a5980f..01168bd7d044 100644
--- a/lib-src/libnyquist/nyquist/cmt/midifile.c
+++ b/lib-src/libnyquist/nyquist/cmt/midifile.c
@@ -23,12 +23,8 @@
#include "string.h"
#define MIDIFILE_ERROR -1
-
-#ifdef PROTOTYPES
#define NOARGS void
-#else
-#define NOARGS
-#endif
+
/* public stuff */
extern int abort_flag;
@@ -38,7 +34,6 @@ void (*Mf_starttrack)(NOARGS) = 0;
void (*Mf_endtrack)(NOARGS) = 0;
int (*Mf_getc)(NOARGS) = 0;
void (*Mf_eot)(NOARGS) = 0;
-#ifdef PROTOTYPES
void (*Mf_error)(char *) = 0;
void (*Mf_header)(int,int,int) = 0;
void (*Mf_on)(int,int,int) = 0;
@@ -58,27 +53,6 @@ void (*Mf_tempo)(int) = 0;
void (*Mf_keysig)(int,int) = 0;
void (*Mf_sqspecific)(int,char*) = 0;
void (*Mf_text)(int,int,char*) = 0;
-#else
-void (*Mf_error)() = 0;
-void (*Mf_header)() = 0;
-void (*Mf_on)() = 0;
-void (*Mf_off)() = 0;
-void (*Mf_pressure)() = 0;
-void (*Mf_controller)() = 0;
-void (*Mf_pitchbend)() = 0;
-void (*Mf_program)() = 0;
-void (*Mf_chanpressure)() = 0;
-void (*Mf_sysex)() = 0;
-void (*Mf_arbitrary)() = 0;
-void (*Mf_metamisc)() = 0;
-void (*Mf_seqnum)() = 0;
-void (*Mf_smpte)() = 0;
-void (*Mf_tempo)() = 0;
-void (*Mf_timesig)() = 0;
-void (*Mf_keysig)() = 0;
-void (*Mf_sqspecific)() = 0;
-void (*Mf_text)() = 0;
-#endif
int Mf_nomerge = 0; /* 1 => continue'ed system exclusives are */
/* not collapsed. */
@@ -100,7 +74,6 @@ static void sysex(NOARGS), msginit(NOARGS);
static int egetc(NOARGS);
static int msgleng(NOARGS);
-#ifdef PROTOTYPES
static int readmt(char*,int);
static long to32bit(int,int,int,int);
static int to16bit(int,int);
@@ -109,15 +82,6 @@ static void badbyte(int);
static void metaevent(int);
static void msgadd(int);
static void chanmessage(int,int,int);
-#else
-static long to32bit();
-static int to16bit();
-static void mferror();
-static void badbyte();
-static void metaevent();
-static void msgadd();
-static void chanmessage();
-#endif
static int midifile_error;
@@ -128,7 +92,7 @@ midifile() /* The only non-static function in this file. */
midifile_error = 0;
if ( Mf_getc == 0 ) {
- mferror("mf.h() called without setting Mf_getc");
+ mferror("mf.h() called without setting Mf_getc");
return;
}
ntrks = readheader();

6
audacity.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 17 20:19:44 UTC 2025 - Konstantin Voinov <kv@kott.no-ip.biz>
- Add Use-full-function-prototypes-in-libnyquist.patch fixing build
with gcc-15
-------------------------------------------------------------------
Tue Jun 10 19:16:42 UTC 2025 - Konstantin Voinov <kv@kott.no-ip.biz>

2
audacity.spec
View File

@@ -36,6 +36,7 @@ Patch0: audacity-no_buildstamp.patch
# PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.patch - Fix false positive errors Two new gcc10 ones ignoring assert
Patch1: audacity-no_return_in_nonvoid.patch
# PATCH-FIX-OPENSUSE vst-system-path.patch - search fo vsts in /usr/lib64 in x86_64 and ARM system
Patch2: Use-full-function-prototypes-in-libnyquist.patch
Patch3: lib64-plugins-default-path.patch
BuildRequires: cmake >= 3.16
BuildRequires: desktop-file-utils
@@ -125,6 +126,7 @@ physical memory size can be edited.
%setup -q -n %{name}-Audacity-%{version}
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1
%ifarch x86_64 aarch64
%patch -P 3 -p1