diff --git a/flac-1.3.2.tar.xz b/flac-1.3.2.tar.xz deleted file mode 100644 index 5b9c69a..0000000 Binary files a/flac-1.3.2.tar.xz and /dev/null differ diff --git a/flac-1.3.3.tar.xz b/flac-1.3.3.tar.xz new file mode 100644 index 0000000..beba9af Binary files /dev/null and b/flac-1.3.3.tar.xz differ diff --git a/flac-cflags.patch b/flac-cflags.patch deleted file mode 100644 index 02c1e05..0000000 --- a/flac-cflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up flac-1.3.2/configure.ac.cflags flac-1.3.2/configure.ac ---- flac-1.3.2/configure.ac.cflags 2017-01-02 14:02:15.663046237 +0100 -+++ flac-1.3.2/configure.ac 2017-01-02 14:04:20.718046015 +0100 -@@ -390,7 +390,7 @@ if test "x$debug" = xtrue; then - else - CPPFLAGS="-DNDEBUG $CPPFLAGS" - CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//') -- CFLAGS="-O3 -funroll-loops $CFLAGS" -+ CFLAGS="$user_cflags" - fi - - XIPH_GCC_VERSION -@@ -400,7 +400,6 @@ if test x$ac_cv_c_compiler_gnu = xyes ; - CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations - - XIPH_ADD_CFLAGS([-Wdeclaration-after-statement]) -- XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2]) - - AC_LANG_PUSH([C++]) - XIPH_ADD_CXXFLAGS([-Weffc++]) -@@ -426,10 +425,6 @@ if test x$ac_cv_c_compiler_gnu = xyes ; - XIPH_ADD_CFLAGS([-fno-inline-small-functions]) - fi - -- if test "x$asm_optimisation$sse_os" = "xyesyes" ; then -- XIPH_ADD_CFLAGS([-msse2]) -- fi -- - fi - - case "$host_os" in diff --git a/flac-memleak.patch b/flac-memleak.patch deleted file mode 100644 index 03fe2d9..0000000 --- a/flac-memleak.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 4f47b63e9c971e6391590caf00a0f2a5ed612e67 -Author: Erik de Castro Lopo -Date: Sat Apr 8 18:34:49 2017 +1000 - - stream_decoder.c: Fix a memory leak - - Leak reported by Secunia Research. - -diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c -index 14d5fe7f..a5527511 100644 ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -1753,6 +1753,9 @@ FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__Stre - } - memset (obj->comments[i].entry, 0, obj->comments[i].length) ; - if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) { -+ /* Current i-th entry is bad, so we delete it. */ -+ free (obj->comments[i].entry) ; -+ obj->comments[i].entry = NULL ; - obj->num_comments = i; - goto skip; - } diff --git a/flac.spec b/flac.spec index f522cb9..c95c1d5 100644 --- a/flac.spec +++ b/flac.spec @@ -1,15 +1,13 @@ %define xmms_inputdir %(xmms-config --input-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General) Name: flac -Version: 1.3.2 -Release: 12 +Version: 1.3.3 +Release: 1 Summary: encoder/decoder which support the Free Lossless Audio Codec License: BSD and GPLv2+ and GFDL Source0: http://downloads.xiph.org/releases/flac/flac-%{version}.tar.xz URL: http://www.xiph.org/flac/ -Patch6000: flac-cflags.patch -Patch6001: flac-memleak.patch Provides: %{name}-libs Obsoletes: %{name}-libs @@ -63,7 +61,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} mv %{buildroot}%{_docdir}/flac* ./flac-doc mkdir -p flac-doc-devel -mv flac-doc{/html/api,-devel} +mv flac-doc{/api,-devel} rm flac-doc/FLAC.tag %{buildroot}%{_libdir}/*.la \ %{buildroot}%{xmms_inputdir}/*.la @@ -100,6 +98,9 @@ update-desktop-database &> /dev/null || : %doc flac-doc-devel/* %changelog +* Fri Apr 24 2020 lihongjiang - 1.3.3-1 +- update version to 1.3.3 + * Wed Jan 22 2020 lihongjiang - 1.3.2-12 - ignore make check temporary