From 421bdd4dd1ee97c2b26e86736e64a39f2dfc1163ffddeb9d66744ef205557e97 Mon Sep 17 00:00:00 2001 From: Michael Gorse Date: Tue, 12 Mar 2024 12:10:04 +0000 Subject: [PATCH] Rework gcc 14 patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/musepack?expand=0&rev=15 --- libmpcdec-gcc14.patch | 45 ++++++++++++++++--------------------------- musepack.changes | 2 +- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/libmpcdec-gcc14.patch b/libmpcdec-gcc14.patch index 95bd98c..d7d9be7 100644 --- a/libmpcdec-gcc14.patch +++ b/libmpcdec-gcc14.patch @@ -1,35 +1,24 @@ -diff -urp musepack_src_r475.orig/libmpcpsy/libmpcpsy.h musepack_src_r475/libmpcpsy/libmpcpsy.h ---- musepack_src_r475.orig/libmpcpsy/libmpcpsy.h 2007-01-20 13:43:42.000000000 -0600 -+++ musepack_src_r475/libmpcpsy/libmpcpsy.h 2024-03-11 14:44:50.561339438 -0500 -@@ -85,9 +85,8 @@ typedef struct { - float KBD1; // = 2. - float KBD2; // = -1. +diff -urp musepack_src_r475.orig/libmpcpsy/ans.c musepack_src_r475/libmpcpsy/ans.c +--- musepack_src_r475.orig/libmpcpsy/ans.c 2009-07-31 07:37:44.000000000 -0500 ++++ musepack_src_r475/libmpcpsy/ans.c 2024-03-12 07:08:19.562206587 -0500 +@@ -288,12 +288,12 @@ NS_Analyse ( PsyModel* m, + // for L or M, respectively + memset ( m->FIR_L, 0, sizeof m->FIR_L ); // reset FIR + memset ( m->NS_Order_L, 0, sizeof m->NS_Order_L ); // reset Flags +- FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, m->SCF_Index_L, Transient ); ++ FindOptimalANS ( MaxBand, MSflag, ANSspec_L, ANSspec_M, m->NS_Order_L, m->SNR_comp_L, m->FIR_L, smr.L, smr.M, (int (*)[3])m->SCF_Index_L, Transient ); -- // FIXME : remove this : -- int * SCF_Index_L; -- int * SCF_Index_R; // Scalefactor-index for Bitstream -+ int SCF_Index_L [32] [3]; -+ int SCF_Index_R [32] [3]; // holds scalefactor-indices + // for R or S, respectively + memset ( m->FIR_R, 0, sizeof m->FIR_R ); // reset FIR + memset ( m->NS_Order_R, 0, sizeof m->NS_Order_R ); // reset Flags +- FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, m->SCF_Index_R, Transient ); ++ FindOptimalANS ( MaxBand, MSflag, ANSspec_R, ANSspec_S, m->NS_Order_R, m->SNR_comp_R, m->FIR_R, smr.R, smr.S, (int (*)[3])m->SCF_Index_R, Transient ); - } PsyModel; - -diff -urp musepack_src_r475.orig/mpcenc/mpcenc.c musepack_src_r475/mpcenc/mpcenc.c ---- musepack_src_r475.orig/mpcenc/mpcenc.c 2009-08-26 15:39:06.000000000 -0500 -+++ musepack_src_r475/mpcenc/mpcenc.c 2024-03-11 14:54:47.759752494 -0500 -@@ -1535,8 +1535,8 @@ mainloop ( int argc, char** argv ) - - // initialize tables which must be initialized once and only once - -- m.SCF_Index_L = (int*) e.SCF_Index_L; -- m.SCF_Index_R = (int*) e.SCF_Index_R; -+ memcpy (&m.SCF_Index_L, &e.SCF_Index_L, sizeof (m.SCF_Index_L)); -+ memcpy (&m.SCF_Index_R, &e.SCF_Index_R, sizeof (m.SCF_Index_R)); - - Init_Psychoakustik (&m); - Init_FPU (); + return; + } diff -urp musepack_src_r475.orig/mpcenc/mpcenc.h musepack_src_r475/mpcenc/mpcenc.h --- musepack_src_r475.orig/mpcenc/mpcenc.h 2009-02-23 12:15:46.000000000 -0600 -+++ musepack_src_r475/mpcenc/mpcenc.h 2024-03-11 14:53:19.692828299 -0500 ++++ musepack_src_r475/mpcenc/mpcenc.h 2024-03-12 07:07:38.048701994 -0500 @@ -254,8 +254,8 @@ extern float __invSCF [128 + 6]; float ISNR_Schaetzer ( const float* samples, const float comp, const int res); diff --git a/musepack.changes b/musepack.changes index e76e914..7705bf3 100644 --- a/musepack.changes +++ b/musepack.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Mar 11 19:56:41 UTC 2024 - Michael Gorse +Tue Mar 12 12:09:36 UTC 2024 - Michael Gorse - Rework libmpcdec.patch and libmpcdec-extern.patch so that they apply with -p1, and use autosetup.