[haiku-commits] haiku: hrev47079 - src/add-ons/media/plugins/ffmpeg src/add-ons/media/plugins/raw_decoder build/jam/packages

From: pulkomandy@xxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Mon, 31 Mar 2014 15:34:35 +0200 (CEST)
hrev47079 adds 1 changeset to branch 'master'
old head: 943b310c90ad5e96395c4d33cb996774959a1cda
new head: d71e18fef493548d46c5ae6213daa023b691ff98
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=d71e18f+%5E943b310

----------------------------------------------------------------------------

d71e18f: 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.

                             [ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev47079
Commit:      d71e18fef493548d46c5ae6213daa023b691ff98
URL:         http://cgit.haiku-os.org/haiku/commit/?id=d71e18f
Author:      Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date:        Mon Mar 31 13:32:31 2014 UTC

Ticket:      https://dev.haiku-os.org/ticket/4893
Ticket:      https://dev.haiku-os.org/ticket/10049

----------------------------------------------------------------------------

3 files changed, 42 insertions(+), 32 deletions(-)
build/jam/packages/HaikuSecondary             |  6 +--
src/add-ons/media/plugins/ffmpeg/Jamfile      | 53 +++++++++++++----------
src/add-ons/media/plugins/raw_decoder/Jamfile | 15 ++++---

----------------------------------------------------------------------------

diff --git a/build/jam/packages/HaikuSecondary 
b/build/jam/packages/HaikuSecondary
index 1257052..975f425 100644
--- a/build/jam/packages/HaikuSecondary
+++ b/build/jam/packages/HaikuSecondary
@@ -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 ;
diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile 
b/src/add-ons/media/plugins/ffmpeg/Jamfile
index e05fdfc..c328056 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -32,29 +32,34 @@ if $(TARGET_ARCH) != x86_64 {
        ;
 }
 
-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 ] ;
-
-Addon ffmpeg :
-       $(sources)
-       :
-
-       # FFmpeg libraries (from FFmpeg optional package):
-       [ BuildFeatureAttribute ffmpeg : libraries ]
-
-       be
-       media
-       $(TARGET_LIBSUPC++)
-;
+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 ] ;
+
+               Addon [ MultiArchDefaultGristFiles ffmpeg ] :
+                       $(sources)
+                       :
+
+                       # FFmpeg libraries (from FFmpeg optional package):
+                       [ BuildFeatureAttribute ffmpeg : libraries ]
+
+                       be
+                       media
+                       $(TARGET_LIBSUPC++)
+               ;
+       }
+}
 
 
diff --git a/src/add-ons/media/plugins/raw_decoder/Jamfile 
b/src/add-ons/media/plugins/raw_decoder/Jamfile
index 4f4f2a3..687e790 100644
--- a/src/add-ons/media/plugins/raw_decoder/Jamfile
+++ b/src/add-ons/media/plugins/raw_decoder/Jamfile
@@ -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++)
+               ;
+       }
+}
[haiku-commits] haiku: hrev47079 - src/add-ons/media/plugins/ffmpeg src/add-ons/media/plugins/raw_decoder build/jam/packages

Other related posts:
