[librabbitmq/glbinding] Port update (#6391)

* [librabbitmq/glbinding] Port update

* fix librabbitmq uwp warning.

* [glbinding/globjects] Fix glbinding::KHRplatform was not found and globjects built failed

8 files changed, 64 insertions, 14 deletions

diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL
index f63cec773..a6db3dcde 100644
--- a/ports/glbinding/CONTROL
+++ b/ports/glbinding/CONTROL
@@ -1,3 +1,3 @@
 Source: glbinding
-Version: 3.0.2-5
+Version: 3.1.0
 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API
diff --git a/ports/glbinding/fix-uwpmacro.patch b/ports/glbinding/fix-uwpmacro.patch
new file mode 100644
index 000000000..61c179662
--- /dev/null
+++ b/ports/glbinding/fix-uwpmacro.patch
@@ -0,0 +1,33 @@
+diff --git a/source/glbinding/CMakeLists.txt b/source/glbinding/CMakeLists.txt

+index 97654c8..bca68d1 100644

+--- a/source/glbinding/CMakeLists.txt

++++ b/source/glbinding/CMakeLists.txt

+@@ -261,6 +261,11 @@ target_link_libraries(${target}

+ # Compile definitions

+ # 

+ 

++

++if (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

++  target_compile_definitions(${target} PRIVATE SYSTEM_WINDOWS WINDOWS_STORE)

++endif()

++

+ target_compile_definitions(${target}

+     PRIVATE

+     # since we use stl and stl is intended to use exceptions, exceptions should not be disabled

+diff --git a/source/glbinding/source/getProcAddress.cpp b/source/glbinding/source/getProcAddress.cpp

+index c1cfc5c..7e5f8bc 100644

+--- a/source/glbinding/source/getProcAddress.cpp

++++ b/source/glbinding/source/getProcAddress.cpp

+@@ -18,7 +18,11 @@ namespace glbinding {

+ 

+ ProcAddress getProcAddress(const char * name)

+ {

+-    static auto module = LoadLibrary(_T("OPENGL32.DLL"));

++#ifdef WINDOWS_STORE

++	static auto module = ::LoadPackagedLibrary(_T("OPENGL32.DLL"), 0);

++#else

++	static auto module = ::LoadLibrary(_T("OPENGL32.DLL"));

++#endif

+ 

+ 	// Prevent static linking of opengl32

+ 	static auto wglGetProcAddress_ = reinterpret_cast<void * (__stdcall *)(const char *)>(::GetProcAddress(module, "wglGetProcAddress"));

diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
index e645e5021..659d7c23c 100644
--- a/ports/glbinding/portfile.cmake
+++ b/ports/glbinding/portfile.cmake
@@ -2,10 +2,12 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cginternals/glbinding
-    REF d7a1873ad741fb13a9c6dcbae93d0cda45a11933
-    SHA512 70848d8ddad3e2ddfc54549ed3cdde569991858135140b30b50fa6e92c5aec6e3dd235418e091456f9b68da2fad09fbef117dedac7b48c26bcab62b6f0fa791f
+    REF v3.1.0
+    SHA512 d7294c9a0dc47a7c107b134e5dfa78c5812fc6bf739b9fd778fa7ce946d5ea971839a65c3985e0915fd75311e4a85fb221d33a71856c460199eab0e7622f7151
     HEAD_REF master
-    PATCHES force-system-install.patch
+    PATCHES 
+		force-system-install.patch
+		fix-uwpmacro.patch
 )
 
 vcpkg_configure_cmake(
@@ -47,7 +49,7 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
     file(WRITE ${TARGET_CMAKE} "${_contents}")
 endforeach()
 
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/glbinding-aux/glbinding-aux-export.cmake)\nset(glbinding_FOUND TRUE)\n")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/glbinding-aux/glbinding-aux-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/KHRplatform/KHRplatform-export.cmake)\nset(glbinding_FOUND TRUE)\n")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
diff --git a/ports/globjects/CONTROL b/ports/globjects/CONTROL
index b75b256c6..e05b2393f 100644
--- a/ports/globjects/CONTROL
+++ b/ports/globjects/CONTROL
@@ -1,5 +1,5 @@
 Source: globjects
 Maintainer: mattias@mattiascibien.net
-Version: 1.1.0-2018-09-19
+Version: 1.1.0-2018-09-19-1
 Build-Depends: glbinding, glm
 Description: C++ library strictly wrapping OpenGL objects. <https://github.com/cginternals/globjects>
diff --git a/ports/globjects/portfile.cmake b/ports/globjects/portfile.cmake
index 5019fea0d..164edec71 100644
--- a/ports/globjects/portfile.cmake
+++ b/ports/globjects/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cginternals/globjects
-    REF fe53c4a386506d3374df12ad6f1f67c4232aa389
-    SHA512 62b40675671acf050bfe4836da5b6b6a757185d296a86ad1079cf79e4a149820971ed46fce7379b73707dff368919b63d52044230a7ce75601441fe368d91e63
+    REF dc68b09a53ec20683d3b3a12ed8d9cb12602bb9a
+    SHA512 5145df795a73a8d74e983e143fd57441865f3082860efb89a3aa8c4d64c2eb6f0256a8049ccd5479dd77e53ef6638d9c903b29a8ef2b41a076003d9595912500
     HEAD_REF master
     PATCHES system-install.patch
 )
diff --git a/ports/librabbitmq/CONTROL b/ports/librabbitmq/CONTROL
index f8c686735..afd552b9b 100644
--- a/ports/librabbitmq/CONTROL
+++ b/ports/librabbitmq/CONTROL
@@ -1,4 +1,4 @@
-Source: librabbitmq

-Version: 0.8.0-1

-Build-Depends: openssl

-Description: A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.

+Source: librabbitmq
+Version: 0.9.0
+Build-Depends: openssl
+Description: A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.
diff --git a/ports/librabbitmq/fix-uwpwarning.patch b/ports/librabbitmq/fix-uwpwarning.patch
new file mode 100644
index 000000000..896145970
--- /dev/null
+++ b/ports/librabbitmq/fix-uwpwarning.patch
@@ -0,0 +1,13 @@
+diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt

+index bd5369a..f6d703f 100644

+--- a/librabbitmq/CMakeLists.txt

++++ b/librabbitmq/CMakeLists.txt

+@@ -113,7 +113,7 @@ set(RABBITMQ_SOURCES

+     ${AMQP_SSL_SRCS}

+ )

+ 

+-add_definitions(-DAMQP_BUILD)

++add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS)

+ 

+ set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT})

+ 

diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake
index cea0af218..02ca27c8d 100644
--- a/ports/librabbitmq/portfile.cmake
+++ b/ports/librabbitmq/portfile.cmake
@@ -3,9 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO alanxz/rabbitmq-c
-  REF v0.8.0
-  SHA512 54e1c98a6b0eb7de848c9fac13dcde6455a6f71acee9e62a96c171f0e3e1cf860a70837f07b633d1a55b1ffd3d33ed7186b52495fa4c6e755b69a7e728eb9f1a
+  REF v0.9.0
+  SHA512 a63fe267a3ec112a5e9456a03066132b91f897181947fba18ea3efb14ca0a69996d7dfaecda61a0dd360e03a4e56569e70592e1674b75d20b937a118e1acfc64
   HEAD_REF master
+  PATCHES
+	fix-uwpwarning.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)