diff --git a/libmpcdec-fastmath-no-const.patch b/libmpcdec-fastmath-no-const.patch new file mode 100644 index 0000000..6e5d8f6 --- /dev/null +++ b/libmpcdec-fastmath-no-const.patch @@ -0,0 +1,36 @@ +diff -urp musepack_src_r475.orig/common/fastmath.c musepack_src_r475/common/fastmath.c +--- musepack_src_r475.orig/common/fastmath.c 2007-06-09 09:43:34.000000000 -0500 ++++ musepack_src_r475/common/fastmath.c 2020-09-14 10:39:01.942623458 -0500 +@@ -21,10 +21,10 @@ + + #ifdef FAST_MATH + +-const float tabatan2 [ 2*TABSTEP+1] [2]; +-const float tabcos [26*TABSTEP+1] [2]; +-const float tabsqrt_ex [256]; +-const float tabsqrt_m [ TABSTEP+1] [2]; ++float tabatan2 [ 2*TABSTEP+1] [2]; ++float tabcos [26*TABSTEP+1] [2]; ++float tabsqrt_ex [256]; ++float tabsqrt_m [ TABSTEP+1] [2]; + + + void Init_FastMath ( void ) +diff -urp musepack_src_r475.orig/include/mpc/mpcmath.h musepack_src_r475/include/mpc/mpcmath.h +--- musepack_src_r475.orig/include/mpc/mpcmath.h 2009-07-31 07:37:44.000000000 -0500 ++++ musepack_src_r475/include/mpc/mpcmath.h 2020-09-14 10:44:15.624279644 -0500 +@@ -87,10 +87,10 @@ static mpc_inline mpc_int32_t mpc_lrintf + # define IFLOORF(x) my_ifloor ((float)(x)) + + void Init_FastMath ( void ); +-extern const float tabatan2 [] [2]; +-extern const float tabcos [] [2]; +-extern const float tabsqrt_ex []; +-extern const float tabsqrt_m [] [2]; ++extern float tabatan2 [] [2]; ++extern float tabcos [] [2]; ++extern float tabsqrt_ex []; ++extern float tabsqrt_m [] [2]; + + static mpc_inline float my_atan2 ( float x, float y ) + { diff --git a/musepack.changes b/musepack.changes index 58c962c..f4bc38f 100644 --- a/musepack.changes +++ b/musepack.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 14 15:40:02 UTC 2020 - Michael Gorse + +- Add libmpcdec-fastmath-no-const.patch: remove const declarations + from some arrays which should not have them (boo#1176374). + ------------------------------------------------------------------- Wed Jan 8 15:52:02 UTC 2020 - Michael Gorse diff --git a/musepack.spec b/musepack.spec index b90f65f..2f88d19 100644 --- a/musepack.spec +++ b/musepack.spec @@ -1,7 +1,7 @@ # # spec file for package musepack # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2013 Asterios Dramis . # # All modifications and additions to the file contributed by third parties @@ -32,6 +32,7 @@ Source99: baselibs.conf 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 BuildRequires: cmake BuildRequires: libcuefile-devel BuildRequires: libreplaygain-devel @@ -73,6 +74,7 @@ been developed. %setup -q -n %{name}_src_%{version} %patch0 %patch1 +%patch2 -p1 %build # Fix rpmlint warning "version-control-internal-file"