diff --git a/0001-gallium-Disable-rgb10-configs-by-default.patch b/0001-gallium-Disable-rgb10-configs-by-default.patch new file mode 100644 index 0000000000000000000000000000000000000000..09593a04eb37016c88e4dfdf86cd09c6efcbe334 --- /dev/null +++ b/0001-gallium-Disable-rgb10-configs-by-default.patch @@ -0,0 +1,27 @@ +From b33c8b56abcc4837f96f7f106b108681858482e0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Tue, 24 Apr 2018 09:46:41 +0200 +Subject: [PATCH] gallium: Disable rgb10 configs by default + +Applications tend to not handle rgb10 configs very well, so lets +disable it for now. + +https://bugzilla.redhat.com/show_bug.cgi?id=1560481 +--- + src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +index 21dc599dc2..23f9194149 100644 +--- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h ++++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +@@ -33,5 +33,5 @@ DRI_CONF_SECTION_END + DRI_CONF_SECTION_MISCELLANEOUS + DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER("false") + DRI_CONF_GLSL_ZERO_INIT("false") +- DRI_CONF_ALLOW_RGB10_CONFIGS("true") ++ DRI_CONF_ALLOW_RGB10_CONFIGS("false") + DRI_CONF_SECTION_END +-- +2.17.0 + diff --git a/0001-llvm-SONAME-without-version.patch b/0001-llvm-SONAME-without-version.patch deleted file mode 100644 index cb910947432676b55040b0c25ef14ba5cd9e0ba6..0000000000000000000000000000000000000000 --- a/0001-llvm-SONAME-without-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c2b4d93a5e4796ca53361c61d7e31edc24241932 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 20 Mar 2016 13:26:25 +0100 -Subject: [PATCH 1/4] llvm SONAME without version - -Signed-off-by: Igor Gnatenko ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 5f75c60..d77f907 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2645,7 +2645,7 @@ - dnl ourselves. - dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) - dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, -- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` -+ LLVM_SO_NAME=LLVM - AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) - - if test "x$llvm_have_one_so" = xyes; then --- -2.7.4 - diff --git a/0004-bigendian-assert.patch b/0004-bigendian-assert.patch deleted file mode 100644 index 8de9975da87f172ec2a261dedd1bec4eb617c249..0000000000000000000000000000000000000000 --- a/0004-bigendian-assert.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6ccae713acc457d7df6ab15e124a7d77c5093213 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 20 Mar 2016 13:28:07 +0100 -Subject: [PATCH 4/4] bigendian assert - -Signed-off-by: Igor Gnatenko ---- - src/gallium/auxiliary/util/u_math.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h -index ecb1d63..90ada14 100644 ---- a/src/gallium/auxiliary/util/u_math.h -+++ b/src/gallium/auxiliary/util/u_math.h -@@ -59,6 +59,9 @@ - extern "C" { - #endif - -+#ifdef PIPE_ARCH_BIG_ENDIAN -+#include -+#endif - - #ifndef M_SQRT2 - #define M_SQRT2 1.41421356237309504880 --- -2.7.4 - diff --git a/Makefile b/Makefile index d6550fe559a16b96cbe99cacb0620bb08cbee298..febfecddd649516189bd87885691cd9f96c1585a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.2.2 +VERSION ?= 18.3.6 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa-18.2.2.tar.xz b/mesa-18.3.6.tar.xz similarity index 57% rename from mesa-18.2.2.tar.xz rename to mesa-18.3.6.tar.xz index b1385f3e662c2a8571a1116b57cbfa3e39ecc1ec..6bc4985a2a287bb05c72ba04f57f1bdebc010c85 100644 Binary files a/mesa-18.2.2.tar.xz and b/mesa-18.3.6.tar.xz differ diff --git a/mesa.spec b/mesa.spec index cc7fc6414524769107b7bfcc4ca345dbf2a0dc29..b3fc2ce83619e526119aa4158d0c8c184ae32ac7 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,13 +1,13 @@ %undefine _annotated_build -%define base_drivers swrast,nouveau,radeon,r200 +%define base_drivers nouveau,r100,r200 %ifarch %{ix86} x86_64 %define platform_drivers ,i915,i965 %define with_vmware 1 -%define vulkan_drivers --with-vulkan-drivers=intel,radeon +%define vulkan_drivers intel,amd %else -%define vulkan_drivers --with-vulkan-drivers=radeon +%define vulkan_drivers amd %endif %ifarch %{arm} aarch64 @@ -17,31 +17,37 @@ %define with_vc4 1 %endif -%define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers} +%ifnarch %{x86} +%global with_asm 1 +%endif + +%define dri_drivers %{?base_drivers}%{?platform_drivers} %global sanitize 0 %define with_opencl 0 +%define with_xa 1 +%define with_omx 1 Name: mesa Summary: Mesa graphics libraries -Version: 18.2.2 -Release: 6 +Version: 18.3.6 +Release: 1 License: MIT URL: https://www.mesa3d.org Source0: https://mesa.freedesktop.org/archive/%{name}-%{version}.tar.xz Source3: Makefile -Patch1: 0001-llvm-SONAME-without-version.patch + Patch3: 0003-evergreen-big-endian.patch -Patch4: 0004-bigendian-assert.patch +Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch BuildRequires: gcc gcc-c++ automake autoconf libtool kernel-headers libdrm-devel libXxf86vm-devel expat-devel -BuildRequires: xorg-x11-proto-devel imake libselinux-devel libXrandr-devel libXext-devel libXfixes-devel libXdamage-devel -BuildRequires: libXi-devel libXmu-devel libxshmfence-devel elfutils python3 python2 gettext llvm-devel clang-devel -BuildRequires: elfutils-libelf-devel python3-libxml2 python2-libxml2 libudev-devel bison flex -BuildRequires: wayland-devel wayland-protocols-devel libvdpau-devel libva-devel zlib-devel -BuildRequires: libomxil-bellagio-devel libclc-devel vulkan-devel python3-mako python2-mako +BuildRequires: xorg-x11-proto-devel imake libselinux-devel libXrandr-devel libXext-devel libXfixes-devel +BuildRequires: libXi-devel libXmu-devel libxshmfence-devel elfutils python3 gettext llvm-devel clang-devel +BuildRequires: elfutils-libelf-devel libudev-devel bison flex meson gettext python3-devel libXdamage-devel +BuildRequires: wayland-devel wayland-protocols-devel libvdpau-devel libva-devel zlib-devel +BuildRequires: libomxil-bellagio-devel libclc-devel vulkan-devel python3-mako libX11-devel %if 0%{?with_opencl} BuildRequires: opencl-filesystem %endif @@ -237,44 +243,39 @@ Headers for development with the Vulkan API. %build -autoreconf -ivf - -%ifarch %{ix86} -%global asm_flags --disable-asm -%endif - -%configure \ - %{?asm_flags} \ - --enable-libglvnd \ - --enable-selinux \ - --enable-gallium-osmesa \ - --with-dri-driverdir=%{_libdir}/dri \ - --enable-egl \ - --disable-gles1 \ - --enable-gles2 \ - --disable-xvmc \ - --enable-vdpau \ - --enable-va \ - --with-platforms=x11,drm,surfaceless,wayland \ - --enable-shared-glapi \ - --enable-gbm \ - --enable-omx-bellagio \ - --enable-opencl --enable-opencl-icd \ - --enable-glx-tls \ - --enable-texture-float=yes \ - %{?vulkan_drivers} \ - --enable-llvm \ - --enable-llvm-shared-libs \ - --enable-dri \ - --enable-xa \ - --enable-nine \ - --with-gallium-drivers=%{?with_vmware:svga,}radeonsi,r600,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_tegra:tegra,}%{?with_vc4:vc4,}virgl,r300,nouveau \ - %{?dri_drivers} - -%make_build MKDEP=/bin/true V=1 +%meson -Dcpp_std=gnu++11 \ + -Dplatforms=x11,wayland,drm,surfaceless \ + -Ddri3=true \ + -Ddri-drivers=%{?dri_drivers} \ + -Dgallium-drivers=swrast,virgl,r300,nouveau%{?with_vmware:,svga},radeonsi,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv,imx}%{?with_tegra:,tegra}%{?with_vc4:,vc4} \ + -Dgallium-vdpau=true \ + -Dgallium-xvmc=false \ + -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \ + -Dgallium-va=true \ + -Dgallium-xa=true \ + -Dgallium-nine=true \ + -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \ + -Dvulkan-drivers=%{?vulkan_drivers} \ + -Dshared-glapi=true \ + -Dgles1=false \ + -Dgles2=true \ + -Dopengl=true \ + -Dgbm=true \ + -Dglx=dri \ + -Degl=true \ + -Dglvnd=true \ + -Dasm=%{?with_asm:true}%{!?with_asm:false} \ + -Dllvm=true \ + -Dshared-llvm=true \ + -Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \ + -Dbuild-tests=false \ + -Dselinux=true \ + -Dosmesa=gallium \ + %{nil} +%meson_build %install -%make_install +%meson_install rm -f %{buildroot}%{_libdir}/vdpau/*.so rm -f %{buildroot}%{_libdir}/libGLX_mesa.so @@ -408,7 +409,8 @@ popd %files dri-drivers %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/drirc +%dir %{_datadir}/drirc.d +%{_datadir}/drirc.d/00-mesa-defaults.conf %{_libdir}/dri/radeon_dri.so %{_libdir}/dri/r200_dri.so %{_libdir}/dri/nouveau_vieux_dri.so @@ -445,9 +447,6 @@ popd %defattr(-,root,root) %{_libdir}/vdpau/libvdpau_nouveau.so.1* %{_libdir}/vdpau/libvdpau_r*.so.1* -%if 0%{?with_tegra} -%{_libdir}/vdpau/libvdpau_tegra.so.1* -%endif %files vulkan-drivers %ifarch %{ix86} x86_64 @@ -461,6 +460,9 @@ popd %{_includedir}/vulkan/ %changelog +* Tue Jun 02 2020 songnannan - 18.3.6-1 +- update to 18.3.6 + * Wed Jan 15 2020 openEuler Buildteam - 18.2.2-6 - disable opencl