Upgrade to mesa 22.1.7

1. Upgrade version number
2. Remove deprecated option
3. Fix some issues which caused by upgrade of mesa22.1.7

Change-Id: I86a928c9f5e272e209825e6a1b7a8bab30425ddf
Signed-off-by: Xuelian Bai <xuelian.bai@samsung.com>

diff --git a/packaging/mesa.spec b/packaging/mesa.spec
index 473446f..87e1521 100644 (file)
--- a/packaging/mesa.spec
+++ b/packaging/mesa.spec
@@ -1,5 +1,5 @@
 Name:           mesa
-Version:        21.2.3
+Version:        22.1.7
 Release:        0
 License:        MIT and Apache-2.0 and SGI Free Software License B v2.0 and BSD-3-Clause
 Summary:        System for rendering interactive 3-D graphics
@@ -107,7 +107,6 @@ meson --prefix %{_hal_prefix} build/ \
         -Dgbm=%{?enable_gbm:enabled}%{?!enable_gbm:disabled} \
         -Dplatforms="tizen" \
         -Dgallium-drivers=%{gallium_drivers} \
-        -Ddri-drivers=%{dri_drivers} \
         -Dvulkan-drivers=%{vulkan_drivers}
 
 

diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index d07b8fb..839a751 100644 (file)
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -478,7 +478,7 @@ libmesa = static_library(
     inc_libmesa_asm, include_directories('main'),
   ],
   link_with : [libglsl, libmesa_sse41],
-  dependencies : [idep_nir, idep_vtn, dep_vdpau, idep_mesautil],
+  dependencies : [idep_nir, idep_vtn, dep_vdpau, idep_mesautil, dep_dlog],
   build_by_default : false,
 )