mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

Meson: Fix deprecation warnings

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1876>
This commit is contained in:
Xavier Claessens 2022-03-07 08:46:57 -05:00 committed by GStreamer Marge Bot
parent 9d6a7dbdf3
commit 1a0eea3299
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subprojects/gst-plugins-bad/gst-libs/gst/vulkan/meson.build
View file

@ -98,7 +98,7 @@ vulkan_conf_options = [
] ]
foreach option : vulkan_conf_options foreach option : vulkan_conf_options
vulkan_conf.set10(option, false) vulkan_conf.set(option, 0)
endforeach endforeach
if ['ios', 'darwin'].contains(host_system) 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] optional_deps += [xcb_dep, xkbcommon_dep, xkbcommon_x11_dep]
vulkan_windowing = true 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'] enabled_vulkan_winsys += ['xcb']
endif endif
@ -189,7 +189,7 @@ if wayland_client_dep.found() and cc.has_header('vulkan/vulkan_wayland.h', depen
optional_deps += wayland_client_dep optional_deps += wayland_client_dep
vulkan_windowing = true 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'] enabled_vulkan_winsys += ['wayland']
endif endif
@ -219,7 +219,7 @@ if host_system == 'darwin'
) )
optional_deps += [cocoa_dep] optional_deps += [cocoa_dep]
vulkan_windowing = true 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'] enabled_vulkan_winsys += ['cocoa']
endif endif
endif endif
@ -234,7 +234,7 @@ if host_system == 'ios'
) )
optional_deps += [uikit_dep] optional_deps += [uikit_dep]
vulkan_windowing = true 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'] enabled_vulkan_winsys += ['ios']
endif endif
endif endif
@ -247,7 +247,7 @@ if host_system == 'windows'
vulkan_priv_sources += ['win32/gstvkwindow_win32.c'] vulkan_priv_sources += ['win32/gstvkwindow_win32.c']
optional_deps += [gdi_dep] optional_deps += [gdi_dep]
vulkan_windowing = true 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'] enabled_vulkan_winsys += ['win32']
endif endif
endif endif
@ -259,7 +259,7 @@ if host_system == 'android'
'android/gstvkwindow_android.c', 'android/gstvkwindow_android.c',
) )
vulkan_windowing = true 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'] enabled_vulkan_winsys += ['android']
endif endif
endif endif

6
subprojects/gst-plugins-bad/sys/msdk/meson.build
View file

@ -106,7 +106,7 @@ endif
if use_onevpl or cxx.has_header('mfxvp9.h', args: '-I' + mfx_incdir) if use_onevpl or cxx.has_header('mfxvp9.h', args: '-I' + mfx_incdir)
msdk_sources += [ 'gstmsdkvp9dec.c' ] msdk_sources += [ 'gstmsdkvp9dec.c' ]
cdata.set10('USE_MSDK_VP9_DEC', 1) cdata.set('USE_MSDK_VP9_DEC', 1)
endif endif
# Usually MFX_VERSION 1026+ is required to support raw VP9 stream, however Fedora 30 has MFX_VERSION==1026 # 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 if have_mfx_ver126
msdk_sources += [ 'gstmsdkvp9enc.c' ] msdk_sources += [ 'gstmsdkvp9enc.c' ]
cdata.set10('USE_MSDK_VP9_ENC', 1) cdata.set('USE_MSDK_VP9_ENC', 1)
endif endif
mfx_ver134_check_code = ''' mfx_ver134_check_code = '''
@ -141,7 +141,7 @@ have_mfx_ver134 = cc.compiles(mfx_ver134_check_code,
if have_mfx_ver134 if have_mfx_ver134
msdk_sources += [ 'gstmsdkav1dec.c' ] msdk_sources += [ 'gstmsdkav1dec.c' ]
cdata.set10('USE_MSDK_AV1_DEC', 1) cdata.set('USE_MSDK_AV1_DEC', 1)
endif endif
if host_machine.system() == 'windows' if host_machine.system() == 'windows'

26
subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
View file

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