diff options
| author | NancyLi1013 <lirui09@beyondsoft.com> | 2020-04-06 19:21:59 -0700 |
|---|---|---|
| committer | NancyLi1013 <lirui09@beyondsoft.com> | 2020-04-06 19:22:19 -0700 |
| commit | 9cbb1bd46e0948374fe496195cca828e68a71f3c (patch) | |
| tree | e65160aa6a3783966bba32283d1dd2a2eb05a41f /ports/glad | |
| parent | 0f1294c61e51bba3c4257502852eecbe1a943a4b (diff) | |
| parent | 6c4e822611324de4af9c8bb0ef8094e4a9b30a6e (diff) | |
| download | vcpkg-9cbb1bd46e0948374fe496195cca828e68a71f3c.tar.gz vcpkg-9cbb1bd46e0948374fe496195cca828e68a71f3c.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/NancyLi/10611-fix-mosquitto
# Conflicts:
# ports/libwebsockets/CONTROL
Diffstat (limited to 'ports/glad')
| -rw-r--r-- | ports/glad/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glad/encoding.patch | 13 | ||||
| -rw-r--r-- | ports/glad/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/glad/CONTROL b/ports/glad/CONTROL index dc556e13d..a0d234f36 100644 --- a/ports/glad/CONTROL +++ b/ports/glad/CONTROL @@ -1,5 +1,5 @@ Source: glad
-Version: 0.1.33
+Version: 0.1.33-1
Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.
Build-Depends: egl-registry, opengl-registry
Homepage: https://github.com/Dav1dde/glad
diff --git a/ports/glad/encoding.patch b/ports/glad/encoding.patch new file mode 100644 index 000000000..0497cc79a --- /dev/null +++ b/ports/glad/encoding.patch @@ -0,0 +1,13 @@ +diff --git a/glad/__main__.py b/glad/__main__.py +index e7c0544a5..1e10dcc60 100644 +--- a/glad/__main__.py ++++ b/glad/__main__.py +@@ -32,7 +32,7 @@ def main(): + if reproducible: + logger.info('reproducible build, using packaged specification: \'%s.xml\'', value) + try: +- return spec_cls.from_file(glad.files.open_local(value + '.xml')) ++ return spec_cls.from_file(glad.files.open_local(value + '.xml', encoding='utf-8-sig')) + except IOError: + raise ValueError('unable to open reproducible copy of {}.xml, ' + 'try dropping --reproducible'.format(value)) diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake index 9f08fe660..1c14ca77f 100644 --- a/ports/glad/portfile.cmake +++ b/ports/glad/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF de6c39e3040c987323b8ed078c36442f4fb681b3
SHA512 a24523186d59de5c0895791c639c62573eaacf1d3843d3bf81eba848b4a33a9a8d17f9b6f791202dac77692bf147e25b3650989731d5ddb7a22e7d023b66885e
HEAD_REF master
+ PATCHES encoding.patch
)
vcpkg_find_acquire_program(PYTHON3)
|