meson: Mark files as files()

Making it more robust and future proof

And fix issues that it creates

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1093>

diff --git a/subprojects/gst-devtools/docs/meson.build b/subprojects/gst-devtools/docs/meson.build
index 75d6029..287ddbc 100644 (file)
--- a/subprojects/gst-devtools/docs/meson.build
+++ b/subprojects/gst-devtools/docs/meson.build
@@ -49,12 +49,7 @@ foreach f: excludes
         'validate', 'gst', 'validate', f)]
 endforeach
 
-validate_sources = []
-foreach f: gstvalidate_headers + gstvalidate_sources
-    validate_sources += [join_paths(meson.current_source_dir(), '..',
-        'validate', 'gst', 'validate', f)]
-endforeach
-
+validate_sources = gstvalidate_headers + gstvalidate_sources
 hotdoc = import('hotdoc')
 plugins_doc = []
 libs_doc = [hotdoc.generate_doc('gst-devtools',

diff --git a/subprojects/gst-devtools/validate/gst/validate/meson.build b/subprojects/gst-devtools/validate/gst/validate/meson.build
index d04f1a4..77a6428 100644 (file)
--- a/subprojects/gst-devtools/validate/gst/validate/meson.build
+++ b/subprojects/gst-devtools/validate/gst/validate/meson.build
@@ -1,4 +1,4 @@
-gstvalidate_sources = [
+gstvalidate_sources = files(
     'gst-validate-reporter.c',
     'gst-validate-mockdecryptor.c',
     'gst-validate-monitor.c',
@@ -20,9 +20,9 @@ gstvalidate_sources = [
     'flow/gstvalidateflow.c',
     'flow/formatting.c',
     'validate.c',
-]
+)
 
-gstvalidate_headers = [
+gstvalidate_headers = files(
     'validate.h',
     'validate-prelude.h',
     'gst-validate-types.h',
@@ -44,7 +44,7 @@ gstvalidate_headers = [
     'gst-validate-scenario.h',
     'gst-validate-utils.h',
     'gst-validate-media-info.h'
-]
+)
 
 install_headers(gstvalidate_headers, subdir : 'gstreamer-1.0/gst/validate')
 

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build
index 022c110..fbd33b7 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/audio/meson.build
@@ -1,5 +1,5 @@
-badaudio_sources = ['gstnonstreamaudiodecoder.c', 'gstplanaraudioadapter.c']
-badaudio_headers = ['gstnonstreamaudiodecoder.h', 'audio-bad-prelude.h', 'gstplanaraudioadapter.h']
+badaudio_sources = files('gstnonstreamaudiodecoder.c', 'gstplanaraudioadapter.c')
+badaudio_headers = files('gstnonstreamaudiodecoder.h', 'audio-bad-prelude.h', 'gstplanaraudioadapter.h')
 install_headers(badaudio_headers, subdir : 'gstreamer-1.0/gst/audio')
 
 

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/basecamerabinsrc/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/basecamerabinsrc/meson.build
index ba6771e..64a4c42 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/basecamerabinsrc/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/basecamerabinsrc/meson.build
@@ -1,14 +1,14 @@
-camerabin_sources = [
+camerabin_sources = files(
   'gstcamerabin-enum.c',
   'gstcamerabinpreview.c',
   'gstbasecamerasrc.c',
-]
-camerabin_headers = [
+)
+camerabin_headers = files(
   'basecamerabinsrc-prelude.h',
   'gstcamerabin-enum.h',
   'gstcamerabinpreview.h',
   'gstbasecamerasrc.h',
-]
+)
 install_headers(camerabin_headers, subdir : 'gstreamer-1.0/gst/basecamerabinsrc')
 
 gstbasecamerabin = library('gstbasecamerabinsrc-' + api_version,

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build
index 953f0f0..9b1dadc 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecs/meson.build
@@ -1,4 +1,4 @@
-codecs_sources = files([
+codecs_sources = files(
   'gsth264decoder.c',
   'gsth264picture.c',
   'gsth265decoder.c',
@@ -12,9 +12,9 @@ codecs_sources = files([
   'gstav1decoder.c',
   'gstav1picture.c',
   'gstvp9statefulparser.c',
-])
+)
 
-codecs_headers = [
+codecs_headers = files(
   'gsth264decoder.h',
   'gsth264picture.h',
   'gsth265decoder.h',
@@ -28,7 +28,7 @@ codecs_headers = [
   'gstav1decoder.h',
   'gstav1picture.h',
   'gstvp9statefulparser.h',
-]
+)
 
 cp_args = [
   '-DGST_USE_UNSTABLE_API',

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build
index 5ca5488..500233d 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/insertbin/meson.build
@@ -1,5 +1,5 @@
-insert_sources = ['gstinsertbin.c']
-insert_headers = ['gstinsertbin.h']
+insert_sources = files('gstinsertbin.c')
+insert_headers = files('gstinsertbin.h')
 install_headers(insert_headers, subdir : 'gstreamer-1.0/gst/insertbin')
 
 gstinsertbin = library('gstinsertbin-' + api_version,

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build
index 45f22c8..19ae87a 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/mpegts/meson.build
@@ -1,4 +1,4 @@
-mpegts_sources = [
+mpegts_sources = files(
   'mpegts.c',
   'gstmpegtssection.c',
   'gstmpegtsdescriptor.c',
@@ -6,9 +6,9 @@ mpegts_sources = [
   'gst-dvb-section.c',
   'gst-atsc-section.c',
   'gst-scte-section.c',
-]
+)
 
-mpegts_headers = [
+mpegts_headers = files(
   'gstmpegtssection.h',
   'gst-atsc-section.h',
   'gst-dvb-section.h',
@@ -20,7 +20,7 @@ mpegts_headers = [
   'gst-isdb-descriptor.h',
   'mpegts-prelude.h',
   'mpegts.h',
-]
+)
 install_headers(mpegts_headers, subdir : 'gstreamer-1.0/gst/mpegts')
 
 mpegts_enums = gnome.mkenums_simple('gstmpegts-enumtypes',

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build
index 99535ba..b6467b1 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/play/meson.build
@@ -1,13 +1,13 @@
-gstplay_sources = [
+gstplay_sources = files(
   'gstplay.c',
   'gstplay-signal-adapter.c',
   'gstplay-video-renderer.c',
   'gstplay-media-info.c',
   'gstplay-video-overlay-video-renderer.c',
   'gstplay-visualization.c',
-]
+)
 
-gstplay_headers = [
+gstplay_headers = files(
   'play.h',
   'play-prelude.h',
   'gstplay.h',
@@ -17,7 +17,7 @@ gstplay_headers = [
   'gstplay-media-info.h',
   'gstplay-video-overlay-video-renderer.h',
   'gstplay-visualization.h',
-]
+)
 
 install_headers(gstplay_headers, subdir : 'gstreamer-' + api_version + '/gst/play/')
 

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build
index 1056494..59ea6db 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/player/meson.build
@@ -1,4 +1,4 @@
-gstplayer_sources = [
+gstplayer_sources = files([
   'gstplayer.c',
   'gstplayer-signal-dispatcher.c',
   'gstplayer-video-renderer.c',
@@ -7,9 +7,9 @@ gstplayer_sources = [
   'gstplayer-video-overlay-video-renderer.c',
   'gstplayer-wrapped-video-renderer.c',
   'gstplayer-visualization.c',
-]
+])
 
-gstplayer_headers = [
+gstplayer_headers = files([
   'player.h',
   'player-prelude.h',
   'gstplayer.h',
@@ -20,7 +20,7 @@ gstplayer_headers = [
   'gstplayer-g-main-context-signal-dispatcher.h',
   'gstplayer-video-overlay-video-renderer.h',
   'gstplayer-visualization.h',
-]
+])
 
 install_headers(gstplayer_headers, subdir : 'gstreamer-' + api_version + '/gst/player/')
 

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build
index d5a14ca..00a918c 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build
@@ -5,7 +5,7 @@ if get_option('vulkan').disabled()
   subdir_done()
 endif
 
-vulkan_sources = [
+vulkan_sources = files(
   'gstvkbuffermemory.c',
   'gstvkbufferpool.c',
   'gstvkcommandbuffer.c',
@@ -34,9 +34,9 @@ vulkan_sources = [
   'gstvkvideofilter.c',
   'gstvkutils.c',
   'gstvkwindow.c',
-]
+)
 
-vulkan_headers = [
+vulkan_headers = files(
   'gstvkapi.h',
   'gstvkbarrier.h',
   'gstvkbuffermemory.h',
@@ -70,7 +70,7 @@ vulkan_headers = [
   'vulkan-prelude.h',
   'vulkan_fwd.h',
   'vulkan.h',
-]
+)
 
 vulkan_priv_sources = []
 vulkan_xcb_sources = []
@@ -154,17 +154,17 @@ xkbcommon_dep = dependency('xkbcommon', required : get_option('x11'))
 xkbcommon_x11_dep = dependency('xkbcommon-x11', required : get_option('x11'))
 
 if xcb_dep.found() and xkbcommon_dep.found() and xkbcommon_x11_dep.found() and cc.has_header('vulkan/vulkan_xcb.h', dependencies : vulkan_dep)
-  vulkan_priv_sources += [
+  vulkan_priv_sources += files(
     'xcb/gstvkwindow_xcb.c',
     'xcb/xcb_event_source.c',
-  ]
-  vulkan_xcb_sources += [
+  )
+  vulkan_xcb_sources += files(
     'xcb/gstvkdisplay_xcb.c',
-  ]
-  vulkan_xcb_headers += [
+  )
+  vulkan_xcb_headers += files(
     'xcb/xcb.h',
     'xcb/gstvkdisplay_xcb.h'
-  ]
+  )
 
   optional_deps += [xcb_dep, xkbcommon_dep, xkbcommon_x11_dep]
   vulkan_windowing = true
@@ -174,18 +174,18 @@ endif
 
 wayland_client_dep = dependency('wayland-client', version : '>=1.4', required : get_option('wayland'))
 if wayland_client_dep.found() and cc.has_header('vulkan/vulkan_wayland.h', dependencies : vulkan_dep)
-  vulkan_priv_sources += [
+  vulkan_priv_sources += files(
     'wayland/gstvkdisplay_wayland.c',
     'wayland/gstvkwindow_wayland.c',
     'wayland/wayland_event_source.c',
-  ]
-  vulkan_wayland_sources += [
+  )
+  vulkan_wayland_sources += files(
     'wayland/gstvkdisplay_wayland.c',
-  ]
-  vulkan_wayland_headers += [
+  )
+  vulkan_wayland_headers += files(
     'wayland/wayland.h',
     'wayland/gstvkdisplay_wayland.h'
-  ]
+  )
 
   optional_deps += wayland_client_dep
   vulkan_windowing = true
@@ -213,10 +213,10 @@ if host_system == 'darwin'
   cocoa_dep = dependency('appleframeworks', modules : ['Cocoa'], required : get_option('vulkan'))
 
   if cocoa_dep.found() and cc.has_header('vulkan/vulkan_macos.h', dependencies : vulkan_dep)
-    vulkan_priv_sources += [
+    vulkan_priv_sources += files(
       'cocoa/gstvkdisplay_cocoa.m',
       'cocoa/gstvkwindow_cocoa.m',
-    ]
+    )
     optional_deps += [cocoa_dep]
     vulkan_windowing = true
     vulkan_conf.set10('GST_VULKAN_HAVE_WINDOW_COCOA', 1)
@@ -228,10 +228,10 @@ if host_system == 'ios'
   uikit_dep = dependency('appleframeworks', modules : ['UIKit'], required : get_option('vulkan'))
 
   if uikit_dep.found() and cc.has_header('vulkan/vulkan_ios.h', dependencies : vulkan_dep)
-    vulkan_priv_sources += [
+    vulkan_priv_sources += files(
       'ios/gstvkdisplay_ios.m',
       'ios/gstvkwindow_ios.m',
-    ]
+    )
     optional_deps += [uikit_dep]
     vulkan_windowing = true
     vulkan_conf.set10('GST_VULKAN_HAVE_WINDOW_IOS', 1)
@@ -254,10 +254,10 @@ endif
 
 if host_system == 'android'
   if cc.has_header('vulkan/vulkan_android.h', dependencies : vulkan_dep)
-    vulkan_priv_sources += [
+    vulkan_priv_sources += files(
       'android/gstvkdisplay_android.c',
       'android/gstvkwindow_android.c',
-    ]
+    )
     vulkan_windowing = true
     vulkan_conf.set10('GST_VULKAN_HAVE_WINDOW_ANDROID', 1)
     enabled_vulkan_winsys += ['android']

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build
index c363828..c0e233f 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/meson.build
@@ -1,4 +1,4 @@
-webrtc_sources = [
+webrtc_sources = files([
   'dtlstransport.c',
   'icetransport.c',
   'rtcsessiondescription.c',
@@ -7,9 +7,9 @@ webrtc_sources = [
   'rtptransceiver.c',
   'datachannel.c',
   'sctptransport.c',
-]
+])
 
-webrtc_headers = [
+webrtc_headers = files([
   'dtlstransport.h',
   'icetransport.h',
   'rtcsessiondescription.h',
@@ -20,14 +20,14 @@ webrtc_headers = [
   'webrtc_fwd.h',
   'webrtc.h',
   'sctptransport.h',
-]
+])
 
-webrtc_enumtypes_headers = [
+webrtc_enumtypes_headers = files([
   'dtlstransport.h',
   'icetransport.h',
   'rtptransceiver.h',
   'webrtc_fwd.h',
-]
+])
 
 webrtc_enums = gnome.mkenums_simple('webrtc-enumtypes',
   sources : webrtc_enumtypes_headers,

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/allocators/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/allocators/meson.build
index 0ebd0ce..a4804af 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/allocators/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/allocators/meson.build
@@ -1,13 +1,13 @@
-gst_allocators_headers = [
+gst_allocators_headers = files([
   'allocators.h',
   'allocators-prelude.h',
   'gstfdmemory.h',
   'gstphysmemory.h',
   'gstdmabuf.h',
-]
+])
 install_headers(gst_allocators_headers, subdir : 'gstreamer-1.0/gst/allocators/')
 
-gst_allocators_sources = [ 'gstdmabuf.c', 'gstfdmemory.c', 'gstphysmemory.c']
+gst_allocators_sources = files([ 'gstdmabuf.c', 'gstfdmemory.c', 'gstphysmemory.c'])
 gstallocators = library('gstallocators-@0@'.format(api_version),
   gst_allocators_sources,
   c_args : gst_plugins_base_args + ['-DBUILDING_GST_ALLOCATORS'],

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/app/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/app/meson.build
index 6e3c918..9fdaae4 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/app/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/app/meson.build
@@ -1,10 +1,10 @@
-app_sources = ['gstappsrc.c', 'gstappsink.c']
+app_sources = files(['gstappsrc.c', 'gstappsink.c'])
 
-app_mkenum_headers = [
+app_mkenum_headers = files([
   'gstappsrc.h',
-]
+])
 
-app_headers = app_mkenum_headers + [ 'app.h', 'app-prelude.h', 'gstappsrc.h', 'gstappsink.h' ]
+app_headers = app_mkenum_headers + files([ 'app.h', 'app-prelude.h', 'gstappsrc.h', 'gstappsink.h' ])
 install_headers(app_headers, subdir : 'gstreamer-1.0/gst/app/')
 
 app_enums = gnome.mkenums_simple('app-enumtypes',

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build
index b853ba6..2bd3a33 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build
@@ -1,4 +1,4 @@
-audio_src= [
+audio_src = files([
   'audio.c',
   'audio-buffer.c',
   'audio-channel-mixer.c',
@@ -24,9 +24,9 @@ audio_src= [
   'gstaudioutilsprivate.c',
   'streamvolume.c',
   'gstaudiostreamalign.c',
-]
+])
 
-audio_mkenum_headers = [
+audio_mkenum_headers = files([
   'audio.h',
   'audio-format.h',
   'audio-channels.h',
@@ -41,10 +41,10 @@ audio_mkenum_headers = [
   'gstaudiocdsrc.h',
   'gstaudiobasesink.h',
   'gstaudiostreamalign.h',
-]
+])
 
 # FIXME: check headers
-audio_headers = audio_mkenum_headers + [
+audio_headers = audio_mkenum_headers + files([
   'audio-prelude.h',
   'audio-buffer.h',
   'gstaudiobasesink.h',
@@ -59,7 +59,7 @@ audio_headers = audio_mkenum_headers + [
   'gstaudiosink.h',
   'gstaudiosrc.h',
   'streamvolume.h',
-]
+])
 install_headers(audio_headers, subdir : 'gstreamer-1.0/gst/audio/')
 
 audio_enums = gnome.mkenums_simple('audio-enumtypes',

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
index 289074b..1c807e3 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
@@ -5,7 +5,7 @@ if get_option('gl').disabled()
   subdir_done()
 endif
 
-gl_sources = [
+gl_sources = files([
   'gstglapi.c',
   'gstglbasefilter.c',
   'gstglbasememory.c',
@@ -35,11 +35,11 @@ gl_sources = [
   'gstglutils.c',
   'gstglviewconvert.c',
   'gstglwindow.c',
-]
+])
 
-gl_priv_sources = []
+gl_priv_sources = files([])
 
-gir_gl_headers = [
+gir_gl_headers = files([
   'gl.h',
   'gl-prelude.h',
   'gstgl_enums.h',
@@ -73,13 +73,13 @@ gir_gl_headers = [
   'gstglutils.h',
   'gstglviewconvert.h',
   'gstglwindow.h',
-]
+])
 
-gl_headers = gir_gl_headers + [
+gl_headers = gir_gl_headers + files([
   'gstglfuncs.h',
-]
+])
 
-gl_prototype_headers = [
+gl_prototype_headers = files([
   'glprototypes/all_functions.h',
   'glprototypes/base.h',
   'glprototypes/buffer_storage.h',
@@ -97,7 +97,7 @@ gl_prototype_headers = [
   'glprototypes/shaders.h',
   'glprototypes/sync.h',
   'glprototypes/vao.h',
-]
+])
 
 gl_x11_sources = []
 gl_x11_headers = []
@@ -530,22 +530,21 @@ if need_platform_egl != 'no'
   endif
 
   if egl_dep.found()
-    gl_egl_sources += [
+    gl_egl_sources += files([
       'egl/gstegl.c',
       'egl/gsteglimage.c',
       'egl/gstglcontext_egl.c',
       'egl/gstgldisplay_egl.c',
       'egl/gstglmemoryegl.c',
       'egl/gstgldisplay_egl_device.c',
-    ]
-    gl_egl_headers += [
-      'egl/egl.h',
+    ])
+    gl_egl_headers += files([
       'egl/gstegl.h',
       'egl/gsteglimage.h',
       'egl/gstgldisplay_egl.h',
       'egl/gstglmemoryegl.h',
       'egl/gstgldisplay_egl_device.h',
-    ]
+    ])
     gl_platform_deps += egl_dep
     glconf.set10('GST_GL_HAVE_PLATFORM_EGL', 1)
 
@@ -613,19 +612,19 @@ if need_win_wayland != 'no'
         output: 'xdg-shell-client-protocol.c',
       )
 
-      gl_wayland_sources += [
+      gl_wayland_sources += files([
         'wayland/gstgldisplay_wayland.c',
-      ]
-      gl_priv_sources += [
+      ])
+      gl_priv_sources += files([
         'wayland/gstglwindow_wayland_egl.c',
         'wayland/wayland_event_source.c',
         xdg_shell_header,
         xdg_shell_code,
-      ]
-      gl_wayland_headers += [
+      ])
+      gl_wayland_headers += files([
         'wayland/wayland.h',
         'wayland/gstgldisplay_wayland.h'
-      ]
+      ])
       glconf.set('GST_GL_HAVE_WINDOW_WAYLAND', 1)
       gl_winsys_deps += [wayland_client_dep, wayland_cursor_dep, wayland_egl_dep]
       enabled_gl_winsys += 'wayland'
@@ -653,26 +652,26 @@ endif
 if need_win_x11 != 'no'
   xcb_dep = dependency('x11-xcb', required : false)
   if x11_dep.found() and xcb_dep.found()
-    gl_x11_sources += [
+    gl_x11_sources += files([
       'x11/gstgldisplay_x11.c',
-    ]
-    gl_priv_sources += [
+    ])
+    gl_priv_sources += files([
       'x11/gstglwindow_x11.c',
       'x11/xcb_event_source.c',
-    ]
-    gl_x11_headers += [
+    ])
+    gl_x11_headers += files([
       'x11/x11.h',
       'x11/gstgldisplay_x11.h',
-    ]
+    ])
     glconf.set('GST_GL_HAVE_WINDOW_X11', 1)
     gl_winsys_deps += [x11_dep, xcb_dep]
     enabled_gl_winsys += 'x11'
 
     if need_platform_glx != 'no' and glx_dep.found() and cc.has_function ('glXMakeCurrent', dependencies : glx_dep)
       glconf.set('GST_GL_HAVE_PLATFORM_GLX', 1)
-      gl_priv_sources += [
+      gl_priv_sources += files([
         'x11/gstglcontext_glx.c',
-      ]
+      ])
       # GLX is in the opengl library on linux
       gl_platform_deps += glx_dep
       enabled_gl_platforms += 'glx'
@@ -688,9 +687,9 @@ if need_win_dispmanx != 'no'
       error('dispmanx requires the use of egl')
     endif
 
-    gl_priv_sources += [
+    gl_priv_sources += files([
       'dispmanx/gstglwindow_dispmanx_egl.c'
-    ]
+    ])
 
     glconf.set('GST_GL_HAVE_WINDOW_DISPMANX', 1)
     gl_winsys_deps += bcm_host_dep
@@ -725,18 +724,18 @@ if host_system == 'windows' and need_win_win32 != 'no'
     if have_wgl or have_egl_win32
       gl_includes += [compat_includes]
       gl_platform_deps += gdi_dep
-      gl_priv_sources += [
+      gl_priv_sources += files([
         'win32/gstglwindow_win32.c',
-      ]
+      ])
       enabled_gl_winsys += 'win32'
       gl_winsys_deps += gdi_dep
       glconf.set('GST_GL_HAVE_WINDOW_WIN32', 1)
     endif
 
     if have_wgl
-      gl_priv_sources += [
+      gl_priv_sources += files([
         'wgl/gstglcontext_wgl.c',
-      ]
+      ])
       enabled_gl_platforms += 'wgl'
       glconf.set('GST_GL_HAVE_PLATFORM_WGL', 1)
     endif
@@ -757,9 +756,9 @@ if need_win_winrt != 'no' and host_system == 'windows'
     if windows_graphics_h and windows_app_dep.found() and runtimeobject_lib.found()
       enabled_gl_winsys += 'winrt'
       glconf.set10('GST_GL_HAVE_WINDOW_WINRT', 1)
-      gl_priv_sources += [
+      gl_priv_sources += files([
         'winrt/gstglwindow_winrt_egl.cpp'
-      ]
+      ])
       gl_winsys_deps += runtimeobject_lib
     elif need_win_winrt == 'yes'
       error('WinRT is enabled, but headers/libraries were not found')
@@ -809,12 +808,12 @@ if host_system == 'darwin'
       if need_win_cocoa != 'no'
         cocoa_dep = dependency('appleframeworks', modules : ['Cocoa'], required : false)
         if cocoa_dep.found()
-          gl_priv_sources += [
+          gl_priv_sources += files([
             'cocoa/gstglcaopengllayer.m',
             'cocoa/gstglcontext_cocoa.m',
             'cocoa/gstgldisplay_cocoa.m',
             'cocoa/gstglwindow_cocoa.m'
-          ]
+          ])
           gl_winsys_deps += cocoa_dep
           enabled_gl_winsys += 'cocoa'
           glconf.set10('GST_GL_HAVE_WINDOW_COCOA', 1)
@@ -856,10 +855,10 @@ if host_system == 'ios' and need_platform_eagl != 'no' and need_win_eagl != 'no'
       quartzcore_dep,
       uikit_dep,
     ]
-    gl_priv_sources += [
+    gl_priv_sources += files([
       'eagl/gstglcontext_eagl.m',
       'eagl/gstglwindow_eagl.m',
-    ]
+    ])
     enabled_gl_winsys += 'eagl'
     enabled_gl_platforms += 'eagl'
     glconf.set('GST_GL_HAVE_WINDOW_EAGL', 1)
@@ -884,11 +883,11 @@ if need_win_gbm != 'no'
   gbm_libdrm_dep = dependency('libdrm', version : '>= 2.4.55', required : false)
   gbm_dep = dependency('gbm', required : false)
   if egl_dep.found() and gbm_gudev_dep.found() and gbm_libdrm_dep.found() and gbm_dep.found()
-    gl_priv_sources += [
+    gl_priv_sources += files([
       'gbm/gstgldisplay_gbm.c',
       'gbm/gstgl_gbm_utils.c',
       'gbm/gstglwindow_gbm_egl.c',
-    ]
+    ])
     enabled_gl_winsys += 'gbm'
     gl_winsys_deps += [gbm_gudev_dep, gbm_libdrm_dep, gbm_dep]
     glconf.set('GST_GL_HAVE_WINDOW_GBM', 1)
@@ -908,10 +907,10 @@ if need_platform_egl != 'no' and need_win_viv_fb != 'no'
       enabled_gl_winsys += 'viv-fb'
       glconf.set10('GST_GL_HAVE_WINDOW_VIV_FB', 1)
       glconf.set10('GST_GL_HAVE_VIV_DIRECTVIV', 1)
-      gl_priv_sources += [
+      gl_priv_sources += files([
         'viv-fb/gstgldisplay_viv_fb.c',
         'viv-fb/gstglwindow_viv_fb_egl.c',
-      ]
+      ])
       gl_cpp_args += ['-DEGL_API_FB']
     endif
   endif
@@ -931,9 +930,9 @@ if host_system == 'android' and need_win_android != 'no' and need_platform_egl !
   if gles2_dep.found() and egl_dep.found()
     enabled_gl_winsys += ['android']
     glconf.set10('GST_GL_HAVE_WINDOW_ANDROID', 1)
-    gl_priv_sources += [
+    gl_priv_sources += files([
       'android/gstglwindow_android_egl.c'
-    ]
+    ])
   endif
 endif
 

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build
index 085384a..9ddf71c 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/meson.build
@@ -1,4 +1,4 @@
-pbutils_sources = [
+pbutils_sources = files([
   'gstpluginsbaseversion.c',
   'pbutils.c',
   'codec-utils.c',
@@ -10,7 +10,7 @@ pbutils_sources = [
   'gstaudiovisualizer.c',
   'gstdiscoverer.c',
   'gstdiscoverer-types.c'
-  ]
+])
 
 pbconf = configuration_data()
 pbconf.set('PACKAGE_VERSION_MAJOR', gst_version_major)
@@ -22,7 +22,7 @@ gst_pbutils_version_h = configure_file(input : 'gstpluginsbaseversion.h.in',
   install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/pbutils'),
   configuration: pbconf)
 
-pbutils_headers = [
+pbutils_headers = files([
   'pbutils.h',
   'pbutils-prelude.h',
   'codec-utils.h',
@@ -33,7 +33,7 @@ pbutils_headers = [
   'missing-plugins.h',
   'gstdiscoverer.h',
   'gstaudiovisualizer.h',
-]
+])
 install_headers(pbutils_headers, subdir : 'gstreamer-1.0/gst/pbutils/')
 
 pbutils_mkenum_headers = pbutils_headers

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/rtp/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/rtp/meson.build
index cdc1717..8b25c00 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/rtp/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/rtp/meson.build
@@ -1,4 +1,4 @@
-rtp_sources = [
+rtp_sources = files([
   'gstrtpbuffer.c',
   'gstrtcpbuffer.c',
   'gstrtppayloads.c',
@@ -7,9 +7,9 @@ rtp_sources = [
   'gstrtpbaseaudiopayload.c',
   'gstrtpbasepayload.c',
   'gstrtpbasedepayload.c'
-  ]
+  ])
 
-rtp_headers = [
+rtp_headers = files([
   'gstrtcpbuffer.h',
   'gstrtpbaseaudiopayload.h',
   'gstrtpbasedepayload.h',
@@ -21,7 +21,7 @@ rtp_headers = [
   'gstrtppayloads.h',
   'rtp-prelude.h',
   'rtp.h',
-]
+])
 install_headers(rtp_headers, subdir : 'gstreamer-1.0/gst/rtp/')
 
 rtp_enums = gnome.mkenums_simple('gstrtp-enumtypes',

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/rtsp/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/rtsp/meson.build
index fb8b920..cd93e99 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/rtsp/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/rtsp/meson.build
@@ -1,4 +1,4 @@
-rtsp_sources = [
+rtsp_sources = files([
   'gstrtsptransport.c',
   'gstrtspurl.c',
   'gstrtspmessage.c',
@@ -6,9 +6,9 @@ rtsp_sources = [
   'gstrtspdefs.c',
   'gstrtspextension.c',
   'gstrtsprange.c'
-  ]
+  ])
 
-rtsp_headers = [
+rtsp_headers = files([
   'gstrtspconnection.h',
   'gstrtspdefs.h',
   'gstrtspextension.h',
@@ -19,7 +19,7 @@ rtsp_headers = [
   'gstrtspurl.h',
   'rtsp-prelude.h',
   'rtsp.h',
-]
+])
 install_headers(rtsp_headers, subdir : 'gstreamer-1.0/gst/rtsp/')
 
 rtsp_enums = gnome.mkenums_simple('gstrtsp-enumtypes',

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build
index 4e15683..1aa38ec 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build
@@ -1,14 +1,14 @@
-gst_sdp_headers = [
+gst_sdp_headers = files([
   'sdp.h',
   'sdp-prelude.h',
   'gstsdp.h',
   'gstmikey.h',
   'gstsdpmessage.h',
-]
+])
 install_headers(gst_sdp_headers, subdir : 'gstreamer-1.0/gst/sdp/')
 
 sdp_deps = [rtp_dep, gst_dep, gio_dep]
-gst_sdp_sources = ['gstsdpmessage.c', 'gstmikey.c']
+gst_sdp_sources = files(['gstsdpmessage.c', 'gstmikey.c'])
 gstsdp = library('gstsdp-@0@'.format(api_version),
   gst_sdp_sources,
   c_args : gst_plugins_base_args + ['-DBUILDING_GST_SDP'],

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build
index 0bd85b1..1d791c7 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build
@@ -1,4 +1,4 @@
-tag_sources = [
+tag_sources = files([
   'gstvorbistag.c',
   'gstid3tag.c',
   'gstxmptag.c',
@@ -13,17 +13,17 @@ tag_sources = [
   'id3v2frames.c',
   'xmpwriter.c',
 ]
-
-tag_mkenum_headers = [
+)
+tag_mkenum_headers = files([
   'gsttagdemux.h',
   'tag.h',
-]
+])
 
-tag_headers = tag_mkenum_headers + [
+tag_headers = tag_mkenum_headers + files([
   'gsttagmux.h',
   'xmpwriter.h',
   'tag-prelude.h',
-]
+])
 install_headers(tag_headers, subdir : 'gstreamer-1.0/gst/tag/')
 
 tag_enums = gnome.mkenums_simple('tag-enumtypes',

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build
index 9c0cb6a..e8bb3be 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build
@@ -1,4 +1,4 @@
-video_sources = [
+video_sources = files([
   'colorbalance.c',
   'colorbalancechannel.c',
   'convertframe.c',
@@ -35,9 +35,9 @@ video_sources = [
   'videodirection.c',
   'videoorientation.c',
   'videooverlay.c',
-]
+])
 
-video_headers = [
+video_headers = files([
   'colorbalance.h',
   'colorbalancechannel.h',
   'gstvideoaffinetransformationmeta.h',
@@ -73,7 +73,7 @@ video_headers = [
   'video-blend.h',
   'video-overlay-composition.h',
   'video-multiview.h',
-]
+])
 install_headers(video_headers, subdir : 'gstreamer-1.0/gst/video/')
 
 video_mkenum_headers = [

diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build
index fecea65..d53b97c 100644 (file)
--- a/subprojects/gst-plugins-base/meson.build
+++ b/subprojects/gst-plugins-base/meson.build
@@ -39,7 +39,9 @@ libversion = '@0@.@1@.0'.format(soversion, curversion)
 osxversion = curversion + 1
 
 plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
+static_build = get_option('default_library') == 'static'
 plugins = []
+libraries = {}
 
 cc = meson.get_compiler('c')
 

diff --git a/subprojects/gst-rtsp-server/gst/rtsp-server/meson.build b/subprojects/gst-rtsp-server/gst/rtsp-server/meson.build
index 24d7c39..ebb9078 100644 (file)
--- a/subprojects/gst-rtsp-server/gst/rtsp-server/meson.build
+++ b/subprojects/gst-rtsp-server/gst/rtsp-server/meson.build
@@ -1,4 +1,4 @@
-rtsp_server_sources = [
+rtsp_server_sources = files(
   'rtsp-address-pool.c',
   'rtsp-auth.c',
   'rtsp-client.c',
@@ -23,9 +23,9 @@ rtsp_server_sources = [
   'rtsp-onvif-client.c',
   'rtsp-onvif-media-factory.c',
   'rtsp-onvif-media.c',
-]
+)
 
-rtsp_server_headers = [
+rtsp_server_headers = files(
   'rtsp-auth.h',
   'rtsp-address-pool.h',
   'rtsp-context.h',
@@ -51,7 +51,7 @@ rtsp_server_headers = [
   'rtsp-onvif-client.h',
   'rtsp-onvif-media-factory.h',
   'rtsp-onvif-media.h',
-]
+)
 
 install_headers(rtsp_server_headers, subdir : 'gstreamer-1.0/gst/rtsp-server')
 

diff --git a/subprojects/gstreamer/gst/meson.build b/subprojects/gstreamer/gst/meson.build
index c70998c..6937e08 100644 (file)
--- a/subprojects/gstreamer/gst/meson.build
+++ b/subprojects/gstreamer/gst/meson.build
@@ -1,4 +1,4 @@
-gst_sources = [
+gst_sources = files([
   'gst.c',
   'gstobject.c',
   'gstallocator.c',
@@ -71,9 +71,9 @@ gst_sources = [
   'gstutils.c',
   'gstvalue.c',
   'gstparse.c',
-]
+])
 
-gst_headers = [
+gst_headers = files([
   'gst.h',
   'glib-compat.h',
   'gstobject.h',
@@ -147,12 +147,12 @@ gst_headers = [
   'gstregistry.h',
   'gstparse.h',
   'math-compat.h',
-]
+])
 install_headers(gst_headers, subdir : 'gstreamer-1.0/gst')
 
 gst_registry = get_option('registry')
 if gst_registry
-  gst_registry_sources = ['gstregistrybinary.c']
+  gst_registry_sources = files(['gstregistrybinary.c'])
 else
   gst_registry_sources = []
 endif

diff --git a/subprojects/gstreamer/libs/gst/base/meson.build b/subprojects/gstreamer/libs/gst/base/meson.build
index d289376..9653c2c 100644 (file)
--- a/subprojects/gstreamer/libs/gst/base/meson.build
+++ b/subprojects/gstreamer/libs/gst/base/meson.build
@@ -1,4 +1,4 @@
-gst_base_sources = [
+gst_base_sources = files([
   'gstadapter.c',
   'gstaggregator.c',
   'gstbaseparse.c',
@@ -15,9 +15,9 @@ gst_base_sources = [
   'gstpushsrc.c',
   'gstqueuearray.c',
   'gsttypefindhelper.c',
-]
+])
 
-gst_base_headers = [
+gst_base_headers = files([
   'base.h',
   'base-prelude.h',
   'gstadapter.h',
@@ -36,9 +36,7 @@ gst_base_headers = [
   'gstpushsrc.h',
   'gstqueuearray.h',
   'gsttypefindhelper.h',
-]
-
-gst_base_gen_sources = []
+])
 
 gst_base = library('gstbase-@0@'.format(apiversion),
   gst_base_sources,

diff --git a/subprojects/gstreamer/libs/gst/check/libcheck/meson.build b/subprojects/gstreamer/libs/gst/check/libcheck/meson.build
index c6d496d..cc1d77d 100644 (file)
--- a/subprojects/gstreamer/libs/gst/check/libcheck/meson.build
+++ b/subprojects/gstreamer/libs/gst/check/libcheck/meson.build
@@ -1,4 +1,4 @@
-libcheck_files = [
+libcheck_files = files([
   'check.c',
   'check_error.c',
   'check_list.c',
@@ -9,7 +9,7 @@ libcheck_files = [
   'check_run.c',
   'check_str.c',
   'libcompat/libcompat.c'
-]
+])
 
 if not cdata.has('HAVE_ALARM')
   libcheck_files += ['libcompat/alarm.c']
@@ -41,11 +41,11 @@ endif
 
 # FIXME: check that timer_create, timer_settime, timer_delete are in rt_lib
 if not rt_lib.found()
-  libcheck_files += [
+  libcheck_files += files([
     'libcompat/timer_create.c',
     'libcompat/timer_settime.c',
     'libcompat/timer_delete.c'
-  ]
+  ])
 endif
 
 configure_file(input : 'check.h.in',

diff --git a/subprojects/gstreamer/libs/gst/check/meson.build b/subprojects/gstreamer/libs/gst/check/meson.build
index 316465a..7fd7179 100644 (file)
--- a/subprojects/gstreamer/libs/gst/check/meson.build
+++ b/subprojects/gstreamer/libs/gst/check/meson.build
@@ -1,11 +1,11 @@
-gst_check_sources = [
+gst_check_sources = files([
   'gstbufferstraw.c',
   'gstcheck.c',
   'gstconsistencychecker.c',
   'gstharness.c',
   'gsttestclock.c',
-]
-gst_check_headers = [
+])
+gst_check_headers = files([
   'check.h',
   'check-prelude.h',
   'gstbufferstraw.h',
@@ -13,7 +13,7 @@ gst_check_headers = [
   'gstconsistencychecker.h',
   'gstharness.h',
   'gsttestclock.h',
-]
+])
 install_headers(gst_check_headers, subdir : 'gstreamer-1.0/gst/check/')
 
 

diff --git a/subprojects/gstreamer/libs/gst/controller/meson.build b/subprojects/gstreamer/libs/gst/controller/meson.build
index 08857ca..841da75 100644 (file)
--- a/subprojects/gstreamer/libs/gst/controller/meson.build
+++ b/subprojects/gstreamer/libs/gst/controller/meson.build
@@ -1,4 +1,4 @@
-gst_controller_sources = [
+gst_controller_sources = files([
   'gstargbcontrolbinding.c',
   'gstdirectcontrolbinding.c',
   'gsttimedvaluecontrolsource.c',
@@ -6,14 +6,14 @@ gst_controller_sources = [
   'gstproxycontrolbinding.c',
   'gsttriggercontrolsource.c',
   'gstlfocontrolsource.c',
-]
+])
 
-controller_mkenum_headers = [
+controller_mkenum_headers = files([
   'gstinterpolationcontrolsource.h',
   'gstlfocontrolsource.h',
-]
+])
 
-gst_controller_headers = controller_mkenum_headers + [
+gst_controller_headers = controller_mkenum_headers + files([
   'gstargbcontrolbinding.h',
   'gstdirectcontrolbinding.h',
   'gsttimedvaluecontrolsource.h',
@@ -23,7 +23,7 @@ gst_controller_headers = controller_mkenum_headers + [
   'gstlfocontrolsource.h',
   'controller-prelude.h',
   'controller.h',
-]
+])
 install_headers(gst_controller_headers, subdir : 'gstreamer-1.0/gst/controller/')
 
 controller_enums = gnome.mkenums_simple('controller-enumtypes',

diff --git a/subprojects/gstreamer/libs/gst/net/meson.build b/subprojects/gstreamer/libs/gst/net/meson.build
index f63ae28..96f77f1 100644 (file)
--- a/subprojects/gstreamer/libs/gst/net/meson.build
+++ b/subprojects/gstreamer/libs/gst/net/meson.build
@@ -1,4 +1,4 @@
-gst_net_sources = [
+gst_net_sources = files([
   'gstnetaddressmeta.c',
   'gstnetclientclock.c',
   'gstnetcontrolmessagemeta.c',
@@ -7,9 +7,9 @@ gst_net_sources = [
   'gstptpclock.c',
   'gstntppacket.c',
   'gstnetutils.c',
-]
+])
 
-gst_net_headers = [
+gst_net_headers = files([
  'gstnet.h',
  'gstnetaddressmeta.h',
  'gstnetclientclock.h',
@@ -20,7 +20,7 @@ gst_net_headers = [
  'gstptpclock.h',
  'net-prelude.h',
  'net.h',
-]
+])
 install_headers(gst_net_headers, subdir : 'gstreamer-1.0/gst/net/')
 
 gst_net_gen_sources = []