[WPE][GTK] Building with ENABLE_VIDEO=OFF fails to find AudioTrack.idl
authoraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Nov 2017 16:28:24 +0000 (16:28 +0000)
committeraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Nov 2017 16:28:24 +0000 (16:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179372

Reviewed by Michael Catanzaro.

Arrange MSE extensions defined in {Audio,Text,Video}TrackMediaSource.idl to be
only used for building when both ENABLE_VIDEO_TRACK and ENABLE_MEDIA_SOURCE are
enabled.

No new tests needed.

* CMakeLists.txt: Add conditional for ENABLE_MEDIA_SOURCE and move the addition
of the IDL files to the build there.
* Sources.txt: Conversely, source unification should skip sources derived from
the IDL files when ENABLE_MEDIA_SOURCE disabled, so add guards as well.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224533 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Sources.txt

index 5c4d1b3..b9d138d 100644 (file)
@@ -270,14 +270,11 @@ set(WebCore_NON_SVG_IDL_FILES
     Modules/mediasession/MediaRemoteControls.idl
     Modules/mediasession/MediaSession.idl
 
-    Modules/mediasource/AudioTrackMediaSource.idl
     Modules/mediasource/DOMURLMediaSource.idl
     Modules/mediasource/MediaSource.idl
     Modules/mediasource/SourceBuffer.idl
     Modules/mediasource/SourceBufferList.idl
-    Modules/mediasource/TextTrackMediaSource.idl
     Modules/mediasource/VideoPlaybackQuality.idl
-    Modules/mediasource/VideoTrackMediaSource.idl
 
     Modules/mediastream/CanvasCaptureMediaStreamTrack.idl
     Modules/mediastream/DoubleRange.idl
@@ -1226,6 +1223,14 @@ if (ENABLE_VIDEO_TRACK)
         html/track/VideoTrackList.idl
     )
 
+    if (ENABLE_MEDIA_SOURCE)
+        list(APPEND WebCore_IDL_FILES
+            Modules/mediasource/AudioTrackMediaSource.idl
+            Modules/mediasource/TextTrackMediaSource.idl
+            Modules/mediasource/VideoTrackMediaSource.idl
+        )
+    endif ()
+
     list(APPEND WebCore_SOURCES
         html/track/AudioTrack.cpp
         html/track/AudioTrackList.cpp
index cad28c3..fa602f1 100644 (file)
@@ -1,3 +1,21 @@
+2017-11-07  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE][GTK] Building with ENABLE_VIDEO=OFF fails to find AudioTrack.idl
+        https://bugs.webkit.org/show_bug.cgi?id=179372
+
+        Reviewed by Michael Catanzaro.
+
+        Arrange MSE extensions defined in {Audio,Text,Video}TrackMediaSource.idl to be
+        only used for building when both ENABLE_VIDEO_TRACK and ENABLE_MEDIA_SOURCE are
+        enabled.
+
+        No new tests needed.
+
+        * CMakeLists.txt: Add conditional for ENABLE_MEDIA_SOURCE and move the addition
+        of the IDL files to the build there.
+        * Sources.txt: Conversely, source unification should skip sources derived from
+        the IDL files when ENABLE_MEDIA_SOURCE disabled, so add guards as well.
+
 2017-11-07  Youenn Fablet  <youenn@apple.com>
 
         Support the case of fetch events that are not responded
index 038a0a5..050b8ed 100644 (file)
@@ -2262,7 +2262,6 @@ JSAudioListener.cpp
 JSAudioNode.cpp
 JSAudioParam.cpp
 JSAudioProcessingEvent.cpp
-JSAudioTrackMediaSource.cpp
 JSBarProp.cpp
 JSBasicCredential.cpp
 JSBeforeLoadEvent.cpp
@@ -2902,7 +2901,6 @@ JSTextDecoder.cpp
 JSTextEncoder.cpp
 JSTextEvent.cpp
 JSTextMetrics.cpp
-JSTextTrackMediaSource.cpp
 JSTimeRanges.cpp
 JSTransitionEvent.cpp
 JSTreeWalker.cpp
@@ -2922,7 +2920,6 @@ JSVRPose.cpp
 JSVRStageParameters.cpp
 JSValidityState.cpp
 JSVideoPlaybackQuality.cpp
-JSVideoTrackMediaSource.cpp
 JSVisibilityState.cpp
 JSVoidCallback.cpp
 JSWaveShaperNode.cpp
@@ -3081,6 +3078,12 @@ JSVTTRegionList.cpp
 JSVideoTrack.cpp
 JSVideoTrackList.cpp
 
+#if ENABLE_MEDIA_SOURCE
+JSAudioTrackMediaSource.cpp
+JSTextTrackMediaSource.cpp
+JSVideoTrackMediaSource.cpp
+#endif
+
 #endif
 
 #if ENABLE_QUOTA