From f5c886f8651afd4e5b2d8dc04c6e24f28c369d33 Mon Sep 17 00:00:00 2001
From: xingxing <xingxing9@huawei.com>
Date: Tue, 22 Feb 2022 17:22:23 +0800
Subject: [PATCH] fix coredump

(cherry picked from commit 1ce8d81b437987ad39a806766f0c894111e1568d)
---
 ...lx-Add-another-fallback-library-name.patch | 30 +++++++++++++++++++
 libglvnd.spec                                 |  7 ++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 backport-0001-glx-Add-another-fallback-library-name.patch

diff --git a/backport-0001-glx-Add-another-fallback-library-name.patch b/backport-0001-glx-Add-another-fallback-library-name.patch
new file mode 100644
index 0000000..76f640c
--- /dev/null
+++ b/backport-0001-glx-Add-another-fallback-library-name.patch
@@ -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
+ 
\ No newline at end of file
diff --git a/libglvnd.spec b/libglvnd.spec
index 26ee507..261afe4 100644
--- a/libglvnd.spec
+++ b/libglvnd.spec
@@ -1,12 +1,14 @@
 Name:           libglvnd
 Version:        1.3.2
-Release:        1
+Release:        2
 Epoch:          1
 Summary:        The GL Vendor-Neutral Dispatch library
 License:        MIT
 URL:            https://github.com/NVIDIA/libglvnd
 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:  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
 
 %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
 - Type:enhancement
 - Id:NA
-- 
Gitee