Add mesa-khr-devel subpackage to hold <KHR/khrplatform.h>, and make

mesa-lib{GL,GLES,EGL}-devel Require it.
This commit is contained in:
Adam Jackson 2018-12-11 12:19:41 -05:00
parent f5e5b5f178
commit 90e764ce2f

View file

@ -43,7 +43,7 @@ Name: mesa
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
%global ver 18.2.6 %global ver 18.2.6
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 2%{?dist} Release: 3%{?dist}
License: MIT License: MIT
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -141,6 +141,12 @@ Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}:}%{version}-%{release}
%description filesystem %description filesystem
%{summary}. %{summary}.
%package khr-devel
Summary: Mesa Khronos development headers
%description khr-devel
%{summary}.
%package libGL %package libGL
Summary: Mesa libGL runtime libraries Summary: Mesa libGL runtime libraries
Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@ -153,6 +159,7 @@ Requires: libglvnd-glx%{?_isa} >= 1:1.0.1-0.9
Summary: Mesa libGL development package Summary: Mesa libGL development package
Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libglvnd-devel%{?_isa} Requires: libglvnd-devel%{?_isa}
Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: libGL-devel Provides: libGL-devel
Provides: libGL-devel%{?_isa} Provides: libGL-devel%{?_isa}
@ -170,6 +177,7 @@ Requires: libglvnd-egl%{?_isa}
Summary: Mesa libEGL development package Summary: Mesa libEGL development package
Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libglvnd-devel%{?_isa} Requires: libglvnd-devel%{?_isa}
Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: libEGL-devel Provides: libEGL-devel
Provides: libEGL-devel%{?_isa} Provides: libEGL-devel%{?_isa}
@ -188,6 +196,7 @@ Requires: libglvnd-gles%{?_isa}
Summary: Mesa libGLES development package Summary: Mesa libGLES development package
Requires: %{name}-libGLES%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libGLES%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libglvnd-devel%{?_isa} Requires: libglvnd-devel%{?_isa}
Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: libGLES-devel Provides: libGLES-devel
Provides: libGLES-devel%{?_isa} Provides: libGLES-devel%{?_isa}
@ -435,6 +444,10 @@ popd
%endif %endif
%endif %endif
%files khr-devel
%dir %{_includedir}/KHR
%{_includedir}/KHR/khrplatform.h
%files libGL %files libGL
%{_libdir}/libGLX_mesa.so.0* %{_libdir}/libGLX_mesa.so.0*
%{_libdir}/libGLX_system.so.0* %{_libdir}/libGLX_system.so.0*
@ -462,8 +475,6 @@ popd
%{_includedir}/EGL/eglmesaext.h %{_includedir}/EGL/eglmesaext.h
%{_includedir}/EGL/eglplatform.h %{_includedir}/EGL/eglplatform.h
%{_includedir}/EGL/eglextchromium.h %{_includedir}/EGL/eglextchromium.h
%dir %{_includedir}/KHR
%{_includedir}/KHR/khrplatform.h
%{_libdir}/pkgconfig/egl.pc %{_libdir}/pkgconfig/egl.pc
%files libGLES %files libGLES
@ -622,6 +633,10 @@ popd
%{_includedir}/vulkan/ %{_includedir}/vulkan/
%changelog %changelog
* Tue Dec 11 2018 Adam Jackson <ajax@redhat.com> - 18.2.6-3
- Add mesa-khr-devel subpackage to hold <KHR/khrplatform.h>, and make
mesa-lib{GL,GLES,EGL}-devel Require it.
* Tue Dec 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.2.6-2 * Tue Dec 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 18.2.6-2
- Backport patch to fix totem - Backport patch to fix totem
- Remove GCC workaround - Remove GCC workaround