i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/packages/HaikuSecondary
+3 -3
View File
@@ -31,9 +31,9 @@ AddFilesToPackage $(addOnsDir) Translators
# AddFilesToPackage $(addOnsDir) locale catalogs # AddFilesToPackage $(addOnsDir) locale catalogs
# : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ; # : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
# #
# AddFilesToPackage $(addOnsDir) media : $(SYSTEM_ADD_ONS_MEDIA) ; #AddFilesToPackage $(addOnsDir) media : $(SYSTEM_ADD_ONS_MEDIA) ;
# AddFilesToPackage $(addOnsDir) media plugins AddFilesToPackage $(addOnsDir) media plugins
# : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ; : [ MultiArchDefaultGristFiles $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ] ;
# #
# AddFilesToPackage $(addOnsDir) disk_systems # AddFilesToPackage $(addOnsDir) disk_systems
# : <disk_system>intel <disk_system>gpt <disk_system>bfs <disk_system>ntfs ; # : <disk_system>intel <disk_system>gpt <disk_system>bfs <disk_system>ntfs ;
src/add-ons/media/plugins/ffmpeg/Jamfile
+25 -20
View File
@@ -32,29 +32,34 @@ if $(TARGET_ARCH) != x86_64 {
; ;
} }
UseBuildFeatureHeaders ffmpeg ; local architectureObject ;
Includes [ FGristFiles $(sources) ] for architectureObject in [ MultiArchSubDirSetup ] {
: [ BuildFeatureAttribute ffmpeg : headers ] ; on $(architectureObject) {
UseBuildFeatureHeaders ffmpeg ;
Includes [ FGristFiles $(sources) ]
: [ BuildFeatureAttribute ffmpeg : headers ] ;
local ffmpegHeaders = [ BuildFeatureAttribute ffmpeg : headers : path ] ; local ffmpegHeaders = [ BuildFeatureAttribute ffmpeg : headers : path ] ;
UseHeaders $(ffmpegHeaders) ; UseHeaders $(ffmpegHeaders) ;
UseHeaders [ FDirName $(ffmpegHeaders) libavcodec ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavcodec ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libavdevice ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavdevice ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libavfilter ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavfilter ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libavformat ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavformat ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libavutil ] ; UseHeaders [ FDirName $(ffmpegHeaders) libavutil ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libswscale ] ; UseHeaders [ FDirName $(ffmpegHeaders) libswscale ] ;
Addon ffmpeg : Addon [ MultiArchDefaultGristFiles ffmpeg ] :
$(sources) $(sources)
: :
# FFmpeg libraries (from FFmpeg optional package): # FFmpeg libraries (from FFmpeg optional package):
[ BuildFeatureAttribute ffmpeg : libraries ] [ BuildFeatureAttribute ffmpeg : libraries ]
be be
media media
$(TARGET_LIBSUPC++) $(TARGET_LIBSUPC++)
; ;
}
}
src/add-ons/media/plugins/raw_decoder/Jamfile
+10 -5
View File
@@ -4,9 +4,14 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders media ; UsePrivateHeaders media ;
Addon raw_decoder : local architectureObject ;
AudioConversion.cpp for architectureObject in [ MultiArchSubDirSetup ] {
RawDecoderPlugin.cpp on $(architectureObject) {
: be libmedia.so $(TARGET_LIBSUPC++) Addon [ MultiArchDefaultGristFiles raw_decoder ] :
; AudioConversion.cpp
RawDecoderPlugin.cpp
: be media $(TARGET_LIBSUPC++)
;
}
}