[opengl/egl-registry] update and add pc file (#21651)

* [egl-registry] update * [opengl-registry] update + pc file * [glad] update due to new opengl spec layout * fix hash * version stuff * push glad to port verison 3 * version stuff * fix version * use glob for opengl-registry installation. * version stuff * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * version stuff Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
microsoft · Nov 26, 2021 · e4e9755 · e4e9755
1 parent 22cd726
commit e4e9755
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 45 deletions.
diff --git a/ports/egl-registry/portfile.cmake b/ports/egl-registry/portfile.cmake
@@ -1,26 +1,26 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO KhronosGroup/EGL-Registry
-  REF 11478904448bbdf5757b798c856a525aa2b351b1
-  SHA512 f1e54810cb2948e9d8798d65507069bba4ee6534d719e792db11e36d600ef37e59a34262809d8b1e41160ae1e45a283fa322cd9d9a647985c48a6d7d6d1706ee
+  REF 992aa3914f8fea801b1034c992db389911d9f3c3
+  SHA512 75524ed23066e856f080f6551a6c7b6573d13ff7b4555594e2987e1e6a38ba13042d5037d56d656048e83c0b4ff002b5badacf9224516f9f5e521d4af653805a
   HEAD_REF master
 )
 
 file(
   COPY
-    ${SOURCE_PATH}/api/KHR
-    ${SOURCE_PATH}/api/EGL
-  DESTINATION ${CURRENT_PACKAGES_DIR}/include
+    "${SOURCE_PATH}/api/KHR"
+    "${SOURCE_PATH}/api/EGL"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/include"
 )
 
 file(
   COPY
-    ${SOURCE_PATH}/api/egl.xml
-  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+    "${SOURCE_PATH}/api/egl.xml"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/opengl"
 )
 
 file(
-  INSTALL ${SOURCE_PATH}/sdk/docs/man/copyright.xml
-  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+  INSTALL "${SOURCE_PATH}/sdk/docs/man/copyright.xml"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
   RENAME copyright
 )
diff --git a/ports/egl-registry/vcpkg.json b/ports/egl-registry/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "egl-registry",
-  "version-string": "2020-02-20",
-  "port-version": 1,
+  "version-date": "2021-11-23",
   "description": "the EGL API and Extension Registry",
   "homepage": "https://github.com/KhronosGroup/EGL-Registry"
 }
diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake
@@ -112,18 +112,17 @@ string(REPLACE ";" "," GLAD_API "${GLAD_API}")
 vcpkg_find_acquire_program(PYTHON3)
 
 file(COPY
-    ${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h
-    ${CURRENT_INSTALLED_DIR}/include/EGL/eglplatform.h
-    ${CURRENT_INSTALLED_DIR}/share/egl-registry/egl.xml
-    ${CURRENT_INSTALLED_DIR}/share/opengl-registry/gl.xml
-    ${CURRENT_INSTALLED_DIR}/share/opengl-registry/glx.xml
-    ${CURRENT_INSTALLED_DIR}/share/opengl-registry/wgl.xml
-    DESTINATION ${SOURCE_PATH}/glad/files
+    "${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h"
+    "${CURRENT_INSTALLED_DIR}/include/EGL/eglplatform.h"
+    "${CURRENT_INSTALLED_DIR}/share/opengl/egl.xml"
+    "${CURRENT_INSTALLED_DIR}/share/opengl/gl.xml"
+    "${CURRENT_INSTALLED_DIR}/share/opengl/glx.xml"
+    "${CURRENT_INSTALLED_DIR}/share/opengl/wgl.xml"
+    DESTINATION "${SOURCE_PATH}/glad/files"
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DGLAD_EXPORT=OFF
         -DGLAD_INSTALL=ON
@@ -143,7 +142,8 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glad)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/KHR)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/EGL)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/KHR")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/EGL")
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/glad/vcpkg.json b/ports/glad/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "glad",
   "version": "0.1.34",
-  "port-version": 1,
+  "port-version": 3,
   "description": "Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.",
   "homepage": "https://github.com/Dav1dde/glad",
   "documentation": "https://github.com/Dav1dde/glad/wiki",

diff --git a/ports/opengl-registry/portfile.cmake b/ports/opengl-registry/portfile.cmake
@@ -1,27 +1,37 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO KhronosGroup/OpenGL-Registry
-  REF 4594c03239fb76580bc5d5a13acb2a8f563f0158
-  SHA512 c005a4eb7e5c17002647e7762ae1a7ecba0d0780a62d66f1afd3b7f45c1ca49bd5a069ab0fabb94de3ec971604586457932941fa8eb924cf5ac3a959d8f5f146
+  REF a48c224a2db6edc4f4c610025b529d1c31ee9445
+  SHA512 30cfb1f8979676298e72604898879dae31953839acffc203027165fc131e74dafcf827fdeb07e64021fb8e8318bca38fa4d8656d8248f7bfba76e01d24895818
   HEAD_REF master
 )
 
-file(COPY ${SOURCE_PATH}/api/GL DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/api/GLES DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/api/GLES2 DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/api/GLES3 DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/api/GLSC DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(COPY ${SOURCE_PATH}/api/GLSC2 DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY "${SOURCE_PATH}/api/GL" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/api/GLES" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/api/GLES2" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/api/GLES3" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/api/GLSC" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/api/GLSC2" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+file(GLOB reg_files "${SOURCE_PATH}/xml/*.xml" "${SOURCE_PATH}/xml/readme.pdf" "${SOURCE_PATH}/xml/*.rnc" "${SOURCE_PATH}/xml/reg.py")
 file(COPY
-  ${SOURCE_PATH}/xml/gl.xml
-  ${SOURCE_PATH}/xml/glx.xml
-  ${SOURCE_PATH}/xml/wgl.xml
-  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+  ${reg_files}
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/opengl"
 )
 
 # Using the Makefile because it is the smallest file with a complete copy of the license text
 file(
-  INSTALL ${SOURCE_PATH}/xml/Makefile
-  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+  INSTALL "${SOURCE_PATH}/xml/Makefile"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
   RENAME copyright
 )
+
+# pc layout from cygwin (consumed in xserver!)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/khronos-opengl-registry.pc" [=[
+prefix=${pcfiledir}/../..
+datadir=${prefix}/share
+specdir=${datadir}/opengl
+Name: khronos-opengl-registry
+Description: Khronos OpenGL registry
+Version: git4594c03239fb76580bc5d5a13acb2a8f563f0158
+]=])
diff --git a/ports/opengl-registry/vcpkg.json b/ports/opengl-registry/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "opengl-registry",
-  "version-string": "2020-03-25",
-  "port-version": 1,
+  "version-date": "2021-11-17",
   "description": "the API and Extension registries for the OpenGL family APIs",
   "homepage": "https://github.com/KhronosGroup/OpenGL-Registry",
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1993,8 +1993,8 @@
       "port-version": 2
     },
     "egl-registry": {
-      "baseline": "2020-02-20",
-      "port-version": 1
+      "baseline": "2021-11-23",
+      "port-version": 0
     },
     "eigen3": {
       "baseline": "3.3.9",
@@ -2450,7 +2450,7 @@
     },
     "glad": {
       "baseline": "0.1.34",
-      "port-version": 1
+      "port-version": 3
     },
     "glbinding": {
       "baseline": "3.1.0",
@@ -4953,8 +4953,8 @@
       "port-version": 9
     },
     "opengl-registry": {
-      "baseline": "2020-03-25",
-      "port-version": 1
+      "baseline": "2021-11-17",
+      "port-version": 0
     },
     "openh264": {
       "baseline": "2021-03-16",

diff --git a/versions/e-/egl-registry.json b/versions/e-/egl-registry.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec272777ea9d0ceccf5cc8b0336f038853e5c911",
+      "version-date": "2021-11-23",
+      "port-version": 0
+    },
     {
       "git-tree": "33252a782754c5b8595212530c1729d41bb78c19",
       "version-string": "2020-02-20",

diff --git a/versions/g-/glad.json b/versions/g-/glad.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2ebf6ed85a860c74f8649571e168900426cbb944",
+      "version": "0.1.34",
+      "port-version": 3
+    },
     {
       "git-tree": "2bb03ac897eea39575c41edf7353df6a47af3f35",
       "version": "0.1.34",

diff --git a/versions/o-/opengl-registry.json b/versions/o-/opengl-registry.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7f4a1e05a6cfbd923a2eaf9d32da22bde0742a15",
+      "version-date": "2021-11-17",
+      "port-version": 0
+    },
     {
       "git-tree": "d14f0786a99a87d5d429ba257674fb55e93ccae6",
       "version-string": "2020-03-25",