ffmpeg plugin only needs to link against ffmpeg libs.

* clean the ffmpeg build feature.
This commit is contained in:
Jerome Duval
2013-12-05 18:04:13 +01:00
parent 724f4e2d38
commit 9e46d51cc2
2 changed files with 11 additions and 27 deletions
+11 -18
View File
@@ -299,25 +299,18 @@ if [ IsPackageAvailable mesa_devel ] {
if [ IsPackageAvailable ffmpeg_devel ] {
local ffmpegLibs = libavformat.so libavcodec.so libavdevice.so
libavfilter.so libswscale.so libavutil.so ;
local speexLibs = libspeex.so ;
local libtheoraLibs = libtheora.so libtheoradec.so libtheoraenc.so ;
local libvorbisLibs = libvorbis.so libvorbisenc.so ;
local liboggLibs = libogg.so ;
local libvpxLibs = libvpx.so ;
ExtractBuildFeatureArchives ffmpeg :
file: base ffmpeg
runtime: lib
file: devel ffmpeg_devel
depends: base
libraries: $(developLibDir)/$(ffmpegLibs)
headers: $(developHeadersDir)
;
local feature ;
for feature in ffmpeg speex libtheora libvorbis libogg libvpx {
ExtractBuildFeatureArchives $(feature) :
file: base $(feature)
runtime: lib
file: devel $(feature)_devel
depends: base
libraries: $(developLibDir)/$($(feature)Libs)
headers: $(developHeadersDir)
;
EnableBuildFeatures $(feature) ;
}
EnableBuildFeatures ffmpeg ;
} else {
Echo "FFMpeg support not available on $(TARGET_PACKAGING_ARCH)" ;
}
-9
View File
@@ -52,18 +52,9 @@ Addon ffmpeg :
# FFmpeg libraries (from FFmpeg optional package):
[ BuildFeatureAttribute ffmpeg : libraries ]
[ BuildFeatureAttribute libbz2 : libraries ]
[ BuildFeatureAttribute speex : libraries ]
[ BuildFeatureAttribute libtheora : libraries ]
[ BuildFeatureAttribute libvorbis : libraries ]
[ BuildFeatureAttribute libogg : libraries ]
[ BuildFeatureAttribute libvpx : libraries ]
be
media
[ BuildFeatureAttribute zlib : library ]
$(TARGET_LIBSUPC++)
$(TARGET_NETWORK_LIBS)
;