aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffin Downs <35574547+grdowns@users.noreply.github.com>2019-03-19 14:11:31 -0700
committerGitHub <noreply@github.com>2019-03-19 14:11:31 -0700
commitc482d2c4d50582b3cd52bdd58e126347a145d5e5 (patch)
treef350eb11b10b1a2d50c6914a299e021951ff5163
parentfd0346372fab12a6925a4c243f2b19b713699d12 (diff)
parent2df31838e8e6e0cd334e730e8008345cc16a319a (diff)
downloadvcpkg-c482d2c4d50582b3cd52bdd58e126347a145d5e5.tar.gz
vcpkg-c482d2c4d50582b3cd52bdd58e126347a145d5e5.zip
Merge pull request #5726 from LarryIII/FixUncombination
[gli]Fix gli is incompatible with glm
-rw-r--r--ports/gli/CONTROL2
-rw-r--r--ports/gli/portfile.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/gli/CONTROL b/ports/gli/CONTROL
index b8edac798..521a79120 100644
--- a/ports/gli/CONTROL
+++ b/ports/gli/CONTROL
@@ -1,4 +1,4 @@
Source: gli
-Version: 0.8.2-1
+Version: dd17acf
Build-Depends: glm
Description: OpenGL Image (GLI) https://gli.g-truc.net
diff --git a/ports/gli/portfile.cmake b/ports/gli/portfile.cmake
index 305233619..beae5e530 100644
--- a/ports/gli/portfile.cmake
+++ b/ports/gli/portfile.cmake
@@ -4,8 +4,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO g-truc/gli
- REF 0.8.2.0
- SHA512 c254a4e1497d0add985e4a882c552db99c512cc0e9cc72145d51a6e7deada817d624d9818099a47136a8a3ef1223a26a34e355e3c713166f0bb062e506059834
+ REF dd17acf9cc7fc6e6abe9f9ec69949eeeee1ccd82
+ SHA512 9e3a4ab9ee73d5c271b8346cf81339cd3cd0c20d20991524b816313b6a99e8d3a01863316a38cf1a52ef9c5b31d689ecccf6248b12d1d270460c048bf904650b
HEAD_REF master
)