rpms/libglvnd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add another fallback GLX library name

Browse Source
This commit is contained in:
Adam Jackson 2018-06-14 11:28:06 -04:00
parent 95191bcae4
commit 5bce839fc8
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-glx-Add-another-fallback-library-name.patch Normal file
View File

@ -0,0 +1,30 @@
From 24606973bfabd75285fbd489264235167ba0f44c Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 14 Jun 2018 11:25:21 -0400
Subject: [PATCH] glx: Add another fallback library name
This is mostly to avoid file conflicts with external packaging.
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
src/GLX/libglxmapping.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/GLX/libglxmapping.c b/src/GLX/libglxmapping.c
index be384f8..2016a04 100644
--- a/src/GLX/libglxmapping.c
+++ b/src/GLX/libglxmapping.c
@@ -591,6 +591,10 @@ __GLXvendorInfo *__glXLookupVendorByScreen(Display *dpy, const int screen)
vendor = __glXLookupVendorByName(FALLBACK_VENDOR_NAME);
}
+ if (!vendor) {
+ vendor = __glXLookupVendorByName("fedora");
+ }
+
dpyInfo->vendors[screen] = vendor;
}
__glvndPthreadFuncs.rwlock_unlock(&dpyInfo->vendorLock);
--
2.17.0

6
libglvnd.spec
View File

@ -7,7 +7,7 @@
Name: libglvnd
Version: 1.0.1
Release: 0.6%{?commit0:.git%{shortcommit0}}%{?dist}
Release: 0.7%{?commit0:.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
@ -17,6 +17,7 @@ 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: libglvnd-python3.patch
Patch1: 0001-glx-Add-another-fallback-library-name.patch
BuildRequires: libtool
BuildRequires: gcc
@ -233,6 +234,9 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
%changelog
* Thu Jun 14 2018 Adam Jackson <ajax@redhat.com> - 1.0.1-0.7.git5baa1e5
- Add another fallback GLX library name
* Thu Apr 26 2018 Adam Jackson <ajax@redhat.com> - 1.0.1-0.6.git5baa1e5
- Enable %%check for all but ppc64 and s390x, which has known but low-impact
failures