gentoo resync : 13.05.2018

3 files changed, 113 insertions, 0 deletions

diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index e83cadba9527..e25fae738e22 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,13 +1,16 @@
 AUX chromaprint-1.1-gtest.patch 3954 BLAKE2B cf94b85a97407f6efe1f6de75959506d3e50af685220df8ad7a454a46087029117de8c6b730172d69369e203856102771a3c234137fddcbf84511cba9cd83ddb SHA512 adbbfd9a8456751b4071d78cad1a67c4d11dcbb0f74dfefcbf6e92505c6543f81df316b2e43b927ac98405b054b1dba74658610c226e40e26184d4e927099fa3
 AUX chromaprint-1.2-ffmpeg29.patch 1573 BLAKE2B 8375d1ea02edbfaf1e39d8e5f33529296f3c80648ee8d534d5f289404f399830e28169109d9813aa844a1bfa42ec048f548e21f1d3c15ab540f3fb9d5f76834f SHA512 7366b9ebff706e67ebe3e0a57605607351076d071b62c9c1aa6e17f2721bbba315a0bde42b4a44f0a6d1921c410e224aac724017e8b4e33ec239b83675936579
+AUX chromaprint-1.4.3-test-bigendian.patch 1944 BLAKE2B e8441359f3d830451398c492e0711e6eeb290be75e336099b307e61d327158fbc2e188ffa96201e16fa5d2c1588ab763b79d9881b6f3ba276c6dcdee7de5e4ea SHA512 a6df0cd861c3d9d2c5ae28f50459c6930ddac262e2126e2f3ca4ec05a5e4d790df8cb0d7fc90eb0f4269ea4289958e9777d7d39cf588fea99e4c1d1f9f63bb59
 DIST chromaprint-1.2.tar.gz 529646 BLAKE2B a45b88edfe7e37bc09d960a385f8b7303705da9cc717c85f707b6ea3ed2f2f288589850461ab368ef5a9873239d058416757c5f7fd524d0e240b14145e3aa07e SHA512 dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb
 DIST chromaprint-1.3.2.tar.gz 538395 BLAKE2B b08d6ff106c3728d91352e694d39722390500480bb5049298150de198593116def213445d5cd96772d3956508df80b92ce3b440c14606aeff8eeca934aa402de SHA512 7f89eb09f293a3691efcb01544da612cf674a00af1c188db3f1075db44fee0a8e0aeff3ca6eccd0731ae6bbff9eb0fd51b22128fa927fdbd21638e2832f76e95
 DIST chromaprint-1.4.1.tar.gz 611014 BLAKE2B 139a3d58392f442feab1d955b03accb5ec81df3cb3de43a9a1d53d7ce061cee94aaad4ce66a860326fa84f155eba39e50e34a7055522e0637cacee8c91e7f7e7 SHA512 9d414ba01be87f973df877afc600c761bf338292680d2626baa2a483f0bb681b506d02baa8f9de297489459ba1ebae9005202bfe7ba661b7bd4d60d4a2463ede
 DIST chromaprint-1.4.2.tar.gz 613367 BLAKE2B ffec54c952a35f8f5bf6bc74b5d58339af3f0ffc0a0c0e88ee5e864e9112ad96cced629dcb8422f5e74aca3c48f93f7fa153cc6aabf0659a4e90416c34f34e43 SHA512 69449adf1c95c1395a5545d36877afe95b409d045357cc675e9ac58aee2955b3a9a245f37805192804a9b7fddc792b9e9289bf6448fa3393131048d28e06d7e2
+DIST chromaprint-1.4.3.tar.gz 613741 BLAKE2B 728f08e14c46a36d98c3a32a7c7a221a48b51561b623a403d9bee6aeea5cb5254866da26d50db0dbc5b0b4ceddb8312d52a8aab4c2979709bd2c8221b9e84d0f SHA512 101360bd643d2410fafcdd4aef8fe4c716ec728f0e4b9b3a62ba125fe010b0315e55a1839a2ca8c29d9abfbf8171560b23d68b732e75632ce8f4a4698f77ea72
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD chromaprint-1.2-r1.ebuild 1130 BLAKE2B 035bee5657f5c579a0243716a1b3f29ad0b96f3ca012e4e6668b3461b8857df60d23dcdbca70d389e07e49e39497cd5b4af79235e8ee79c11a9cf37d96b0853f SHA512 f9672834feac2dd1d6ec0d11d123b22cf50d0f5550ae702eeb641d3296190f90baa8a3805e1ec98ba8d060a93e8d6270f8c0d8799ab0aecc6e2c0bcbe3e545d4
 EBUILD chromaprint-1.2.ebuild 1076 BLAKE2B 4042edcc33926c157cd7fda5ae9749c07b99a662bd12856b12973ff05044de6f32b79622d85cdc983d80dd070ae5b10abfb6042ed63905bc1e1288578c1c97bb SHA512 163e6bc812268032500c0ed1b97c277f97dc379bbaa6221dd8953b5797849a8f2af98c2eea52b518644ce6a99d5edae1462bb699fcb05a7116a3c0c492ccafcd
 EBUILD chromaprint-1.3.2.ebuild 1098 BLAKE2B 69614a6f80d2dd553f2eb61b5ca38ce69fa0cf69e812ead17a5ae15e23d55788996602a39ca795e19938a45f004d05a66444fb0a23e375f25d1d6ec1850efb92 SHA512 c15f598ff012bd91c312d26e25bd27c1981abf050fb76770a98cfe2f23d96faf50fa6a4e05dc4584d6fca5803a702c7f33bba328b5bcaf09c257509fceaa8da7
 EBUILD chromaprint-1.4.1.ebuild 1331 BLAKE2B 1fc4cb113fb92d29a5613687fc41a029df40e9cf9851171e3dc3ca417c14205128d2733d7aba59972add6b716364d32d362bf5d956723bec22dd708c309556d4 SHA512 9ed09f55707ddedfdb536f8b2613a5118d96e05878d9c37eda15c1a25dfacb07e6add91ffcef71a98a0a4b5b6caa9925074af449ec0e1edc7c333ceea986a256
 EBUILD chromaprint-1.4.2.ebuild 1354 BLAKE2B 15029b3527b9534047b54150899f4f7f2d2f2bbd6f4598eb6eb216150f44adca2a4a84a77e4b9fa545418212a0c86ec7044937eed41962d81f85c7ff92443ed3 SHA512 1589c4c72d09d8c89266f1cdf4e36153f88c42604c5596cf12fadfba594789257bdd7ca2b2886c66a03d2eeebc1bc2f6b74c631866eaa5dc38e4bdf8925a77be
+EBUILD chromaprint-1.4.3.ebuild 1467 BLAKE2B a3eabebfbec5ad69d188108fcbc3ac7225ec8905a9e061e4c11075ba3c94fe7463ff19dc315e88cefe6dbe517c5a87e925f1f2bdae2d46ee86c543c8c5a404ef SHA512 277fa46adbeac1bf4bf53a8eb276a406ea0ed9241c3581bd47a7dcd185c014caa6fb59775b901700a6df866e0cd78c8f1e04193f9cbcea71412fe4c744dde441
 MISC metadata.xml 502 BLAKE2B b4f7420ba8b5e4004b6f8fa9cc70c0eddea04a0e1759c9724b94198e3df99c2505893706cb5232c643a43208822d7ef5bb56660c76029cadb52b9a0562fd8021 SHA512 229e807429496e637ba289f269af83eca274c53eb2fc2d9dc5f304c39118eaf1d0ae9a5cca01ffa1958d110c55537f1792e26343bf3309ad72b1f0411af9dafe
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
new file mode 100644
index 000000000000..c1ac357af584
--- /dev/null
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+GTEST_VERSION="1.8.0"
+
+DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
+HOMEPAGE="http://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 ~amd64-fbsd"
+IUSE="libav test tools"
+
+# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
+RDEPEND="
+	libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
+	!libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest[${MULTILIB_USEDEP}]
+		dev-libs/boost[${MULTILIB_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/chromaprint-1.4.3-test-bigendian.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=$(usex libav avresample swresample)
+		)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	emake check
+}
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
new file mode 100644
index 000000000000..dc080bb98470
--- /dev/null
+++ b/media-libs/chromaprint/files/chromaprint-1.4.3-test-bigendian.patch
@@ -0,0 +1,60 @@
+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;
+ }