Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build media plugins for the secondary arch.

Browse Source 
These are used when an app uses BMediaFile/BMediaTrack, which leads to
the plug-ins being instanciated on the application side.

* Fixes one more part of #10049 (media add-ons are still missing).
* Will probably not solve any real-world issue because of #4893.
This commit is contained in:
Adrien Destugues 2014-03-31 15:32:31 +02:00
parent 943b310c90
commit d71e18fef4
3 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/jam/packages/HaikuSecondary
View File

@ -31,9 +31,9 @@ AddFilesToPackage $(addOnsDir) Translators
# AddFilesToPackage $(addOnsDir) locale catalogs
# : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
#
# AddFilesToPackage $(addOnsDir) media : $(SYSTEM_ADD_ONS_MEDIA) ;
# AddFilesToPackage $(addOnsDir) media plugins
# : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
#AddFilesToPackage $(addOnsDir) media : $(SYSTEM_ADD_ONS_MEDIA) ;
AddFilesToPackage $(addOnsDir) media plugins
: [ MultiArchDefaultGristFiles $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ] ;
#
# AddFilesToPackage $(addOnsDir) disk_systems
# : <disk_system>intel <disk_system>gpt <disk_system>bfs <disk_system>ntfs ;

45
src/add-ons/media/plugins/ffmpeg/Jamfile
View File

@ -32,29 +32,34 @@ if $(TARGET_ARCH) != x86_64 {
;
}
UseBuildFeatureHeaders ffmpeg ;
Includes [ FGristFiles $(sources) ]
: [ BuildFeatureAttribute ffmpeg : headers ] ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
UseBuildFeatureHeaders ffmpeg ;
Includes [ FGristFiles $(sources) ]
: [ BuildFeatureAttribute ffmpeg : headers ] ;
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 ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libswscale ] ;
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 ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libswscale ] ;
Addon ffmpeg :
$(sources)
:
Addon [ MultiArchDefaultGristFiles ffmpeg ] :
$(sources)
:
# FFmpeg libraries (from FFmpeg optional package):
[ BuildFeatureAttribute ffmpeg : libraries ]
# FFmpeg libraries (from FFmpeg optional package):
[ BuildFeatureAttribute ffmpeg : libraries ]
be
media
$(TARGET_LIBSUPC++)
;
be
media
$(TARGET_LIBSUPC++)
;
}
}

15
src/add-ons/media/plugins/raw_decoder/Jamfile
View File

@ -4,9 +4,14 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders media ;
Addon raw_decoder :
AudioConversion.cpp
RawDecoderPlugin.cpp
: be libmedia.so $(TARGET_LIBSUPC++)
;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles raw_decoder ] :
AudioConversion.cpp
RawDecoderPlugin.cpp
: be media $(TARGET_LIBSUPC++)
;
}
}