[aubio] Update to handle static FFMPEG

attila-kun · Feb 14, 2018 · 89bd633 · 89bd633
1 parent a40559a
commit 89bd633
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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