浏览代码

mesa-24.2.7-1

Tomohiro "Tomo-p" KATO 7 月之前
父节点
当前提交
66ba5a87a8
共有 1 个文件被更改,包括 59 次插入13 次删除
  1. 59 13
      m/mesa/mesa-vl.spec

+ 59 - 13
m/mesa/mesa-vl.spec

@@ -12,7 +12,7 @@
 %global with_vaapi 1
 %global with_nine 1
 #global with_omx 1
-#global with_opencl 1
+%global with_opencl 1
 %global base_drivers nouveau,r100,r200
 
 %ifarch %{ix86} x86_64
@@ -39,7 +39,7 @@
 Summary:        Mesa graphics libraries
 Summary(ja):    Mesa グラフィックスライブラリ
 Name:           mesa
-Version:        23.1.8
+Version:        24.2.7
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -56,9 +56,6 @@ Source4:        Mesa-MLAA-License-Clarification-Email.txt
 
 Patch10:        gnome-shell-glthread-disable.patch
 
-# from upstream
-Patch1000:      mesa-llvm17.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: meson
 BuildRequires: pkgconfig
@@ -85,13 +82,17 @@ BuildRequires: libzstd-devel
 BuildRequires: eudev-libudev-devel
 BuildRequires: llvm-devel >= 9.0.0
 %if 0%{?with_opencl}
-BuildRequires: clang-devel
-BuildRequires: libclc-devel
+BuildRequires:  clang-devel
+BuildRequires:  pkgconfig(libclc)
+BuildRequires:  pkgconfig(SPIRV-Tools)
+BuildRequires:  pkgconfig(LLVMSPIRVLib)
 %endif
 BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-setuptools
 BuildRequires: python3-mako
+BuildRequires: python3-ply
+BuildRequires: python3-pyyaml
 BuildRequires: libxml2-python
 %if 0%{?with_vdpau}
 BuildRequires: libvdpau-devel >= 1.1
@@ -100,7 +101,7 @@ BuildRequires: libvdpau-devel >= 1.1
 BuildRequires: libva-devel
 %endif
 BuildRequires: elfutils-libelf-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 %if %{with vulkan}
 BuildRequires: vulkan-devel
 BuildRequires: glslang-devel
@@ -296,6 +297,26 @@ Requires:       %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release
 %endif
 
 
+%if 0%{?with_opencl}
+%package libOpenCL
+Summary:        Mesa OpenCL runtime library
+Requires:       libclc%{?_isa}
+Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libOpenCL
+%{summary}.
+
+
+%package libOpenCL-devel
+Summary:        Mesa OpenCL development package
+Group:          programming
+Requires:       %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libOpenCL-devel
+%{summary}.
+%endif
+
+
 %package source
 Summary: Mesa source code required to build X server
 Summary(ja): X サーバをビルドするために必要な Mesa ソースコード
@@ -442,7 +463,7 @@ cp %{SOURCE4} docs/
 
 
 %build
-export PYTHON=%{__pythpn3}
+export PYTHON=%{__python3}
 
 %meson \
 %if %{with wayland}
@@ -452,9 +473,9 @@ export PYTHON=%{__pythpn3}
 %endif
   -Ddri3=enabled \
 %if 0%{?with_hardware}
-  -Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan:,zink} \
+  -Dgallium-drivers=softpipe,llvmpipe,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan:,zink} \
 %else
-  -Dgallium-drivers=swrast,virgl \
+  -Dgallium-drivers=softpipe,llvmpipe,virgl \
 %endif
   -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \
   -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
@@ -472,10 +493,11 @@ export PYTHON=%{__pythpn3}
   -Dglx=dri \
   -Degl=enabled \
 %if %{with glvnd}
-  -Dglvnd=true \
+  -Dglvnd=enabled \
 %else
-  -Dglvnd=false \
+  -Dglvnd=disabled \
 %endif
+  -Dintel-clc=enabled \
   -Dmicrosoft-clc=disabled \
   -Dllvm=enabled \
   -Dshared-llvm=enabled \
@@ -486,6 +508,11 @@ export PYTHON=%{__pythpn3}
   -Dandroid-libbacktrace=disabled \
   -Dlibunwind=disabled \
   -Dlmsensors=disabled \
+%ifarch x86_64
+  -Dintel-rt=enabled \
+%else
+  -Dintel-rt=disabled \
+%endif
   %{nil}
 %meson_build
 
@@ -601,6 +628,7 @@ mkdir -p $RPM_BUILD_ROOT/%{mesasourcedir}
 %endif
 
 %files dri-drivers
+%{_libdir}/libgallium-*.so
 %dir %{_libdir}/dri
 %{_libdir}/dri/*_dri.so
 %{_libdir}/dri/*_drv_video.so
@@ -637,6 +665,20 @@ mkdir -p $RPM_BUILD_ROOT/%{mesasourcedir}
 %files vulkan-devel
 %endif
 
+
+%if 0%{?with_opencl}
+%files libOpenCL
+%{_libdir}/libMesaOpenCL.so.*
+#{_libdir}/libRusticlOpenCL.so.*
+%{_sysconfdir}/OpenCL/vendors/mesa.icd
+#{_sysconfdir}/OpenCL/vendors/rusticl.icd
+
+%files libOpenCL-devel
+%{_libdir}/libMesaOpenCL.so
+#{_libdir}/libRusticlOpenCL.so
+%endif
+
+
 %if %{with source}
 # We constructed this dir carefully, so just slurp in the whole thing.
 %files source
@@ -684,6 +726,10 @@ mkdir -p $RPM_BUILD_ROOT/%{mesasourcedir}
 
 
 %changelog
+* Fri Nov 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 24.2.7-1
+- updated to 24.2.7.
+- built with llvm-19.
+
 * Sun Oct 01 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 23.1.8-1
 - updated to 23.1.8.
 - built with llvm-17.