From e4effb7c2f5a57818bee045d61dd284e51712a5d Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Mon, 15 Jan 2024 23:21:02 +0200
Subject: [PATCH] moltenvk: add v1.2.7, drop old versions

---
 recipes/moltenvk/all/conandata.yml                | 15 +++------------
 ...endencies-1.2.0.yml => dependencies-1.2.7.yml} |  0
 .../1.2.0-0001-fix-version-number-icd-json.patch  | 11 -----------
 recipes/moltenvk/config.yml                       |  4 ++--
 4 files changed, 5 insertions(+), 25 deletions(-)
 rename recipes/moltenvk/all/dependencies/{dependencies-1.2.0.yml => dependencies-1.2.7.yml} (100%)
 delete mode 100644 recipes/moltenvk/all/patches/1.2.0-0001-fix-version-number-icd-json.patch

diff --git a/recipes/moltenvk/all/conandata.yml b/recipes/moltenvk/all/conandata.yml
index f00f13232e63f..6fb173d56c911 100644
--- a/recipes/moltenvk/all/conandata.yml
+++ b/recipes/moltenvk/all/conandata.yml
@@ -1,13 +1,13 @@
 sources:
+  "1.2.7":
+    url: "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v1.2.7.tar.gz"
+    sha256: "3166edcfdca886b4be1a24a3c140f11f9a9e8e49878ea999e3580dfbf9fe4bec"
   "1.2.2":
     url: "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v1.2.2.tar.gz"
     sha256: "8065a10c2d70b561f48475dedb118e643176527b162d6e439fa127270c2a07dd"
   "1.2.1":
     url: "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v1.2.1.tar.gz"
     sha256: "4742df8f35473c5a737f2b120ae06aa6b9e8a7a3753b88932e501b06b1d17ea8"
-  "1.2.0":
-    url: "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v1.2.0.tar.gz"
-    sha256: "6e7af2dad0530b2b404480dbe437ca4670c6615cc2ec6cf6a20ed04d9d75e0bd"
   "1.1.11":
     url: "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v1.1.11.tar.gz"
     sha256: "938ea0ba13c6538b0ee505ab391a3020f206ab9d29c869f20dd19318a4ee8997"
@@ -22,15 +22,6 @@ patches:
       patch_description: "Fix build errors in Xcode 15.3 beta"
       patch_type: "portability"
       patch_source: "https://github.com/KhronosGroup/MoltenVK/issues/2156"
-  "1.2.0":
-    - patch_file: "patches/1.2.0-0001-fix-version-number-icd-json.patch"
-      patch_description: "Fix api_version in MoltenVK_icd.json"
-      patch_type: "portability"
-      patch_source: "https://github.com/KhronosGroup/MoltenVK/pull/1747"
-    - patch_file: "patches/1.2.2-0001-MVKSmallVector-Make-iterator-const-correct.patch"
-      patch_description: "Fix build errors in Xcode 15.3 beta"
-      patch_type: "portability"
-      patch_source: "https://github.com/KhronosGroup/MoltenVK/issues/2156"
   "1.1.11":
     - patch_file: "patches/1.1.11-0001-vulkan-alias-private-extern.patch"
       patch_description: "Fix vulkan alias symbols when vulkan symbols are hidden"
diff --git a/recipes/moltenvk/all/dependencies/dependencies-1.2.0.yml b/recipes/moltenvk/all/dependencies/dependencies-1.2.7.yml
similarity index 100%
rename from recipes/moltenvk/all/dependencies/dependencies-1.2.0.yml
rename to recipes/moltenvk/all/dependencies/dependencies-1.2.7.yml
diff --git a/recipes/moltenvk/all/patches/1.2.0-0001-fix-version-number-icd-json.patch b/recipes/moltenvk/all/patches/1.2.0-0001-fix-version-number-icd-json.patch
deleted file mode 100644
index 6f8bf87465fe2..0000000000000
--- a/recipes/moltenvk/all/patches/1.2.0-0001-fix-version-number-icd-json.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/MoltenVK/icd/MoltenVK_icd.json
-+++ b/MoltenVK/icd/MoltenVK_icd.json
-@@ -2,7 +2,7 @@
-     "file_format_version" : "1.0.0",
-     "ICD": {
-         "library_path": "./libMoltenVK.dylib",
--        "api_version" : "1.1.0",
-+        "api_version" : "1.2.0",
-         "is_portability_driver" : true
-     }
- }
diff --git a/recipes/moltenvk/config.yml b/recipes/moltenvk/config.yml
index e368ebecaad4f..824acf0f21bfb 100644
--- a/recipes/moltenvk/config.yml
+++ b/recipes/moltenvk/config.yml
@@ -1,9 +1,9 @@
 versions:
+  "1.2.7":
+    folder: all
   "1.2.2":
     folder: all
   "1.2.1":
     folder: all
-  "1.2.0":
-    folder: all
   "1.1.11":
     folder: all