Build media plugins for the secondary arch.
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:
@@ -32,8 +32,8 @@ AddFilesToPackage $(addOnsDir) Translators
|
|||||||
# : $(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 ;
|
||||||
|
|||||||
@@ -32,6 +32,9 @@ if $(TARGET_ARCH) != x86_64 {
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
local architectureObject ;
|
||||||
|
for architectureObject in [ MultiArchSubDirSetup ] {
|
||||||
|
on $(architectureObject) {
|
||||||
UseBuildFeatureHeaders ffmpeg ;
|
UseBuildFeatureHeaders ffmpeg ;
|
||||||
Includes [ FGristFiles $(sources) ]
|
Includes [ FGristFiles $(sources) ]
|
||||||
: [ BuildFeatureAttribute ffmpeg : headers ] ;
|
: [ BuildFeatureAttribute ffmpeg : headers ] ;
|
||||||
@@ -45,7 +48,7 @@ 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)
|
||||||
:
|
:
|
||||||
|
|
||||||
@@ -56,5 +59,7 @@ Addon ffmpeg :
|
|||||||
media
|
media
|
||||||
$(TARGET_LIBSUPC++)
|
$(TARGET_LIBSUPC++)
|
||||||
;
|
;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,14 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
|
|||||||
|
|
||||||
UsePrivateHeaders media ;
|
UsePrivateHeaders media ;
|
||||||
|
|
||||||
Addon raw_decoder :
|
local architectureObject ;
|
||||||
|
for architectureObject in [ MultiArchSubDirSetup ] {
|
||||||
|
on $(architectureObject) {
|
||||||
|
Addon [ MultiArchDefaultGristFiles raw_decoder ] :
|
||||||
AudioConversion.cpp
|
AudioConversion.cpp
|
||||||
RawDecoderPlugin.cpp
|
RawDecoderPlugin.cpp
|
||||||
: be libmedia.so $(TARGET_LIBSUPC++)
|
: be media $(TARGET_LIBSUPC++)
|
||||||
;
|
;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user