Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[libepoxy] Update to 1.5.4 #11448

Merged
merged 2 commits into from
May 20, 2020
Merged

[libepoxy] Update to 1.5.4 #11448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8aae5a5
[libepoxy] Update to 1.5.4
c72578 May 19, 2020
bdee068
Merge branch 'master' into 2020-05-19_libepoxy_Update_to_1.5.4
strega-nil May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ports/libepoxy/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
22 changes: 22 additions & 0 deletions ports/libepoxy/libepoxy-1.5.4_Add_call_convention_to_mock_function.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
10 changes: 7 additions & 3 deletions ports/libepoxy/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down