diff --git a/libsndfile-1.0.25-system-gsm.patch b/libsndfile-1.0.25-system-gsm.patch new file mode 100644 index 0000000..0488111 --- /dev/null +++ b/libsndfile-1.0.25-system-gsm.patch @@ -0,0 +1,103 @@ +diff -up libsndfile-1.1.0/CMakeLists.txt.system-gsm libsndfile-1.1.0/CMakeLists.txt +--- libsndfile-1.1.0/CMakeLists.txt.system-gsm 2022-03-27 14:39:27.000000000 +0200 ++++ libsndfile-1.1.0/CMakeLists.txt 2022-04-25 22:41:46.472440316 +0200 +@@ -286,7 +286,6 @@ add_library (sndfile + src/double64.c + src/ima_adpcm.c + src/ms_adpcm.c +- src/gsm610.c + src/dwvw.c + src/vox_adpcm.c + src/interleave.c +@@ -347,23 +346,6 @@ add_library (sndfile + src/mpeg.c + src/mpeg_decode.c + src/mpeg_l3_encode.c +- src/GSM610/config.h +- src/GSM610/gsm.h +- src/GSM610/gsm610_priv.h +- src/GSM610/add.c +- src/GSM610/code.c +- src/GSM610/decode.c +- src/GSM610/gsm_create.c +- src/GSM610/gsm_decode.c +- src/GSM610/gsm_destroy.c +- src/GSM610/gsm_encode.c +- src/GSM610/gsm_option.c +- src/GSM610/long_term.c +- src/GSM610/lpc.c +- src/GSM610/preprocess.c +- src/GSM610/rpe.c +- src/GSM610/short_term.c +- src/GSM610/table.c + src/G72x/g72x.h + src/G72x/g72x_priv.h + src/G72x/g721.c +@@ -412,6 +394,7 @@ target_link_libraries (sndfile + $<$:Opus::opus> + $<$:MPG123::libmpg123> + $<$:mp3lame::mp3lame> ++ -lgsm + ) + set_target_properties (sndfile PROPERTIES + PUBLIC_HEADER "${sndfile_HDRS}" +diff -up libsndfile-1.1.0/Makefile.am.system-gsm libsndfile-1.1.0/Makefile.am +--- libsndfile-1.1.0/Makefile.am.system-gsm 2022-03-27 10:55:12.000000000 +0200 ++++ libsndfile-1.1.0/Makefile.am 2022-04-25 22:39:56.976112391 +0200 +@@ -47,7 +47,6 @@ SYMBOL_FILES = src/Symbols.gnu-binutils + + EXTRA_DIST += src/config.h.in src/test_endswap.tpl src/test_endswap.def \ + $(SYMBOL_FILES) src/create_symbols_file.py src/binheader_writef_check.py \ +- src/GSM610/README src/GSM610/COPYRIGHT src/GSM610/ChangeLog \ + src/G72x/README src/G72x/README.original src/G72x/ChangeLog \ + src/make-static-lib-hidden-privates.sh \ + src/config.h.cmake +@@ -72,7 +71,7 @@ src_libsndfile_la_SOURCES = src/sndfile. + src/ogg.c src/ogg.h src/ogg_vorbis.c src/ogg_speex.c src/ogg_pcm.c src/ogg_opus.c src/ogg_vcomment.c src/ogg_vcomment.h \ + src/common.h src/sfconfig.h src/sfendian.h src/wavlike.h src/sf_unistd.h src/chanmap.h src/mpeg.c + nodist_src_libsndfile_la_SOURCES = $(nodist_include_HEADERS) +-src_libsndfile_la_LIBADD = src/GSM610/libgsm.la src/G72x/libg72x.la src/ALAC/libalac.la \ ++src_libsndfile_la_LIBADD = -lgsm src/G72x/libg72x.la src/ALAC/libalac.la \ + src/libcommon.la $(EXTERNAL_XIPH_LIBS) -lm $(MPEG_LIBS) + EXTRA_src_libsndfile_la_DEPENDENCIES = $(SYMBOL_FILES) + +@@ -91,17 +90,6 @@ src_test_main_SOURCES = src/test_main.c + src/test_binheader_writef.c src/test_nms_adpcm.c + src_test_main_LDADD = src/libcommon.la + +-############## +-# src/GSM610 # +-############## +- +-noinst_LTLIBRARIES += src/GSM610/libgsm.la +-src_GSM610_libgsm_la_SOURCES = src/GSM610/config.h src/GSM610/gsm.h src/GSM610/gsm610_priv.h \ +- src/GSM610/add.c src/GSM610/code.c src/GSM610/decode.c src/GSM610/gsm_create.c \ +- src/GSM610/gsm_decode.c src/GSM610/gsm_destroy.c src/GSM610/gsm_encode.c \ +- src/GSM610/gsm_option.c src/GSM610/long_term.c src/GSM610/lpc.c src/GSM610/preprocess.c \ +- src/GSM610/rpe.c src/GSM610/short_term.c src/GSM610/table.c +- + ############ + # src/G72x # + ############ +diff -up libsndfile-1.1.0/src/gsm610.c.system-gsm libsndfile-1.1.0/src/gsm610.c +--- libsndfile-1.1.0/src/gsm610.c.system-gsm 2021-05-17 11:12:28.000000000 +0200 ++++ libsndfile-1.1.0/src/gsm610.c 2022-04-25 22:37:21.059496852 +0200 +@@ -27,7 +27,7 @@ + #include "sfendian.h" + #include "common.h" + #include "wavlike.h" +-#include "GSM610/gsm.h" ++#include + + #define GSM610_BLOCKSIZE 33 + #define GSM610_SAMPLES 160 +@@ -391,7 +391,8 @@ gsm610_seek (SF_PRIVATE *psf, int UNUSED + psf_fseek (psf, psf->dataoffset, SEEK_SET) ; + pgsm610->blockcount = 0 ; + +- gsm_init (pgsm610->gsm_data) ; ++ gsm_destroy (pgsm610->gsm_data) ; ++ pgsm610->gsm_data = gsm_create () ; + if ((SF_CONTAINER (psf->sf.format)) == SF_FORMAT_WAV || + (SF_CONTAINER (psf->sf.format)) == SF_FORMAT_W64) + gsm_option (pgsm610->gsm_data, GSM_OPT_WAV49, &true_flag) ; diff --git a/libsndfile-1.2.0.tar.xz b/libsndfile-1.2.0.tar.xz deleted file mode 100644 index e054a16..0000000 Binary files a/libsndfile-1.2.0.tar.xz and /dev/null differ diff --git a/libsndfile-1.2.2.tar.xz b/libsndfile-1.2.2.tar.xz new file mode 100644 index 0000000..8ce5a73 Binary files /dev/null and b/libsndfile-1.2.2.tar.xz differ diff --git a/libsndfile.spec b/libsndfile.spec index aee5d49..6a81434 100644 --- a/libsndfile.spec +++ b/libsndfile.spec @@ -1,15 +1,21 @@ Name: libsndfile -Version: 1.2.0 -Release: 2 +Version: 1.2.2 +Release: 1 Summary: Library for reading and writing sound files -License: LGPLv2+ and GPLv2+ and BSD +License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause URL: http://libsndfile.github.io/libsndfile Source0: https://github.com/libsndfile/libsndfile/releases/download/%{version}/%{name}-%{version}.tar.xz +Patch0: libsndfile-1.0.25-system-gsm.patch BuildRequires: alsa-lib-devel gcc gcc-c++ flac-devel BuildRequires: libogg-devel libtool libvorbis-devel pkgconfig BuildRequires: sqlite-devel BuildRequires: opus-devel +BuildRequires: gsm-devel +BuildRequires: make +BuildRequires: python3 +BuildRequires: lame-devel +BuildRequires: mpg123-devel %description Libsndfile is a C library for reading and writing files containing @@ -37,14 +43,18 @@ BuildArch: noarch Help files for %{name}-utils. %prep -%autosetup -n %{name}-%{version} -p1 +%setup -q +%patch -P0 -p1 -b .system-gsm +rm -r src/GSM610 %build +autoreconf -I M4 -fiv # for system-gsm patch %configure \ --disable-dependency-tracking \ --enable-sqlite \ --enable-alsa \ --enable-largefile \ + --enable-mpeg \ --disable-static %disable_rpath %make_build @@ -55,6 +65,9 @@ rm -rf __docs mkdir __docs cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/* __docs rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} +find %{buildroot} -type f -name "*.la" -delete + +# fix multilib issues mv %{buildroot}%{_includedir}/sndfile.h \ %{buildroot}%{_includedir}/sndfile-%{__isa_bits}.h @@ -114,6 +127,9 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check %{_mandir}/man1/sndfile-salvage.1* %changelog +* Tue Oct 31 2023 haomimi - 1.2.2-1 +- pdate to 1.2.2 + * Mon Sep 11 2023 penghaitao - 1.2.0-2 - Add opus-devel to satisfy configure requirements check