|
@@ -1,11 +1,11 @@
|
|
# When bootstrapping an arch, omit the -demos subpackage.
|
|
# When bootstrapping an arch, omit the -demos subpackage.
|
|
-%bcond_with vulkan
|
|
|
|
|
|
+%bcond_without vulkan
|
|
%bcond_with libva
|
|
%bcond_with libva
|
|
%bcond_with glvnd
|
|
%bcond_with glvnd
|
|
|
|
|
|
%global with_hardware 1
|
|
%global with_hardware 1
|
|
%global with_vdpau 1
|
|
%global with_vdpau 1
|
|
-#global with_vaapi 1
|
|
|
|
|
|
+%global with_vaapi 1
|
|
%global with_nine 1
|
|
%global with_nine 1
|
|
#global with_omx 1
|
|
#global with_omx 1
|
|
#global with_opencl 1
|
|
#global with_opencl 1
|
|
@@ -14,9 +14,9 @@
|
|
%ifarch %{ix86}
|
|
%ifarch %{ix86}
|
|
%define ix86_drivers ,i915,i965
|
|
%define ix86_drivers ,i915,i965
|
|
%endif
|
|
%endif
|
|
-%ifarch x86_64
|
|
|
|
-%define amd64_drivers ,i915,i965
|
|
|
|
-%endif
|
|
|
|
|
|
+#ifarch x86_64
|
|
|
|
+#define amd64_drivers ,i915,i965
|
|
|
|
+#endif
|
|
%define dri_drivers %{base_drivers}%{?ix86_drivers}%{?amd64_drivers}
|
|
%define dri_drivers %{base_drivers}%{?ix86_drivers}%{?amd64_drivers}
|
|
|
|
|
|
%global with_iris 1
|
|
%global with_iris 1
|
|
@@ -36,7 +36,7 @@
|
|
Summary: Mesa graphics libraries
|
|
Summary: Mesa graphics libraries
|
|
Summary(ja): Mesa グラフィックスライブラリ
|
|
Summary(ja): Mesa グラフィックスライブラリ
|
|
Name: mesa
|
|
Name: mesa
|
|
-Version: 19.3.5
|
|
|
|
|
|
+Version: 20.1.4
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
Group: System Environment/Libraries
|
|
Group: System Environment/Libraries
|
|
License: MIT
|
|
License: MIT
|
|
@@ -55,13 +55,6 @@ Source4: Mesa-MLAA-License-Clarification-Email.txt
|
|
|
|
|
|
Patch3: 0003-evergreen-big-endian.patch
|
|
Patch3: 0003-evergreen-big-endian.patch
|
|
|
|
|
|
-# Disable rgb10 configs by default:
|
|
|
|
-# https://bugzilla.redhat.com/show_bug.cgi?id=1560481
|
|
|
|
-Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch
|
|
|
|
-
|
|
|
|
-# https://gitlab.freedesktop.org/mesa/mesa/commit/ee9811a0bb86d3d75fafeece368f6182048807d0
|
|
|
|
-Patch1000: mesa-llvm10.patch
|
|
|
|
-
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRequires: meson
|
|
BuildRequires: meson
|
|
BuildRequires: pkgconfig
|
|
BuildRequires: pkgconfig
|
|
@@ -72,10 +65,13 @@ BuildRequires: libXxf86vm-devel
|
|
BuildRequires: expat-devel >= 2.0
|
|
BuildRequires: expat-devel >= 2.0
|
|
BuildRequires: xorg-x11-proto-devel >= 7.4
|
|
BuildRequires: xorg-x11-proto-devel >= 7.4
|
|
BuildRequires: xorg-x11-server-sdk
|
|
BuildRequires: xorg-x11-server-sdk
|
|
-BuildRequires: kernel-headers
|
|
|
|
|
|
+%if 0%{?with_hardware}
|
|
|
|
+BuildRequires: kernel-headers
|
|
|
|
+%endif
|
|
BuildRequires: makedepend
|
|
BuildRequires: makedepend
|
|
BuildRequires: libXext-devel
|
|
BuildRequires: libXext-devel
|
|
BuildRequires: libXfixes-devel
|
|
BuildRequires: libXfixes-devel
|
|
|
|
+BuildRequires: libxcb-devel
|
|
BuildRequires: libXdamage-devel
|
|
BuildRequires: libXdamage-devel
|
|
BuildRequires: libXi-devel
|
|
BuildRequires: libXi-devel
|
|
BuildRequires: libXmu-devel
|
|
BuildRequires: libXmu-devel
|
|
@@ -84,14 +80,20 @@ BuildRequires: libxshmfence-devel
|
|
BuildRequires: eudev-libudev-devel
|
|
BuildRequires: eudev-libudev-devel
|
|
BuildRequires: llvm-devel >= 9.0.0
|
|
BuildRequires: llvm-devel >= 9.0.0
|
|
%if 0%{?with_opencl}
|
|
%if 0%{?with_opencl}
|
|
-BuildRequires: clang-devel >= 3.3
|
|
|
|
|
|
+BuildRequires: clang-devel
|
|
|
|
+BuildRequires: libclc-devel
|
|
%endif
|
|
%endif
|
|
BuildRequires: python3-devel
|
|
BuildRequires: python3-devel
|
|
BuildRequires: python3-rpm-macros
|
|
BuildRequires: python3-rpm-macros
|
|
BuildRequires: python3-setuptools
|
|
BuildRequires: python3-setuptools
|
|
BuildRequires: python3-mako
|
|
BuildRequires: python3-mako
|
|
BuildRequires: libxml2-python
|
|
BuildRequires: libxml2-python
|
|
|
|
+%if 0%{?with_vdpau}
|
|
BuildRequires: libvdpau-devel >= 1.1
|
|
BuildRequires: libvdpau-devel >= 1.1
|
|
|
|
+%endif
|
|
|
|
+%if 0%{?with_vaapi}
|
|
|
|
+BuildRequires: libva-devel
|
|
|
|
+%endif
|
|
BuildRequires: elfutils-libelf-devel
|
|
BuildRequires: elfutils-libelf-devel
|
|
BuildRequires: zlib-devel
|
|
BuildRequires: zlib-devel
|
|
%if %{with vulkan}
|
|
%if %{with vulkan}
|
|
@@ -434,8 +436,7 @@ The drivers with support for the Vulkan API.
|
|
|
|
|
|
%package vulkan-devel
|
|
%package vulkan-devel
|
|
Summary: Mesa Vulkan development files
|
|
Summary: Mesa Vulkan development files
|
|
-Requires: %{name}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}}%{version}-%{
|
|
|
|
-release}
|
|
|
|
|
|
+Requires: %{name}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
|
|
Requires: vulkan-devel
|
|
Requires: vulkan-devel
|
|
|
|
|
|
%description vulkan-devel
|
|
%description vulkan-devel
|
|
@@ -443,6 +444,9 @@ Headers for development with the Vulkan API.
|
|
%endif
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
+%debug_package
|
|
|
|
+
|
|
|
|
+
|
|
%prep
|
|
%prep
|
|
%autosetup -n %{name}-%{version} -p1
|
|
%autosetup -n %{name}-%{version} -p1
|
|
cp %{SOURCE2} .
|
|
cp %{SOURCE2} .
|
|
@@ -491,6 +495,7 @@ sed -i -e 's/cpp_std=gnu++11/cpp_std=gnu++14/g' meson.build
|
|
-Dbuild-tests=false \
|
|
-Dbuild-tests=false \
|
|
-Dselinux=false \
|
|
-Dselinux=false \
|
|
-Dosmesa=gallium \
|
|
-Dosmesa=gallium \
|
|
|
|
+ -Dvulkan-device-select-layer=true \
|
|
%{nil}
|
|
%{nil}
|
|
%meson_build
|
|
%meson_build
|
|
|
|
|
|
@@ -616,8 +621,13 @@ rm -rf $RPM_BUILD_ROOT
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
%dir %{_libdir}/dri
|
|
%dir %{_libdir}/dri
|
|
%{_libdir}/dri/*_dri.so
|
|
%{_libdir}/dri/*_dri.so
|
|
|
|
+%{_libdir}/dri/*_drv_video.so
|
|
%dir %{_datadir}/drirc.d
|
|
%dir %{_datadir}/drirc.d
|
|
%config(noreplace) %{_datadir}/drirc.d/*
|
|
%config(noreplace) %{_datadir}/drirc.d/*
|
|
|
|
+%if 0%{?with_opencl}
|
|
|
|
+%dir %{_libdir}/gallium-pipe
|
|
|
|
+%{_libdir}/gallium-pipe/*.so
|
|
|
|
+%endif
|
|
|
|
|
|
%files vdpau-drivers
|
|
%files vdpau-drivers
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
@@ -723,18 +733,23 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%if %{with vulkan}
|
|
%if %{with vulkan}
|
|
%files vulkan-drivers
|
|
%files vulkan-drivers
|
|
|
|
+%if 0%{?with_hardware}
|
|
|
|
+%ifarch %{ix86} x86_64
|
|
%{_libdir}/libvulkan_intel.so
|
|
%{_libdir}/libvulkan_intel.so
|
|
|
|
+%{_datadir}/vulkan/icd.d/intel_icd.*.json
|
|
|
|
+%endif
|
|
%{_libdir}/libvulkan_radeon.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
|
|
|
|
|
|
+%{_datadir}/vulkan/icd.d/radeon_icd.*.json
|
|
|
|
+%{_libdir}/libVkLayer_MESA_device_select.so
|
|
|
|
+%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
|
|
%endif
|
|
%endif
|
|
|
|
|
|
%files vulkan-devel
|
|
%files vulkan-devel
|
|
-%{_includedir}/vulkan/
|
|
|
|
|
|
+%if 0%{?with_hardware}
|
|
|
|
+%ifarch %{ix86} x86_64
|
|
|
|
+%{_includedir}/vulkan/vulkan_intel.h
|
|
|
|
+%endif
|
|
|
|
+%endif
|
|
%endif
|
|
%endif
|
|
|
|
|
|
# compat32
|
|
# compat32
|
|
@@ -797,10 +812,15 @@ rm -rf $RPM_BUILD_ROOT
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
%dir %{_libdir}/dri
|
|
%dir %{_libdir}/dri
|
|
%{_libdir}/dri/*_dri.so
|
|
%{_libdir}/dri/*_dri.so
|
|
|
|
+%{_libdir}/dri/*_drv_video.so
|
|
|
|
|
|
%endif
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Thu Jul 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.1.4-1
|
|
|
|
+- updated to 20.1.4.
|
|
|
|
+- dropped Patch7 and 1000: fixed in upstream.
|
|
|
|
+
|
|
* Thu Mar 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.3.5-1
|
|
* Thu Mar 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.3.5-1
|
|
- updated to 19.3.5.
|
|
- updated to 19.3.5.
|
|
- imported Patch1000 from upstream for llvm10.
|
|
- imported Patch1000 from upstream for llvm10.
|