[Mesa-dev] [PATCH mesa 1/2] meson: standardize .so version to major.minor.patch
Dylan Baker
dylan at pnwbakers.com
Thu Nov 2 23:51:18 UTC 2017
I'm also not sure that it matters, but I think consistency with autotools is
important,
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Quoting Eric Engestrom (2017-11-02 16:42:11)
> This `version` field defines the filename for the .so.
> The plan .so as well as .so.$major are always symlinks to this.
>
> Unless I'm mistaken, only the major is ever used, so this shouldn't, but
> for consistency with autotools (and in case it does matter), let's
> always have all 3 major.minor.patch components.
>
> (The soname isn't affected, and is always .so.$major)
>
> Signed-off-by: Eric Engestrom <eric at engestrom.ch>
> ---
> src/egl/meson.build | 2 +-
> src/gallium/targets/osmesa/meson.build | 2 +-
> src/gbm/meson.build | 2 +-
> src/glx/meson.build | 2 +-
> src/mapi/es1api/meson.build | 2 +-
> src/mapi/es2api/meson.build | 2 +-
> src/mesa/drivers/osmesa/meson.build | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/src/egl/meson.build b/src/egl/meson.build
> index 67ca8cef92..36b1d9e41b 100644
> --- a/src/egl/meson.build
> +++ b/src/egl/meson.build
> @@ -145,7 +145,7 @@ if not with_glvnd
> egl_lib_version = '1.0.0'
> else
> egl_lib_name = 'EGL_mesa'
> - egl_lib_version = '0'
> + egl_lib_version = '0.0.0'
> files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c]
> files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c')
> install_data(
> diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build
> index b4b3911ffd..72f77724e4 100644
> --- a/src/gallium/targets/osmesa/meson.build
> +++ b/src/gallium/targets/osmesa/meson.build
> @@ -62,7 +62,7 @@ libosmesa = shared_library(
> pkg.generate(
> name : 'osmesa',
> description : 'Mesa Off-screen Rendering Library',
> - version : '8',
> + version : '8.0.0',
> libraries : libosmesa,
> libraries_private : gl_priv_libs,
> )
> diff --git a/src/gbm/meson.build b/src/gbm/meson.build
> index 437896ef7f..f25f317202 100644
> --- a/src/gbm/meson.build
> +++ b/src/gbm/meson.build
> @@ -57,7 +57,7 @@ libgbm = shared_library(
> link_args : [ld_args_gc_sections],
> link_with : [links_gbm, libloader, libmesa_util, libxmlconfig],
> dependencies : [deps_gbm, dep_dl],
> - version : '1.0',
> + version : '1.0.0',
> install : true,
> )
>
> diff --git a/src/glx/meson.build b/src/glx/meson.build
> index 573316c942..01ebc56773 100644
> --- a/src/glx/meson.build
> +++ b/src/glx/meson.build
> @@ -112,7 +112,7 @@ if not with_glvnd
> gl_lib_version = '1.2.0'
> else
> gl_lib_name = 'GLX_mesa'
> - gl_lib_version = '0'
> + gl_lib_version = '0.0.0'
> files_libglx += files(
> 'g_glxglvnddispatchfuncs.c',
> 'g_glxglvnddispatchindices.h',
> diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
> index 84a21cd6b7..8d95aee02f 100644
> --- a/src/mapi/es1api/meson.build
> +++ b/src/mapi/es1api/meson.build
> @@ -36,7 +36,7 @@ libglesv1_cm = shared_library(
> include_directories : [inc_src, inc_include, inc_mapi],
> link_with : libglapi,
> dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl],
> - version : '1.1',
> + version : '1.1.0',
> install : true,
> )
>
> diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
> index 3d6888a4b8..7e868d77b3 100644
> --- a/src/mapi/es2api/meson.build
> +++ b/src/mapi/es2api/meson.build
> @@ -36,7 +36,7 @@ libgles2 = shared_library(
> include_directories : [inc_src, inc_include, inc_mapi],
> link_with : libglapi,
> dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl],
> - version : '2',
> + version : '2.0.0',
> install : true,
> )
>
> diff --git a/src/mesa/drivers/osmesa/meson.build b/src/mesa/drivers/osmesa/meson.build
> index 407cda7e94..a406bb3c21 100644
> --- a/src/mesa/drivers/osmesa/meson.build
> +++ b/src/mesa/drivers/osmesa/meson.build
> @@ -42,7 +42,7 @@ libosmesa = shared_library(
> pkg.generate(
> name : 'osmesa',
> description : 'Mesa Off-screen Rendering Library',
> - version : '8',
> + version : '8.0.0',
> libraries : libosmesa,
> libraries_private : gl_priv_libs,
> )
> --
> Cheers,
> Eric
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171102/9e3c46cb/attachment.sig>
More information about the mesa-dev
mailing list