From 3499d9ea646311a879813fa033226b7624d9e1eb Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Thu, 27 Sep 2018 21:21:14 +0900 Subject: [PATCH] meson: Replace empty configuration_data() with copy keyword Use 'copy' keyword to avoid meson warning message. Note that 'copy' keyword in configure_file() is available since meson 0.47.0 https://bugzilla.gnome.org/show_bug.cgi?id=797298 --- gst-libs/gst/audio/meson.build | 4 ++-- gst-libs/gst/video/meson.build | 4 ++-- gst/adder/meson.build | 4 ++-- gst/audiomixer/meson.build | 4 ++-- gst/videotestsrc/meson.build | 4 ++-- gst/volume/meson.build | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build index 7bc2460298..0e4efab2e3 100644 --- a/gst-libs/gst/audio/meson.build +++ b/gst-libs/gst/audio/meson.build @@ -89,10 +89,10 @@ if have_orcc else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', - configuration : configuration_data()) + copy : true) orc_c = configure_file(input : orcsrc + '-dist.c', output : orcsrc + '.c', - configuration : configuration_data()) + copy : true) endif simd_cargs = [] diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build index 356a345259..5d694c18b4 100644 --- a/gst-libs/gst/video/meson.build +++ b/gst-libs/gst/video/meson.build @@ -114,10 +114,10 @@ if have_orcc else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', - configuration : configuration_data()) + copy : true) orc_c = configure_file(input : orcsrc + '-dist.c', output : orcsrc + '.c', - configuration : configuration_data()) + copy : true) endif gstvideo = library('gstvideo-@0@'.format(api_version), diff --git a/gst/adder/meson.build b/gst/adder/meson.build index 19edae34ad..7ba1ff19d7 100644 --- a/gst/adder/meson.build +++ b/gst/adder/meson.build @@ -13,10 +13,10 @@ if have_orcc else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', - configuration : configuration_data()) + copy : true) orc_c = configure_file(input : orcsrc + '-dist.c', output : orcsrc + '.c', - configuration : configuration_data()) + copy : true) endif adder = library('gstadder', diff --git a/gst/audiomixer/meson.build b/gst/audiomixer/meson.build index 9da6b16d11..0bca202fb0 100644 --- a/gst/audiomixer/meson.build +++ b/gst/audiomixer/meson.build @@ -16,10 +16,10 @@ if have_orcc else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', - configuration : configuration_data()) + copy : true) orc_c = configure_file(input : orcsrc + '-dist.c', output : orcsrc + '.c', - configuration : configuration_data()) + copy : true) endif gstaudiomixer = library('gstaudiomixer', diff --git a/gst/videotestsrc/meson.build b/gst/videotestsrc/meson.build index 08c6406c70..6a81838285 100644 --- a/gst/videotestsrc/meson.build +++ b/gst/videotestsrc/meson.build @@ -13,10 +13,10 @@ if have_orcc else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', - configuration : configuration_data()) + copy : true) orc_c = configure_file(input : orcsrc + '-dist.c', output : orcsrc + '.c', - configuration : configuration_data()) + copy : true) endif gstvideotestsrc = library('gstvideotestsrc', diff --git a/gst/volume/meson.build b/gst/volume/meson.build index b4d24507d6..3af909fbe8 100644 --- a/gst/volume/meson.build +++ b/gst/volume/meson.build @@ -13,10 +13,10 @@ if have_orcc else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', - configuration : configuration_data()) + copy : true) orc_c = configure_file(input : orcsrc + '-dist.c', output : orcsrc + '.c', - configuration : configuration_data()) + copy : true) endif gstvolume = library('gstvolume', 'gstvolume.c', orc_c, orc_h,