Skip to content

Commit

Permalink
fix: mesa-freeworld (#1932) (#1941)
Browse files Browse the repository at this point in the history
Signed-off-by: madomado <[email protected]>
(cherry picked from commit 2fc0022)

Co-authored-by: madomado <[email protected]>
  • Loading branch information
raboneko and madonuko authored Aug 16, 2024
1 parent 0992a8b commit 6c52f55
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions anda/system/mesa-freeworld/mesa-freeworld.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ algorithms and decoding only VC1 algorithm.
%global with_radeonsi 1
%global with_vmware 1
%global with_vulkan_hw 0
#global with_vdpau 1
%global with_vdpau 1
%global with_va 1
%if !0%{?rhel}
%global with_r300 1
Expand Down Expand Up @@ -173,6 +173,7 @@ BuildRequires: python3-mako
BuildRequires: python3-ply
%endif
BuildRequires: python3-pycparser
BuildRequires: python3-pyyaml
BuildRequires: vulkan-headers
BuildRequires: glslang
%if 0%{?with_vulkan_hw}
Expand Down Expand Up @@ -219,7 +220,7 @@ export RUSTFLAGS="%build_rustflags"
-Ddri3=enabled \
-Dosmesa=false \
%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_hw:,zink} \
-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_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \
%else
-Dgallium-drivers=swrast,virgl \
%endif
Expand Down Expand Up @@ -300,6 +301,7 @@ rm -rf %{buildroot}%{_libdir}/{d3d,EGL,gallium-pipe,libGLX,pkgconfig}
rm -rf %{buildroot}%{_includedir}/{d3dadapter,EGL,GL,KHR}
rm -fr %{buildroot}%{_sysconfdir}/OpenGL
rm -fr %{buildroot}%{_libdir}/libGL.so*
rm -fr %{buildroot}%{_libdir}/libgallium-*.so
rm -fr %{buildroot}%{_libdir}/libglapi.so*
rm -fr %{buildroot}%{_libdir}/libOSMesa.so*
rm -fr %{buildroot}%{_libdir}/pkgconfig/osmesa.pc
Expand All @@ -312,11 +314,6 @@ rm -fr %{buildroot}%{_libdir}/dri/*_dri.so
rm -fr %{buildroot}%{_libdir}/libvulkan*.so
rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so

%if 0%{?with_vdpau}
%else
rm %buildroot%_datadir/metainfo/org.mesa3d.vdpau.freeworld.metainfo.xml
%endif

%if 0%{?with_va}
%files -n %{srcname}-va-drivers-freeworld
%{_libdir}/dri/nouveau_drv_video.so
Expand All @@ -326,6 +323,7 @@ rm %buildroot%_datadir/metainfo/org.mesa3d.vdpau.freeworld.metainfo.xml
%if 0%{?with_radeonsi}
%{_libdir}/dri/radeonsi_drv_video.so
%endif
%{_libdir}/dri/libgallium_drv_video.so
%{_libdir}/dri/virtio_gpu_drv_video.so
%{_metainfodir}/org.mesa3d.vaapi.freeworld.metainfo.xml
%license docs/license.rst
Expand All @@ -340,14 +338,21 @@ rm %buildroot%_datadir/metainfo/org.mesa3d.vdpau.freeworld.metainfo.xml
%if 0%{?with_radeonsi}
%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
%endif
%{_libdir}/vdpau/libvdpau_gallium.so.1*
%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
%{_metainfodir}/org.mesa3d.vdpau.freeworld.metainfo.xml
%license docs/license.rst
%endif

%changelog
* Thu Aug 1 2024 Thorsten Leemhuis <[email protected]> - 24.1.5-1
- Update to 24.1.5
* Thu Aug 8 2024 Thorsten Leemhuis <[email protected]> - 24.2.0~rc4-1
- Update to 24.2.0-rc4

* Fri Aug 02 2024 RPM Fusion Release Engineering <[email protected]> - 24.2.0~rc3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

* Thu Aug 1 2024 Thorsten Leemhuis <[email protected]> - 24.2.0~rc3-1
- Update to 24.2.0-rc3
- Drop upstreamed patch

* Fri Jul 19 2024 Thorsten Leemhuis <[email protected]> - 24.1.4-2
Expand Down

0 comments on commit 6c52f55

Please sign in to comment.