Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package musepack for openSUSE:Factory checked in at 2024-03-13 22:16:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/musepack (Old) and /work/SRC/openSUSE:Factory/.musepack.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "musepack" Wed Mar 13 22:16:46 2024 rev:6 rq:1157171 version:r475 Changes: -------- --- /work/SRC/openSUSE:Factory/musepack/musepack.changes 2024-02-23 16:41:28.238944344 +0100 +++ /work/SRC/openSUSE:Factory/.musepack.new.1770/musepack.changes 2024-03-13 22:17:13.633288956 +0100 @@ -1,0 +2,8 @@ +Tue Mar 12 12:09:36 UTC 2024 - Michael Gorse <[email protected]> + +- Rework libmpcdec.patch and libmpcdec-extern.patch so that they + apply with -p1, and use autosetup. +- Add libmpcdec-gcc14.patch: fix the build with gcc 14 + (boo#1221008). + +------------------------------------------------------------------- New: ---- libmpcdec-gcc14.patch BETA DEBUG BEGIN: New: apply with -p1, and use autosetup. - Add libmpcdec-gcc14.patch: fix the build with gcc 14 (boo#1221008). BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ musepack.spec ++++++ --- /var/tmp/diff_new_pack.EYQnhX/_old 2024-03-13 22:17:14.121306910 +0100 +++ /var/tmp/diff_new_pack.EYQnhX/_new 2024-03-13 22:17:14.125307056 +0100 @@ -33,6 +33,7 @@ # PATCh-FIX-UPSTREAM libmpcdec-extern.patch boo#1160284 [email protected] -- add extern declarations. Patch1: libmpcdec-extern.patch Patch2: libmpcdec-fastmath-no-const.patch +Patch3: libmpcdec-gcc14.patch BuildRequires: cmake BuildRequires: libcuefile-devel BuildRequires: libreplaygain-devel @@ -71,10 +72,7 @@ been developed. %prep -%setup -q -n %{name}_src_%{version} -%patch -P 0 -%patch -P 1 -%patch -P 2 -p1 +%autosetup -p1 -n %{name}_src_%{version} %build # Fix rpmlint warning "version-control-internal-file" ++++++ libmpcdec-extern.patch ++++++ --- /var/tmp/diff_new_pack.EYQnhX/_old 2024-03-13 22:17:14.153308087 +0100 +++ /var/tmp/diff_new_pack.EYQnhX/_new 2024-03-13 22:17:14.157308234 +0100 @@ -1,8 +1,7 @@ -Index: libmpcdec/requant.h -=================================================================== ---- libmpcdec/requant.h (revision 478) -+++ libmpcdec/requant.h (revision 479) -@@ -47,9 +47,9 @@ +diff -urp musepack_src_r475.orig/libmpcdec/requant.h musepack_src_r475/libmpcdec/requant.h +--- musepack_src_r475.orig/libmpcdec/requant.h 2009-02-23 12:44:04.000000000 -0600 ++++ musepack_src_r475/libmpcdec/requant.h 2024-03-10 13:23:35.095195384 -0500 +@@ -47,9 +47,9 @@ extern "C" { /* C O N S T A N T S */ ++++++ libmpcdec-gcc14.patch ++++++ 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 ); // 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 ); 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-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); float ISNR_Schaetzer_Trans ( const float* samples, const float comp, const int res); -void QuantizeSubband ( unsigned int* qu_output, const float* input, const int res, float* errors, const int maxNsOrder ); -void QuantizeSubbandWithNoiseShaping ( unsigned int* qu_output, const float* input, const int res, float* errors, const float* FIR ); +void QuantizeSubband ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const int maxNsOrder ); +void QuantizeSubbandWithNoiseShaping ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const float* FIR ); void NoiseInjectionComp ( void ); ++++++ libmpcdec.patch ++++++ --- /var/tmp/diff_new_pack.EYQnhX/_old 2024-03-13 22:17:14.181309117 +0100 +++ /var/tmp/diff_new_pack.EYQnhX/_new 2024-03-13 22:17:14.181309117 +0100 @@ -1,5 +1,6 @@ ---- libmpcdec/CMakeLists.txt.orig 2010-08-21 18:55:01.000000000 +0300 -+++ libmpcdec/CMakeLists.txt 2013-03-11 22:28:18.414009124 +0200 +diff -urp musepack_src_r475.orig/libmpcdec/CMakeLists.txt musepack_src_r475/libmpcdec/CMakeLists.txt +--- musepack_src_r475.orig/libmpcdec/CMakeLists.txt 2010-08-21 10:55:01.000000000 -0500 ++++ musepack_src_r475/libmpcdec/CMakeLists.txt 2024-03-10 13:21:31.111523099 -0500 @@ -1,7 +1,11 @@ include_directories(${libmpc_SOURCE_DIR}/include) if(SHARED)
