Meson: Fix deprecation warnings

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

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 1e5b4ac..6ccd553 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build
@@ -98,7 +98,7 @@ vulkan_conf_options = [
 ]
 
 foreach option : vulkan_conf_options
-  vulkan_conf.set10(option, false)
+  vulkan_conf.set(option, 0)
 endforeach
 
 if ['ios', 'darwin'].contains(host_system)
@@ -168,7 +168,7 @@ if xcb_dep.found() and xkbcommon_dep.found() and xkbcommon_x11_dep.found() and c
 
   optional_deps += [xcb_dep, xkbcommon_dep, xkbcommon_x11_dep]
   vulkan_windowing = true
-  vulkan_conf.set10('GST_VULKAN_HAVE_WINDOW_XCB', 1)
+  vulkan_conf.set('GST_VULKAN_HAVE_WINDOW_XCB', 1)
   enabled_vulkan_winsys += ['xcb']
 endif
 
@@ -189,7 +189,7 @@ if wayland_client_dep.found() and cc.has_header('vulkan/vulkan_wayland.h', depen
 
   optional_deps += wayland_client_dep
   vulkan_windowing = true
-  vulkan_conf.set10('GST_VULKAN_HAVE_WINDOW_WAYLAND', 1)
+  vulkan_conf.set('GST_VULKAN_HAVE_WINDOW_WAYLAND', 1)
   enabled_vulkan_winsys += ['wayland']
 endif
 
@@ -219,7 +219,7 @@ if host_system == 'darwin'
     )
     optional_deps += [cocoa_dep]
     vulkan_windowing = true
-    vulkan_conf.set10('GST_VULKAN_HAVE_WINDOW_COCOA', 1)
+    vulkan_conf.set('GST_VULKAN_HAVE_WINDOW_COCOA', 1)
     enabled_vulkan_winsys += ['cocoa']
   endif
 endif
@@ -234,7 +234,7 @@ if host_system == 'ios'
     )
     optional_deps += [uikit_dep]
     vulkan_windowing = true
-    vulkan_conf.set10('GST_VULKAN_HAVE_WINDOW_IOS', 1)
+    vulkan_conf.set('GST_VULKAN_HAVE_WINDOW_IOS', 1)
     enabled_vulkan_winsys += ['ios']
   endif
 endif
@@ -247,7 +247,7 @@ if host_system == 'windows'
     vulkan_priv_sources += ['win32/gstvkwindow_win32.c']
     optional_deps += [gdi_dep]
     vulkan_windowing = true
-    vulkan_conf.set10('GST_VULKAN_HAVE_WINDOW_WIN32', 1)
+    vulkan_conf.set('GST_VULKAN_HAVE_WINDOW_WIN32', 1)
     enabled_vulkan_winsys += ['win32']
   endif
 endif
@@ -259,7 +259,7 @@ if host_system == 'android'
       'android/gstvkwindow_android.c',
     )
     vulkan_windowing = true
-    vulkan_conf.set10('GST_VULKAN_HAVE_WINDOW_ANDROID', 1)
+    vulkan_conf.set('GST_VULKAN_HAVE_WINDOW_ANDROID', 1)
     enabled_vulkan_winsys += ['android']
   endif
 endif

diff --git a/subprojects/gst-plugins-bad/sys/msdk/meson.build b/subprojects/gst-plugins-bad/sys/msdk/meson.build
index 205de2a..1e54d91 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/msdk/meson.build
+++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build
@@ -106,7 +106,7 @@ endif
 
 if use_onevpl or cxx.has_header('mfxvp9.h', args: '-I' + mfx_incdir)
   msdk_sources += [ 'gstmsdkvp9dec.c' ]
-  cdata.set10('USE_MSDK_VP9_DEC', 1)
+  cdata.set('USE_MSDK_VP9_DEC', 1)
 endif
 
 # Usually MFX_VERSION 1026+ is required to support raw VP9 stream, however Fedora 30 has MFX_VERSION==1026
@@ -126,7 +126,7 @@ have_mfx_ver126 = cc.compiles(mfx_ver126_check_code,
 
 if have_mfx_ver126
   msdk_sources += [ 'gstmsdkvp9enc.c' ]
-  cdata.set10('USE_MSDK_VP9_ENC', 1)
+  cdata.set('USE_MSDK_VP9_ENC', 1)
 endif
 
 mfx_ver134_check_code = '''
@@ -141,7 +141,7 @@ have_mfx_ver134 = cc.compiles(mfx_ver134_check_code,
 
 if have_mfx_ver134
   msdk_sources += [ 'gstmsdkav1dec.c' ]
-  cdata.set10('USE_MSDK_AV1_DEC', 1)
+  cdata.set('USE_MSDK_AV1_DEC', 1)
 endif
 
 if host_machine.system() == 'windows'

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 66e2e4f..f7286a0 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
@@ -150,7 +150,7 @@ glconf_options = [
 ]
 
 foreach option : glconf_options
-  glconf.set10(option, false)
+  glconf.set(option, 0)
 endforeach
 
 unneeded_dep = dependency('', required : false)
@@ -494,11 +494,11 @@ endif
 
 if gles2_dep.found()
   gl_lib_deps += gles2_dep
-  glconf.set10('GST_GL_HAVE_GLES2', 1)
+  glconf.set('GST_GL_HAVE_GLES2', 1)
   if gles3_h
-    glconf.set10('GST_GL_HAVE_GLES3', 1)
+    glconf.set('GST_GL_HAVE_GLES3',1)
     if gles3ext3_h
-      glconf.set10('GST_GL_HAVE_GLES3EXT3_H', 1)
+      glconf.set('GST_GL_HAVE_GLES3EXT3_H', 1)
     endif
   endif
   enabled_gl_apis += 'gles2'
@@ -506,7 +506,7 @@ endif
 
 if gl_dep.found()
   gl_lib_deps += gl_dep
-  glconf.set10('GST_GL_HAVE_OPENGL', 1)
+  glconf.set('GST_GL_HAVE_OPENGL', 1)
   enabled_gl_apis += 'gl'
 endif
 
@@ -552,11 +552,11 @@ if need_platform_egl != 'no'
       'egl/gstgldisplay_egl_device.h',
     ])
     gl_platform_deps += egl_dep
-    glconf.set10('GST_GL_HAVE_PLATFORM_EGL', 1)
+    glconf.set('GST_GL_HAVE_PLATFORM_EGL', 1)
 
     if cc.has_header('libdrm/drm_fourcc.h')
       gl_misc_deps += allocators_dep
-      glconf.set10('GST_GL_HAVE_DMABUF', 1)
+      glconf.set('GST_GL_HAVE_DMABUF', 1)
     endif
 
     egl_includes = '''
@@ -762,7 +762,7 @@ 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)
+      glconf.set('GST_GL_HAVE_WINDOW_WINRT', 1)
       gl_priv_sources += [
         'winrt/gstglwindow_winrt_egl.cpp'
       ]
@@ -810,7 +810,7 @@ if host_system == 'darwin'
     if foundation_dep.found() and quartzcore_dep.found() and corefoundation_dep.found()
       gl_platform_deps += [quartzcore_dep, corefoundation_dep, foundation_dep]
       enabled_gl_platforms += 'cgl'
-      glconf.set10('GST_GL_HAVE_PLATFORM_CGL', 1)
+      glconf.set('GST_GL_HAVE_PLATFORM_CGL', 1)
 
       if need_win_cocoa != 'no'
         cocoa_dep = dependency('appleframeworks', modules : ['Cocoa'], required : false)
@@ -823,7 +823,7 @@ if host_system == 'darwin'
           ]
           gl_winsys_deps += cocoa_dep
           enabled_gl_winsys += 'cocoa'
-          glconf.set10('GST_GL_HAVE_WINDOW_COCOA', 1)
+          glconf.set('GST_GL_HAVE_WINDOW_COCOA', 1)
         elif need_win_cocoa == 'yes'
           error('Could not find Cocoa')
         endif
@@ -912,8 +912,8 @@ if need_platform_egl != 'no' and need_win_viv_fb != 'no'
   if egl_dep.found() and cc.has_function ('fbGetDisplay', dependencies : egl_dep)
     if cc.has_function ('glTexDirectVIV', dependencies : gles2_dep)
       enabled_gl_winsys += 'viv-fb'
-      glconf.set10('GST_GL_HAVE_WINDOW_VIV_FB', 1)
-      glconf.set10('GST_GL_HAVE_VIV_DIRECTVIV', 1)
+      glconf.set('GST_GL_HAVE_WINDOW_VIV_FB', 1)
+      glconf.set('GST_GL_HAVE_VIV_DIRECTVIV', 1)
       gl_priv_sources += [
         'viv-fb/gstgldisplay_viv_fb.c',
         'viv-fb/gstglwindow_viv_fb_egl.c',
@@ -936,7 +936,7 @@ endif
 if host_system == 'android' and need_win_android != 'no' and need_platform_egl != 'no'
   if gles2_dep.found() and egl_dep.found()
     enabled_gl_winsys += ['android']
-    glconf.set10('GST_GL_HAVE_WINDOW_ANDROID', 1)
+    glconf.set('GST_GL_HAVE_WINDOW_ANDROID', 1)
     gl_priv_sources += [
       'android/gstglwindow_android_egl.c'
     ]