aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2017-11-02 23:24:00 +0000
committerEric Engestrom <[email protected]>2017-11-07 10:47:20 +0000
commit5be1b1a8ce6c635cf0310d2b97056a2b8f11a601 (patch)
treeef0232f3f79b0920e5fe52b80982aa4d80a40ef8
parent0084f4a42290ab54c185c9284a5670d4da4fc66e (diff)
meson: standardize .so version to major.minor.patch
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 matter, 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 <[email protected]> Reviewed-by: Dylan Baker <[email protected]>
-rw-r--r--src/egl/meson.build2
-rw-r--r--src/gallium/targets/osmesa/meson.build2
-rw-r--r--src/gbm/meson.build2
-rw-r--r--src/glx/meson.build2
-rw-r--r--src/mapi/es1api/meson.build2
-rw-r--r--src/mapi/es2api/meson.build2
-rw-r--r--src/mapi/shared-glapi/meson.build1
-rw-r--r--src/mesa/drivers/osmesa/meson.build2
8 files changed, 8 insertions, 7 deletions
diff --git a/src/egl/meson.build b/src/egl/meson.build
index 67ca8cef921..36b1d9e41b0 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 b4b3911ffd5..72f77724e44 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 437896ef7f0..f25f3172027 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 573316c9424..01ebc567734 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 84a21cd6b76..8d95aee02f4 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 3d6888a4b8f..7e868d77b31 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/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build
index 0d88de0545f..05fd53b7a25 100644
--- a/src/mapi/shared-glapi/meson.build
+++ b/src/mapi/shared-glapi/meson.build
@@ -44,6 +44,7 @@ libglapi = shared_library(
link_args : [ld_args_gc_sections],
include_directories : [inc_src, inc_include, inc_mapi],
dependencies : [dep_thread, dep_selinux],
+ version : '0.0.0',
install : true,
)
diff --git a/src/mesa/drivers/osmesa/meson.build b/src/mesa/drivers/osmesa/meson.build
index 407cda7e94b..a406bb3c210 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,
)