From 8aae5a5f6b38c461a4e0059d5c1e984ac431d540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Tue, 19 May 2020 13:26:03 +0200 Subject: [PATCH] [libepoxy] Update to 1.5.4 - 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 --- ports/libepoxy/CONTROL | 2 +- ...Add_call_convention_to_mock_function.patch | 22 +++++++++++++++++++ ports/libepoxy/portfile.cmake | 13 ++++++----- 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL index 2ff219a8fd2848..d65965b34e79c1 100644 --- a/ports/libepoxy/CONTROL +++ b/ports/libepoxy/CONTROL @@ -1,5 +1,5 @@ Source: libepoxy -Version: 1.5.3-3 +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 new file mode 100644 index 00000000000000..d6ddd92e476d94 --- /dev/null +++ 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 +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 index e578dd659b9674..69482f9c227c9a 100644 --- 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) @@ -70,5 +74,4 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/pkgconfig) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig) -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)