.gitignore

@@ -1 +1 @@
-SOURCES/libglvnd-1.3.4.tar.gz
+SOURCES/libglvnd-1.7.0.tar.gz

.libglvnd.metadata

@@ -1 +1 @@
-876cde82fa46b891fdb4ea3e58a4adfc7fffea25 SOURCES/libglvnd-1.3.4.tar.gz
+614fa576c0238e7d432dbc793926290a1efba538 SOURCES/libglvnd-1.7.0.tar.gz

SOURCES/libglvnd-python3.patch

@@ -1,64 +0,0 @@
-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
- 

SPECS/libglvnd.spec

@@ -1,19 +1,17 @@
-#global commit0 f92208be88dd06a70b6f79a1cb95571e2762a9ec
+%global commit0 faa23f21fc677af5792825dc30cb1ccef4bf33a6
-#global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 
 Name:           libglvnd
-Version:        1.3.4
+Version:        1.7.0
-Release:        1%{?dist}
+Release:        6%{?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
+License:        MIT-feh AND MIT-Modern-Variant AND BSD-1-Clause AND BSD-3-Clause AND GPL-3.0-or-later WITH Autoconf-exception-macro
-URL:            https://github.com/NVIDIA/libglvnd
+URL:            https://gitlab.freedesktop.org/glvnd/libglvnd
-Source0:        %{url}/archive/v%{version}/%{name}-%{version}.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: make
@@ -24,7 +22,10 @@ BuildRequires:  python3-libxml2
 BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
-BuildRequires:  xorg-x11-server-Xvfb
+# X11 testing
+BuildRequires:  mesa-dri-drivers
+BuildRequires:  mutter
+BuildRequires:  xwayland-run
 
 %{?_without_mesa_glvnd_default:
 %global __provides_exclude_from %{_libdir}/%{name}
@@ -125,7 +126,7 @@ libGL and libGLX are the common dispatch interface for the GLX API.
 
 
 %prep
-%autosetup -p1 -n %{name}-%{?commit0}%{?!commit0:%{version}}
+%autosetup -p1 -n %{name}-v%{version}-%{?commit0}
 autoreconf -vif
 
 %build
@@ -163,7 +164,7 @@ 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 || \
+xwfb-run -c mutter make check V=1 || \
 %ifarch s390x ppc64
     :
 %else
@@ -242,15 +243,65 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
 
 
 %changelog
-* Mon Nov 22 2021 Dave Airlie <airlied@redhat.com> - 1:1.3.4-1
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:1.7.0-6
-- Update to 1.3.4 for nvidia drivers
+- Rebuilt for MSVSphere 10
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.3.2-5
+* Wed Aug 07 2024 José Expósito <jexposit@redhat.com> - 1:1.7.0-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Move away from xvfb-run
-  Related: rhbz#1991688
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.3.2-4
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.7.0-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 15 2023 Dave Airlie <airlied@redhat.com> - 1:1.7.0-2
+- SPDX license update
+
+* Thu Sep 14 2023 Nicolas Chauvet <kwizart@gmail.com> - 1:1.7.0-1
+- Update to 1.7.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Nov 22 2022 Nicolas Chauvet <kwizart@gmail.com> - 1:1.6.0-1
+- Update to 1.6.0
+
+* Tue Aug 23 2022 Nicolas Chauvet <kwizart@gmail.com> - 1:1.5.0-1
+- Update to 1.5.0
+
+* Fri Aug 12 2022 Nicolas Chauvet <kwizart@gmail.com> - 1:1.4.0-4
+- Backport patch for BTI enabled aarch64 hw - rhbz#2111900
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Dec 20 2021 Nicolas Chauvet <kwizart@gmail.com> - 1:1.4.0-1
+- Update to 1.4.0
+
+* Sun Oct 24 2021 Leigh Scott <leigh123linux@gmail.com> - 1:1.3.4-2
+- Rebuilt
+
+* Wed Aug 25 2021 Nicolas Chauvet <kwizart@gmail.com> - 1:1.3.4-1
+- Update to 1.3.4
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat May 01 2021 Nicolas Chauvet <kwizart@gmail.com> - 1:1.3.3-1
+- Update to 1.3.3
+
+* Mon Apr 19 2021 Aleksei Bavshin <alebastr@fedoraproject.org> - 1:1.3.2-4
+- Add upstream patch to fix egl call failures with nvidia libs installed
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild