libglvnd package update

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
5 years ago · 8001a91d25
2 changed files with 140 additions and 50 deletions
--- a/SOURCES/libglvnd-python3.patch
+++ b/SOURCES/libglvnd-python3.patch
@ -1,54 +1,64 @@
				@@ -1,54 +1,64 @@
-diff -up libglvnd-1.0.0/src/generate/eglFunctionList.py.jx libglvnd-1.0.0/src/generate/eglFunctionList.py
--- libglvnd-1.0.0/src/generate/eglFunctionList.py.jx	2017-11-02 12:58:38.000000000 -0400
-+++ libglvnd-1.0.0/src/generate/eglFunctionList.py	2018-03-15 12:43:19.113294070 -0400
+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/python
-+#!/usr/bin/python3
+-#!/usr/bin/env python
+#!/usr/bin/env python3
+ # encoding=utf-8
+ # Copyright © 2018-2019 Intel Corporation
 
- """
- Contains a list of EGL functions to generate dispatch functions for.
-diff -up libglvnd-1.0.0/src/generate/genCommon.py.jx libglvnd-1.0.0/src/generate/genCommon.py
--- libglvnd-1.0.0/src/generate/genCommon.py.jx	2017-11-02 12:58:38.000000000 -0400
-+++ libglvnd-1.0.0/src/generate/genCommon.py	2018-03-15 12:37:13.260268667 -0400
+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.0.0/src/generate/gen_egl_dispatch.py.jx libglvnd-1.0.0/src/generate/gen_egl_dispatch.py
--- libglvnd-1.0.0/src/generate/gen_egl_dispatch.py.jx	2017-11-02 12:58:38.000000000 -0400
-+++ libglvnd-1.0.0/src/generate/gen_egl_dispatch.py	2018-03-15 12:43:00.057032312 -0400
+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/python
-+#!/usr/bin/python3
+-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Generates dispatch functions for EGL.
-diff -up libglvnd-1.0.0/src/generate/gen_gldispatch_mapi.py.jx libglvnd-1.0.0/src/generate/gen_gldispatch_mapi.py
--- libglvnd-1.0.0/src/generate/gen_gldispatch_mapi.py.jx	2017-11-02 12:58:38.000000000 -0400
-+++ libglvnd-1.0.0/src/generate/gen_gldispatch_mapi.py	2018-03-15 12:37:13.283268982 -0400
+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.0.0/src/generate/gen_libgl_glxstubs.py.jx libglvnd-1.0.0/src/generate/gen_libgl_glxstubs.py
--- libglvnd-1.0.0/src/generate/gen_libgl_glxstubs.py.jx	2017-11-02 12:58:38.000000000 -0400
-+++ libglvnd-1.0.0/src/generate/gen_libgl_glxstubs.py	2018-03-15 12:37:10.684233282 -0400
+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.0.0/src/generate/gen_libOpenGL_exports.py.jx libglvnd-1.0.0/src/generate/gen_libOpenGL_exports.py
--- libglvnd-1.0.0/src/generate/gen_libOpenGL_exports.py.jx	2017-11-02 12:58:38.000000000 -0400
-+++ libglvnd-1.0.0/src/generate/gen_libOpenGL_exports.py	2018-03-15 12:37:13.308269324 -0400
+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
+ 
--- a/SPECS/libglvnd.spec
+++ b/SPECS/libglvnd.spec
@ -1,28 +1,28 @@
				@@ -1,28 +1,28 @@
-%global commit0 5baa1e5cfc422eb53e66f12ffb80c93d4a693cd9
-%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
+#global commit0 f92208be88dd06a70b6f79a1cb95571e2762a9ec
+#global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})

-#if 0%{?rhel} && 0%{?rhel} <= 7
-#global _without_mesa_glvnd_default 1
-#endif
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%global _without_mesa_glvnd_default 1
+%endif

 Name:           libglvnd
-Version:        1.0.1
-Release:        0.8%{?commit0:.git%{shortcommit0}}%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 # Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
 Epoch:          1
 Summary:        The GL Vendor-Neutral Dispatch library

 License:        MIT
 URL:            https://github.com/NVIDIA/libglvnd
-#Source0:        %%{url}/archive/v%%{version}/%%{name}-%%{version}.tar.gz
-Source0:        %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
+Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+#Source0:        %%{url}/archive/%%{commit0}.tar.gz#/%%{name}-%%{shortcommit0}.tar.gz
 Patch0:         libglvnd-python3.patch
 Patch1:         0001-glx-Add-another-fallback-library-name.patch

 BuildRequires:  libtool
 BuildRequires:  gcc
-BuildRequires:  python
-BuildRequires:  libxml2-python
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-libxml2
 BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
@ -62,6 +62,17 @@ Requires:       %{name}-gles%{?_isa} = %{epoch}:%{version}-%{release}
				@@ -62,6 +62,17 @@ 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}
+# Required by any glx.h users.
+Requires:       libX11-devel%{?_isa}
+# We might split into more sub-packages
+Obsoletes:      mesa-libGLES-devel < 19.3.0~rc1
+Provides:       mesa-libGLES-devel
+Provides:       mesa-libGLES-devel%{?_isa}
+Obsoletes:      mesa-khr-devel < 19.3.0~rc1
+Provides:       mesa-khr-devel
+Provides:       mesa-khr-devel%{?_isa}
+Provides:       libGLES-devel
+Provides:       libGLES-devel%{?_isa}

 %description    devel
 The %{name}-devel package contains libraries and header files for
@ -90,8 +101,9 @@ libOpenGL is the common dispatch interface for the workstation OpenGL API.
				@@ -90,8 +101,9 @@ libOpenGL is the common dispatch interface for the workstation OpenGL API.
 Summary:        GLES support for libglvnd
 Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %{!?_without_mesa_glvnd_default:
-# mesa is the default EGL implementation provider
-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}
 }
@ -137,6 +149,7 @@ autoreconf -vif
				@@ -137,6 +149,7 @@ autoreconf -vif
 %endif

 %build
+export PYTHON=%{__python3}
 #Prefer asm and tls for x86* and ppc64*
 #armhfp and aarch64 fallback to asm and tsd
 #Others arches fallback to pure-c and tls.
@ -171,28 +184,25 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
				@@ -171,28 +184,25 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
 %check
 export DO_X11_TESTS=1
 xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
-%ifarch s390 s390x ppc ppc64 ppc64le
+%ifarch s390x ppc64
    :
 %else
    (cat `find . -name test-suite.log` ; exit 1)
 %endif


-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 %files
 %doc README.md
 %dir %{_sysconfdir}/glvnd/
 %dir %{_datadir}/glvnd/
 %{_libdir}/libGLdispatch.so.0*

-%post opengl -p /sbin/ldconfig
-%postun opengl -p /sbin/ldconfig
+%ldconfig_scriptlets opengl
 %files opengl
 %{_libdir}/libOpenGL.so.0*

-%post gles -p /sbin/ldconfig
-%postun gles -p /sbin/ldconfig
+%ldconfig_scriptlets gles
 %files gles
 %if 0%{?_without_mesa_glvnd_default}
 %{_libdir}/%{name}/libGLES*.so.*
@ -200,8 +210,7 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
				@@ -200,8 +210,7 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
 %{_libdir}/libGLES*.so.*
 %endif

-%post glx -p /sbin/ldconfig
-%postun glx -p /sbin/ldconfig
+%ldconfig_scriptlets glx
 %files glx
 %if 0%{?_without_mesa_glvnd_default}
 %{_libdir}/%{name}/libGL.so.*
@ -211,8 +220,7 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
				@@ -211,8 +220,7 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
 %{_libdir}/libGLX.so.*
 %endif

-%post egl -p /sbin/ldconfig
-%postun egl -p /sbin/ldconfig
+%ldconfig_scriptlets egl
 %files egl
 %dir %{_sysconfdir}/glvnd/egl_vendor.d/
 %dir %{_datadir}/glvnd/egl_vendor.d/
@ -229,19 +237,91 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
				@@ -229,19 +237,91 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
 %files core-devel
 %dir %{_includedir}/glvnd/
 %{_includedir}/glvnd/*.h
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/libglvnd.pc

 %files devel
+%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
 %if 0%{?_without_mesa_glvnd_default}
 %{_libdir}/%{name}/lib*.so
 %endif
+%{_libdir}/pkgconfig/gl*.pc
+%{_libdir}/pkgconfig/egl.pc
+%{_libdir}/pkgconfig/opengl.pc


 %changelog
-* Tue Jul 24 2018 Dave Airlie <airlied@redhat.com> - 1.0.1-0.8.git5baa1e5
+* Mon Feb 24 2020 Nicolas Chauvet <kwizart@gmail.com> - 1:1.3.1-1
+- Update to 1.3.1
+
+* Wed Feb 19 2020 Kalev Lember <klember@redhat.com> - 1:1.3.0-1
+- Update to 1.3.0
+
+* Wed Feb 19 2020 Kalev Lember <klember@redhat.com> - 1:1.2.0-10
+- Bump mesa-libGLES obsoletes version as well
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 1:1.2.0-8
+- Bump mesa-libGLES-devel and mesa-khr-devel obsoletes versions
+
+* Sat Oct 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 1:1.2.0-7
+- Move from core to main
+
+* Fri Oct 25 2019 Peter Robinson <pbrobinson@gmail.com> - 1:1.2.0-6
+- Add %%{?_isa} too, just for fun!
+
+* Fri Oct 25 2019 Peter Robinson <pbrobinson@gmail.com> - 1:1.2.0-5
+- provides shouldn't have been versioned
+
+* Fri Oct 25 2019 Peter Robinson <pbrobinson@gmail.com> - 1:1.2.0-4
+- Also provide old libGLES-devel
+
+* Fri Oct 25 2019 Peter Robinson <pbrobinson@gmail.com> - 1:1.2.0-4
+- Obsolete/Provide the bits moved from mesa so builds don't break
+
+* Fri Oct 25 2019 Pete Walter <pwalter@fedoraproject.org> - 1:1.2.0-2
+- Sync headers with mesa
+
+* Thu Oct 24 2019 Leigh Scott <leigh123linux@gmail.com> - 1:1.2.0-1
+- libglvnd 1.2.0
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Mar 14 2019 Adam Jackson <ajax@redhat.com> - 1.1.1-4
+- libglvnd 1.1.1
+
+* Thu Feb 14 2019 Nicolas Chauvet <kwizart@gmail.com> - 1:1.1.0-4.gitf92208b
+- Update snapshot
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Aug 16 2018 Leigh Scott <leigh123linux@googlemail.com> - 1:1.1.0-2
+- Add upstream python3 PR
+
+* Thu Aug 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 1:1.1.0-1
+- Update to 1.1.0 release
+
+* Tue Jul 24 2018 Dave Airlie <airlied@redhat.com> - 1.0.1-0.9.git5baa1e5
 - rename fallback from fedora to system

+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.1-0.8.git5baa1e5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu Jun 14 2018 Adam Jackson <ajax@redhat.com> - 1.0.1-0.7.git5baa1e5
 - Add another fallback GLX library name