From f72b091cc36510193c62ac3617125df7d10e96a2 Mon Sep 17 00:00:00 2001
From: Cheney-Wang <850426846@qq.com>
Date: Wed, 26 Oct 2022 23:36:36 -0700
Subject: [PATCH 1/5] [glbinding] Fix CMake warnings

---
 ports/glbinding/portfile.cmake | 23 +++++++++++------------
 ports/glbinding/vcpkg.json     | 13 +++++++++++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
index 6aa2e4e393e0e5..aa08f5c0e15fa1 100644
--- a/ports/glbinding/portfile.cmake
+++ b/ports/glbinding/portfile.cmake
@@ -11,21 +11,20 @@ vcpkg_from_github(
         0004_fix-config-expected-paths.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DOPTION_BUILD_TESTS=OFF
-        -DOPTION_BUILD_GPU_TESTS=OFF
         -DOPTION_BUILD_TOOLS=OFF
         -DOPTION_BUILD_EXAMPLES=OFF
         -DGIT_REV=0
-        -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
         -DOPTION_BUILD_EXAMPLES=OFF
+    MAYBE_UNUSED_VARIABLES
+        -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup()
 vcpkg_copy_pdbs()
 
 ## _IMPORT_PREFIX needs to go up one extra level in the directory tree.
@@ -48,12 +47,12 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
     file(WRITE ${TARGET_CMAKE} "${_contents}")
 endforeach()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Remove files already published by egl-registry
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR")
 
 # Handle copyright
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright)
-configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/glbinding/usage @ONLY)
+file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
diff --git a/ports/glbinding/vcpkg.json b/ports/glbinding/vcpkg.json
index 4a13308968ca2a..512d8a85a264a9 100644
--- a/ports/glbinding/vcpkg.json
+++ b/ports/glbinding/vcpkg.json
@@ -1,10 +1,19 @@
 {
   "name": "glbinding",
   "version-string": "3.1.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API",
   "homepage": "https://github.com/cginternals/glbinding",
+  "license": "MIT",
   "dependencies": [
-    "egl-registry"
+    "egl-registry",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

From b2f5ebfa7c525e5d039432e19de88ca5755c2a23 Mon Sep 17 00:00:00 2001
From: Cheney-Wang <850426846@qq.com>
Date: Wed, 26 Oct 2022 23:38:43 -0700
Subject: [PATCH 2/5] Use "version" instead of "version-string"

---
 ports/glbinding/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/glbinding/vcpkg.json b/ports/glbinding/vcpkg.json
index 512d8a85a264a9..0112b09202a96c 100644
--- a/ports/glbinding/vcpkg.json
+++ b/ports/glbinding/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "glbinding",
-  "version-string": "3.1.0",
+  "version": "3.1.0",
   "port-version": 4,
   "description": "glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API",
   "homepage": "https://github.com/cginternals/glbinding",

From 758caa99f95f8248ac2a5f54f4098947947fcf0b Mon Sep 17 00:00:00 2001
From: Cheney-Wang <850426846@qq.com>
Date: Wed, 26 Oct 2022 23:39:47 -0700
Subject: [PATCH 3/5] x-add-version

---
 versions/baseline.json     | 2 +-
 versions/g-/glbinding.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 82608314061564..bcbdc3e7b0cf75 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2634,7 +2634,7 @@
     },
     "glbinding": {
       "baseline": "3.1.0",
-      "port-version": 3
+      "port-version": 4
     },
     "glew": {
       "baseline": "2.2.0",
diff --git a/versions/g-/glbinding.json b/versions/g-/glbinding.json
index 657a17a96eef8c..9ee5bbf491693a 100644
--- a/versions/g-/glbinding.json
+++ b/versions/g-/glbinding.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "263ca20312a93de0c46928a2f1861e91c2a01a2f",
+      "version": "3.1.0",
+      "port-version": 4
+    },
     {
       "git-tree": "6feb489ecd418b013262401ff4911eccf5c03deb",
       "version-string": "3.1.0",

From 7d4e44c867fb167bb5b5fc5eacdcecb89fef09fd Mon Sep 17 00:00:00 2001
From: Cheney-Wang <850426846@qq.com>
Date: Thu, 27 Oct 2022 03:20:21 -0700
Subject: [PATCH 4/5] Restore the removed parameters

---
 ports/glbinding/portfile.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
index aa08f5c0e15fa1..bc6d11c9e3e5f5 100644
--- a/ports/glbinding/portfile.cmake
+++ b/ports/glbinding/portfile.cmake
@@ -18,9 +18,10 @@ vcpkg_cmake_configure(
         -DOPTION_BUILD_TOOLS=OFF
         -DOPTION_BUILD_EXAMPLES=OFF
         -DGIT_REV=0
+        -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
         -DOPTION_BUILD_EXAMPLES=OFF
     MAYBE_UNUSED_VARIABLES
-        -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
+        CMAKE_DISABLE_FIND_PACKAGE_cpplocate
 )
 
 vcpkg_cmake_install()

From a5effe165295b6a7730bff380e6c1eff46eae7b2 Mon Sep 17 00:00:00 2001
From: Cheney-Wang <850426846@qq.com>
Date: Thu, 27 Oct 2022 03:21:32 -0700
Subject: [PATCH 5/5] x-add-version

---
 versions/g-/glbinding.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/g-/glbinding.json b/versions/g-/glbinding.json
index 9ee5bbf491693a..d5e9c8711fdb69 100644
--- a/versions/g-/glbinding.json
+++ b/versions/g-/glbinding.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "263ca20312a93de0c46928a2f1861e91c2a01a2f",
+      "git-tree": "5932f5a201e721aa59a787380b9448e1018bb4b3",
       "version": "3.1.0",
       "port-version": 4
     },