From ab75d3b5a83bf2a3b2fecfeb84d739c7cdc1a5de Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 24 Dec 2017 16:39:23 +0100 Subject: [PATCH] Do not advertise libavdevice in ffmpeg build feature. It is not actually used by our ffmpeg plugin. --- build/jam/BuildFeatures | 4 ++-- src/add-ons/media/plugins/ffmpeg/Jamfile | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures index 900b2efb96..4a076dfe96 100644 --- a/build/jam/BuildFeatures +++ b/build/jam/BuildFeatures @@ -237,8 +237,8 @@ if [ IsPackageAvailable mesa_devel ] { # FFmpeg if [ IsPackageAvailable ffmpeg_devel ] { - local ffmpegLibs = libavformat.so libavcodec.so libavdevice.so - libavfilter.so libswscale.so libavutil.so libswresample.so ; + local ffmpegLibs = libavformat.so libavcodec.so libavfilter.so libswscale.so + libavutil.so libswresample.so ; ExtractBuildFeatureArchives ffmpeg : file: base ffmpeg diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile index 16daf259ac..9411065ac9 100644 --- a/src/add-ons/media/plugins/ffmpeg/Jamfile +++ b/src/add-ons/media/plugins/ffmpeg/Jamfile @@ -43,7 +43,6 @@ for architectureObject in [ MultiArchSubDirSetup ] { local ffmpegHeaders = [ BuildFeatureAttribute ffmpeg : headers : path ] ; UseHeaders $(ffmpegHeaders) ; UseHeaders [ FDirName $(ffmpegHeaders) libavcodec ] ; - UseHeaders [ FDirName $(ffmpegHeaders) libavdevice ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavfilter ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavformat ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavutil ] ;