On 2020/11/16 07:30, Rafael Sadowski wrote: > On Mon Nov 16, 2020 at 01:24:55AM -0500, Brad Smith wrote: > > > > On 11/16/2020 1:22 AM, Rafael Sadowski wrote: > > > On Sun Nov 15, 2020 at 12:54:23PM +0100, Rafael Sadowski wrote: > > > > Simple update diff to the latest version. > > > > > > > Symbols have been removed so bump shared lib. Spotted by cwen@, thanks. > > > > You bumped the comment version not the version that actually matters. > > > > I need another coffee. Thanks Brad! Last diff, I am not interested in > this update.
OK. I checked on the symbols because there are a lot of changes for a fairly small update, most of them are not really in the exported API and went away because they changed from gcc-specific visibility flags to the CMAKE_(C|CXX)_VISIBILITY_PRESET / CMAKE_VISIBILITY_INLINES_HIDDEN. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/audio/chromaprint/Makefile,v > retrieving revision 1.13 > diff -u -p -u -p -r1.13 Makefile > --- Makefile 23 Aug 2019 20:18:04 -0000 1.13 > +++ Makefile 16 Nov 2020 06:28:01 -0000 > @@ -4,9 +4,9 @@ COMMENT = audio fingerprint extraction > > GH_ACCOUNT = acoustid > GH_PROJECT = chromaprint > -GH_TAGNAME = v1.4.3 > +GH_TAGNAME = v1.5.0 > > -SHARED_LIBS = chromaprint 2.0 # 1.4.3 > +SHARED_LIBS = chromaprint 3.0 # 1.5.0 > > CATEGORIES = audio devel > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/audio/chromaprint/distinfo,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 distinfo > --- distinfo 23 Aug 2019 20:18:04 -0000 1.3 > +++ distinfo 16 Nov 2020 06:28:01 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (chromaprint-1.4.3.tar.gz) = > 1K5llig6rXoBWlsERQEgVMY0pLkynssjAAzTVLQKKDs= > -SIZE (chromaprint-1.4.3.tar.gz) = 613718 > +SHA256 (chromaprint-1.5.0.tar.gz) = > XI4NV5yzR4kAaZEQqpYcFVKkIqGHQc9n3WITaxuHfHs= > +SIZE (chromaprint-1.5.0.tar.gz) = 615221 > Index: patches/patch-tests_test_utils_cpp > =================================================================== > RCS file: patches/patch-tests_test_utils_cpp > diff -N patches/patch-tests_test_utils_cpp > --- patches/patch-tests_test_utils_cpp 23 Aug 2019 20:18:04 -0000 > 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,29 +0,0 @@ > -$OpenBSD: patch-tests_test_utils_cpp,v 1.1 2019/08/23 20:18:04 cwen Exp $ > - > -Make tests endian neutral. Can be removed with chromaprint>=1.4.4: > -https://github.com/acoustid/chromaprint/commit/8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1 > - > -Index: tests/test_utils.cpp > ---- tests/test_utils.cpp.orig > -+++ tests/test_utils.cpp > -@@ -2,6 +2,7 @@ > - #include <algorithm> > - #include <limits> > - #include "utils.h" > -+#include "test_utils.h" > - > - using namespace chromaprint; > - > -@@ -91,4 +92,12 @@ TEST(Utils, CountSetBits64) { > - EXPECT_EQ(56, CountSetBits(0xFFFFFFFFFFFFFFU)); > - EXPECT_EQ(64, CountSetBits(0xFFFFFFFFFFFFFFFFU)); > - EXPECT_EQ(8, CountSetBits(0x0101010101010101U)); > -+} > -+ > -+TEST(Utils, LoadAudioFile) { > -+ std::vector<short> data = LoadAudioFile("data/test_mono_44100.raw"); > -+ ASSERT_EQ(data.size(), 176400/2); > -+ EXPECT_EQ(data[1000], 0); > -+ EXPECT_EQ(data[2000], 107); > -+ EXPECT_EQ(data[3000], 128); > - } > Index: patches/patch-tests_test_utils_h > =================================================================== > RCS file: patches/patch-tests_test_utils_h > diff -N patches/patch-tests_test_utils_h > --- patches/patch-tests_test_utils_h 23 Aug 2019 20:18:04 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,29 +0,0 @@ > -$OpenBSD: patch-tests_test_utils_h,v 1.1 2019/08/23 20:18:04 cwen Exp $ > - > -Make tests endian neutral. Can be removed with chromaprint>=1.4.4: > -https://github.com/acoustid/chromaprint/commit/8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1 > - > -Index: tests/test_utils.h > ---- tests/test_utils.h.orig > -+++ tests/test_utils.h > -@@ -31,11 +31,15 @@ inline std::vector<short> LoadAudioFile(const std::str > - { > - std::string path = TESTS_DIR + file_name; > - std::ifstream file(path.c_str(), std::ifstream::in | > std::ifstream::binary); > -- file.seekg(0, std::ios::end); > -- int length = file.tellg(); > -- file.seekg(0, std::ios::beg); > -- std::vector<short> data(length / 2); > -- file.read((char *)&data[0], length); > -+ uint8_t buf[4096]; > -+ std::vector<int16_t> data; > -+ while (!file.eof()) { > -+ file.read((char *) buf, 4096); > -+ size_t nread = file.gcount(); > -+ for (size_t i = 0; i < nread - 1; i += 2) { > -+ data.push_back((int16_t) (((uint16_t) buf[i+1] << 8) | > ((uint16_t) buf[i]))); > -+ } > -+ } > - file.close(); > - return data; > - } >
