Mesa (master): meson: Reformat glx code to match more common style
Dylan Baker
dbaker at kemper.freedesktop.org
Mon Dec 4 21:16:57 UTC 2017
Module: Mesa
Branch: master
Commit: b08a35b15087e0a51f4afe9f7f17c48c43a352bc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b08a35b15087e0a51f4afe9f7f17c48c43a352bc
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Fri Dec 1 14:46:42 2017 -0800
meson: Reformat glx code to match more common style
Generally in our meson build large arrays are formated in the form:
[
..., ..., ..., $
...,
]
So use that form
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Jon Turney <jon.turney at dronecode.org.uk>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
---
src/glx/meson.build | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/glx/meson.build b/src/glx/meson.build
index 2ffef4cf22..02bd79082f 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -142,8 +142,10 @@ libglx = static_library(
inc_common, inc_glapi, inc_loader,
include_directories('../../include/GL/internal'),
],
- c_args : [c_vis_args, gl_lib_cargs,
- '-DGL_LIB_NAME="lib at 0@.so. at 1@"'.format(gl_lib_name, gl_lib_version.split('.')[0])],
+ c_args : [
+ c_vis_args, gl_lib_cargs,
+ '-DGL_LIB_NAME="lib at 0@.so. at 1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
+ ],
link_with : [libloader, libloader_dri3_helper, libmesa_util, libxmlconfig, extra_libs_libglx],
dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd],
build_by_default : false,
@@ -167,9 +169,10 @@ if with_glx == 'dri'
link_with : [libglapi_static, libglapi],
link_whole : libglx,
link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl],
- dependencies : [dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11,
- dep_xcb_glx, dep_xcb, dep_x11_xcb,
- dep_xcb_dri2, dep_xcb_dri3, extra_deps_libgl],
+ dependencies : [
+ dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11, dep_xcb_glx, dep_xcb,
+ dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, extra_deps_libgl,
+ ],
version : gl_lib_version,
install : true,
)
More information about the mesa-commit
mailing list