Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 12 commits into from
Nov 26, 2021
Merged

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

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
af55aab
[egl-registry] update
Neumann-A Nov 24, 2021
41f207a
[opengl-registry] update + pc file
Neumann-A Nov 24, 2021
564550b
[glad] update due to new opengl spec layout
Neumann-A Nov 24, 2021
67b68d9
fix hash
Neumann-A Nov 24, 2021
7f2a1c6
version stuff
Neumann-A Nov 24, 2021
12212c1
push glad to port verison 3
Neumann-A Nov 24, 2021
a370255
version stuff
Neumann-A Nov 24, 2021
e3bb921
fix version
Neumann-A Nov 24, 2021
5c71373
use glob for opengl-registry installation.
Neumann-A Nov 24, 2021
59ba248
version stuff
Neumann-A Nov 24, 2021
1df4ac1
Apply suggestions from code review
Neumann-A Nov 25, 2021
29d0ab5
version stuff
Neumann-A Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ports/egl-registry/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
3 changes: 1 addition & 2 deletions ports/egl-registry/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "egl-registry",
"version-string": "2020-02-20",
"port-version": 1,
"version-string": "2021-11-23",
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
"description": "the EGL API and Extension Registry",
"homepage": "https://github.com/KhronosGroup/EGL-Registry"
}
22 changes: 11 additions & 11 deletions ports/glad/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +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}
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
OPTIONS
-DGLAD_EXPORT=OFF
Expand All @@ -143,7 +143,7 @@ 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")
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
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)
2 changes: 1 addition & 1 deletion ports/glad/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "glad",
"version": "0.1.34",
"port-version": 1,
"port-version": 3,
JonLiu1993 marked this conversation as resolved.
Show resolved Hide resolved
"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",
Expand Down
38 changes: 24 additions & 14 deletions ports/opengl-registry/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
]=])
3 changes: 1 addition & 2 deletions ports/opengl-registry/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "opengl-registry",
"version-string": "2020-03-25",
"port-version": 1,
"version-string": "2021-11-17",
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
"description": "the API and Extension registries for the OpenGL family APIs",
"homepage": "https://github.com/KhronosGroup/OpenGL-Registry",
"dependencies": [
Expand Down
10 changes: 5 additions & 5 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -2446,7 +2446,7 @@
},
"glad": {
"baseline": "0.1.34",
"port-version": 1
"port-version": 3
},
"glbinding": {
"baseline": "3.1.0",
Expand Down Expand Up @@ -4945,8 +4945,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",
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/egl-registry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "683163accb58927e50bde0e66c06049610cbe3a0",
"version-string": "2021-11-23",
"port-version": 0
},
{
"git-tree": "33252a782754c5b8595212530c1729d41bb78c19",
"version-string": "2020-02-20",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/glad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "26af7e85a7ebb05bd9741aed07badc6865e1d70c",
"version": "0.1.34",
"port-version": 3
},
{
"git-tree": "2bb03ac897eea39575c41edf7353df6a47af3f35",
"version": "0.1.34",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opengl-registry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "91faee18c40260f9104d59cef183c4c3fd0dbdb8",
"version-string": "2021-11-17",
"port-version": 0
},
{
"git-tree": "d14f0786a99a87d5d429ba257674fb55e93ccae6",
"version-string": "2020-03-25",
Expand Down