Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used (#18858)

Alternative resolution of https://github.com/microsoft/vcpkg/pull/18846/

5 files changed, 32 insertions, 17 deletions

diff --git a/ports/gl3w/CONTROL b/ports/gl3w/CONTROL
deleted file mode 100644
index 02550fdc5..000000000
--- a/ports/gl3w/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: gl3w
-Version: 2018-05-31-2
-Homepage: https://github.com/skaslev/gl3w
-Description: Simple OpenGL core profile loading
-Build-Depends: opengl-registry
diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake
index da12c18cb..1cf3e0f2b 100644
--- a/ports/gl3w/portfile.cmake
+++ b/ports/gl3w/portfile.cmake
@@ -8,19 +8,27 @@ vcpkg_from_github(
       0001-enable-shared-build.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h DESTINATION ${SOURCE_PATH}/include/GL)
+# Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used
+vcpkg_download_distfile(KHRPLATFORM_H
+  URLS "https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h"
+  FILENAME khrplatform.h
+  SHA512 93d9075718eddb69c44482acdc72bbbd3511741272a6124d05ab1ef0702ef03e918501403b6fd334faf2c61f3332f34b7730158aa090db3d448c32b5dd9d9e67
+  )
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h" DESTINATION "${SOURCE_PATH}/include/GL")
+file(COPY "${KHRPLATFORM_H}" DESTINATION "${SOURCE_PATH}/include/KHR")
 
 vcpkg_find_acquire_program(PYTHON3)
 
 vcpkg_execute_required_process(
-  COMMAND ${PYTHON3} ${SOURCE_PATH}/gl3w_gen.py
-  WORKING_DIRECTORY ${SOURCE_PATH}
+  COMMAND "${PYTHON3}" "${SOURCE_PATH}/gl3w_gen.py"
+  WORKING_DIRECTORY "${SOURCE_PATH}"
   LOGNAME gl3w-gen
 )
 
 vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
+  SOURCE_PATH "${SOURCE_PATH}"
   PREFER_NINJA
   OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
 )
@@ -30,10 +38,7 @@ vcpkg_copy_pdbs()
 vcpkg_fixup_cmake_targets()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-  set(HEADER ${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h)
-  file(READ ${HEADER} _contents)
-  string(REPLACE "#define GL3W_API" "#define GL3W_API __declspec(dllimport)" _contents "${_contents}")
-  file(WRITE ${HEADER} "${_contents}")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h" "#define GL3W_API" "#define GL3W_API __declspec(dllimport)")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/UNLICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gl3w RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/UNLICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/gl3w/vcpkg.json b/ports/gl3w/vcpkg.json
new file mode 100644
index 000000000..f38702da2
--- /dev/null
+++ b/ports/gl3w/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "gl3w",
+  "version-date": "2018-05-31",
+  "port-version": 3,
+  "description": "Simple OpenGL core profile loading",
+  "homepage": "https://github.com/skaslev/gl3w",
+  "dependencies": [
+    "opengl-registry"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index ba7a0da07..3d5327d7e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2285,8 +2285,8 @@
       "port-version": 0
     },
     "gl3w": {
-      "baseline": "2018-05-31-2",
-      "port-version": 0
+      "baseline": "2018-05-31",
+      "port-version": 3
     },
     "glad": {
       "baseline": "0.1.34",
diff --git a/versions/g-/gl3w.json b/versions/g-/gl3w.json
index 0cfc000c4..a718bca62 100644
--- a/versions/g-/gl3w.json
+++ b/versions/g-/gl3w.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "bbd82479631534cfe954646d63d29734c3b7728f",
+      "version-date": "2018-05-31",
+      "port-version": 3
+    },
+    {
       "git-tree": "7786d613957355b4d238d8fd2278f78fbab5a886",
       "version-string": "2018-05-31-2",
       "port-version": 0