!24 [sync] PR-22: Define a fallback vendor name
From: @openeuler-sync-bot Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
8f9f97b6e1
30
backport-0001-glx-Add-another-fallback-library-name.patch
Normal file
30
backport-0001-glx-Add-another-fallback-library-name.patch
Normal 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("system");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
dpyInfo->vendors[screen] = vendor;
|
||||||
|
}
|
||||||
|
__glvndPthreadFuncs.rwlock_unlock(&dpyInfo->vendorLock);
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
||||||
@ -1,12 +1,14 @@
|
|||||||
Name: libglvnd
|
Name: libglvnd
|
||||||
Version: 1.3.2
|
Version: 1.3.2
|
||||||
Release: 1
|
Release: 2
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Summary: The GL Vendor-Neutral Dispatch library
|
Summary: The GL Vendor-Neutral Dispatch library
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/NVIDIA/libglvnd
|
URL: https://github.com/NVIDIA/libglvnd
|
||||||
Source0: https://github.com/NVIDIA/libglvnd/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/NVIDIA/libglvnd/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
Patch6000: backport-0001-glx-Add-another-fallback-library-name.patch
|
||||||
|
|
||||||
BuildRequires: libtool xorg-x11-server-Xvfb pkgconfig(xext) pkgconfig(x11)
|
BuildRequires: libtool xorg-x11-server-Xvfb pkgconfig(xext) pkgconfig(x11)
|
||||||
BuildRequires: gcc python3-rpm-macros python3-libxml2 pkgconfig(glproto)
|
BuildRequires: gcc python3-rpm-macros python3-libxml2 pkgconfig(glproto)
|
||||||
|
|
||||||
@ -92,6 +94,9 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || (cat `find . -name test-
|
|||||||
%{_libdir}/pkgconfig/*gl.pc
|
%{_libdir}/pkgconfig/*gl.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 22 2022 xingxing <xingxing9@h-partners.com> - 1:1.3.2-2
|
||||||
|
- fix coredump
|
||||||
|
|
||||||
* Tue Oct 13 2020 hanhui <hanhui15@huawei.com> - 1:1.3.2-1
|
* Tue Oct 13 2020 hanhui <hanhui15@huawei.com> - 1:1.3.2-1
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- Id:NA
|
- Id:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user