commit: da9c5d029470980f27b81473e25016d5aa4bf7c6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 3 13:18:51 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jun 6 08:06:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da9c5d02
media-libs/chromaprint: Drop old Package-Manager: Portage-2.3.40, Repoman-2.3.9 media-libs/chromaprint/Manifest | 3 - media-libs/chromaprint/chromaprint-1.2-r1.ebuild | 42 --------- media-libs/chromaprint/chromaprint-1.2.ebuild | 47 ---------- media-libs/chromaprint/chromaprint-1.3.2.ebuild | 42 --------- media-libs/chromaprint/chromaprint-1.4.1.ebuild | 46 --------- .../chromaprint/files/chromaprint-1.1-gtest.patch | 104 --------------------- .../files/chromaprint-1.2-ffmpeg29.patch | 48 ---------- 7 files changed, 332 deletions(-) diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest index 2dda794d0e0..78d7e8f7527 100644 --- a/media-libs/chromaprint/Manifest +++ b/media-libs/chromaprint/Manifest @@ -1,6 +1,3 @@ -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 diff --git a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild deleted file mode 100644 index 81b0bbafac9..00000000000 --- a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-multilib - -DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" -HOMEPAGE="https://acoustid.org/chromaprint"; -SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~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}] - )" - -DOCS="NEWS.txt README.md" - -PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch ) - -multilib_src_configure() { - local mycmakeargs=( - "-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)" - "-DBUILD_TESTS=$(usex test ON OFF)" - -DWITH_AVFFT=ON - ) - cmake-utils_src_configure -} - -multilib_src_test() { - emake check -} diff --git a/media-libs/chromaprint/chromaprint-1.2.ebuild b/media-libs/chromaprint/chromaprint-1.2.ebuild deleted file mode 100644 index e6bff8e5479..00000000000 --- a/media-libs/chromaprint/chromaprint-1.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit cmake-utils - -DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" -HOMEPAGE="https://acoustid.org/chromaprint"; -SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 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:0= ) - !libav? ( >=media-video/ffmpeg-2.6:0= ) -" -DEPEND="${RDEPEND} - test? ( - dev-cpp/gtest - dev-libs/boost - )" - -DOCS="NEWS.txt README.md" - -PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build tools EXAMPLES) - $(cmake-utils_use_build test TESTS) - -DWITH_AVFFT=ON - ) - cmake-utils_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - emake check -} - -src_install() { - cmake-utils_src_install -} diff --git a/media-libs/chromaprint/chromaprint-1.3.2.ebuild b/media-libs/chromaprint/chromaprint-1.3.2.ebuild deleted file mode 100644 index dcff5eb696a..00000000000 --- a/media-libs/chromaprint/chromaprint-1.3.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-multilib - -DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" -HOMEPAGE="https://acoustid.org/chromaprint"; -SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"; - -LICENSE="LGPL-2.1" -SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~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}] - )" - -DOCS="NEWS.txt README.md" - -PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch ) - -multilib_src_configure() { - local mycmakeargs=( - "-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)" - "-DBUILD_TESTS=$(usex test ON OFF)" - -DWITH_AVFFT=ON - ) - cmake-utils_src_configure -} - -multilib_src_test() { - emake check -} diff --git a/media-libs/chromaprint/chromaprint-1.4.1.ebuild b/media-libs/chromaprint/chromaprint-1.4.1.ebuild deleted file mode 100644 index 102d01c254b..00000000000 --- a/media-libs/chromaprint/chromaprint-1.4.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# 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="https://acoustid.org/chromaprint"; -SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${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 ~ppc ~ppc64 ~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}] - )" - -DOCS="NEWS.txt README.md" - -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.1-gtest.patch b/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch deleted file mode 100644 index 8305ae7c1af..00000000000 --- a/media-libs/chromaprint/files/chromaprint-1.1-gtest.patch +++ /dev/null @@ -1,104 +0,0 @@ - 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 <[email protected]> --# --# 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/files/chromaprint-1.2-ffmpeg29.patch b/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch deleted file mode 100644 index 6910f243b2e..00000000000 --- a/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 37092d380a28abcc63fa120499030a0f2b7df80f -Author: Rodger Combs <[email protected]> -Date: Fri Oct 2 14:48:01 2015 -0500 - - fpcalc: remove uses of deprecated lavc APIs - -Index: chromaprint-1.2/examples/fpcalc.c -=================================================================== ---- chromaprint-1.2.orig/examples/fpcalc.c -+++ chromaprint-1.2/examples/fpcalc.c -@@ -17,10 +17,6 @@ - #define MAX(a, b) ((a) > (b) ? (a) : (b)) - #define MIN(a, b) ((a) < (b) ? (a) : (b)) - --#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0) --#define avcodec_free_frame av_freep --#endif -- - int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration) - { - int ok = 0, remaining, length, consumed, codec_ctx_opened = 0, got_frame, stream_index; -@@ -131,7 +127,7 @@ int decode_audio_file(ChromaprintContext - remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate; - chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate, codec_ctx->channels); - -- frame = avcodec_alloc_frame(); -+ frame = av_frame_alloc(); - - while (1) { - if (av_read_frame(format_ctx, &packet) < 0) { -@@ -139,7 +135,7 @@ int decode_audio_file(ChromaprintContext - } - - if (packet.stream_index == stream_index) { -- avcodec_get_frame_defaults(frame); -+ av_frame_unref(frame); - - got_frame = 0; - consumed = avcodec_decode_audio4(codec_ctx, frame, &got_frame, &packet); -@@ -196,7 +192,7 @@ finish: - - done: - if (frame) { -- avcodec_free_frame(&frame); -+ av_frame_free(&frame); - } - if (dst_data[0]) { - av_freep(&dst_data[0]);
