Update snapshot to 20180327
This commit is contained in:
parent
8a6c7f93d5
commit
47075bbd6a
@ -1,53 +0,0 @@
|
||||
From 627cc6634cd85dc9006ff6f59c39d75fe850b3af Mon Sep 17 00:00:00 2001
|
||||
From: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Mon, 12 Feb 2018 09:41:59 -0800
|
||||
Subject: [PATCH] GLX: Work around 'X_GLXCreateContextAtrribsARB' typo fix API
|
||||
break
|
||||
|
||||
Older versions of glxproto.h contained a typo where "Attribs" was misspelled.
|
||||
The typo was fixed in the xorgproto version of glxproto.h, breaking the API.
|
||||
|
||||
Fixes #149.
|
||||
---
|
||||
src/GLX/libglx.c | 14 ++++++++++++--
|
||||
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/GLX/libglx.c b/src/GLX/libglx.c
|
||||
index fbdbf1d..2ba8817 100644
|
||||
--- a/src/GLX/libglx.c
|
||||
+++ b/src/GLX/libglx.c
|
||||
@@ -53,6 +53,16 @@
|
||||
#define GLX_MINOR_VERSION 4
|
||||
#define GLX_VERSION_STRING "1.4"
|
||||
|
||||
+/*
|
||||
+ * Older versions of glxproto.h contained a typo where "Attribs" was misspelled.
|
||||
+ * The typo was fixed in the xorgproto version of glxproto.h, breaking the API.
|
||||
+ * Work around that here.
|
||||
+ */
|
||||
+#if !defined(X_GLXCreateContextAttribsARB) && \
|
||||
+ defined(X_GLXCreateContextAtrribsARB)
|
||||
+#define X_GLXCreateContextAttribsARB X_GLXCreateContextAtrribsARB
|
||||
+#endif
|
||||
+
|
||||
static glvnd_mutex_t clientStringLock = GLVND_MUTEX_INITIALIZER;
|
||||
|
||||
/**
|
||||
@@ -279,7 +289,7 @@ static GLXContext glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
|
||||
vendor = __glXGetDynDispatch(dpy, screen);
|
||||
if (vendor == NULL) {
|
||||
__glXSendError(dpy, BadValue, 0,
|
||||
- X_GLXCreateContextAtrribsARB, True);
|
||||
+ X_GLXCreateContextAttribsARB, True);
|
||||
return None;
|
||||
}
|
||||
}
|
||||
@@ -288,7 +298,7 @@ static GLXContext glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
|
||||
|
||||
if (vendor == NULL) {
|
||||
// We didn't get a GLX_SCREEN attribute, so look at the config instead.
|
||||
- vendor = CommonDispatchFBConfig(dpy, config, X_GLXCreateContextAtrribsARB);
|
||||
+ vendor = CommonDispatchFBConfig(dpy, config, X_GLXCreateContextAttribsARB);
|
||||
}
|
||||
|
||||
if (vendor != NULL && vendor->staticDispatch.createContextAttribsARB != NULL) {
|
@ -1,5 +1,5 @@
|
||||
%global commit0 b029c24a6343c3fd1f899c88e5f98053a7150187
|
||||
%global date 20180226
|
||||
%global commit0 5baa1e5cfc422eb53e66f12ffb80c93d4a693cd9
|
||||
%global date 20180327
|
||||
%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
Name: libglvnd
|
||||
Version: 1.0.1
|
||||
Release: 0.3%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
|
||||
Release: 0.4%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
|
||||
# Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
|
||||
Epoch: 1
|
||||
Summary: The GL Vendor-Neutral Dispatch library
|
||||
@ -20,8 +20,7 @@ License: MIT
|
||||
URL: https://github.com/NVIDIA/libglvnd
|
||||
#Source0: %%{url}/archive/v%%{version}/%%{name}-%%{version}.tar.gz
|
||||
Source0: %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
|
||||
Patch0: %{url}/pull/150.patch#/X_GLXCreateContextAtrribsARB_fix_API_break.patch
|
||||
Patch1: libglvnd-python3.patch
|
||||
Patch0: libglvnd-python3.patch
|
||||
|
||||
BuildRequires: libtool
|
||||
BuildRequires: gcc
|
||||
@ -244,6 +243,9 @@ xvfb-run -a make check V=1 || cat `find . -name test-suite.log`
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Apr 13 2018 Leigh Scott <leigh123linux@googlemail.com> - 1:1.0.1-0.4.20180327git5baa1e5
|
||||
- Update snapshot to 20180327
|
||||
|
||||
* Thu Mar 15 2018 Adam Jackson <ajax@redhat.com> - 1.0.1-0.3.20180226gitb029c24
|
||||
- Use Recommends: mesa-* not Requires.
|
||||
- (Trivially) switch the build to python3
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (libglvnd-b029c24.tar.gz) = 523c68a979c1662ff30ce789861ba67d76faa2d4f55665277d9eb4b557a186fb351612b26e9d3e451387000ad3e21051cfd14c31a5abaac8fed370becdfd139c
|
||||
SHA512 (libglvnd-5baa1e5.tar.gz) = 59ee02ed0931bf8d471f83e97cb04e11144f5cb815cc62240eb879394bc3248ca97764b5e38cc7d4f3662f3ccf7c21094a4ef03db052470684be7a4cac19cf99
|
||||
|
Loading…
Reference in New Issue
Block a user