ref: 7f7b558638eb8eda989e4449452005ea489298eb
parent: 79052b17110ad3fabbe3ff7bf41fccec8f73e37d
author: Janne Grunau <[email protected]>
date: Sat Mar 9 06:20:44 EST 2019
build: add "api" to api/soname related versions Refs #241, Closes #255.
--- a/include/dav1d/meson.build
+++ b/include/dav1d/meson.build
@@ -24,9 +24,9 @@
# installed version.h header generation
version_h_data = configuration_data()
-version_h_data.set('DAV1D_VERSION_MAJOR', dav1d_version_major)-version_h_data.set('DAV1D_VERSION_MINOR', dav1d_version_minor)-version_h_data.set('DAV1D_VERSION_PATCH', dav1d_version_revision)+version_h_data.set('DAV1D_API_VERSION_MAJOR', dav1d_api_version_major)+version_h_data.set('DAV1D_API_VERSION_MINOR', dav1d_api_version_minor)+version_h_data.set('DAV1D_API_VERSION_PATCH', dav1d_api_version_revision)version_h_target = configure_file(input: 'version.h.in',
output: 'version.h',
configuration: version_h_data)
--- a/include/dav1d/version.h.in
+++ b/include/dav1d/version.h.in
@@ -27,8 +27,8 @@
#ifndef DAV1D_VERSION_H
#define DAV1D_VERSION_H
-#define DAV1D_VERSION_MAJOR @DAV1D_VERSION_MAJOR@
-#define DAV1D_VERSION_MINOR @DAV1D_VERSION_MINOR@
-#define DAV1D_VERSION_PATCH @DAV1D_VERSION_PATCH@
+#define DAV1D_API_VERSION_MAJOR @DAV1D_API_VERSION_MAJOR@
+#define DAV1D_API_VERSION_MINOR @DAV1D_API_VERSION_MINOR@
+#define DAV1D_API_VERSION_PATCH @DAV1D_API_VERSION_PATCH@
#endif /* DAV1D_VERSION_H */
--- a/meson.build
+++ b/meson.build
@@ -31,10 +31,10 @@
meson_version: '>= 0.47.0')
dav1d_soname_version = '1.0.1'
-dav1d_version_array = dav1d_soname_version.split('.')-dav1d_version_major = dav1d_version_array[0]
-dav1d_version_minor = dav1d_version_array[1]
-dav1d_version_revision = dav1d_version_array[2]
+dav1d_api_version_array = dav1d_soname_version.split('.')+dav1d_api_version_major = dav1d_api_version_array[0]
+dav1d_api_version_minor = dav1d_api_version_array[1]
+dav1d_api_version_revision = dav1d_api_version_array[2]
dav1d_src_root = meson.current_source_dir()
cc = meson.get_compiler('c')--- a/src/meson.build
+++ b/src/meson.build
@@ -201,7 +201,7 @@
if host_machine.system() == 'windows'
dav1d_soversion = ''
else
- dav1d_soversion = dav1d_version_major
+ dav1d_soversion = dav1d_api_version_major
endif
libdav1d = library('dav1d',