Upgrade to v1.3.208tizen_7.0_m2_releasesubmit/tizen/20220613.104856submit/tizen/20220609.091423submit/tizen/20220609.070600submit/tizen/20220607.045230submit/tizen/20220509.032328submit/tizen/20220506.015933accepted/tizen/unified/20220610.134751accepted/tizen/7.0/unified/hotfix/20221116.110600accepted/tizen/7.0/unified/20221110.060217tizen_7.0_hotfixtizen_7.0accepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unified

1. Suppress mismatch warnings
2. Fix build&install errors

Change-Id: If4d6f1b447a540fd369b9bd6e05627a0b0b5f81c

2 files changed, 15 insertions, 10 deletions

diff --git a/cmake/FindWayland.cmake b/cmake/FindWayland.cmake
index f93218b87..819a1eae0 100644
--- a/cmake/FindWayland.cmake
+++ b/cmake/FindWayland.cmake
@@ -48,13 +48,13 @@ IF (NOT WIN32)
   list(REMOVE_DUPLICATES WAYLAND_INCLUDE_DIR)
 
   include(FindPackageHandleStandardArgs)
-
+  set(FPHSA_NAME_MISMATCHED 1)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_CLIENT  DEFAULT_MSG  WAYLAND_CLIENT_LIBRARIES  WAYLAND_CLIENT_INCLUDE_DIR)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_SERVER  DEFAULT_MSG  WAYLAND_SERVER_LIBRARIES  WAYLAND_SERVER_INCLUDE_DIR)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_EGL     DEFAULT_MSG  WAYLAND_EGL_LIBRARIES     WAYLAND_EGL_INCLUDE_DIR)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_CURSOR  DEFAULT_MSG  WAYLAND_CURSOR_LIBRARIES  WAYLAND_CURSOR_INCLUDE_DIR)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND         DEFAULT_MSG  WAYLAND_LIBRARIES         WAYLAND_INCLUDE_DIR)
-
+  unset(FPHSA_NAME_MISMATCHED)
   MARK_AS_ADVANCED(
         WAYLAND_INCLUDE_DIR         WAYLAND_LIBRARIES
         WAYLAND_CLIENT_INCLUDE_DIR  WAYLAND_CLIENT_LIBRARIES
diff --git a/packaging/vulkan-validation-layers.spec b/packaging/vulkan-validation-layers.spec
index 7f8a32ab3..2f186ec15 100644
--- a/packaging/vulkan-validation-layers.spec
+++ b/packaging/vulkan-validation-layers.spec
@@ -1,5 +1,5 @@
 Name:       vulkan-validation-layers
-Version:    1.2.179
+Version:    1.3.208
 Release:    0
 Summary:    Vulkan validation layers
 Group:      Graphics & UI Framework/GL
@@ -11,11 +11,12 @@ BuildRequires:  cmake
 BuildRequires:  python3
 BuildRequires:  vulkan-headers = %{version}
 BuildRequires:  glslang-devel
-BuildRequires:  pkgconfig(SPIRV-Tools) = 2021.1.1
+BuildRequires:  pkgconfig(SPIRV-Tools) = 2022.2.0
 BuildRequires:  spirv-tools
 BuildRequires:  vulkan-loader-devel
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  spirv-headers
+BuildRequires:  spirv-headers-devel
 
 %define BUILD_TYPE Debug
 
@@ -37,9 +38,10 @@ developing applications that use %{name}.
 cp %{SOURCE1001} .
 export CFLAGS="$CFLAGS -w -Wno-psabi"
 export CXXFLAGS="$CXXFLAGS -w -Wno-psabi"
-cmake -DCMAKE_BUILD_TYPE=%{BUILD_TYPE} \
+cmake . -DCMAKE_BUILD_TYPE=%{BUILD_TYPE} \
       -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF -DBUILD_WSI_WAYLAND_SUPPORT=ON \
-      -DGLSLANG_INSTALL_DIR=%{_bindir} -DSPIRV_HEADERS_INSTALL_DIR=/usr/include/spirv \
+      -DGLSLANG_INSTALL_DIR=%{_bindir} -DSPIRV_HEADERS_INSTALL_DIR=%{_includedir}/spirv \
+      -DVULKAN_HEADERS_INSTALL_DIR=/usr -DSPIRV_HEADERS_INCLUDE_DIR=%{_includedir} \
       -DUSE_ROBIN_HOOD_HASHING=OFF \
       -DCMAKE_INSTALL_LIBDIR=%{_libdir} -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/vulkan \
       -DCMAKE_INSTALL_DATADIR=%{_datadir} -DCMAKE_INSTALL_BINDIR=%{_bindir}
@@ -47,17 +49,20 @@ make -j8
 
 %install
 rm -rf %{buildroot}
-%make_install
 mkdir -p %{buildroot}%{_includedir}/vulkan
+%make_install
 cp -a ./layers/generated/*.h %{buildroot}%{_includedir}/vulkan
-%remove_docs
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %manifest %{name}.manifest
 %license LICENSE.txt
 %defattr(-,root,root,-)
-%{_datadir}/*
-%{_libdir}/*
+%{_includedir}/vulkan/*
+%{_libdir}/libVkLayer_khronos_validation.so
+/usr/share/vulkan/explicit_layer.d/*
 
 %files devel
 %defattr(-,root,root,-)