OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: rename all instances of xf86vm to xxf86vm

Browse Source 
Because consistency

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Dylan Baker
2017-10-24 11:34:04 -07:00
parent b92992e95c
commit 1f11ac4395
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@@ -745,7 +745,7 @@ dep_xcb_dri2 = []
dep_xcb_dri3 = [] dep_xcb_dri3 = []
dep_dri2proto = [] dep_dri2proto = []
dep_glproto = [] dep_glproto = []
dep_xf86vm = [] dep_xxf86vm = []
dep_xcb_dri3 = [] dep_xcb_dri3 = []
dep_xcb_present = [] dep_xcb_present = []
dep_xcb_sync = [] dep_xcb_sync = []
@@ -758,7 +758,7 @@ if with_platform_x11
dep_xdamage = dependency('xdamage', version : '>= 1.1') dep_xdamage = dependency('xdamage', version : '>= 1.1')
dep_xfixes = dependency('xfixes') dep_xfixes = dependency('xfixes')
dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1') dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1')
dep_xf86vm = dependency('xxf86vm', required : false) dep_xxf86vm = dependency('xxf86vm', required : false)
endif endif
if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
dep_xcb = dependency('xcb') dep_xcb = dependency('xcb')
@@ -822,7 +822,7 @@ gl_priv_reqs = [
'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb', 'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb',
'xcb-glx >= 1.8.1', 'libdrm >= 2.4.75', 'xcb-glx >= 1.8.1', 'libdrm >= 2.4.75',
] ]
if dep_xf86vm != [] and dep_xf86vm.found() if dep_xxf86vm != [] and dep_xxf86vm.found()
gl_priv_reqs += 'xxf86vm' gl_priv_reqs += 'xxf86vm'
endif endif
if with_dri_platform == 'drm' if with_dri_platform == 'drm'

2
src/glx/meson.build
View File

@@ -126,7 +126,7 @@ gl_lib_cargs = [
'-D_REENTRANT', '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir), '-D_REENTRANT', '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir),
] ]
if dep_xf86vm != [] and dep_xf86vm.found() if dep_xxf86vm != [] and dep_xxf86vm.found()
gl_lib_cargs += '-DHAVE_XF86VIDMODE' gl_lib_cargs += '-DHAVE_XF86VIDMODE'
endif endif