From dcd650a5f117d6ed5e2a9f4c4e8ac90b4d09af8c Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:27:36 +0100 Subject: [PATCH] rebuilt with debug package [release r475-2mamba;Sat Jan 30 2021] --- musepack-r475-am-maintainer-mode.patch | 12 +++++ musepack-r475-link-libm.patch | 7 +++ musepack-r475-link-order.patch | 44 +++++++++++++++++ musepack-r475-missing_extern_kw.patch | 22 +++++++++ musepack-r475-mpcchap.patch | 66 ++++++++++++++++++++++++++ musepack-r475-visibility.patch | 13 +++++ musepack.spec | 40 +++++++++++----- 7 files changed, 191 insertions(+), 13 deletions(-) create mode 100644 musepack-r475-am-maintainer-mode.patch create mode 100644 musepack-r475-link-libm.patch create mode 100644 musepack-r475-link-order.patch create mode 100644 musepack-r475-missing_extern_kw.patch create mode 100644 musepack-r475-mpcchap.patch create mode 100644 musepack-r475-visibility.patch diff --git a/musepack-r475-am-maintainer-mode.patch b/musepack-r475-am-maintainer-mode.patch new file mode 100644 index 0000000..e18baba --- /dev/null +++ b/musepack-r475-am-maintainer-mode.patch @@ -0,0 +1,12 @@ +Index: libmpc-0.1~r459/configure.in +=================================================================== +--- libmpc-0.1~r459.orig/configure.in 2010-05-31 16:32:02.551447078 +0200 ++++ libmpc-0.1~r459/configure.in 2010-05-31 16:32:09.578951197 +0200 +@@ -4,6 +4,7 @@ + AC_CONFIG_SRCDIR([libmpcdec/mpc_reader.c]) + AM_CONFIG_HEADER([include/config.h]) + AM_INIT_AUTOMAKE ++AM_MAINTAINER_MODE + + AC_LANG_C + AC_PROG_CC diff --git a/musepack-r475-link-libm.patch b/musepack-r475-link-libm.patch new file mode 100644 index 0000000..14789d1 --- /dev/null +++ b/musepack-r475-link-libm.patch @@ -0,0 +1,7 @@ +--- a/libmpcdec/Makefile.am.old 2009-10-20 20:11:41.000000000 +0200 ++++ b/libmpcdec/Makefile.am 2009-10-20 20:12:02.000000000 +0200 +@@ -17,3 +17,4 @@ + $(common_sources) + + libmpcdec_la_LDFLAGS = -no-undefined -version-info 7:0:1 ++libmpcdec_la_LIBADD = -lm diff --git a/musepack-r475-link-order.patch b/musepack-r475-link-order.patch new file mode 100644 index 0000000..a2e9dba --- /dev/null +++ b/musepack-r475-link-order.patch @@ -0,0 +1,44 @@ +--- + mpc2sv8/Makefile.am | 5 +++-- + mpcdec/Makefile.am | 5 +++-- + mpcenc/Makefile.am | 5 +++-- + 3 files changed, 9 insertions(+), 6 deletions(-) + +--- libmpc.orig/mpc2sv8/Makefile.am ++++ libmpc/mpc2sv8/Makefile.am +@@ -11,6 +11,7 @@ common_sources = ../common/crc32.c + METASOURCES = AUTO + bin_PROGRAMS = mpc2sv8 + mpc2sv8_SOURCES = mpc2sv8.c $(common_sources) +-mpc2sv8_LDADD = -lm \ ++mpc2sv8_LDADD = \ + $(top_builddir)/libmpcdec/libmpcdec.la \ +- $(top_builddir)/libmpcenc/libmpcenc.a ++ $(top_builddir)/libmpcenc/libmpcenc.a \ ++ -lm +--- libmpc.orig/mpcdec/Makefile.am ++++ libmpc/mpcdec/Makefile.am +@@ -9,6 +9,7 @@ endif + METASOURCES = AUTO + bin_PROGRAMS = mpcdec + mpcdec_SOURCES = mpcdec.c +-mpcdec_LDADD = -lm \ ++mpcdec_LDADD = \ + $(top_builddir)/libmpcdec/libmpcdec.la \ +- $(top_builddir)/libwavformat/libwavformat.a ++ $(top_builddir)/libwavformat/libwavformat.a \ ++ -lm +--- libmpc.orig/mpcenc/Makefile.am ++++ libmpc/mpcenc/Makefile.am +@@ -22,8 +22,9 @@ mpcenc_SOURCES = keyboard.c mpcenc.c pip + $(common_sources) \ + mpcenc.h predict.h config.h + +-mpcenc_LDADD = -lm \ ++mpcenc_LDADD = \ + $(EXTRALIBS) \ + $(top_builddir)/libmpcpsy/libmpcpsy.a \ +- $(top_builddir)/libmpcenc/libmpcenc.a ++ $(top_builddir)/libmpcenc/libmpcenc.a \ ++ -lm + diff --git a/musepack-r475-missing_extern_kw.patch b/musepack-r475-missing_extern_kw.patch new file mode 100644 index 0000000..031d8f6 --- /dev/null +++ b/musepack-r475-missing_extern_kw.patch @@ -0,0 +1,22 @@ +Subject: Add extern keyword to global variable declaration. +Origin: upstream, commit:r479 +Bug-Debian: http://bugs.debian.org/665974 +--- + libmpcdec/requant.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- libmpc.orig/libmpcdec/requant.h ++++ libmpc/libmpcdec/requant.h +@@ -47,9 +47,9 @@ extern "C" { + + + /* C O N S T A N T S */ +-const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer +-const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients +-const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset ++extern const mpc_uint8_t Res_bit [18]; ///< Bits per sample for chosen quantizer ++extern const MPC_SAMPLE_FORMAT __Cc [1 + 18]; ///< Requantization coefficients ++extern const mpc_int16_t __Dc [1 + 18]; ///< Requantization offset + + #define Cc (__Cc + 1) + #define Dc (__Dc + 1) diff --git a/musepack-r475-mpcchap.patch b/musepack-r475-mpcchap.patch new file mode 100644 index 0000000..b1f04b0 --- /dev/null +++ b/musepack-r475-mpcchap.patch @@ -0,0 +1,66 @@ +Index: libmpc/configure.in +=================================================================== +--- libmpc.orig/configure.in ++++ libmpc/configure.in +@@ -28,6 +28,12 @@ esac + AC_SUBST([EXTRALIBS]) + + AC_ARG_ENABLE([mpcchap], [AS_HELP_STRING([--enable-mpcchap], [enable building mpcchap])]) ++if test "x$enable_mpcchap" = xyes; then ++ PKG_CHECK_MODULES(LIBCUE, libcue) ++ AC_SUBST(LIBCUE_CFLAGS) ++ AC_SUBST(LIBCUE_LIBS) ++fi ++ + AM_CONDITIONAL([MPC_CHAP], [test "x$enable_mpcchap" = xyes]) + + +Index: libmpc/mpcchap/Makefile.am +=================================================================== +--- libmpc.orig/mpcchap/Makefile.am ++++ libmpc/mpcchap/Makefile.am +@@ -4,7 +4,8 @@ bin_PROGRAMS = mpcchap + + common_sources = ../common/tags.c ../common/crc32.c + +-AM_CPPFLAGS = -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include \ ++ $(LIBCUE_CFLAGS) + + if HAVE_VISIBILITY + AM_CFLAGS = -fvisibility=hidden +@@ -16,4 +17,4 @@ dictionary.h iniparser.h + + mpcchap_LDADD = $(top_builddir)/libmpcdec/libmpcdec.la \ + $(top_builddir)/libmpcenc/libmpcenc.a \ +- -lm -lcuefile ++ -lm $(LIBCUE_LIBS) +Index: libmpc/mpcchap/mpcchap.c +=================================================================== +--- libmpc.orig/mpcchap/mpcchap.c ++++ libmpc/mpcchap/mpcchap.c +@@ -24,7 +24,7 @@ + + #include + +-#include ++#include + + // tags.c + void Init_Tags ( void ); +@@ -153,13 +153,13 @@ mpc_status add_chaps_ini(char * mpc_file + mpc_status add_chaps_cue(char * mpc_file, char * chap_file, mpc_demux * demux, mpc_streaminfo * si) + { + Cd *cd = 0; +- int nchap, format = UNKNOWN; ++ int nchap; + struct stat stbuf; + FILE * in_file; + int chap_pos, end_pos, chap_size, i; + char * tmp_buff; + +- if (0 == (cd = cf_parse(chap_file, &format))) { ++ if (0 == (cd = cue_parse_file(chap_file))) { + fprintf(stderr, "%s: input file error\n", chap_file); + return !MPC_STATUS_OK; + } diff --git a/musepack-r475-visibility.patch b/musepack-r475-visibility.patch new file mode 100644 index 0000000..887fdce --- /dev/null +++ b/musepack-r475-visibility.patch @@ -0,0 +1,13 @@ +Index: libmpc/configure.in +=================================================================== +--- libmpc.orig/configure.in ++++ libmpc/configure.in +@@ -37,7 +37,7 @@ fi + AM_CONDITIONAL([MPC_CHAP], [test "x$enable_mpcchap" = xyes]) + + +-CHECK_VISIBILITY ++AM_CONDITIONAL([HAVE_VISIBILITY], [true]) + + AC_CONFIG_FILES([ + Makefile diff --git a/musepack.spec b/musepack.spec index 677acb0..1558204 100644 --- a/musepack.spec +++ b/musepack.spec @@ -1,6 +1,6 @@ Name: musepack Version: r475 -Release: 1mamba +Release: 2mamba Summary: An audio compression format with a strong emphasis on high quality Group: System/Multimedia Vendor: openmamba @@ -9,10 +9,17 @@ Packager: Silvan Calarco URL: http://www.musepack.net/ Source: http://files.musepack.net/source/musepack_src_%{version}.tar.gz Patch0: musepack_src_r475-libmpcdec-soname.patch +Patch1: musepack-r475-am-maintainer-mode.patch +Patch2: musepack-r475-link-libm.patch +Patch3: musepack-r475-mpcchap.patch +Patch4: musepack-r475-link-order.patch +Patch5: musepack-r475-visibility.patch +Patch6: musepack-r475-missing_extern_kw.patch License: LGPL, BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libcuefile-devel +BuildRequires: ldconfig +BuildRequires: libcue-devel BuildRequires: libreplaygain-devel ## AUTOBUILDREQ-END BuildRequires: cmake @@ -43,22 +50,23 @@ This package contains libraries and header files for developing applications tha %prep %setup -q -n %{name}_src_%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +autoreconf -fi %build -%cmake -d build +%configure \ + --enable-mpcchap + %make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall -C build - -rm -rf %{buildroot}%{_includedir}/mpc/.svn - -install -D -m0755 ./build/libmpcdec/libmpcdec.so.6.0.0 \ - %{buildroot}%{_libdir}/libmpcdec.so.6.0.0 - -ln -s libmpcdec.so.6.0.0 %{buildroot}%{_libdir}/libmpcdec.so.6 -ln -s libmpcdec.so.6.0.0 %{buildroot}%{_libdir}/libmpcdec.so +%makeinstall %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -79,10 +87,10 @@ ln -s libmpcdec.so.6.0.0 %{buildroot}%{_libdir}/libmpcdec.so %files -n lib%{name} %defattr(-,root,root) %{_libdir}/libmpcdec.so.* +%doc libmpcdec/COPYING libmpcdec/AUTHORS %files -n lib%{name}-devel %defattr(-,root,root) -%{_libdir}/libmpcdec.so %dir %{_includedir}/mpc %{_includedir}/mpc/datatypes.h %{_includedir}/mpc/minimax.h @@ -91,7 +99,13 @@ ln -s libmpcdec.so.6.0.0 %{buildroot}%{_libdir}/libmpcdec.so %{_includedir}/mpc/mpcmath.h %{_includedir}/mpc/reader.h %{_includedir}/mpc/streaminfo.h +%{_libdir}/libmpcdec.a +%{_libdir}/libmpcdec.la +%{_libdir}/libmpcdec.so %changelog +* Sat Jan 30 2021 Silvan Calarco r475-2mamba +- rebuilt with debug package + * Sat Nov 30 2013 Silvan Calarco r475-1mamba - package created using the webbuild interface