Update to 1.5.2
This commit is contained in:
parent
e8591408fa
commit
256904a1cc
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/libepoxy-1.4.3.tar.xz
|
||||
/libepoxy-1.5.0.tar.xz
|
||||
/libepoxy-1.5.1.tar.xz
|
||||
/libepoxy-1.5.2.tar.xz
|
||||
|
@ -1,60 +0,0 @@
|
||||
From 6ac91edcc78e7aad95fd026bad8e18eda4ee2999 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed, 25 Apr 2018 12:13:01 -0400
|
||||
Subject: [PATCH] test/glx_public_api_core: Fail softer if core contexts aren't
|
||||
available
|
||||
|
||||
If you've built Mesa with --disable-texture-float, and try to run the
|
||||
tests against Xvfb, glx_public_api_core will fail: creating a direct
|
||||
context with llvmpipe will fail because you don't have
|
||||
ARB_texture_float, and the internal fallback to an indirect context will
|
||||
fail because indirect only supports through 1.4. So the server will
|
||||
throw GLXBadFBConfig at you to say "I don't support core contexts",
|
||||
which we should interpret as a skip not a failure.
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
---
|
||||
test/glx_public_api_core.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/test/glx_public_api_core.c b/test/glx_public_api_core.c
|
||||
index 83b9689..f5a4f04 100644
|
||||
--- a/test/glx_public_api_core.c
|
||||
+++ b/test/glx_public_api_core.c
|
||||
@@ -131,6 +131,12 @@ test_glx_version(void)
|
||||
return true;
|
||||
}
|
||||
|
||||
+static int
|
||||
+error_handler(Display *d, XErrorEvent *ev)
|
||||
+{
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
@@ -148,6 +154,7 @@ main(int argc, char **argv)
|
||||
None
|
||||
};
|
||||
GLXContext ctx;
|
||||
+ int (*old_handler)(Display *, XErrorEvent *);
|
||||
|
||||
dpy = get_display_or_skip();
|
||||
|
||||
@@ -157,9 +164,12 @@ main(int argc, char **argv)
|
||||
visinfo = get_glx_visual(dpy);
|
||||
win = get_glx_window(dpy, visinfo, false);
|
||||
config = get_fbconfig_for_visinfo(dpy, visinfo);
|
||||
+
|
||||
+ old_handler = XSetErrorHandler(error_handler);
|
||||
ctx = glXCreateContextAttribsARB(dpy, config, NULL, True, attribs);
|
||||
if (ctx == None)
|
||||
errx(77, "glXCreateContext failed");
|
||||
+ XSetErrorHandler(old_handler);
|
||||
|
||||
glXMakeCurrent(dpy, win, ctx);
|
||||
|
||||
--
|
||||
2.17.0
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: epoxy runtime library
|
||||
Name: libepoxy
|
||||
Version: 1.5.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.5.2
|
||||
Release: 1%{?dist}
|
||||
License: MIT
|
||||
URL: https://github.com/anholt/libepoxy
|
||||
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||
@ -14,9 +14,6 @@ BuildRequires: pkgconfig(glesv2)
|
||||
BuildRequires: python3
|
||||
BuildRequires: xorg-x11-server-Xvfb mesa-dri-drivers
|
||||
|
||||
# https://github.com/anholt/libepoxy/pull/167
|
||||
Patch0: 0001-test-glx_public_api_core-Fail-softer-if-core-context.patch
|
||||
|
||||
%description
|
||||
A library for handling OpenGL function pointer management.
|
||||
|
||||
@ -57,6 +54,9 @@ xvfb-run -d -s "-screen 0 640x480x24" ninja -C %{_vpath_builddir} test || \
|
||||
%{_libdir}/pkgconfig/epoxy.pc
|
||||
|
||||
%changelog
|
||||
* Sun May 20 2018 Kalev Lember <klember@redhat.com> - 1.5.2-1
|
||||
- Update to 1.5.2
|
||||
|
||||
* Wed Apr 25 2018 Adam Jackson <ajax@redhat.com> - 1.5.1-2
|
||||
- Enable tests for all arches
|
||||
- Run tests against Xvfb so we get plausible amounts of coverage
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (libepoxy-1.5.1.tar.xz) = 0bacb9c966bdd451ed73859f4766f794d6dde965b1a1932a9355d1811f5852067071c5012cc7a1818e1b7e7162c9f816b9ff241820aa29bcf91f5938b46b4ce1
|
||||
SHA512 (libepoxy-1.5.2.tar.xz) = 74eac05280d8877995d07cb28d0c3ef285ad57c0c9a3369c59fc3601f2281f92dc103e78cf5538aca853e2a64d145d967c43f3176274fd046fb27aa86827a521
|
||||
|
Loading…
Reference in New Issue
Block a user