Compare commits

..

No commits in common. "95366061dbcc4f786ef1d5df8b61c540a4a8994a" and "e89474e50bcb2f63577f036bb3ab056e323e5bc8" have entirely different histories.

5 changed files with 20 additions and 27 deletions

View File

@ -6,10 +6,6 @@ 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>
Reference:https://src.fedoraproject.org/rpms/libglvnd/blob/rawhide/f/0001-glx-Add-another-fallback-library-name.patch
Conflict:NA
---
src/GLX/libglxmapping.c | 4 ++++
1 file changed, 4 insertions(+)

View File

@ -1,3 +1,12 @@
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

BIN
libglvnd-1.3.4.tar.gz Normal file

Binary file not shown.

View File

@ -1,17 +1,20 @@
Name: libglvnd
Version: 1.7.0
Release: 2
Version: 1.3.4
Release: 1
Epoch: 1
Summary: The GL Vendor-Neutral Dispatch library
License: MIT
URL: https://github.com/NVIDIA/libglvnd
Source0: https://github.com/NVIDIA/libglvnd/archive/refs/tags/v%{version}.tar.gz
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
BuildRequires: libtool xorg-x11-server-Xvfb pkgconfig(xext) pkgconfig(x11)
BuildRequires: gcc python3-rpm-macros python3-libxml2 pkgconfig(glproto) make
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
%description
libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors.
@ -20,12 +23,12 @@ 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}-opengl%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: libglvnd-core-devel = %{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}
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}
@ -170,22 +173,7 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || (cat `find . -name test-
%{_libdir}/pkgconfig/opengl.pc
%changelog
* Thu Sep 26 2024 zhangpan <zhangpan103@h-partners.com> - 1:1.7.0-2
- backport patch from upstream
* Thu Dec 28 2023 Paul Thomas <paulthomas100199@gmail.com> - 1:1.7.0-1
- update to version 1.7.0
* Sat Jul 22 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1:1.6.0-1
- update to 1.6.0
* 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
* Wed Dec 1 2021 Leigh xingxing<xingxing9@huawei.com> - 1:1.3.4-1
- Update to 1.3.4
- split glx egl gles package

Binary file not shown.