diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-05-19 00:24:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 15:24:02 -0700 |
| commit | 7e5febae30b5271636a35cbb0a5edad87ad5fbdf (patch) | |
| tree | edc1aca106b23183c0f9f1d4870c8989ddd10809 | |
| parent | 1dfba89852faa3bbe7aa6dbc9517fe3cf8712dc1 (diff) | |
| download | vcpkg-7e5febae30b5271636a35cbb0a5edad87ad5fbdf.tar.gz vcpkg-7e5febae30b5271636a35cbb0a5edad87ad5fbdf.zip | |
[glad] fix features (#17966)
* [glad] fix features
* version stuff
| -rw-r--r-- | ports/glad/portfile.cmake | 88 | ||||
| -rw-r--r-- | ports/glad/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/glad.json | 5 |
4 files changed, 53 insertions, 43 deletions
diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake index e8f3b0bef..e29d97d56 100644 --- a/ports/glad/portfile.cmake +++ b/ports/glad/portfile.cmake @@ -37,66 +37,70 @@ if("glx" IN_LIST FEATURES) string(APPEND GLAD_SPEC ",glx")
endif()
+# This needs to be ordered highest to lowest for it to be correct!
if("gl-api-latest" IN_LIST FEATURES)
LIST(APPEND GLAD_API "gl=")
-elseif("gl-api-10" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=1.0")
-elseif("gl-api-11" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=1.1")
-elseif("gl-api-12" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=1.2")
-elseif("gl-api-13" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=1.3")
-elseif("gl-api-14" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=1.4")
-elseif("gl-api-15" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=1.5")
-elseif("gl-api-20" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=2.0")
-elseif("gl-api-21" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=2.1")
-elseif("gl-api-30" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=3.0")
-elseif("gl-api-31" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=3.1")
-elseif("gl-api-32" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=3.2")
-elseif("gl-api-33" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=3.3")
-elseif("gl-api-40" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=4.0")
-elseif("gl-api-41" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=4.1")
-elseif("gl-api-42" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=4.2")
-elseif("gl-api-43" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=4.3")
-elseif("gl-api-44" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=4.4")
-elseif("gl-api-45" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gl=4.5")
elseif("gl-api-46" IN_LIST FEATURES)
LIST(APPEND GLAD_API "gl=4.6")
+elseif("gl-api-45" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=4.5")
+elseif("gl-api-44" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=4.4")
+elseif("gl-api-43" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=4.3")
+elseif("gl-api-42" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=4.2")
+elseif("gl-api-41" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=4.1")
+elseif("gl-api-40" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=4.0")
+elseif("gl-api-33" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=3.3")
+elseif("gl-api-32" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=3.2")
+elseif("gl-api-31" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=3.1")
+elseif("gl-api-30" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=3.0")
+elseif("gl-api-21" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=2.1")
+elseif("gl-api-20" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=2.0")
+elseif("gl-api-15" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=1.5")
+elseif("gl-api-14" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=1.4")
+elseif("gl-api-13" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=1.3")
+elseif("gl-api-12" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=1.2")
+elseif("gl-api-11" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=1.1")
+elseif("gl-api-10" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gl=1.0")
endif()
+# This needs to be ordered highest to lowest for it to be correct!
if("gles1-api-latest" IN_LIST FEATURES)
LIST(APPEND GLAD_API "gles1=")
elseif("gles1-api-10" IN_LIST FEATURES)
LIST(APPEND GLAD_API "gles1=1.0")
endif()
+# This needs to be ordered highest to lowest for it to be correct!
if("gles2-api-latest" IN_LIST FEATURES)
LIST(APPEND GLAD_API "gles2=")
-elseif("gles2-api-20" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gles2=2.0")
-elseif("gles2-api-30" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gles2=3.0")
-elseif("gles2-api-31" IN_LIST FEATURES)
- LIST(APPEND GLAD_API "gles2=3.1")
elseif("gles2-api-32" IN_LIST FEATURES)
LIST(APPEND GLAD_API "gles2=3.2")
+elseif("gles2-api-31" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gles2=3.1")
+elseif("gles2-api-30" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gles2=3.0")
+elseif("gles2-api-20" IN_LIST FEATURES)
+ LIST(APPEND GLAD_API "gles2=2.0")
endif()
+# This needs to be ordered highest to lowest for it to be correct!
if("glsc2-api-latest" IN_LIST FEATURES)
LIST(APPEND GLAD_API "glsc2=")
elseif("glsc2-api-20" IN_LIST FEATURES)
diff --git a/ports/glad/vcpkg.json b/ports/glad/vcpkg.json index a3a637a17..8843c744b 100644 --- a/ports/glad/vcpkg.json +++ b/ports/glad/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glad", "version": "0.1.34", + "port-version": 1, "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/versions/baseline.json b/versions/baseline.json index fdf9d7907..25d538877 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2258,7 +2258,7 @@ }, "glad": { "baseline": "0.1.34", - "port-version": 0 + "port-version": 1 }, "glbinding": { "baseline": "3.1.0", diff --git a/versions/g-/glad.json b/versions/g-/glad.json index 8f9bf92c0..951f19b27 100644 --- a/versions/g-/glad.json +++ b/versions/g-/glad.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2bb03ac897eea39575c41edf7353df6a47af3f35", + "version": "0.1.34", + "port-version": 1 + }, + { "git-tree": "bea697f07b65eddfb003dc98637caaaa66a773fa", "version": "0.1.34", "port-version": 0 |