diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-libs/chromaprint | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'media-libs/chromaprint')
5 files changed, 6 insertions, 178 deletions
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest index a23ee170060e..ca56cdc814c5 100644 --- a/media-libs/chromaprint/Manifest +++ b/media-libs/chromaprint/Manifest @@ -1,9 +1,4 @@ -AUX chromaprint-1.4.3-cmake.patch 1787 BLAKE2B 596a2ec2e684c3f2a03180fd5420029cca56c07bf3362e2158a99f40c2d4a117b7d17ce6a8afc20647654643ee31569849e8413962168799963acb043bf869fa SHA512 b53dfd1c26f34aedae6964d9e87725872f5b3b4d7f6d5f8162490579f05d863bc27d5bc4f6f2303f95346ace2cd751e6f3a0ee15c34d15eb3088123f472c5338 -AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492e0711e6eeb290be75e336099b307e61d327158fbc2e188ffa96201e16fa5d2c1588ab763b79d9881b6f3ba276c6dcdee7de5e4ea SHA512 a6df0cd861c3d9d2c5ae28f50459c6930ddac262e2126e2f3ca4ec05a5e4d790df8cb0d7fc90eb0f4269ea4289958e9777d7d39cf588fea99e4c1d1f9f63bb59 -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 -EBUILD chromaprint-1.4.3.ebuild 1344 BLAKE2B 3d972ab4b4912089f91da2ad2f60df3731ec672c633938bc5ae986facf7d4ddf8b916753f44bffca062cc7334a8ff415dd2311c92cac68b01790f2b003595188 SHA512 bfc148cbbb5cf2846b8bf2d162ea77364207a02bd0b8457362cfa788660a94350776cf5ad4ab8b38d299c560b4a432865fa54592504f31412b44f31fee39b4a8 -EBUILD chromaprint-1.5.0.ebuild 1276 BLAKE2B 32373b8684f8cf429f6893eb147a387dbdcda3328a7f204ed5d004943a116320fb1cb601355457d3b7d0a6e350367c78e47f3d31e74730e0272806da1bd3524a SHA512 f745544934e666fdef0683768906b0332ec6d13c625477c9f2f0656dba19fd59691b428c685c80032506ae0d11acc1a214c1d114336c71e76f5f4b836ff89df7 +EBUILD chromaprint-1.5.0.ebuild 1328 BLAKE2B cba2e2ef808fbf5ef0919793b5e5dd7e30faa9303f8b4ec7c67caa5bb423238211497051823a2a378480445d08aed42d969a37cc70e11b956f339d10ea766f6c SHA512 5f381256d6f6f59b885a2db658b1f057a6ab7321842cee6eb3a9a9702879a8be515435d68b723bc860afec45ee1c2f722a6000401a4acb85a28e40d76674c9df MISC metadata.xml 502 BLAKE2B df06b1e73d069ac54fae83766cfc89cb668c9c43c22e6ea50be9b3e40dd172b6400152804bd9f13fa63475eda8acc1791f0051174af391a22aa58b5899c99e3f SHA512 c7941613a5b06a74271018c079d1b483d816c558bd0fdf0be390e14df90dfa0eeb4769a9af3348d42345516899b828257b583815357b58b11033be9025135b22 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 81c4f4b78a7a..000000000000 --- 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/chromaprint-1.5.0.ebuild b/media-libs/chromaprint/chromaprint-1.5.0.ebuild index 443f5af521e7..256d472f451f 100644 --- a/media-libs/chromaprint/chromaprint-1.5.0.ebuild +++ b/media-libs/chromaprint/chromaprint-1.5.0.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_ECLASS=cmake GTEST_VERSION="1.10.0" +GTEST_DIR_VERSION="1.10.x" inherit cmake-multilib DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints" @@ -15,7 +16,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="test tools" RESTRICT="!test? ( test )" @@ -30,7 +31,7 @@ DOCS=( NEWS.txt README.md ) S="${WORKDIR}/${PN}-v${PV}" multilib_src_configure() { - export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VERSION}/googletest/" + export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/" local mycmakeargs=( -DBUILD_TOOLS=$(multilib_native_usex tools ON OFF) -DBUILD_TESTS=$(usex test ON OFF) @@ -41,5 +42,5 @@ multilib_src_configure() { } multilib_src_test() { - emake check + cd tests && (./all_tests || die "Tests failed") } 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?= <lukas@oxygene.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; - } |