From 89bd6330dc28a5171a043910922534966bc379b5 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 13 Feb 2018 16:08:04 -0800 Subject: [PATCH] [aubio] Update to handle static FFMPEG --- ports/aubio/CMakeLists.txt | 7 ++++++- ports/aubio/CONTROL | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt index 50e61339e..a405a48de 100644 --- a/ports/aubio/CMakeLists.txt +++ b/ports/aubio/CMakeLists.txt @@ -37,8 +37,10 @@ find_library(OGG_LIB ogg) find_library(FLAC_LIB flac) find_library(VORBIS_LIB vorbis) find_library(VORBISENC_LIB vorbisenc) +find_package(BZip2 REQUIRED) +find_package(LibLZMA REQUIRED) -include_directories(src ${LIBSNDFILE_H}) +include_directories(src ${LIBSNDFILE_H} ${LIBLZMA_INCLUDE_DIRS}) file(GLOB_RECURSE SOURCES src/*.c) @@ -56,7 +58,10 @@ target_link_libraries(aubio PUBLIC ${AVFILTER_LIB} ${AVFORMAT_LIB} ${SWRESAMPLE_LIB} + BZip2::BZip2 + ${LIBLZMA_LIBRARIES} ws2_32.lib + Secur32.lib ) if(BUILD_TOOLS) diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL index 7261afd80..945157c7e 100644 --- a/ports/aubio/CONTROL +++ b/ports/aubio/CONTROL @@ -1,4 +1,4 @@ Source: aubio -Version: 0.4.6 +Version: 0.4.6-1 Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio. Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis