From e87afbbb839a6a9dadeb382ea6fb7dad139669da Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Sat, 21 Mar 2020 19:05:31 +0800 Subject: [PATCH] fix test compile err --- audiofile-fix-test-compile-err.patch | 47 ++++++++++++++++++++++++++++ audiofile.spec | 11 +++++-- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 audiofile-fix-test-compile-err.patch diff --git a/audiofile-fix-test-compile-err.patch b/audiofile-fix-test-compile-err.patch new file mode 100644 index 0000000..d4a34ce --- /dev/null +++ b/audiofile-fix-test-compile-err.patch @@ -0,0 +1,47 @@ +From ea3b8e88065b9698357b3636363b78c2bb74e240 Mon Sep 17 00:00:00 2001 +From: Shouping Wang +Date: Sat, 21 Mar 2020 18:54:32 +0800 +Subject: [PATCH] audiofile-fix-test-compile-err + +Signed-off-by: Shouping Wang +--- + test/NeXT.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/test/NeXT.cpp b/test/NeXT.cpp +index 7e39850..b8829a9 100644 +--- a/test/NeXT.cpp ++++ b/test/NeXT.cpp +@@ -41,9 +41,9 @@ const char kDataUnspecifiedLength[] = + { + '.', 's', 'n', 'd', + 0, 0, 0, 24, // offset of 24 bytes +- 0xff, 0xff, 0xff, 0xff, // unspecified length ++ (char)0xff, (char)0xff, (char)0xff, (char)0xff, // unspecified length + 0, 0, 0, 3, // 16-bit linear +- 0, 0, 172, 68, // 44100 Hz ++ 0, 0, (char)172, 68, // 44100 Hz + 0, 0, 0, 1, // 1 channel + 0, 1, + 0, 1, +@@ -63,7 +63,7 @@ const char kDataTruncated[] = + 0, 0, 0, 24, // offset of 24 bytes + 0, 0, 0, 20, // length of 20 bytes + 0, 0, 0, 3, // 16-bit linear +- 0, 0, 172, 68, // 44100 Hz ++ 0, 0, (char)172, 68, // 44100 Hz + 0, 0, 0, 1, // 1 channel + 0, 1, + 0, 1, +@@ -158,7 +158,7 @@ const char kDataZeroChannels[] = + 0, 0, 0, 24, // offset of 24 bytes + 0, 0, 0, 2, // 2 bytes + 0, 0, 0, 3, // 16-bit linear +- 0, 0, 172, 68, // 44100 Hz ++ 0, 0, (char)172, 68, // 44100 Hz + 0, 0, 0, 0, // 0 channels + 0, 1 + }; +-- +1.8.3.1 + diff --git a/audiofile.spec b/audiofile.spec index da95dc1..dd6a5e5 100644 --- a/audiofile.spec +++ b/audiofile.spec @@ -1,14 +1,15 @@ Name: audiofile Version: 0.3.6 -Release: 23 +Release: 24 Summary: Library for reading and writing audio files in many common formats License: LGPLv2+ and GPLv2+ URL: http://audiofile.68k.org/ Source0: http://audiofile.68k.org/%{name}-%{version}.tar.gz Patch0: audiofile-CVE-2015-7747.patch Patch1: audiofile-fix-gcc6-compile-error.patch +Patch2: audiofile-fix-test-compile-err.patch -BuildRequires: gcc-c++ libtool alsa-lib-devel flac-devel +BuildRequires: gcc-c++ libtool alsa-lib-devel flac-devel gdb %description The Audio File Library is a C-based library for reading and writing audio files in many @@ -74,6 +75,12 @@ make check %{_mandir}/man3/* %changelog +* Sat Mar 21 2020 Shouping Wang - 0.3.6-24 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix test compile err + * Thu Jan 9 2020 JeanLeo - 0.3.6-23 - Type:bugfix - ID:NA -- Gitee