SLFO-pool/musepack
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main musepack revision 7e9457f283927db2d84438385aad615b

Browse Source
This commit is contained in:
Adrian Schröter 2024-10-03 17:40:06 +02:00
parent 3a7a385eac
commit c5c5df7aaf
5 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmpcdec-extern.patch
View File

@ -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 */

32
libmpcdec-gcc14.patch Normal file
View File

@ -0,0 +1,32 @@
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 );

5
libmpcdec.patch
View File

@ -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)

13
musepack.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Mar 12 12:09:36 UTC 2024 - Michael Gorse <mgorse@suse.com>
- 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).
-------------------------------------------------------------------
Thu Feb 22 11:51:15 UTC 2024 - pgajdos@suse.com
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Mon Sep 14 15:40:02 UTC 2020 - Michael Gorse <mgorse@suse.com>

8
musepack.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package musepack
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2013 Asterios Dramis <asterios.dramis@gmail.com>.
#
# All modifications and additions to the file contributed by third parties
@ -33,6 +33,7 @@ Patch0: libmpcdec.patch
# PATCh-FIX-UPSTREAM libmpcdec-extern.patch boo#1160284 mgorse@suse.com -- 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 @@ It is based on the MPEG-1 Layer-2 / MP2 algorithms, but has further
been developed.
%prep
%setup -q -n %{name}_src_%{version}
%patch0
%patch1
%patch2 -p1
%autosetup -p1 -n %{name}_src_%{version}
%build
# Fix rpmlint warning "version-control-internal-file"