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 <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>

diff --git a/src/egl/meson.build b/src/egl/meson.build
index 67ca8cef9218d6e9218a4e02367e3b9302234bd4..36b1d9e41b0fa10029cb4dee8e1b967c6c19afbc 100644 (file)
--- 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 b4b3911ffd51a3dd30af2a000648448281db9ab5..72f77724e442358d7f0185d9cc52b9e4c7eb3c30 100644 (file)
--- 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 437896ef7f019e2573085eaa392481226af4c33c..f25f3172027794f1cc4f157092f32ba9d3f8d463 100644 (file)
--- 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 573316c9424ac9364e45f4e4aae85e551ee55c0b..01ebc5677341117de598720ac7d3a1c6c41d80bf 100644 (file)
--- 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 84a21cd6b7697d687328bf5e06f9ce00815f97d9..8d95aee02f4026edf3f2feda06a07ebe9bb6b2d0 100644 (file)
--- 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 3d6888a4b8f789cf355a57d008f193ed9256e7c6..7e868d77b313602c3d2a51f3cc49edc03eee8e59 100644 (file)
--- 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 0d88de0545ffff8ca15ca8600c55dc0e392d0582..05fd53b7a25c55585109ccd962ff4ce9cc410101 100644 (file)
--- 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 407cda7e94b151edb0b49e763de29cbb3668d6c8..a406bb3c2100b9994034b3337e9580fd37135dd1 100644 (file)
--- 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,
 )