!32 添加fangtian 宏

From: @yanansong 
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
+ 

backport-libglvnd-python3.patch

@@ -0,0 +1,64 @@
+diff -up libglvnd-1.3.1/bin/symbols-check.py.orig libglvnd-1.3.1/bin/symbols-check.py
+--- libglvnd-1.3.1/bin/symbols-check.py.orig	2020-02-21 22:28:47.000000000 +0100
++++ libglvnd-1.3.1/bin/symbols-check.py	2020-02-28 11:38:55.126765978 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # encoding=utf-8
+ # Copyright © 2018-2019 Intel Corporation
+ 
+diff -up libglvnd-1.3.1/src/generate/eglFunctionList.py.orig libglvnd-1.3.1/src/generate/eglFunctionList.py
+diff -up libglvnd-1.3.1/src/generate/genCommon.py.orig libglvnd-1.3.1/src/generate/genCommon.py
+--- libglvnd-1.3.1/src/generate/genCommon.py.orig	2020-02-21 22:28:47.000000000 +0100
++++ libglvnd-1.3.1/src/generate/genCommon.py	2020-02-28 11:38:55.148766076 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # (C) Copyright 2015, NVIDIA CORPORATION.
+ # All Rights Reserved.
+diff -up libglvnd-1.3.1/src/generate/gen_egl_dispatch.py.orig libglvnd-1.3.1/src/generate/gen_egl_dispatch.py
+--- libglvnd-1.3.1/src/generate/gen_egl_dispatch.py.orig	2020-02-21 22:28:47.000000000 +0100
++++ libglvnd-1.3.1/src/generate/gen_egl_dispatch.py	2020-02-28 11:38:55.155766107 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ """
+ Generates dispatch functions for EGL.
+diff -up libglvnd-1.3.1/src/generate/gen_gldispatch_mapi.py.orig libglvnd-1.3.1/src/generate/gen_gldispatch_mapi.py
+--- libglvnd-1.3.1/src/generate/gen_gldispatch_mapi.py.orig	2020-02-21 22:28:47.000000000 +0100
++++ libglvnd-1.3.1/src/generate/gen_gldispatch_mapi.py	2020-02-28 11:38:55.150766085 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Copyright (C) 2010 LunarG Inc.
+ # (C) Copyright 2015, NVIDIA CORPORATION.
+diff -up libglvnd-1.3.1/src/generate/gen_libgl_glxstubs.py.orig libglvnd-1.3.1/src/generate/gen_libgl_glxstubs.py
+--- libglvnd-1.3.1/src/generate/gen_libgl_glxstubs.py.orig	2020-02-21 22:28:47.000000000 +0100
++++ libglvnd-1.3.1/src/generate/gen_libgl_glxstubs.py	2020-02-28 11:38:55.152766094 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # (C) Copyright 2015, NVIDIA CORPORATION.
+ # All Rights Reserved.
+diff -up libglvnd-1.3.1/src/generate/gen_libOpenGL_exports.py.orig libglvnd-1.3.1/src/generate/gen_libOpenGL_exports.py
+--- libglvnd-1.3.1/src/generate/gen_libOpenGL_exports.py.orig	2020-02-21 22:28:47.000000000 +0100
++++ libglvnd-1.3.1/src/generate/gen_libOpenGL_exports.py	2020-02-28 11:38:55.160766129 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # (C) Copyright 2015, NVIDIA CORPORATION.
+ # All Rights Reserved.
+diff -up libglvnd-1.3.1/src/GLX/gen_glx_stubs.py.orig libglvnd-1.3.1/src/GLX/gen_glx_stubs.py
+--- libglvnd-1.3.1/src/GLX/gen_glx_stubs.py.orig	2020-02-21 22:28:47.000000000 +0100
++++ libglvnd-1.3.1/src/GLX/gen_glx_stubs.py	2020-02-28 11:38:55.168766164 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ import sys
+ 

export_fangtian_extra_ext_header.patch

@@ -0,0 +1,28 @@
+diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h
+index 94dd038..a3a4e3c 100644
+--- a/include/EGL/eglext.h
++++ b/include/EGL/eglext.h
+@@ -276,6 +276,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSetDamageRegionKHR (EGLDisplay dpy, EGLSurface
+ #define EGL_PLATFORM_GBM_KHR              0x31D7
+ #endif /* EGL_KHR_platform_gbm */
+ 
++#ifndef EGL_KHR_platform_ohos
++#define EGL_KHR_platform_ohos 1
++#define EGL_PLATFORM_OHOS_KHR             0x34E0
++#endif /* EGL_KHR_platform_ohos */
++
+ #ifndef EGL_KHR_platform_wayland
+ #define EGL_KHR_platform_wayland 1
+ #define EGL_PLATFORM_WAYLAND_KHR          0x31D8
+@@ -1402,6 +1407,11 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void);
+ #define EGL_TRIPLE_BUFFER_NV              0x3230
+ #endif /* EGL_NV_triple_buffer */
+ 
++#ifndef EGL_OHOS_image_native_buffer
++#define EGL_OHOS_image_native_buffer 1
++#define EGL_NATIVE_BUFFER_OHOS            0x34E1
++#endif /* EGL_OHOS_image_native_buffer */
++
+ #ifndef EGL_TIZEN_image_native_buffer
+ #define EGL_TIZEN_image_native_buffer 1
+ #define EGL_NATIVE_BUFFER_TIZEN           0x32A0

libglvnd.spec

@@ -1,27 +1,18 @@
 Name:           libglvnd
-Version:        1.3.2
-Release:        1
+Version:        1.3.4
+Release:        4
 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-libglvnd-python3.patch
+Patch6001:      backport-0001-glx-Add-another-fallback-library-name.patch
+Patch6002:      export_fangtian_extra_ext_header.patch
+
 BuildRequires:  libtool xorg-x11-server-Xvfb pkgconfig(xext) pkgconfig(x11)
-BuildRequires:  gcc python3-rpm-macros python3-libxml2 pkgconfig(glproto)
-
-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}-gles %{name}-glx
-Provides:       %{name}-glx%{?_isa} %{name}-opengl %{name}-opengl%{?_isa} libGLES libGLES%{?_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}
+BuildRequires:  gcc python3-rpm-macros python3-libxml2 pkgconfig(glproto) make
 
 %description
 libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors.
@@ -31,13 +22,16 @@ which vendor to dispatch each API call to at runtime.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-Provides:       libglvnd-core-devel = %{epoch}:%{version}-%{release}
-Obsoletes:      libglvnd-core-devel < %{epoch}:%{version}-%{release}
+Requires:       %{name}-opengl%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-gles%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-glx%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-egl%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-core-devel%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:	libX11-devel%{?_isa}
-Obsoletes:	mesa-libGLES-devel < 19.3.0~rc1
+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 < 19.3.0~rc1
+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}
@@ -47,19 +41,70 @@ Provides:	libGLES-devel%{?_isa} = %{epoch}:%{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%package        core-devel
+Summary:        Core development files for %{name}
+
+%description core-devel
+The %{name}-core-devel package is a bootstrap trick for Mesa, which wants
+to build against the %{name} headers but does not link against any of
+its libraries (and, initially, has file conflicts with them). If you are
+not Mesa you almost certainly want %{name}-devel instead.
+
+%package        opengl
+Summary:        OpenGL support for libglvnd
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+ 
+%description    opengl
+libOpenGL is the common dispatch interface for the workstation OpenGL API.
+
+%package        gles
+Summary:        GLES support for libglvnd
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       mesa-libEGL%{?_isa} >= 13.0.4-1
+Obsoletes:      mesa-libGLES < 19.3.0~rc1
+Provides:       mesa-libGLES
+Provides:       mesa-libGLES%{?_isa}
+Provides:       libGLES
+Provides:       libGLES%{?_isa}
+ 
+%description    gles
+libGLESv[12] are the common dispatch interface for the GLES API.
+ 
+%package        egl
+Summary:        EGL support for libglvnd
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       mesa-libEGL%{?_isa} >= 13.0.4-1
+Provides:       libEGL
+Provides:       libEGL%{?_isa}
+ 
+%description    egl
+libEGL are the common dispatch interface for the EGL API.
+ 
+%package        glx
+Summary:        GLX support for libglvnd
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       mesa-libGL%{?_isa} >= 13.0.4-1
+Provides:       libGL
+Provides:       libGL%{?_isa}
+ 
+%description    glx
+libGL and libGLX are the common dispatch interface for the GLX API.
 %prep
 %autosetup -n %{name}-%{version} -p1
 autoreconf -vif
 
 %build
 export PYTHON=%{__python3}
-%configure --enable-asm --enable-tls
+%configure \
+  --disable-static \
+  --enable-asm \
+  --enable-tls
 
 %make_build V=1
 
 %install
 %make_install
-%delete_la
+%delete_la	
 
 mkdir -p %{buildroot}%{_sysconfdir}/glvnd/egl_vendor.d/
 mkdir -p %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
@@ -75,23 +120,76 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || (cat `find . -name test-
 %files
 %defattr(-,root,root)
 %doc README.md
-%{_libdir}/*.so.*
+%dir %{_sysconfdir}/glvnd/
+%dir %{_datadir}/glvnd/
+%{_libdir}/libGLdispatch.so.0*
+%ldconfig_scriptlets opengl
+%files opengl
+%{_libdir}/libOpenGL.so.0*
+ 
+%ldconfig_scriptlets gles
+%files gles
+%{_libdir}/libGLES*.so.*
+ 
+%ldconfig_scriptlets glx
+%files glx
+%{_libdir}/libGL.so.*
+%{_libdir}/libGLX.so.*
+ 
+%ldconfig_scriptlets egl
+%files egl
 %dir %{_sysconfdir}/glvnd/egl_vendor.d/
-%dir %{_sysconfdir}/egl/egl_external_platform.d/
 %dir %{_datadir}/glvnd/egl_vendor.d/
+%dir %{_sysconfdir}/egl/
+%dir %{_sysconfdir}/egl/egl_external_platform.d/
+%dir %{_datadir}/egl/
 %dir %{_datadir}/egl/egl_external_platform.d/
+%{_libdir}/libEGL*.so.*
+ 
+%files core-devel
+%dir %{_includedir}/glvnd/
+%{_includedir}/glvnd/*.h
+%{_libdir}/pkgconfig/libglvnd.pc
 
 %files devel
 %defattr(-,root,root)
+%dir %{_includedir}/EGL/
+%dir %{_includedir}/GL/
+%dir %{_includedir}/GLES/
+%dir %{_includedir}/GLES2/
+%dir %{_includedir}/GLES3/
+%dir %{_includedir}/KHR/
+%{_includedir}/EGL/*.h
+%{_includedir}/GL/*.h
+%{_includedir}/GLES/*.h
+%{_includedir}/GLES2/*.h
+%{_includedir}/GLES3/*.h
+%{_includedir}/KHR/*.h
 %{_libdir}/lib*.so
-%{_libdir}/pkgconfig/libglvnd.pc
-%{_includedir}/glvnd/*
-%exclude %{_includedir}/*G*
-%exclude %{_includedir}/KHR
-%exclude %{_libdir}/pkgconfig/g*.pc
-%exclude %{_libdir}/pkgconfig/*gl.pc
-
+%{_libdir}/pkgconfig/gl*.pc
+%{_libdir}/pkgconfig/egl.pc
+%{_libdir}/pkgconfig/opengl.pc
+ 
 %changelog
+* Mon Oct 30 2023 yanansong <songyanan5@huawei.com> - 1:1.3.4-4
+- export fangtian macro
+
+* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 1:1.3.4-3
+- rebuild for next release
+
+* Fri Dec 17 2021 hanhui <hanhui15@huawei.com> - 1:1.3.4-2
+- Remove unnecessary installation dependencies
+
+* Wed Dec 1 2021 xingxing<xingxing9@huawei.com> - 1:1.3.4-1
+- Update to 1.3.4
+- split glx egl gles package
+
+* Mon Sep 13 2021 wangkerong <wangkerong@huawei.com> - 1:1.3.2-3
+- split opengl core-devel subpackages from devel package
+
+* Mon Aug 03 2020 orange-snn <songnannan2@huawei.cpm> - 1:1.3.2-2
+- add mesa-libGLES-devel and mesa-khr-devel in provides
+
 * Wed Jul 29 2020 openEuler Buildteam <buildteam@openeuler.org> - 1:1.3.2-1
 - Type:enhancement
 - Id:NA