diff options
| author | Haihao Xiang <haihao.xiang@intel.com> | 2018-11-21 15:36:54 +0800 |
|---|---|---|
| committer | Haihao Xiang <haihao.xiang@intel.com> | 2018-11-21 15:36:54 +0800 |
| commit | b0812368a73d7a791e3d1ee1ebcc95e00c8b8f79 (patch) | |
| tree | c5784d16c1617c0c4dfc4640f6ff4fe509af9f10 | |
| parent | 08de43cf6c3dc0eb6081de35b2f3ab252e16a218 (diff) | |
| parent | 1eddac3e38658169dafd7c0767c2fa34de68d388 (diff) | |
| download | libva-intel-driver-b0812368a73d7a791e3d1ee1ebcc95e00c8b8f79.tar.gz | |
Merge branch 'v2.2-branch' into intel--master
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | meson.build | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -1,7 +1,7 @@ -intel-vaapi-driver NEWS -- summary of changes. 2018-07-xx +intel-vaapi-driver NEWS -- summary of changes. 2018-07-11 Copyright (C) 2009-2018 Intel Corporation -Version 2.2.0 - DD.Jul.2018 +Version 2.2.0 - 11.Jul.2018 * Bump version to 2.2.0 * Add new PCI ID for KBL-Y * Add meson support diff --git a/configure.ac b/configure.ac index 5471aee7..cb5c1e71 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ # intel-vaapi-driver package version number m4_define([intel_vaapi_driver_major_version], [2]) m4_define([intel_vaapi_driver_minor_version], [2]) -m4_define([intel_vaapi_driver_micro_version], [1]) -m4_define([intel_vaapi_driver_pre_version], [1]) +m4_define([intel_vaapi_driver_micro_version], [0]) +m4_define([intel_vaapi_driver_pre_version], [0]) m4_define([intel_vaapi_driver_version], [intel_vaapi_driver_major_version.intel_vaapi_driver_minor_version.intel_vaapi_driver_micro_version]) m4_if(intel_vaapi_driver_pre_version, [0], [], [ diff --git a/meson.build b/meson.build index 3930f340..6a9b50ab 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project( 'intel-vaapi-driver', 'c', - version : '2.2.1.1', + version : '2.2.0', meson_version : '>= 0.43.0', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) |