From 801787127cda23d8285da00bce8d30747e4de69a Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Sun, 25 Apr 2021 08:10:52 +0200 Subject: media-libs/chromaprint: removed obsolete 1.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc --- .../files/chromaprint-1.4.3-cmake.patch | 58 --------------------- .../files/chromaprint-1.4.3-test-bigendian.patch | 60 ---------------------- 2 files changed, 118 deletions(-) delete mode 100644 media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch delete mode 100644 media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch (limited to 'media-libs/chromaprint/files') diff --git a/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch b/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch deleted file mode 100644 index 60fe548cf29c..000000000000 --- a/media-libs/chromaprint/files/chromaprint-1.4.3-cmake.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3991219..f9e172b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,21 +1,11 @@ --cmake_minimum_required(VERSION 2.8.12) -- --if(POLICY CMP0042) -- cmake_policy(SET CMP0042 NEW) --endif() -- --if(POLICY CMP0048) -- cmake_policy(SET CMP0048 OLD) --endif() -- --project(chromaprint C CXX) -+cmake_minimum_required(VERSION 3.3) - - set(chromaprint_VERSION_MAJOR 1) - set(chromaprint_VERSION_MINOR 4) - set(chromaprint_VERSION_PATCH 3) - set(chromaprint_VERSION "${chromaprint_VERSION_MAJOR}.${chromaprint_VERSION_MINOR}.${chromaprint_VERSION_PATCH}") - --set(PROJECT_VERSION "${chromaprint_VERSION}") -+project(chromaprint LANGUAGES C CXX VERSION "${chromaprint_VERSION}") - - set(chromaprint_SOVERSION 1) - -@@ -31,14 +21,14 @@ include(CheckCXXCompilerFlag) - - find_package(Threads) - --check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11) --if(COMPILER_SUPPORTS_CXX11) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") --endif() -+option(BUILD_SHARED_LIBS "Build shared libraries" ON) - --if(CMAKE_COMPILER_IS_GNUCXX AND BUILD_SHARED_LIBS) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") -+set(CMAKE_CXX_STANDARD 11) -+ -+if(BUILD_SHARED_LIBS) -+ set(CMAKE_C_VISIBILITY_PRESET hidden) -+ set(CMAKE_CXX_VISIBILITY_PRESET hidden) -+ set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) - endif() - - if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Debug") -@@ -70,7 +60,6 @@ if(APPLE) - set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to") - endif() - --option(BUILD_SHARED_LIBS "Build shared libraries" ON) - option(BUILD_TOOLS "Build command line tools" OFF) - option(BUILD_TESTS "Build test suite" OFF) - diff --git a/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch b/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch deleted file mode 100644 index dc080bb98470..000000000000 --- a/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= -Date: Sat, 10 Feb 2018 06:52:10 +0100 -Subject: [PATCH] Change LoadAudioFile to not depend on little-endian CPU - -Fixes https://github.com/acoustid/chromaprint/issues/46 ---- - tests/test_utils.cpp | 9 +++++++++ - tests/test_utils.h | 14 +++++++++----- - 2 files changed, 18 insertions(+), 5 deletions(-) - -diff --git a/tests/test_utils.cpp b/tests/test_utils.cpp -index fc8bb86..536f46e 100644 ---- a/tests/test_utils.cpp -+++ b/tests/test_utils.cpp -@@ -2,6 +2,7 @@ - #include - #include - #include "utils.h" -+#include "test_utils.h" - - using namespace chromaprint; - -@@ -92,3 +93,11 @@ TEST(Utils, CountSetBits64) { - EXPECT_EQ(64, CountSetBits(0xFFFFFFFFFFFFFFFFU)); - EXPECT_EQ(8, CountSetBits(0x0101010101010101U)); - } -+ -+TEST(Utils, LoadAudioFile) { -+ std::vector 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); -+} -diff --git a/tests/test_utils.h b/tests/test_utils.h -index 3631007..d01e9e3 100644 ---- a/tests/test_utils.h -+++ b/tests/test_utils.h -@@ -31,11 +31,15 @@ inline std::vector LoadAudioFile(const std::string &file_name) - { - 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 data(length / 2); -- file.read((char *)&data[0], length); -+ uint8_t buf[4096]; -+ std::vector 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; - } -- cgit v1.2.3-65-gdbad