!24 [sync] PR-22: Define a fallback vendor name

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

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
+ 

libglvnd.spec

@@ -1,12 +1,14 @@
 Name:           libglvnd
-Version:        1.2.0
-Release:        1
+Version:        1.3.2
+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)
 
@@ -14,11 +16,14 @@ Requires:       mesa-libEGL%{?_isa} >= 13.0.4-1
 Requires:       mesa-libGL%{?_isa} >= 13.0.4-1
 
 Provides:       %{name}-egl %{name}-egl%{?_isa} %{name}-gles %{name}-gles%{?_isa} %{name}-glx
-Obsoletes: 	%{name}-egl %{name}-egl%{?_isa} %{name}-gles %{name}-gles%{?_isa} %{name}-glx
+Obsoletes: 	%{name}-egl %{name}-gles %{name}-glx
 Provides:       %{name}-glx%{?_isa} %{name}-opengl %{name}-opengl%{?_isa} libGLES libGLES%{?_isa}
-Obsoletes:      %{name}-glx%{?_isa} %{name}-opengl %{name}-opengl%{?_isa} libGLES libGLES%{?_isa}
-Provides:       libEG  libEGL%{?_isa} libEGL libEGL%{?_isa} libGL libGL%{?_isa}
-Obsoletes:      libEG  libEGL%{?_isa} libEGL libEGL%{?_isa} libGL libGL%{?_isa}
+Obsoletes:      %{name}-opengl libGLES 
+Provides:       libEG  libEGL  libEGL%{?_isa} libGL libGL%{?_isa}
+Obsoletes:      libEG  libEGL libGL 
+Obsoletes:	mesa-libGLES < 19.3.0~rc1
+Provides:	mesa-libGLES
+Provides:	mesa-libGLES%{?_isa}
 
 %description
 libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors.
@@ -27,9 +32,18 @@ which vendor to dispatch each API call to at runtime.
 
 %package        devel
 Summary:        Development files for %{name}
-Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 Provides:       libglvnd-core-devel = %{epoch}:%{version}-%{release}
 Obsoletes:      libglvnd-core-devel < %{epoch}:%{version}-%{release}
+Requires:	libX11-devel%{?_isa}
+Obsoletes:	mesa-libGLES-devel < %{epoch}:%{version}-%{release}
+Provides:	mesa-libGLES-devel = %{epoch}:%{version}-%{release}
+Provides:	mesa-libGLES-devel%{?_isa} = %{epoch}:%{version}-%{release}
+Obsoletes:	mesa-khr-devel < %{epoch}:%{version}-%{release}
+Provides:	mesa-khr-devel = %{epoch}:%{version}-%{release}
+Provides:	mesa-khr-devel%{?_isa} = %{epoch}:%{version}-%{release}
+Provides:	libGLES-devel = %{epoch}:%{version}-%{release}
+Provides:	libGLES-devel%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -72,10 +86,38 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || (cat `find . -name test-
 %files devel
 %defattr(-,root,root)
 %{_libdir}/lib*.so
-%{_libdir}/pkgconfig/*.pc
-%{_includedir}/*
+%{_libdir}/pkgconfig/libglvnd.pc
+%{_includedir}/glvnd/*
+%{_includedir}/*G*
+%{_includedir}/KHR
+%{_libdir}/pkgconfig/g*.pc
+%{_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
+- SUG:NA
+- DESC:upgrade to 1.3.2
+
+* Wed Jun 03 2020 songnannan <songnannan2@huawei.com> - 1:1.2.0-4
+- rebuild for mesa
+
+* Tue Jan 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:1.2.0-3
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC:delete the arch in obsoletes
+
+* Tue Jan 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:1.2.0-2
+- Type:enhancement
+- Id:NA
+- SUG:NA
+- DESC:optimization the spec
+
 * Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:1.2.0-1
 - Type:bugfix
 - Id:NA