[gentoo-commits] repo/gentoo:master commit in: media-libs/chromaprint/files/, media-libs/chromaprint/

[Miroslav Šulc]

commit:     801787127cda23d8285da00bce8d30747e4de69a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 06:10:52 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 06:10:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80178712

media-libs/chromaprint: removed obsolete 1.4.3

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-libs/chromaprint/Manifest                    |  2 -
 media-libs/chromaprint/chromaprint-1.4.3.ebuild    | 50 ------------------
 .../files/chromaprint-1.4.3-cmake.patch            | 58 ---------------------
 .../files/chromaprint-1.4.3-test-bigendian.patch   | 60 ----------------------
 4 files changed, 170 deletions(-)

diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 05949209ac9..4d58a476612 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,4 +1,2 @@
-DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST chromaprint-1.5.0.tar.gz 615217 BLAKE2B 14bf219c23360028ac232e67b7eb36e3226bb6e19838ef239266a9d826e1bd50d798f69f961bcb78f36baf48630a93f53243f8f9ab6187c403382bab23042630 SHA512 25ab3f7834581a8204ac09614fef6036c801f5f8b7b72a864701ca0de8082b2458a2bd7c075d53451581d770898576411cdcfb23ce609bc82f9d9b395cc1a129
 DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d

diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
deleted file mode 100644
index 81c4f4b78a7..00000000000
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-GTEST_VERSION="1.8.0"
-inherit cmake-multilib
-
-DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
-HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
-	test? ( https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test tools"
-RESTRICT="!test? ( test )"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND=">=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-bigendian.patch
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-DOCS=( NEWS.txt README.md )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-multilib_src_configure() {
-	export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/"
-	local mycmakeargs=(
-		-DBUILD_TOOLS=$(multilib_native_usex tools ON OFF)
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DFFT_LIB=avfft
-		-DAUDIO_PROCESSOR_LIB="swresample"
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}

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 60fe548cf29..00000000000
--- 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 dc080bb9847..00000000000
--- 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?= <lukas@×××××××.sk>
-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 <algorithm>
- #include <limits>
- #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<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);
-+}
-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<short> 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<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;
- }