From 1204255bc50e717b390e98a7eb8bef7d7e129845 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sun, 12 Mar 2023 11:36:48 +0800 Subject: [PATCH] Add versioned requirement for opencl --- mesa.spec | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/mesa.spec b/mesa.spec index 9bb0750..ffcb1c6 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global with_hardware 1 %global with_vulkan_hw 1 @@ -39,7 +39,7 @@ URL: http://www.mesa3d.org Source0: https://archive.mesa3d.org/mesa-%{version}.tar.xz -BuildRequires: meson >= 0.59.2 +BuildRequires: meson >= 1.0.0 BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gettext @@ -93,7 +93,11 @@ BuildRequires: pkgconfig(libglvnd) >= 1.3.2 BuildRequires: llvm-devel >= 7.0.0 %if 0%{?with_opencl} BuildRequires: clang-devel +BuildRequires: bindgen +BuildRequires: rust-packaging BuildRequires: pkgconfig(libclc) +BuildRequires: pkgconfig(SPIRV-Tools) +BuildRequires: pkgconfig(LLVMSPIRVLib) %endif %if %{with valgrind} BuildRequires: pkgconfig(valgrind) @@ -111,15 +115,15 @@ BuildRequires: pkgconfig(vulkan) %package filesystem Summary: Mesa driver filesystem -Provides: mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: mesa-dri-filesystem = %{EVR} +Obsoletes: mesa-dri-filesystem < %{EVR} %description filesystem %{summary}. %package libGL Summary: Mesa libGL runtime libraries -Requires: %{name}-libglapi = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libglapi = %{EVR} Requires: libglvnd-glx >= 1:1.3.2 %description libGL @@ -127,7 +131,7 @@ Requires: libglvnd-glx >= 1:1.3.2 %package libGL-devel Summary: Mesa libGL development package -Requires: %{name}-libGL = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libGL = %{EVR} Requires: libglvnd-devel >= 1:1.3.2 Provides: libGL-devel Recommends: gl-manpages @@ -144,7 +148,7 @@ Requires: libglvnd-egl >= 1:1.3.2 %package libEGL-devel Summary: Mesa libEGL development package -Requires: %{name}-libEGL = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libEGL = %{EVR} Requires: libglvnd-devel >= 1:1.3.2 Requires: %{name}-khr-devel Provides: libEGL-devel @@ -154,9 +158,9 @@ Provides: libEGL-devel %package dri-drivers Summary: Mesa-based DRI drivers -Requires: %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem = %{EVR} %if 0%{?with_va} -Recommends: %{name}-va-drivers = %{?epoch:%{epoch}:}%{version}-%{release} +Recommends: %{name}-va-drivers = %{EVR} %endif %description dri-drivers @@ -165,7 +169,7 @@ Recommends: %{name}-va-drivers = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_omx} %package omx-drivers Summary: Mesa-based OMX drivers -Requires: %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem = %{EVR} %description omx-drivers %{summary}. @@ -174,7 +178,7 @@ Requires: %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_va} %package va-drivers Summary: Mesa-based VA-API video acceleration drivers -Requires: %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem = %{EVR} Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 Conflicts: %{name}-dri-drivers < 22.3.0 @@ -185,7 +189,7 @@ Conflicts: %{name}-dri-drivers < 22.3.0 %if 0%{?with_vdpau} %package vdpau-drivers Summary: Mesa-based VDPAU drivers -Requires: %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem = %{EVR} %description vdpau-drivers %{summary}. @@ -193,7 +197,7 @@ Requires: %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} %package libOSMesa Summary: Mesa offscreen rendering libraries -Requires: %{name}-libglapi = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libglapi = %{EVR} Provides: libOSMesa %description libOSMesa @@ -201,7 +205,7 @@ Provides: libOSMesa %package libOSMesa-devel Summary: Mesa offscreen rendering development package -Requires: %{name}-libOSMesa = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libOSMesa = %{EVR} %description libOSMesa-devel %{summary}. @@ -215,7 +219,7 @@ Provides: libgbm %package libgbm-devel Summary: Mesa libgbm development package -Requires: %{name}-libgbm = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libgbm = %{EVR} Provides: libgbm-devel %description libgbm-devel @@ -231,7 +235,7 @@ Provides: libxatracker %package libxatracker-devel Summary: Mesa XA state tracker development package -Requires: %{name}-libxatracker = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libxatracker = %{EVR} Provides: libxatracker-devel %description libxatracker-devel @@ -250,15 +254,16 @@ Provides: libglapi Summary: Mesa OpenCL runtime library Requires: ocl-icd Requires: libclc -Requires: %{name}-libgbm = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libgbm = %{EVR} Requires: opencl-filesystem +Requires: spirv-tools-libs = %{installed_version_of spirv-tools-libs} %description libOpenCL %{summary}. %package libOpenCL-devel Summary: Mesa OpenCL development package -Requires: %{name}-libOpenCL = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libOpenCL = %{EVR} %description libOpenCL-devel %{summary}. @@ -273,7 +278,7 @@ Summary: Mesa Direct3D9 state tracker %package libd3d-devel Summary: Mesa Direct3D9 state tracker development package -Requires: %{name}-libd3d = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libd3d = %{EVR} %description libd3d-devel %{summary}. @@ -282,7 +287,7 @@ Requires: %{name}-libd3d = %{?epoch:%{epoch}:}%{version}-%{release} %package vulkan-drivers Summary: Mesa Vulkan drivers Requires: vulkan -Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: mesa-vulkan-devel < %{EVR} %description vulkan-drivers The drivers with support for the Vulkan API. @@ -639,6 +644,9 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0 %endif %changelog +* Sun Mar 12 2023 Funda Wang - 23.0.0-2 +- Add versioned requirement for opencl + * Fri Feb 24 2023 Funda Wang - 23.0.0-1 - New version 23.0.0 -- Gitee