commit: 9d13a601d77a0e22d4bd8cd5b1079709518517c1 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Fri Oct 30 14:32:46 2015 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Fri Oct 30 14:45:33 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d13a601
media-libs/chromaprint: remove old. Package-Manager: portage-2.2.23 media-libs/chromaprint/Manifest | 3 -- media-libs/chromaprint/chromaprint-0.6.ebuild | 45 ----------------- media-libs/chromaprint/chromaprint-0.7.ebuild | 52 ------------------- media-libs/chromaprint/chromaprint-1.1.ebuild | 56 -------------------- .../chromaprint/files/chromaprint-0.7-boost.patch | 8 --- .../chromaprint/files/chromaprint-0.7-ffmpeg.patch | 43 ---------------- .../chromaprint/files/chromaprint-0.7-libav9.patch | 44 ---------------- .../chromaprint/files/chromaprint-1.0-libav9.patch | 11 ---- .../files/chromaprint-1.1-ffmpeg2.patch | 13 ----- ...chromaprint-1.1-libav_build_fix_for_tools.patch | 59 ---------------------- 10 files changed, 334 deletions(-) diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest index 11f8522..fcdbdff 100644 --- a/media-libs/chromaprint/Manifest +++ b/media-libs/chromaprint/Manifest @@ -1,4 +1 @@ -DIST chromaprint-0.6.tar.gz 542366 SHA256 5d9b82da226450c14e43482371a1b2a178e2604ab5b2e9259f33b1b461ee9d63 SHA512 8786c84877663d991d3114776c92b47eb4d813a338e312956a54c444ff07bca05692a019145c722bcbfadd8c2e4c2b6c5ccb0eb784d96d41f58b143e8d57db24 WHIRLPOOL 2ed6ccb8e36393afae971873455bb38bd801daf94912badeca067162a5ab467215799439bfb3afcb51bd302435bcd479b9a991d4f4db90c4783e6a43fe94b09f -DIST chromaprint-0.7.tar.gz 543811 SHA256 4e52c3fd443c91a5c429557753d4ba3f9d31d183810412c0d8600892f3975501 SHA512 2ac03f80888d6c12dd05c20adc82e0f2c9e6bf5edc099d7c7b719b8cb353151fb04b78f5c7bca672d5fe8357a791e86fdea7b6952a0d64c346c079548ebfcd38 WHIRLPOOL 34c5cb7c38dc0e4924e068ff0a695e571fdd2233046ef6ea84e9e0e27e6bf9f5eaedceb79c2f8120e9ac6eb30ace3bc9e15ba59027cd498426e7f94536e2da84 -DIST chromaprint-1.1.tar.gz 542360 SHA256 6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12 SHA512 3d439dfca979e2babc8d2c171b5cb36fd0a5d3b7475e02a0f8bae436f7096e189674b640119f0dccf7cc2cd214bd8674d46b018952f1e3e93ddc0ba19b5155f9 WHIRLPOOL 726c7710f7bd1c138d7ebd1de263a0e214cbd79faf60e35034a60cfd68a9d3b4e52fc1cc93ce4dc7d39683e3a5ac1d7e9bd6c8046cdb5cece83b9c2fbf4971b5 DIST chromaprint-1.2.tar.gz 529646 SHA256 822b8949a322ac04c6f8a3ed78f5e689bcc493c6ca0972bf627c913c8430031a SHA512 dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb WHIRLPOOL b2efb45c23e950b6a4d95c078bed15b03ef35e423b106428a7607034276b343b8c223ffa71e021846ed48f535663e062ae8042d281d769a04effc9afd8a600dd diff --git a/media-libs/chromaprint/chromaprint-0.6.ebuild b/media-libs/chromaprint/chromaprint-0.6.ebuild deleted file mode 100644 index 1399c0c..0000000 --- a/media-libs/chromaprint/chromaprint-0.6.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit cmake-utils - -DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" -HOMEPAGE="http://acoustid.org/chromaprint"; -SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test tools" - -# note: use ffmpeg instead of fftw because it's recommended and required for tools -RDEPEND=">=virtual/ffmpeg-0.6 - tools? ( >=media-libs/taglib-1.6 )" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) - tools? ( dev-libs/boost )" - -DOCS="NEWS.txt README.txt" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build tools EXAMPLES) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build tools) - -DWITH_AVFFT=ON - ) - - cmake-utils_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - emake check -} - -src_install() { - cmake-utils_src_install - use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect -} diff --git a/media-libs/chromaprint/chromaprint-0.7.ebuild b/media-libs/chromaprint/chromaprint-0.7.ebuild deleted file mode 100644 index 062c6e0..0000000 --- a/media-libs/chromaprint/chromaprint-0.7.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit cmake-utils - -DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" -HOMEPAGE="http://acoustid.org/chromaprint"; -SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="test tools" - -# note: use ffmpeg instead of fftw because it's recommended and required for tools -RDEPEND=">=virtual/ffmpeg-0.10 - tools? ( >=media-libs/taglib-1.6 )" -DEPEND="${RDEPEND} - test? ( - dev-cpp/gtest - dev-libs/boost - ) - tools? ( dev-libs/boost )" - -DOCS="NEWS.txt README.txt" - -PATCHES=( "${FILESDIR}"/${P}-boost.patch - "${FILESDIR}"/${P}-ffmpeg.patch - "${FILESDIR}"/${P}-libav9.patch ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build tools EXAMPLES) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build tools) - -DWITH_AVFFT=ON - ) - - cmake-utils_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - emake check -} - -src_install() { - cmake-utils_src_install - use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect -} diff --git a/media-libs/chromaprint/chromaprint-1.1.ebuild b/media-libs/chromaprint/chromaprint-1.1.ebuild deleted file mode 100644 index 80080d9..0000000 --- a/media-libs/chromaprint/chromaprint-1.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints" -HOMEPAGE="http://acoustid.org/chromaprint"; -SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"; - -LICENSE="LGPL-2.1" -SLOT="0" -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 - tools? ( >=media-libs/taglib-1.6 )" -DEPEND="${RDEPEND} - test? ( - dev-cpp/gtest - dev-libs/boost - ) - tools? ( dev-libs/boost )" - -DOCS="NEWS.txt README.txt" - -PATCHES=( - "${FILESDIR}"/${PN}-0.7-ffmpeg.patch - "${FILESDIR}"/${P}-gtest.patch - "${FILESDIR}"/${P}-ffmpeg2.patch - "${FILESDIR}"/${P}-libav_build_fix_for_tools.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build tools EXAMPLES) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build tools) - -DWITH_AVFFT=ON - ) - cmake-utils_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - emake check -} - -src_install() { - cmake-utils_src_install - use tools && dobin "${BUILD_DIR}"/tools/fpcollect -} diff --git a/media-libs/chromaprint/files/chromaprint-0.7-boost.patch b/media-libs/chromaprint/files/chromaprint-0.7-boost.patch deleted file mode 100644 index 46df857..0000000 --- a/media-libs/chromaprint/files/chromaprint-0.7-boost.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- chromaprint-0.7/tests/CMakeLists.txt -+++ chromaprint-0.7/tests/CMakeLists.txt -@@ -1,4 +1,5 @@ - include_directories( -+ ${Boost_INCLUDE_DIRS} - ${GTEST_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/../src - ) diff --git a/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch b/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch deleted file mode 100644 index f51e779..0000000 --- a/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=435856 -https://raw.github.com/pld-linux/chromaprint/master/chromaprint-ffmpeg.patch - ---- chromaprint-0.7/src/ext/ffmpeg_decoder.h.orig 2012-09-05 20:05:36.000000000 +0200 -+++ chromaprint-0.7/src/ext/ffmpeg_decoder.h 2012-10-10 17:59:58.632685943 +0200 -@@ -80,7 +80,7 @@ - avcodec_close(m_codec_ctx); - } - if (m_format_ctx) { -- av_close_input_file(m_format_ctx); -+ avformat_close_input(&m_format_ctx); - } - //av_audio_convert_free(m_convert_ctx); - av_free(m_buffer2); -@@ -89,12 +89,12 @@ - - inline bool Decoder::Open() - { -- if (av_open_input_file(&m_format_ctx, m_file_name.c_str(), NULL, 0, NULL) != 0) { -+ if (avformat_open_input(&m_format_ctx, m_file_name.c_str(), NULL, NULL) != 0) { - m_error = "Couldn't open the file." + m_file_name; - return false; - } - -- if (av_find_stream_info(m_format_ctx) < 0) { -+ if (avformat_find_stream_info(m_format_ctx, NULL) < 0) { - m_error = "Couldn't find stream information in the file."; - return false; - } -@@ -129,11 +129,11 @@ - return false; - } - -- if (m_codec_ctx->sample_fmt != SAMPLE_FMT_S16) { -+ if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) { - m_error = "Unsupported sample format.\n"; - return false; - } -- /*m_convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, 1, -+ /*m_convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1, - m_codec_ctx->sample_fmt, 1, - NULL, 0); - if (!m_convert_ctx) { diff --git a/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch b/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch deleted file mode 100644 index c520970..0000000 --- a/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -burN chromaprint-0.7.orig//src/fft_lib_avfft.h chromaprint-0.7/src/fft_lib_avfft.h ---- chromaprint-0.7.orig//src/fft_lib_avfft.h 2012-09-05 20:05:36.000000000 +0200 -+++ chromaprint-0.7/src/fft_lib_avfft.h 2013-02-16 17:34:08.682624779 +0100 -@@ -25,6 +25,7 @@ - extern "C" { - #include <libavcodec/avcodec.h> - #include <libavcodec/avfft.h> -+#include <libavutil/mem.h> - } - #include "combined_buffer.h" - -diff -burN chromaprint-0.7.orig/examples/fpcalc.c chromaprint-0.7/work/chromaprint-0.7/examples/fpcalc.c ---- chromaprint-0.7.orig/examples/fpcalc.c 2012-09-05 20:05:36.000000000 +0200 -+++ chromaprint-0.7/examples/fpcalc.c 2013-02-16 17:40:09.947611629 +0100 -@@ -42,7 +42,7 @@ - goto done; - } - -- if (av_find_stream_info(format_ctx) < 0) { -+ if (avformat_find_stream_info(format_ctx, NULL) < 0) { - fprintf(stderr, "ERROR: couldn't find stream information in the file\n"); - goto done; - } -@@ -65,7 +65,7 @@ - goto done; - } - -- if (avcodec_open(codec_ctx, codec) < 0) { -+ if (avcodec_open2(codec_ctx, codec, NULL) < 0) { - fprintf(stderr, "ERROR: couldn't open the codec\n"); - goto done; - } -diff -burN chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h chromaprint-0.7/src/ext/ffmpeg_decoder.h ---- chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h 2013-02-16 17:49:06.799592088 +0100 -+++ chromaprint-0.7/src/ext/ffmpeg_decoder.h 2013-02-16 17:49:54.037590369 +0100 -@@ -124,7 +124,7 @@ - return false; - } - -- if (avcodec_open(m_codec_ctx, codec) < 0) { -+ if (avcodec_open2(m_codec_ctx, codec, NULL) < 0) { - m_error = "Couldn't open the codec."; - return false; - } diff --git a/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch b/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch deleted file mode 100644 index e816790..0000000 --- a/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- chromaprint-1.0.orig/src/ext/ffmpeg_decoder.h 2013-11-03 17:32:04.347686878 +0800 -+++ chromaprint-1.0/src/ext/ffmpeg_decoder.h 2013-11-03 17:32:41.082686494 +0800 -@@ -124,7 +124,7 @@ - return false; - } - -- if (avcodec_open(m_codec_ctx, codec) < 0) { -+ if (avcodec_open2(m_codec_ctx, codec, NULL) < 0) { - m_error = "Couldn't open the codec."; - return false; - } diff --git a/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch b/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch deleted file mode 100644 index 2a68de3..0000000 --- a/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- chromaprint-1.1/src/ext/ffmpeg_decoder.h -+++ chromaprint-1.1/src/ext/ffmpeg_decoder.h -@@ -28,6 +28,10 @@ - } - #include "audio_consumer.h" - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+# define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+#endif -+ - class Decoder - { - public: diff --git a/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch b/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch deleted file mode 100644 index b53f798..0000000 --- a/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch +++ /dev/null @@ -1,59 +0,0 @@ -http://bugs.gentoo.org/498194 -http://bitbucket.org/acoustid/chromaprint/commits/90822f6eee64da2941c9cbd9cd41a9664fead1d4 - -From 90822f6eee64da2941c9cbd9cd41a9664fead1d4 Mon Sep 17 00:00:00 2001 -From: Urs Fleisch <[email protected]> -Date: Sat, 28 Dec 2013 09:47:31 +0100 -Subject: [PATCH] Build fpcalc if neither HAVE_SWRESAMPLE nor HAVE_AVRESAMPLE - defined, issue #11. - ---- - examples/fpcalc.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/examples/fpcalc.c b/examples/fpcalc.c -index a4b0ff9..e73e358 100644 ---- a/examples/fpcalc.c -+++ b/examples/fpcalc.c -@@ -33,6 +33,8 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name - SwrContext *convert_ctx = NULL; - #elif defined(HAVE_AVRESAMPLE) - AVAudioResampleContext *convert_ctx = NULL; -+#else -+ void *convert_ctx = NULL; - #endif - int max_dst_nb_samples = 0, dst_linsize = 0; - uint8_t *dst_data[1] = { NULL }; -@@ -75,6 +77,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name - goto done; - } - -+#if defined(HAVE_SWRESAMPLE) || defined(HAVE_AVRESAMPLE) - if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) { - int64_t channel_layout = codec_ctx->channel_layout; - if (!channel_layout) { -@@ -111,6 +114,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name - } - #endif - } -+#endif - - if (stream->duration != AV_NOPTS_VALUE) { - *duration = stream->time_base.num * stream->duration / stream->time_base.den; -@@ -155,10 +159,11 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name - max_dst_nb_samples = frame->nb_samples; - } - #if defined(HAVE_SWRESAMPLE) -- if (swr_convert(convert_ctx, dst_data, frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples) < 0) { -+ if (swr_convert(convert_ctx, dst_data, frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples) < 0) - #elif defined(HAVE_AVRESAMPLE) -- if (avresample_convert(convert_ctx, dst_data, 0, frame->nb_samples, (uint8_t **)frame->data, 0, frame->nb_samples) < 0) { -+ if (avresample_convert(convert_ctx, dst_data, 0, frame->nb_samples, (uint8_t **)frame->data, 0, frame->nb_samples) < 0) - #endif -+ { - fprintf(stderr, "ERROR: couldn't convert the audio\n"); - goto done; - } --- -1.9.rc2.211.gd198f5d -
