@ -1,9 +1,9 @@
@@ -1,9 +1,9 @@
#global commit0 f92208be88dd06a70b6f79a1cb95571e2762a9ec
#global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
%global _without_mesa_glvnd_default 0
%global _without_mesa_glvnd_default 1
Name: libglvnd
Version: 1.3.1
Version: 1.3.2
Release: 1%{?dist}
# Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
Epoch: 1
@ -53,7 +53,6 @@ Provides: mesa-khr-devel
@@ -53,7 +53,6 @@ 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
developing applications that use %{name}.
@ -61,7 +60,6 @@ developing applications that use %{name}.
@@ -61,7 +60,6 @@ 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
@ -72,7 +70,6 @@ not Mesa you almost certainly want %{name}-devel instead.
@@ -72,7 +70,6 @@ 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.
@ -80,14 +77,11 @@ libOpenGL is the common dispatch interface for the workstation OpenGL API.
@@ -80,14 +77,11 @@ libOpenGL is the common dispatch interface for the workstation OpenGL API.
%package gles
Summary: GLES support for libglvnd
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
%{!?_without_mesa_glvnd_default:
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.
@ -95,13 +89,9 @@ libGLESv[12] are the common dispatch interface for the GLES API.
@@ -95,13 +89,9 @@ libGLESv[12] are the common dispatch interface for the GLES API.
%package egl
Summary: EGL 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
Provides: libEGL
Provides: libEGL%{?_isa}
}
%description egl
libEGL are the common dispatch interface for the EGL API.
@ -109,13 +99,9 @@ libEGL are the common dispatch interface for the EGL API.
@@ -109,13 +99,9 @@ libEGL are the common dispatch interface for the EGL API.
%package glx
Summary: GLX support for libglvnd
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
%{!?_without_mesa_glvnd_default:
# mesa is the default GL implementation provider
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.
@ -176,23 +162,14 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
@@ -176,23 +162,14 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
%post gles -p /sbin/ldconfig
%files gles
%if 0%{?_without_mesa_glvnd_default}
%{_libdir}/%{name}/libGLES*.so.*
%else
%{_libdir}/libGLES*.so.*
%endif
%pre glx -p /sbin/ldconfig
%post glx -p /sbin/ldconfig
%files glx
%if 0%{?_without_mesa_glvnd_default}
%{_libdir}/%{name}/libGL.so.*
%{_libdir}/%{name}/libGLX.so.*
%else
%{_libdir}/libGL.so.*
%{_libdir}/libGLX.so.*
%endif
%pre egl -p /sbin/ldconfig
%post egl -p /sbin/ldconfig
@ -204,11 +181,7 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
@@ -204,11 +181,7 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
%dir %{_sysconfdir}/egl/egl_external_platform.d/
%dir %{_datadir}/egl/
%dir %{_datadir}/egl/egl_external_platform.d/
%if 0%{?_without_mesa_glvnd_default}
%{_libdir}/%{name}/libEGL*.so.*
%else
%{_libdir}/libEGL*.so.*
%endif
%files core-devel
%dir %{_includedir}/glvnd/
@ -229,9 +202,6 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
@@ -229,9 +202,6 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
%{_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