Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions ports/gl3w/CONTROL

This file was deleted.

35 changes: 35 additions & 0 deletions ports/gl3w/fix-download-failure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/gl3w_gen.py b/gl3w_gen.py
index 6ef8f38..113b59f 100644
--- a/gl3w_gen.py
+++ b/gl3w_gen.py
@@ -38,6 +38,12 @@ try:
import urllib.request as urllib2
except ImportError:
import urllib2
+
+import ssl
+
+ctx = ssl.create_default_context()
+ctx.check_hostname = False
+ctx.verify_mode = ssl.CERT_NONE

# UNLICENSE copyright header
UNLICENSE = r'''/*
@@ -103,7 +109,7 @@ if not os.path.exists(os.path.join(args.root, 'src')):
# Download glcorearb.h
if not os.path.exists(os.path.join(args.root, 'include/GL/glcorearb.h')):
print('Downloading glcorearb.h to {0}...'.format(os.path.join(args.root, 'include/GL/glcorearb.h')))
- web = urllib2.urlopen('https://www.khronos.org/registry/OpenGL/api/GL/glcorearb.h')
+ web = urllib2.urlopen('https://www.khronos.org/registry/OpenGL/api/GL/glcorearb.h', context=ctx)
with open(os.path.join(args.root, 'include/GL/glcorearb.h'), 'wb') as f:
f.writelines(web.readlines())
else:
@@ -112,7 +118,7 @@ else:
# Download khrplatform.h
if not os.path.exists(os.path.join(args.root, 'include/KHR/khrplatform.h')):
print('Downloading khrplatform.h to {0}...'.format(os.path.join(args.root, 'include/KHR/khrplatform.h')))
- web = urllib2.urlopen('https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h')
+ web = urllib2.urlopen('https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h', context=ctx)
with open(os.path.join(args.root, 'include/KHR/khrplatform.h'), 'wb') as f:
f.writelines(web.readlines())
else:
1 change: 1 addition & 0 deletions ports/gl3w/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
0001-enable-shared-build.patch
fix-download-failure.patch
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
Expand Down
10 changes: 10 additions & 0 deletions ports/gl3w/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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"
]
}
2 changes: 1 addition & 1 deletion scripts/cmake/vcpkg_install_msbuild.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ function(vcpkg_install_msbuild)
endif()
if(NOT exes STREQUAL "")
file(COPY ${exes} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
endif()
endif()

Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2281,8 +2281,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",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gl3w.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1c07b0603f4de7b67c2a411da195780b658b5c0a",
"version-date": "2018-05-31",
"port-version": 3
},
{
"git-tree": "7786d613957355b4d238d8fd2278f78fbab5a886",
"version-string": "2018-05-31-2",
Expand Down