!38 [sync] PR-37: backport patch from upstream

From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

backport-0001-glx-Add-another-fallback-library-name.patch

@@ -0,0 +1,34 @@
+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>
+
+Reference:https://src.fedoraproject.org/rpms/libglvnd/blob/rawhide/f/0001-glx-Add-another-fallback-library-name.patch
+Conflict:NA
+
+---
+ 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
+ 

libglvnd.spec

@@ -1,6 +1,6 @@
 Name:           libglvnd
 Version:        1.7.0
-Release:        1
+Release:        2
 Epoch:          1
 Summary:        The GL Vendor-Neutral Dispatch library
 License:        MIT
@@ -8,6 +8,7 @@ URL:            https://github.com/NVIDIA/libglvnd
 Source0:        https://github.com/NVIDIA/libglvnd/archive/refs/tags/v%{version}.tar.gz
 
 Patch6000:      backport-libglvnd-python3.patch
+Patch6001:      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) make
@@ -169,6 +170,9 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || (cat `find . -name test-
 %{_libdir}/pkgconfig/opengl.pc
  
 %changelog
+* Thu Sep 26 2024 zhangpan <zhangpan103@h-partners.com> - 1:1.7.0-2
+- backport patch from upstream
+
 * Thu Dec 28 2023 Paul Thomas <paulthomas100199@gmail.com> - 1:1.7.0-1
 - update to version 1.7.0