summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-11-24 10:47:40 +0000
committerJustin Lecher <jlec@gentoo.org>2013-11-24 10:47:40 +0000
commitfc379b7e5046cc9bd4ceecd6dd77d1e6e8cb5943 (patch)
tree22991054408fcf70ff2bd7790aaec27908c1e222 /media-libs
parentUpdate for systemd wrt bug #491744 (diff)
downloadhistorical-fc379b7e5046cc9bd4ceecd6dd77d1e6e8cb5943.tar.gz
historical-fc379b7e5046cc9bd4ceecd6dd77d1e6e8cb5943.tar.bz2
historical-fc379b7e5046cc9bd4ceecd6dd77d1e6e8cb5943.zip
media-libs/chromaprint: Version BUmp and drop old (Changelog says: Fixed
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/chromaprint/ChangeLog8
-rw-r--r--media-libs/chromaprint/Manifest27
-rw-r--r--media-libs/chromaprint/chromaprint-1.1.ebuild (renamed from media-libs/chromaprint/chromaprint-1.0.ebuild)16
-rw-r--r--media-libs/chromaprint/files/chromaprint-1.1-gtest.patch104
-rw-r--r--media-libs/chromaprint/metadata.xml2
5 files changed, 141 insertions, 16 deletions
diff --git a/media-libs/chromaprint/ChangeLog b/media-libs/chromaprint/ChangeLog
index 0345e3e7327a..e181c63e61e7 100644
--- a/media-libs/chromaprint/ChangeLog
+++ b/media-libs/chromaprint/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/chromaprint
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.11 2013/11/17 14:20:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.12 2013/11/24 10:47:39 jlec Exp $
+
+*chromaprint-1.1 (24 Nov 2013)
+
+ 24 Nov 2013; Justin Lecher <jlec@gentoo.org> -chromaprint-1.0.ebuild,
+ +chromaprint-1.1.ebuild, +files/chromaprint-1.1-gtest.patch, metadata.xml:
+ Version BUmp and drop old (Changelog says: Fixed
17 Nov 2013; Alexis Ballier <aballier@gentoo.org> chromaprint-1.0.ebuild:
keyword ~amd64-fbsd
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 078228b2982c..0af4a68331f5 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,22 +1,33 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
AUX chromaprint-0.7-boost.patch 208 SHA256 db07c765c365dac7498d4565ba6d62828637084e5ceee23f2559b0d9ffb60996 SHA512 c060e022f8b8be11a54f751b4a6c5de902db0c8a8b75f697b1a18b7e285e015ba0affebc1c57e7202eac9292502bf7bc91594e0a19bcac5cbe1ca35d03cfd292 WHIRLPOOL 8a6e249ccd4099a4e48798155d6b7cb3b7d4c36f4a7060696e6502dbd1610ce253872fc0949b6cf19cad48cc877cabbb272e2159ee44a14cd6aef7646da53ad2
AUX chromaprint-0.7-ffmpeg.patch 1459 SHA256 368b09b0f46bdf1d72fcf17f496e1161fd401eda78832c57b873062ba88c167b SHA512 2f618aefbb7675c1c2e42e16f259ef2964cdd712f3ec6f572111a512ddbd4c973cecc3426ba67603b3640d6856b8591b1047a548550ec71a80688358a2d8745a WHIRLPOOL b9c8a5589e00c36735c9bed7aa7ea162fb581c9f9d55c07f7f985b3aac39962df964f94191e5846914d5a77bd1bf50b32e46b369d8508d0c4e36db00706b74a1
AUX chromaprint-0.7-libav9.patch 1575 SHA256 a6371e223dcbecb3de61f0d4d2cf24990124812b6a02be54ce9e7647ec225b8e SHA512 661b5034c911aebed32d3a4dc3491890c91ed61e24f3d17330dd2d553edc29e16f7a82355906f16e61fa077f868884edeb40def1b4cb51cce9d24415b9f59eab WHIRLPOOL 911e899b3fe62c961090567d85810b4815ff334afeb975debb296b2a99a4f5f791c231135093f15461c58bb12d32141d00db0ed013984c008f204e9ff1276127
AUX chromaprint-1.0-libav9.patch 371 SHA256 2aaa94f74e27d53e2ac63510a92a3222f9787a70db6c5eaa8f537e855f335e64 SHA512 6c17b4d5e32ca2fbf7b925b3e1788899e65c15835906b1dea87a5e3b9a03b02ec53c073ccda225bad55dc055d850aa8bfddaf250c6fcc3e5dcf50ba3e3428b5f WHIRLPOOL 75ab25f6d64a54a4b4dfb63f35a98076bb8ddeb73cc8ced887bb246ee98c008de80c78f51f49f850b24430ec6237daeb21629ddde57cedab268f234a3bd526b4
+AUX chromaprint-1.1-gtest.patch 3954 SHA256 d8d6a0028f5e2ea3d3eb5eedc391a27398b4ab904d19c58a720d45c8900bd8a1 SHA512 adbbfd9a8456751b4071d78cad1a67c4d11dcbb0f74dfefcbf6e92505c6543f81df316b2e43b927ac98405b054b1dba74658610c226e40e26184d4e927099fa3 WHIRLPOOL cfc8d69aa81bb36467d002da1f5175011ca0408cae7458bdaf6861676e679e98292b1e64fdb43895dda5b67e05c010a92164aaaaeddae13f5b482511a37fc721
DIST chromaprint-0.6.tar.gz 542366 SHA256 5d9b82da226450c14e43482371a1b2a178e2604ab5b2e9259f33b1b461ee9d63
DIST chromaprint-0.7.tar.gz 543811 SHA256 4e52c3fd443c91a5c429557753d4ba3f9d31d183810412c0d8600892f3975501 SHA512 2ac03f80888d6c12dd05c20adc82e0f2c9e6bf5edc099d7c7b719b8cb353151fb04b78f5c7bca672d5fe8357a791e86fdea7b6952a0d64c346c079548ebfcd38 WHIRLPOOL 34c5cb7c38dc0e4924e068ff0a695e571fdd2233046ef6ea84e9e0e27e6bf9f5eaedceb79c2f8120e9ac6eb30ace3bc9e15ba59027cd498426e7f94536e2da84
-DIST chromaprint-1.0.tar.gz 541381 SHA256 af4f780e587ebd7e61a8d175db3bbd63ee644a960bd75e52407a28fd83089f1e SHA512 a6820f5ca6fbbcc2417e4619c825efef27c187fef48098c05425d4e53900f931d71d5648d7e6f3d28816692f9fab068440dcecc46294a277afca26f4d0262623 WHIRLPOOL a29b37156f3bcb6dcc001fabf19e9808226eb5bba4773b02d9bf62e8b16f3413de938327aeb48d66ccf2b63a032d335f4b7aa7aa22d8d7314eac5cce792ed593
+DIST chromaprint-1.1.tar.gz 542360 SHA256 6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12 SHA512 3d439dfca979e2babc8d2c171b5cb36fd0a5d3b7475e02a0f8bae436f7096e189674b640119f0dccf7cc2cd214bd8674d46b018952f1e3e93ddc0ba19b5155f9 WHIRLPOOL 726c7710f7bd1c138d7ebd1de263a0e214cbd79faf60e35034a60cfd68a9d3b4e52fc1cc93ce4dc7d39683e3a5ac1d7e9bd6c8046cdb5cece83b9c2fbf4971b5
EBUILD chromaprint-0.6.ebuild 1134 SHA256 4b2ed6b676f99cdb6a6f32eacab5905bcff46022b021089547bcaf819c5193a5 SHA512 fbaffe79a2ca6ccf6bc2d24ac07366086a5ddce4a68a593603af0dacd8910040bcf516e1e8425e09e76bf2dec910ae2598894a45b37fd931aeb27e496bfac352 WHIRLPOOL c4f400a10e8a30b3b27b74642ff502186860502a736156a540fc2be3e7910596692458dd491060ff047b052b58a36884a3dd8a93b9ca8d28a359531332462ddc
EBUILD chromaprint-0.7.ebuild 1276 SHA256 5aa22287d247accc075ee32bf17460a60d2ef9c3de3db66e47479388fa5177fc SHA512 56ec2635e3fada5a487f5ec97455d634c052683a2471cb54124d3a7472b5e3fa08607327d5c993394125b164f9d010d76e954994d2ffcda0e57625556c0aed64 WHIRLPOOL 6c095488c20f3bcc4eff52c3970b0175403a55c11f0b2bad69b4d3a4eac562596073230aab5f7d6f895a594184b035f82899b1f87325a19c5bf2f4cd82af5178
-EBUILD chromaprint-1.0.ebuild 1277 SHA256 5046ad491c89b64af8def5f1ab12c619a1082b3d1fafa27d47ca421537640fc3 SHA512 14c22c6bfe35f2d67a4c855b6334e3590e686e0fb23e6ff4696fff1db14c615a6755b7bf5e72d21ced6a6d81b2f89b40d0b649cc90ac45ac27be27d6f2d188b5 WHIRLPOOL b767e2f9090dffec37e580f4844dad13f04fef3325152126219ae19040c766b8be34e01fb8735a856f450f7f95e68554bd815c5d6d934db4f18c31347f565d6b
-MISC ChangeLog 1804 SHA256 3f54a7200c30d239ab12c151283ae0ebfae45149c18dfba70c06e4ea46971d61 SHA512 ac7bb8f217086b54fee6d2969ef41c514f782890875dba32c57dddb81c61728b3182cc75e4d02f6da921e985e52158e1262e67a588adb922b46ec9295771773e WHIRLPOOL 892fbb7f40c30d8684afab9b06e8d1093b9ffbf1e56a8e1023ba918251b7a6c13d2778b796acb64f8feea648db47bb2bbbf199543e8af3c9334dd9eb627f5c64
-MISC metadata.xml 252 SHA256 855e5677de39364e4a8d58f4c1e5128ca6e16ef1f554368534fabab23e94909e SHA512 3ebc4ad794f88d61d7f42d9087d773daeb6db9427356f2ac80406d18b5fa3210fd400464045b52d666ca6648dae28b8a005a610242885917d416f094a15f24c1 WHIRLPOOL d066dbbf45f21b28466457a3ae78dc797550bd7994c3a0e590374dc3e754199d893a07b5e4b7138be590acbbc8d1c0431c71282be9f7f35fa24dc58564344bec
+EBUILD chromaprint-1.1.ebuild 1264 SHA256 a175d3dfb573f050a10d80b56ecb50649013d516d7948b5bc445aa267db80ef1 SHA512 a1438c4ce9ce0cbb93196d5716da7635dfc985adfdf79593732a67c99d1883b1d3e219b9084c307dc686d40ebf2a38031ca596c62d6f4ae34cfe76a62cbdec39 WHIRLPOOL 7b7f3b8790d54531aec8d0569473f4ef756638aadd3d99d12b9c447f213e3d2dc7ee5694f427a5fcda0f903a3bd142d307319c21b926d59d3e4cd80c8cd5d1da
+MISC ChangeLog 2033 SHA256 1fede2a1cdf47a8e7e4eaebdbbb3a1ea8d53114a71496d0a2f63dfb2ec880fc3 SHA512 46c2565fd4d55de3f14bd3155353d82a419f14c27a331fb3b00ae3c51c62271461a1a2c12e99ec2acb6e564cdf04cfae195c7d585b63d5ad9f04f75c2b834370 WHIRLPOOL 26bfeba97b881f73ac4f890e40d42bb7dd1b673c68c2261bd3bdfcbdfe9d95172896b3e16ebd53f392fdda12b53244b95b7e6100d8aa9615fcdca881093f85e7
+MISC metadata.xml 252 SHA256 3fe938dfdd28a5ae7ef32e2bcccd22a40d4498e9ce0b0cd8b44c0c45c4a8366c SHA512 d47ca10c747b2caa9249c6a931476beacb5d615f126a64d0ebbb03a254c3382457cc5c08d29c61c388818d84407db9458f98cb69c10d8f632bb18ed5c67d2daf WHIRLPOOL eeb84a851b4debdefcaa73bdf06b8f17494b79210ecf4f1a65b3d499848dd3b5dd8319fb6590b4b6cd8ef34d818829b689ae33d26a6d733b1070975d99847f39
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlKI0MIACgkQvFcC4BYPU0ryiQCggVDZ2d4G5Kzf4qWXETbwz+uc
-TfAAoJhHhJPCJ3OjXj3xzd45nF8O1vj4
-=fNc4
+iQIcBAEBCgAGBQJSkdlMAAoJELnU8jG9FVirxqEP/29wTk3Atw1dOVleRKQnSsiW
+lJhxRHSu6SioRi5svHlTyc/9gCUjxx+X+sk/f81Y5s7TwLkfMiAqPlLLiXXffINe
+nRRGryovAG/npBc6e5Nqzi9p9gJFdl53m94ML2yiEQw/Ub/fyxGidniJ4gs0GQ3k
+oqCEmqkAXh7zO/RFRqLnUni5X8XTa1reQ+/7unoNGnNJuGRkNTW95v1o7Xrnh6cu
+Gixg6kC6Sfcm1ncHUQfiehOXV9Z7HzibUBx5QniTyszvnZHW4XGABRDWcw+lUNhT
+HS64xPioF0pl+Twjleb6P39gX6uth2/i/i1fIrpoDpP14CxMVrNGtLGLXP/m5EPD
+1bcolA4SAfoIgLMDx6AJGl/GNZ0CbvM5keloTI5pKTaY5KmCaiXIXF4qsaJw8n44
+Ium5tRCcFRhNBpwCcR788k1mrNt7eroA4vMnZJMRr/JrLXfGUk+7RG2//UMPGzQa
+YuWB5mQ/GPvxB9NdqvMcDNNmusMHyvjOxQQiWQwSq4Yp2gUMs1L1YCS3blWl/8g6
++DaaKn9ChrrAL5DK4Nnyh/Pbt1Wj0z9fsGYKawqd3yiO3bYQ3hY5jhNB+3QbBjNQ
+vJ301p98X7loldp2C4TRas1ulWoNxNIGJtRSsUxKMPJaqtgjvXvA8jtofNCCutdG
+tFCIQ7xT6Z6uswqdgM4j
+=CjWw
-----END PGP SIGNATURE-----
diff --git a/media-libs/chromaprint/chromaprint-1.0.ebuild b/media-libs/chromaprint/chromaprint-1.1.ebuild
index 359d65464a60..c57d0b8c1e93 100644
--- a/media-libs/chromaprint/chromaprint-1.0.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.1.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/chromaprint-1.0.ebuild,v 1.2 2013/11/17 14:20:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/chromaprint-1.1.ebuild,v 1.1 2013/11/24 10:47:39 jlec Exp $
EAPI=5
+
inherit cmake-utils
DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
@@ -15,7 +16,8 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd"
IUSE="test tools"
# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND=">=virtual/ffmpeg-0.10
+RDEPEND="
+ >=virtual/ffmpeg-0.10
tools? ( >=media-libs/taglib-1.6 )"
DEPEND="${RDEPEND}
test? (
@@ -26,8 +28,10 @@ DEPEND="${RDEPEND}
DOCS="NEWS.txt README.txt"
-PATCHES=( "${FILESDIR}/${PN}-0.7-ffmpeg.patch"
- "${FILESDIR}/${P}-libav9.patch" )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.7-ffmpeg.patch
+ "${FILESDIR}"/${P}-gtest.patch
+)
src_configure() {
local mycmakeargs=(
@@ -40,11 +44,11 @@ src_configure() {
}
src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
emake check
}
src_install() {
cmake-utils_src_install
- use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect
+ use tools && dobin "${BUILD_DIR}"/tools/fpcollect
}
diff --git a/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch b/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch
new file mode 100644
index 000000000000..8305ae7c1af0
--- /dev/null
+++ b/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch
@@ -0,0 +1,104 @@
+ cmake/modules/FindGTest.cmake | 82 -------------------------------------------
+ tests/CMakeLists.txt | 1 -
+ 2 files changed, 83 deletions(-)
+
+diff --git a/cmake/modules/FindGTest.cmake b/cmake/modules/FindGTest.cmake
+deleted file mode 100644
+index 21dc2f5..0000000
+--- a/cmake/modules/FindGTest.cmake
++++ /dev/null
+@@ -1,82 +0,0 @@
+-# Locate the Google C++ Testing Framework source directory.
+-#
+-# Defines the following variables:
+-#
+-# GTEST_FOUND - Found the Google Testing framework sources
+-# GTEST_INCLUDE_DIRS - Include directories
+-# GTEST_SOURCE_DIR - Source code directory
+-# GTEST_LIBRARIES - libgtest
+-# GTEST_MAIN_LIBRARIES - libgtest-main
+-# GTEST_BOTH_LIBRARIES - libgtest & libgtest-main
+-#
+-# Accepts the following variables as input:
+-#
+-# GTEST_ROOT - (as CMake or environment variable)
+-# The root directory of the gtest install prefix
+-#
+-# Example usage:
+-#
+-# find_package(GTest REQUIRED)
+-# include_directories(${GTEST_INCLUDE_DIRS})
+-# add_subdirectory(${GTEST_SOURCE_DIR}
+-# ${CMAKE_CURRENT_BINARY_DIR}/gtest_build)
+-#
+-# add_executable(foo foo.cc)
+-# target_link_libraries(foo ${GTEST_BOTH_LIBRARIES})
+-#
+-# enable_testing(true)
+-# add_test(AllTestsInFoo foo)
+-#
+-# =========================================================
+-#
+-# Copyright (C) 2012 Lukas Lalinsky <lalinsky@gmail.com>
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions are
+-# met:
+-#
+-# * Redistributions of source code must retain the above copyright notice,
+-# this list of conditions and the following disclaimer.
+-#
+-# * Redistributions in binary form must reproduce the above copyright notice,
+-# this list of conditions and the following disclaimer in the documentation
+-# and/or other materials provided with the distribution.
+-#
+-# * The names of Kitware, Inc., the Insight Consortium, or the names of
+-# any consortium members, or of any contributors, may not be used to
+-# endorse or promote products derived from this software without
+-# specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-
+-
+-find_path(GTEST_SOURCE_DIR
+- NAMES src/gtest-all.cc CMakeLists.txt
+- HINTS $ENV{GTEST_ROOT} ${GTEST_ROOT} /usr/src/gtest
+-)
+-mark_as_advanced(GTEST_SOURCE_DIR)
+-
+-find_path(GTEST_INCLUDE_DIR
+- NAMES gtest/gtest.h
+- HINTS $ENV{GTEST_ROOT}/include ${GTEST_ROOT}/include
+-)
+-mark_as_advanced(GTEST_INCLUDE_DIR)
+-
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(GTest DEFAULT_MSG GTEST_SOURCE_DIR GTEST_INCLUDE_DIR)
+-
+-if(GTEST_FOUND)
+- set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
+- set(GTEST_LIBRARIES gtest)
+- set(GTEST_MAIN_LIBRARIES gtest_main)
+- set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
+-endif()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 791cd96..9115391 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -3,7 +3,6 @@ include_directories(
+ ${Boost_INCLUDE_DIRS}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../src
+ )
+-add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/gtest_build)
+
+ set(tests_SOURCES
+ main.cpp
diff --git a/media-libs/chromaprint/metadata.xml b/media-libs/chromaprint/metadata.xml
index f13b90f3d998..4cd6b6d902a3 100644
--- a/media-libs/chromaprint/metadata.xml
+++ b/media-libs/chromaprint/metadata.xml
@@ -3,6 +3,6 @@
<pkgmetadata>
<herd>sound</herd>
<use>
- <flag name='tools'>Build and install fpcalc and fpcollect tools</flag>
+ <flag name="tools">Build and install fpcalc and fpcollect tools</flag>
</use>
</pkgmetadata>