[libepoxy] Update to 1.5.4 (#11448)

- New upstream version 1.5.4 - Use simplified file(INSTALL ...) for copyright file - Add libepoxy-1.5.4_Add_call_convention_to_mock_function.patch Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
microsoft · May 20, 2020 · 0567431 · 0567431
1 parent 3b79a2d
commit 0567431
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 8 deletions.
diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL
@@ -1,5 +1,5 @@
-Source: libepoxy
-Version: 1.5.3-4
-Homepage: https://github.com/anholt/libepoxy
-Description: Epoxy is a library for handling OpenGL function pointer management for you
-Build-Depends: tool-meson
+Source: libepoxy
+Version: 1.5.4
+Homepage: https://github.com/anholt/libepoxy
+Description: Epoxy is a library for handling OpenGL function pointer management for you
+Build-Depends: tool-meson
diff --git a/ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch b/ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch
@@ -0,0 +1,22 @@
+From 81d758d025089d6b3b5309205ff4cb75789e6205 Mon Sep 17 00:00:00 2001
+From: crziter <crziter@gmail.com>
+Date: Tue, 25 Feb 2020 11:33:56 +0700
+Subject: [PATCH] Add call convention to mock function
+
+---
+ test/gl_version.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/gl_version.c b/test/gl_version.c
+index 9ab0080..9fe1bba 100644
+--- a/test/gl_version.c
++++ b/test/gl_version.c
+@@ -29,7 +29,7 @@ GLenum mock_enum;
+ const char *mock_gl_version;
+ const char *mock_glsl_version;
+
+-static const GLubyte *override_glGetString(GLenum name)
++static const GLubyte * EPOXY_CALLSPEC override_glGetString(GLenum name)
+ {
+     switch (name) {
+     case GL_VERSION:
diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake
@@ -3,9 +3,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO anholt/libepoxy
-    REF 1.5.3
-    SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-    HEAD_REF master)
+    REF 1.5.4
+    SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
+    HEAD_REF master
+    PATCHES
+        # https://github.com/anholt/libepoxy/pull/220
+        libepoxy-1.5.4_Add_call_convention_to_mock_function.patch
+)
 
 
 if (VCPKG_TARGET_IS_WINDOWS)