Merge branch 'v2.2-branch' into intel--master

intel · Nov 21, 2018 · b081236 · b081236
2 parents 08de43c + 1eddac3
commit b081236
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -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
@@ -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
@@ -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' ])