i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build media add-ons for secondary arch.

Browse Source 
Fixes #10049.
This commit is contained in:
Adrien Destugues
2014-10-31 12:20:52 +01:00
parent 5d8ce4733c
commit dff211d8a6
20 changed files with 345 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/packages/HaikuSecondary
+1 -1
View File
@@ -31,7 +31,7 @@ AddFilesToPackage $(addOnsDir) Translators
# AddFilesToPackage $(addOnsDir) 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
: [ MultiArchDefaultGristFiles $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ] ;
#
src/add-ons/media/media-add-ons/demultiplexer/Jamfile
+6 -1
View File
@@ -2,10 +2,15 @@ SubDir HAIKU_TOP src add-ons media media-add-ons demultiplexer ;
UsePrivateHeaders demultiplexer ;
Addon demultiplexer.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles demultiplexer.media_addon ] :
MediaDemultiplexerNode.cpp
MediaDemultiplexerAddOn.cpp
MediaOutputInfo.cpp
misc.cpp
: be media
;
}
}
src/add-ons/media/media-add-ons/dvb/Jamfile
+12 -3
View File
@@ -2,15 +2,22 @@ SubDir HAIKU_TOP src add-ons media media-add-ons dvb ;
UsePrivateHeaders drivers ;
SubDirC++Flags -D__STDC_CONSTANT_MACROS -Wno-deprecated-declarations ;
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) libavformat ] ;
UseHeaders [ FDirName $(ffmpegHeaders) libavutil ] ;
SubDirC++Flags -D__STDC_CONSTANT_MACROS -Wno-deprecated-declarations ;
Addon dvb.media_addon :
Addon [ MultiArchDefaultGristFiles dvb.media_addon ] :
DVBCard.cpp
DVBMediaAddon.cpp
DVBMediaNode.cpp
@@ -25,3 +32,5 @@ Addon dvb.media_addon :
Includes [ FGristFiles MediaFormat.cpp ]
: [ BuildFeatureAttribute ffmpeg : headers ] ;
}
}
src/add-ons/media/media-add-ons/equalizer/Jamfile
+6 -1
View File
@@ -2,9 +2,14 @@ SubDir HAIKU_TOP src add-ons media media-add-ons equalizer ;
AddResources equalizer.media_addon : Equalizer.rdef ;
Addon equalizer.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles equalizer.media_addon ] :
Equalizer.cpp
EqualizerAddOn.cpp
EqualizerNode.cpp
: be media [ TargetLibstdc++ ]
;
}
}
src/add-ons/media/media-add-ons/esound_sink/Jamfile
+6 -1
View File
@@ -6,10 +6,15 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
SubDirC++Flags -fmultiple-symbol-spaces ;
}
Addon esound_sink.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles esound_sink.media_addon ] :
ESDEndpoint.cpp
ESDSinkAddOn.cpp
ESDSinkNode.cpp
: be media network [ TargetLibsupc++ ]
;
}
}
src/add-ons/media/media-add-ons/firewire_dv/Jamfile
+6 -1
View File
@@ -6,9 +6,14 @@ UsePrivateHeaders firewire ;
UsePrivateHeaders media ;
UsePrivateHeaders shared ;
Addon firewire_dv.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles firewire_dv.media_addon ] :
FireWireCard.cpp
FireWireDVAddOn.cpp
FireWireDVNode.cpp
: be media [ TargetLibsupc++ ]
;
}
}
src/add-ons/media/media-add-ons/legacy/Jamfile
+6 -1
View File
@@ -2,10 +2,15 @@ SubDir HAIKU_TOP src add-ons media media-add-ons legacy ;
UsePrivateHeaders media ;
Addon legacy.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles legacy.media_addon ] :
LegacyAudioConsumer.cpp
LegacyAudioDevice.cpp
LegacyAudioProducer.cpp
LegacyMediaAddOn.cpp
: be media [ TargetLibsupc++ ]
;
}
}
src/add-ons/media/media-add-ons/mixer/Jamfile
+6 -1
View File
@@ -4,7 +4,10 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
AddResources mixer.media_addon : AudioMixer.rdef ;
Addon mixer.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles mixer.media_addon ] :
AudioMixer.cpp
ByteSwap.cpp
Interpolate.cpp
@@ -17,6 +20,8 @@ Addon mixer.media_addon :
Resampler.cpp
: be media [ TargetLibsupc++ ] localestub
;
}
}
DoCatalogs mixer.media_addon
:
src/add-ons/media/media-add-ons/multi_audio/Jamfile
+8 -2
View File
@@ -8,9 +8,13 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
SubDirC++Flags -fmultiple-symbol-spaces ;
}
AddResources hmulti_audio.media_addon : MultiAudio.rdef ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
AddResources [ MultiArchDefaultGristFiles hmulti_audio.media_addon ] :
MultiAudio.rdef ;
Addon hmulti_audio.media_addon :
Addon [ MultiArchDefaultGristFiles hmulti_audio.media_addon ] :
MultiAudioAddOn.cpp
MultiAudioDevice.cpp
MultiAudioNode.cpp
@@ -19,6 +23,8 @@ Addon hmulti_audio.media_addon :
TimeComputer.cpp
: be media [ TargetLibsupc++ ] localestub
;
}
}
DoCatalogs hmulti_audio.media_addon
:
src/add-ons/media/media-add-ons/opensound/Jamfile
+6 -1
View File
@@ -8,7 +8,10 @@ if $(TARGET_PLATFORM) != haiku {
SubDirC++Flags -fmultiple-symbol-spaces -D_ZETA_TS_FIND_DIR_=1 ;
}
Addon opensound.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles opensound.media_addon ] :
OpenSoundAddOn.cpp
OpenSoundDevice.cpp
OpenSoundDeviceEngine.cpp
@@ -16,3 +19,5 @@ Addon opensound.media_addon :
OpenSoundNode.cpp
: be media [ TargetLibsupc++ ]
;
}
}
src/add-ons/media/media-add-ons/radeon/Jamfile
+7 -3
View File
@@ -4,7 +4,10 @@ UsePrivateHeaders graphics ;
UsePrivateHeaders [ FDirName graphics common ] ;
UsePrivateHeaders [ FDirName graphics radeon ] ;
Addon radeon.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles radeon.media_addon ] :
RadeonAddOn.cpp
RadeonProducer.cpp
CC.cpp
@@ -18,6 +21,7 @@ Addon radeon.media_addon :
VideoIn.cpp
Theater100.cpp
Theater200.cpp
: be media
;
LinkAgainst radeon.media_addon : be media ;
}
}
src/add-ons/media/media-add-ons/reader/Jamfile
+6 -1
View File
@@ -4,7 +4,10 @@ UsePrivateHeaders media ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons media media-add-ons ] ;
Application reader.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Application [ MultiArchDefaultGristFiles reader.media_addon ] :
AbstractFileInterfaceNode.cpp
AbstractFileInterfaceAddOn.cpp
MediaReader.cpp
@@ -12,3 +15,5 @@ Application reader.media_addon :
misc.cpp
: be media [ TargetLibsupc++ ]
;
}
}
src/add-ons/media/media-add-ons/tone_producer_demo/Jamfile
+6 -1
View File
@@ -1,7 +1,12 @@
SubDir HAIKU_TOP src add-ons media media-add-ons tone_producer_demo ;
Addon tone_producer_demo.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles tone_producer_demo.media_addon ] :
ToneProducerAddOn.cpp
ToneProducer.cpp
: be media [ TargetLibsupc++ ]
;
}
}
src/add-ons/media/media-add-ons/usb_vision/Jamfile
+6 -1
View File
@@ -4,9 +4,14 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders usb_vision ;
Addon usb_vision.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles usb_vision.media_addon ] :
AddOn.cpp
Producer.cpp
TunerLocale.cpp
: be media [ TargetLibstdc++ ]
;
}
}
src/add-ons/media/media-add-ons/usb_webcam/Jamfile
+11 -2
View File
@@ -13,6 +13,11 @@ if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
usbKitLibraryName = usb ;
}
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
# source directories
local sourceDirs =
addons/quickcam
@@ -29,6 +34,7 @@ for sourceDir in $(sourceDirs) {
usb_webcam $(sourceDir) ] ;
}
## addon sources
local addonSources ;
addonSources =
@@ -74,13 +80,14 @@ actions USBWebcamHeaderGen1
grep -h -a $(GREP_DEFINE) $(2) > $(1) ;
}
USBWebcamHeaderGen CamInternalAddons.h : B_WEBCAM_MKINTFUNC : $(addonSources) ;
USBWebcamHeaderGen CamInternalAddons.h : B_WEBCAM_MKINTFUNC
: $(addonSources) ;
USBWebcamHeaderGen CamInternalSensors.h : B_WEBCAM_DECLARE_SENSOR
: $(sensorsSources) ;
USBWebcamHeaderGen CamInternalColorSpaceTransforms.h
: B_WEBCAM_DECLARE_CSTRANSFORM : $(csTransformsSources) ;
Addon usb_webcam.media_addon :
Addon [ MultiArchDefaultGristFiles usb_webcam.media_addon ] :
$(addonSources)
$(csTransformsSources)
$(sensorsSources)
@@ -97,6 +104,8 @@ Addon usb_webcam.media_addon :
CamStreamingDeframer.cpp
: be media $(usbKitLibraryName) [ TargetLibsupc++ ]
;
}
}
# force dependancies
Includes [ FGristFiles CamRoster.cpp ] : [ FGristFiles CamInternalAddons.h ] ;
src/add-ons/media/media-add-ons/video_mixer/Jamfile
+6 -1
View File
@@ -2,7 +2,10 @@ SubDir HAIKU_TOP src add-ons media media-add-ons video_mixer ;
UsePrivateHeaders media shared ;
Addon video_mixer.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles video_mixer.media_addon ] :
VideoMixerNode.cpp
VideoMixerNodeConsumer.cpp
VideoMixerNodeProducer.cpp
@@ -13,3 +16,5 @@ Addon video_mixer.media_addon :
yuvrgb.nasm
: be media
;
}
}
src/add-ons/media/media-add-ons/video_producer_demo/Jamfile
+6 -1
View File
@@ -1,7 +1,12 @@
SubDir HAIKU_TOP src add-ons media media-add-ons video_producer_demo ;
Addon video_producer_demo.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles video_producer_demo.media_addon ] :
AddOn.cpp
Producer.cpp
: be media [ TargetLibsupc++ ]
;
}
}
src/add-ons/media/media-add-ons/videowindow/Jamfile
+6 -1
View File
@@ -1,9 +1,14 @@
SubDir HAIKU_TOP src add-ons media media-add-ons videowindow ;
Addon video_window_demo.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles video_window_demo.media_addon ] :
VideoAddOn.cpp
VideoNode.cpp
VideoView.cpp
VideoWindow.cpp
: be media [ TargetLibsupc++ ]
;
}
}
src/add-ons/media/media-add-ons/vst_host/Jamfile
+8 -2
View File
@@ -1,10 +1,16 @@
SubDir HAIKU_TOP src add-ons media media-add-ons vst_host ;
AddResources vst_host.media_addon : VSTHost.rdef ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
AddResources [ MultiArchDefaultGristFiles vst_host.media_addon ]
: VSTHost.rdef ;
Addon vst_host.media_addon :
Addon [ MultiArchDefaultGristFiles vst_host.media_addon ] :
VSTHost.cpp
VSTAddOn.cpp
VSTNode.cpp
: be media [ TargetLibstdc++ ]
;
}
}
src/add-ons/media/media-add-ons/writer/Jamfile
+6 -1
View File
@@ -2,7 +2,10 @@ SubDir HAIKU_TOP src add-ons media media-add-ons writer ;
UsePrivateHeaders media ;
Addon writer.media_addon :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles writer.media_addon ] :
../AbstractFileInterfaceNode.cpp
../AbstractFileInterfaceAddOn.cpp
MediaWriter.cpp
@@ -11,3 +14,5 @@ Addon writer.media_addon :
: be media
: true
;
}
}