|
|
|
|
@ -1,52 +1,35 @@
|
|
|
|
|
#global commit0 5baa1e5cfc422eb53e66f12ffb80c93d4a693cd9
|
|
|
|
|
#global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
|
|
|
|
|
%global commit0 faa23f21fc677af5792825dc30cb1ccef4bf33a6
|
|
|
|
|
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel} && 0%{?rhel} <= 7
|
|
|
|
|
%global _without_mesa_glvnd_default 1
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
Name: libglvnd
|
|
|
|
|
Version: 1.3.4
|
|
|
|
|
Release: 2%{?commit0:.git%{shortcommit0}}%{?dist}
|
|
|
|
|
Version: 1.7.0
|
|
|
|
|
Release: 7%{?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
|
|
|
|
|
Patch0: libglvnd-python3.patch
|
|
|
|
|
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://gitlab.freedesktop.org/glvnd/libglvnd
|
|
|
|
|
Source0: %{url}/-/archive/v%{version}/%{name}-%{version}.tar.gz
|
|
|
|
|
Patch1: 0001-glx-Add-another-fallback-library-name.patch
|
|
|
|
|
|
|
|
|
|
BuildRequires: make
|
|
|
|
|
BuildRequires: libtool
|
|
|
|
|
BuildRequires: gcc
|
|
|
|
|
BuildRequires: python3-devel
|
|
|
|
|
BuildRequires: python3-rpm-macros
|
|
|
|
|
BuildRequires: python3-libxml2
|
|
|
|
|
BuildRequires: pkgconfig(glproto)
|
|
|
|
|
BuildRequires: pkgconfig(x11)
|
|
|
|
|
BuildRequires: pkgconfig(xext)
|
|
|
|
|
BuildRequires: xorg-x11-server-Xvfb
|
|
|
|
|
|
|
|
|
|
%if (0%{?rhel} && 0%{?rhel} <= 6)
|
|
|
|
|
BuildRequires: autoconf268
|
|
|
|
|
%endif
|
|
|
|
|
# X11 testing
|
|
|
|
|
BuildRequires: mesa-dri-drivers
|
|
|
|
|
BuildRequires: mutter
|
|
|
|
|
BuildRequires: xwayland-run
|
|
|
|
|
|
|
|
|
|
%{?_without_mesa_glvnd_default:
|
|
|
|
|
%if (0%{?rhel} && 0%{?rhel} <= 6)
|
|
|
|
|
|
|
|
|
|
%{?filter_setup:
|
|
|
|
|
%filter_provides_in %{_libdir}/%{name}
|
|
|
|
|
%filter_requires_in %{_libdir}/%{name}
|
|
|
|
|
%filter_setup
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
%else
|
|
|
|
|
|
|
|
|
|
%global __provides_exclude_from %{_libdir}/%{name}
|
|
|
|
|
%global __requires_exclude_from %{_libdir}/%{name}
|
|
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
@ -73,10 +56,6 @@ 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}
|
|
|
|
|
Conflicts: mesa-libEGL-devel < 19.3.0-rc1
|
|
|
|
|
Conflicts: mesa-libGL-devel < 19.3.0-rc1
|
|
|
|
|
Conflicts: mesa-libGLES-devel < 19.3.0-rc1
|
|
|
|
|
Conflicts: mesa-khr-devel < 19.3.0-rc1
|
|
|
|
|
|
|
|
|
|
%description devel
|
|
|
|
|
The %{name}-devel package contains libraries and header files for
|
|
|
|
|
@ -107,7 +86,7 @@ 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.2.2-2
|
|
|
|
|
Obsoletes: mesa-libGLES < 19.3.0~rc1
|
|
|
|
|
Provides: mesa-libGLES
|
|
|
|
|
Provides: mesa-libGLES%{?_isa}
|
|
|
|
|
Provides: libGLES
|
|
|
|
|
@ -147,14 +126,11 @@ libGL and libGLX are the common dispatch interface for the GLX API.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%autosetup -p1 -n %{name}-%{?commit0}%{?!commit0:%{version}}
|
|
|
|
|
%if 0%{?rhel} == 6
|
|
|
|
|
autoreconf268 -vif
|
|
|
|
|
%else
|
|
|
|
|
%autosetup -p1 -n %{name}-v%{version}-%{?commit0}
|
|
|
|
|
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.
|
|
|
|
|
@ -188,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
|
|
|
|
|
@ -267,40 +243,138 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Wed Feb 21 2024 José Expósito <jexposit@redhat.com> - 1.3.4-2
|
|
|
|
|
- Fix BuildRequires for python3-devel
|
|
|
|
|
Resolves: RHEL-2239
|
|
|
|
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:1.7.0-7
|
|
|
|
|
- Bump release for October 2024 mass rebuild:
|
|
|
|
|
Resolves: RHEL-64018
|
|
|
|
|
|
|
|
|
|
* Wed Nov 17 2021 Dave Airlie <airlied@redhat.com> - 1.3.4-1
|
|
|
|
|
- Update to 1.3.4 release
|
|
|
|
|
* Wed Aug 07 2024 José Expósito <jexposit@redhat.com> - 1:1.7.0-6
|
|
|
|
|
- Move away from xvfb-run
|
|
|
|
|
|
|
|
|
|
* Mon Nov 16 2020 Dave Airlie <airlied@redhat.com> - 1.3.2-1
|
|
|
|
|
- Update to 1.3.2 release
|
|
|
|
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.7.0-5
|
|
|
|
|
- Bump release for June 2024 mass rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Nov 25 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-6
|
|
|
|
|
- version provides
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* Sat Nov 23 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-5
|
|
|
|
|
- Add another conflict
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* Sat Nov 23 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-4
|
|
|
|
|
- conflict
|
|
|
|
|
* Fri Sep 15 2023 Dave Airlie <airlied@redhat.com> - 1:1.7.0-2
|
|
|
|
|
- SPDX license update
|
|
|
|
|
|
|
|
|
|
* Fri Nov 22 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-3
|
|
|
|
|
- more conflicts
|
|
|
|
|
* Thu Sep 14 2023 Nicolas Chauvet <kwizart@gmail.com> - 1:1.7.0-1
|
|
|
|
|
- Update to 1.7.0
|
|
|
|
|
|
|
|
|
|
* Fri Nov 22 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-2
|
|
|
|
|
- add conflicts
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* Fri Nov 22 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-1
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.2-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Jun 29 2020 Nicolas Chauvet <kwizart@gmail.com> - 1:1.3.2-1
|
|
|
|
|
- Update to 1.3.2
|
|
|
|
|
|
|
|
|
|
* Fri May 08 2020 Nicolas Chauvet <kwizart@gmail.com> - 1:1.3.1-2
|
|
|
|
|
- Forward few patches from rhel
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* Tue Aug 14 2018 Petr Viktorin <pviktori@redhat.com> - 1.0.1-0.9.git5baa1e5
|
|
|
|
|
- Fix BuildRequires for /usr/bin/python3
|
|
|
|
|
- Resolves: #1615543
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* Tue Jul 24 2018 Dave Airlie <airlied@redhat.com> - 1.0.1-0.8.git5baa1e5
|
|
|
|
|
- rename fallback to system
|
|
|
|
|
* 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
|
