开源软件构建与测试

Changes of Revision 18

_service:tar_scm:mesa.spec Changed

@@ -10,6 +10,7 @@
 %define with_opencl 1
 %define with_vaapi 1
 %define with_nine 1
+%define with_rusticl 1
 %endif
 
 %ifarch %{ix86} x86_64
@@ -53,6 +54,7 @@
 License:        MIT
 URL:            http://www.mesa3d.org
 Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}.tar.xz
+Source1:        rust-bindgen-0.64.0.tar.xz
 
 Patch0:         0001-llvmpipe-add-an-implementation-with-llvm-orcjit.patch
 Patch1:         0002-llvmpipe-add-riscv-support-in-orcjit.patch
@@ -101,12 +103,13 @@
 %if 0%{?with_opencl}
 BuildRequires:  libclc-devel opencl-filesystem
 BuildRequires:  clang-devel
-BuildRequires:  rust-bindgen
-BuildRequires:  rust-packaging
 BuildRequires:  pkgconfig(libclc)
+%if 0%{?with_rusticl}
+BuildRequires:  rust cargo
 BuildRequires:  pkgconfig(SPIRV-Tools)
 BuildRequires:  pkgconfig(LLVMSPIRVLib)
 %endif
+%endif
 BuildRequires: python3-mako
 %ifarch %{valgrind_arches}
 BuildRequires: pkgconfig(valgrind)
@@ -186,6 +189,16 @@
 %{summary}.
 %endif
 
+%if 0%{?with_vaapi}
+%package        va-drivers
+Summary:        Mesa-based VA-API video acceleration drivers
+Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-vaapi-drivers < 22.2.0-5
+ 
+%description va-drivers
+%{summary}.
+%endif
+
 %package libOSMesa
 Summary:        Mesa offscreen rendering libraries
 Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -263,6 +276,16 @@
 
 %description libOpenCL-devel
 %{summary}.
+
+%if 0%{?with_rusticl}
+%package libRusticlOpenCL
+Summary:        Mesa OpenCL implementation (Rusticl)
+Group:          System/Libraries
+Requires:       libclc(llvm%{_llvm_sonum})
+
+%description libRusticlOpenCL
+This package contains the Mesa Rust-written OpenCL implementation.
+%endif
 %endif
 
 %if 0%{?with_nine}
@@ -304,6 +327,23 @@
 sed -i -e 's/cpp_std=gnu++11/cpp_std=gnu++17/g' meson.build
 
 %build
+
+%if 0%{?with_rusticl}
+mkdir -p my_rust_vendor
+cd my_rust_vendor
+%{__tar} xf %{SOURCE2}
+mkdir -p .cargo
+cat > .cargo/config <<EOL
+[source.crates-io]
+replace-with = "vendored-sources"
+[source.vendored-sources]
+directory = "`pwd`"
+EOL
+env CARGO_HOME=.cargo cargo install bindgen
+export PATH=`pwd`/.cargo/bin:$PATH
+cd -
+%endif
+
 export ASFLAGS="--generate-missing-build-notes=yes"
 %meson -Dcpp_std=gnu++17 \
   -Db_ndebug=true \
@@ -322,7 +362,7 @@
   -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \
   -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
   -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
-%if 0%{?with_opencl}
+%if 0%{?with_opencl} && 0%{?with_rusticl}
   -Dgallium-rusticl=true -Drust_std=2021 \
 %endif
   -Dvulkan-drivers=%{?vulkan_drivers} \
@@ -400,6 +440,7 @@
 %files libEGL-devel
 %dir %{_includedir}/EGL
 %{_includedir}/EGL/eglmesaext.h
+%{_includedir}/EGL/eglext_angle.h
 
 %post libglapi -p /sbin/ldconfig
 %postun libglapi -p /sbin/ldconfig
@@ -454,6 +495,12 @@
 %{_sysconfdir}/OpenCL/vendors/mesa.icd
 %files libOpenCL-devel
 %{_libdir}/libMesaOpenCL.so
+
+%if 0%{?with_rusticl}
+%files libRusticlOpenCL
+%{_sysconfdir}/OpenCL/vendors/rusticl.icd
+%{_libdir}/libRusticlOpenCL.so*
+%endif
 %endif
 
 %if 0%{?with_nine}
@@ -498,6 +545,10 @@
 %{_libdir}/dri/kms_swrast_dri.so
 %{_libdir}/dri/swrast_dri.so
 %{_libdir}/dri/virtio_gpu_dri.so
+%if 0%{?with_opencl}
+%dir %{_libdir}/gallium-pipe
+%{_libdir}/gallium-pipe/*.so
+%endif
 
 %if %{with_hardware}
 %if 0%{?with_omx}
@@ -507,25 +558,32 @@
 %if 0%{?with_vdpau}
 %files vdpau-drivers
 %{_libdir}/vdpau/libvdpau_nouveau.so.1*
+%{_libdir}/vdpau/libvdpau_r300.so.1*
 %{_libdir}/vdpau/libvdpau_r600.so.1*
 %{_libdir}/vdpau/libvdpau_radeonsi.so.1*
+%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
+%endif
+%if 0%{?with_va}
+%files va-drivers
+%{_libdir}/dri/nouveau_drv_video.so
+%{_libdir}/dri/r600_drv_video.so
+%{_libdir}/dri/radeonsi_drv_video.so
+%{_libdir}/dri/virtio_gpu_drv_video.so
 %endif
 %endif
 
 %files vulkan-drivers
 %if 0%{?with_vulkan_hw}
 %{_libdir}/libvulkan_intel.so
-%{_libdir}/libvulkan_radeon.so
-%ifarch x86_64
-%{_datadir}/vulkan/icd.d/intel_icd.x86_64.json
-%{_datadir}/vulkan/icd.d/radeon_icd.x86_64.json
-%else
-%{_datadir}/vulkan/icd.d/intel_icd.i686.json
-%{_datadir}/vulkan/icd.d/radeon_icd.i686.json
-%endif
+%{_datadir}/vulkan/icd.d/intel_icd.*.json
+%{_libdir}/libvulkan_intel_hasvk.so
+%{_datadir}/vulkan/icd.d/intel_hasvk_icd.*.json
 %endif
+%{_libdir}/libvulkan_radeon.so
 %{_libdir}/libvulkan_lvp.so
+%{_datadir}/vulkan/icd.d/radeon_icd.*.json
 %{_datadir}/vulkan/icd.d/lvp_icd.*.json
+%{_datadir}/drirc.d/00-radv-defaults.conf
 %{_libdir}/libVkLayer_MESA_device_select.so
 %{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
 
@@ -537,6 +595,8 @@
 * Tue Mar 07 2023 Jingwiw  <wangjingwei@iscas.ac.cn> - 23.0.0-1
 - Upgrade to 23.0.0
 - Add riscv architecture optimization
+- Add support to rusticl
+- Optimize the mesa spec
 
 * Thu Nov 3 2022 wuzx<wuzx1226@qq.com> - 21.3.1-3
 - Add sw64 architecture

_service Changed

_service:tar_scm:rust-bindgen-0.64.0.tar.xz Added