diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-06-03 15:18:51 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-06-06 10:06:42 +0200 |
commit | da9c5d029470980f27b81473e25016d5aa4bf7c6 (patch) | |
tree | 48686e6b90ca93df0ae965d1565707e3663937fe /media-libs/chromaprint/files | |
parent | media-gfx/enblend: Drop old (diff) | |
download | gentoo-da9c5d029470980f27b81473e25016d5aa4bf7c6.tar.gz gentoo-da9c5d029470980f27b81473e25016d5aa4bf7c6.tar.bz2 gentoo-da9c5d029470980f27b81473e25016d5aa4bf7c6.zip |
media-libs/chromaprint: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'media-libs/chromaprint/files')
-rw-r--r-- | media-libs/chromaprint/files/chromaprint-1.1-gtest.patch | 104 | ||||
-rw-r--r-- | media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch | 48 |
2 files changed, 0 insertions, 152 deletions
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 8305ae7c1af0..000000000000 --- 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 <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/files/chromaprint-1.2-ffmpeg29.patch b/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch deleted file mode 100644 index 6910f243b2e0..000000000000 --- a/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 37092d380a28abcc63fa120499030a0f2b7df80f -Author: Rodger Combs <rodger.combs@gmail.com> -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]); |