This repository has been archived by the owner on Sep 17, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upstream PR for Solus fixes: anholt/libepoxy#143 Signed-off-by: Ikey Doherty <ikey@solus-project.com>
- Loading branch information
1 parent
425ebdf
commit 89ac5e9
Showing
8 changed files
with
428 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
libepoxy.so.0:epoxy_egl_version | ||
libepoxy.so.0:epoxy_gl_version | ||
libepoxy.so.0:epoxy_glx_version | ||
libepoxy.so.0:epoxy_has_egl | ||
libepoxy.so.0:epoxy_has_egl_extension | ||
libepoxy.so.0:epoxy_has_gl_extension | ||
libepoxy.so.0:epoxy_has_glx | ||
libepoxy.so.0:epoxy_has_glx_extension | ||
libepoxy.so.0:epoxy_is_desktop_gl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
libepoxy.so.0:epoxy_egl_version | ||
libepoxy.so.0:epoxy_gl_version | ||
libepoxy.so.0:epoxy_glx_version | ||
libepoxy.so.0:epoxy_has_egl | ||
libepoxy.so.0:epoxy_has_egl_extension | ||
libepoxy.so.0:epoxy_has_gl_extension | ||
libepoxy.so.0:epoxy_has_glx | ||
libepoxy.so.0:epoxy_has_glx_extension | ||
libepoxy.so.0:epoxy_is_desktop_gl |
This file was deleted.
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
34
files/0001-test-Fix-trivial-compiler-warning-in-dlwrap.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From 9dde80065fa09128885d61b0a3baaec780961880 Mon Sep 17 00:00:00 2001 | ||
From: Ikey Doherty <ikey@solus-project.com> | ||
Date: Thu, 19 Oct 2017 15:50:46 +0100 | ||
Subject: [PATCH 1/2] test: Fix trivial compiler warning in dlwrap | ||
|
||
This mutes compiler warnings for `dlwrap.c` by ensuring we actually check | ||
the return status of the `asprintf` call. At this point in the test suite | ||
our possible failure here is only memory, so we'll abort. | ||
|
||
Signed-off-by: Ikey Doherty <ikey@solus-project.com> | ||
--- | ||
test/dlwrap.c | 6 +++++- | ||
1 file changed, 5 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/test/dlwrap.c b/test/dlwrap.c | ||
index c5d447b..60866db 100644 | ||
--- a/test/dlwrap.c | ||
+++ b/test/dlwrap.c | ||
@@ -162,7 +162,11 @@ wrapped_dlsym(const char *prefix, const char *name) | ||
char *wrap_name; | ||
void *symbol; | ||
|
||
- asprintf(&wrap_name, "override_%s_%s", prefix, name); | ||
+ if (asprintf(&wrap_name, "override_%s_%s", prefix, name) < 0) { | ||
+ fputs("Error: Failed to allocate memory.\n", stderr); | ||
+ abort(); | ||
+ } | ||
+ | ||
symbol = dlwrap_real_dlsym(RTLD_DEFAULT, wrap_name); | ||
free(wrap_name); | ||
return symbol; | ||
-- | ||
2.14.2 | ||
|
Oops, something went wrong.