diff --git a/0001-Link-with-libclang-cpp.patch b/0001-Link-with-libclang-cpp.patch new file mode 100644 index 0000000..1a6ddf9 --- /dev/null +++ b/0001-Link-with-libclang-cpp.patch @@ -0,0 +1,37 @@ +From c9987fca1fa611e48f85644493edd8d5a30cf403 Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Fri, 13 Dec 2019 17:42:17 +0000 +Subject: [PATCH] Link with libclang-cpp + +--- + src/gallium/targets/opencl/meson.build | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build +index 907cc74337d..031d35b9716 100644 +--- a/src/gallium/targets/opencl/meson.build ++++ b/src/gallium/targets/opencl/meson.build +@@ -43,19 +43,7 @@ libopencl = shared_library( + dependencies : [ + idep_mesautil, + dep_clock, dep_dl, dep_unwind, dep_elf, +- cpp.find_library('clangCodeGen', dirs : llvm_libdir), +- cpp.find_library('clangFrontendTool', dirs : llvm_libdir), +- cpp.find_library('clangFrontend', dirs : llvm_libdir), +- cpp.find_library('clangDriver', dirs : llvm_libdir), +- cpp.find_library('clangSerialization', dirs : llvm_libdir), +- cpp.find_library('clangParse', dirs : llvm_libdir), +- cpp.find_library('clangSema', dirs : llvm_libdir), +- cpp.find_library('clangAnalysis', dirs : llvm_libdir), +- cpp.find_library('clangAST', dirs : llvm_libdir), +- cpp.find_library('clangASTMatchers', dirs : llvm_libdir), +- cpp.find_library('clangEdit', dirs : llvm_libdir), +- cpp.find_library('clangLex', dirs : llvm_libdir), +- cpp.find_library('clangBasic', dirs : llvm_libdir), ++ cpp.find_library('clang-cpp', dirs : llvm_libdir), + ], + version : '@0@.0.0'.format(opencl_version), + install : true, +-- +2.20.1 + diff --git a/0001-gallium-Disable-rgb10-configs-by-default.patch b/0001-gallium-Disable-rgb10-configs-by-default.patch deleted file mode 100644 index 09593a0..0000000 --- a/0001-gallium-Disable-rgb10-configs-by-default.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/egl.pc b/egl.pc deleted file mode 100644 index 8459099..0000000 --- a/egl.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -libdir=${prefix}/lib64 -includedir=${prefix}/include - -Name: egl -Description: Mesa EGL Library -Version: 19.2.0 -Requires.private: x11, xext, xdamage >= 1.1, xfixes, x11-xcb, xcb, xcb-glx >= 1.8.1, xcb-dri2 >= 1.8, xxf86vm, libdrm >= 2.4.75 -Libs: -L${libdir} -lEGL -Libs.private: -lpthread -pthread -lm -ldl -Cflags: -I${includedir} diff --git a/glesv2.pc b/glesv2.pc deleted file mode 100644 index 7af1555..0000000 --- a/glesv2.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -libdir=${prefix}/lib64 -includedir=${prefix}/include - -Name: glesv2 -Description: Mesa OpenGL ES 2.0 library -Version: 19.1.0 -Libs: -L${libdir} -lGLESv2 -Libs.private: -lpthread -pthread -lm -ldl -Cflags: -I${includedir} diff --git a/mesa.spec b/mesa.spec index 2b20fdc..2fe6973 100644 --- a/mesa.spec +++ b/mesa.spec @@ -12,6 +12,7 @@ %ifarch %{ix86} x86_64 %global platform_drivers ,i915,i965 +%global with_iris 1 %global with_vmware 1 %global with_xa 1 %global vulkan_drivers intel,amd @@ -51,9 +52,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.2.0-rc1 +%global ver 20.0.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2.0.riscv64%{?dist} +Release: 1.0.riscv64%{?dist} License: MIT URL: http://www.mesa3d.org @@ -62,14 +63,10 @@ Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz # Source1 contains email correspondence clarifying the license terms. # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source1: Mesa-MLAA-License-Clarification-Email.txt -Source2: glesv2.pc -Source3: egl.pc 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://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package +Patch4: 0001-Link-with-libclang-cpp.patch BuildRequires: meson >= 0.45 BuildRequires: gcc @@ -143,7 +140,7 @@ BuildRequires: pkgconfig(valgrind) BuildRequires: python3-devel BuildRequires: python3-mako %if 0%{?with_hardware} -BuildRequires: vulkan-devel +BuildRequires: vulkan-headers %endif %description @@ -157,12 +154,6 @@ Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}:}%{version}-%{release} %description filesystem %{summary}. -%package khr-devel -Summary: Mesa Khronos development headers - -%description khr-devel -%{summary}. - %package libGL Summary: Mesa libGL runtime libraries Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -175,7 +166,6 @@ Requires: libglvnd-glx%{?_isa} >= 1:1.0.1-0.9 Summary: Mesa libGL development package Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libglvnd-devel%{?_isa} -Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libGL-devel Provides: libGL-devel%{?_isa} @@ -193,32 +183,13 @@ Requires: libglvnd-egl%{?_isa} Summary: Mesa libEGL development package Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libglvnd-devel%{?_isa} -Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-khr-devel%{?_isa} Provides: libEGL-devel Provides: libEGL-devel%{?_isa} %description libEGL-devel %{summary}. -%package libGLES -Summary: Mesa libGLES runtime libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-gles%{?_isa} - -%description libGLES -%{summary}. - -%package libGLES-devel -Summary: Mesa libGLES development package -Requires: %{name}-libGLES%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} -Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libGLES-devel -Provides: libGLES-devel%{?_isa} - -%description libGLES-devel -%{summary}. - %package dri-drivers Summary: Mesa-based DRI drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -356,17 +327,22 @@ Headers for development with the Vulkan API. %prep %autosetup -n %{name}-%{ver} -p1 cp %{SOURCE1} docs/ -cp %{SOURCE2} . -cp %{SOURCE3} . + +# Make sure the build uses gnu++14 as llvm 10 headers require that +sed -i -e 's/cpp_std=gnu++11/cpp_std=gnu++14/g' meson.build %build -%meson -Dcpp_std=gnu++11 \ +# Build with -fcommon until the omx build with gcc10 is fixed upstream +# https://gitlab.freedesktop.org/mesa/mesa/issues/2385 +%global optflags %{optflags} -fcommon + +%meson -Dcpp_std=gnu++14 \ -Dplatforms=x11,wayland,drm,surfaceless \ -Ddri3=true \ -Ddri-drivers=%{?dri_drivers} \ %if 0%{?with_hardware} - -Dgallium-drivers=swrast,virgl,r300,nouveau%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi,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} \ + -Dgallium-drivers=swrast,virgl,r300,nouveau%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi,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} \ %else -Dgallium-drivers=swrast,virgl \ %endif @@ -399,10 +375,6 @@ cp %{SOURCE3} . %install %meson_install -install glesv2.pc %{buildroot}%{_libdir}/pkgconfig/ - -install egl.pc %{buildroot}%{_libdir}/pkgconfig/ - # libvdpau opens the versioned name, don't bother including the unversioned rm -vf %{buildroot}%{_libdir}/vdpau/*.so # likewise glvnd @@ -431,53 +403,22 @@ popd %endif %endif -%files khr-devel -%dir %{_includedir}/KHR -%{_includedir}/KHR/khrplatform.h - %files libGL %{_libdir}/libGLX_mesa.so.0* %{_libdir}/libGLX_system.so.0* %files libGL-devel -%{_includedir}/GL/gl.h -%{_includedir}/GL/gl_mangle.h -%{_includedir}/GL/glext.h -%{_includedir}/GL/glx.h -%{_includedir}/GL/glx_mangle.h -%{_includedir}/GL/glxext.h -%{_includedir}/GL/glcorearb.h %dir %{_includedir}/GL/internal %{_includedir}/GL/internal/dri_interface.h %{_libdir}/pkgconfig/dri.pc %{_libdir}/libglapi.so -%{_libdir}/pkgconfig/gl.pc %files libEGL %{_datadir}/glvnd/egl_vendor.d/50_mesa.json %{_libdir}/libEGL_mesa.so.0* %files libEGL-devel %dir %{_includedir}/EGL -%{_includedir}/EGL/eglext.h -%{_includedir}/EGL/egl.h %{_includedir}/EGL/eglmesaext.h -%{_includedir}/EGL/eglplatform.h %{_includedir}/EGL/eglextchromium.h -%{_libdir}/pkgconfig/egl.pc - -%files libGLES -# No files, all provided by libglvnd -%files libGLES-devel -%dir %{_includedir}/GLES2 -%{_includedir}/GLES2/gl2platform.h -%{_includedir}/GLES2/gl2.h -%{_includedir}/GLES2/gl2ext.h -%dir %{_includedir}/GLES3 -%{_includedir}/GLES3/gl3platform.h -%{_includedir}/GLES3/gl3.h -%{_includedir}/GLES3/gl3ext.h -%{_includedir}/GLES3/gl31.h -%{_includedir}/GLES3/gl32.h -%{_libdir}/pkgconfig/glesv2.pc %ldconfig_scriptlets libglapi %files libglapi @@ -555,8 +496,11 @@ popd %ifarch %{ix86} x86_64 %{_libdir}/dri/i915_dri.so %{_libdir}/dri/i965_dri.so +%{_libdir}/dri/iris_dri.so %endif %ifarch %{arm} aarch64 +%{_libdir}/dri/ingenic-drm_dri.so +%{_libdir}/dri/mcde_dri.so %{_libdir}/dri/mxsfb-drm_dri.so %{_libdir}/dri/stm_dri.so %endif @@ -652,9 +596,101 @@ popd %endif %changelog -* Fri Aug 23 2019 David Abdurachmanov 19.2.0~rc1-2.0.riscv64 +* Wed Apr 01 2020 David Abdurachmanov 20.0.2-1.0.riscv64 - Disable Clang for now (not yet built) +* Thu Mar 19 2020 Pete Walter - 20.0.2-1 +- Update to 20.0.2 + +* Fri Mar 06 2020 Pete Walter - 20.0.1-1 +- Update to 20.0.1 + +* Wed Feb 26 2020 Kalev Lember - 20.0.0-2 +- Fix the build with llvm 10 (#1803351) + +* Thu Feb 20 2020 Pete Walter - 20.0.0-1 +- Update to 20.0.0 + +* Fri Feb 14 2020 Pete Walter - 20.0.0~rc3-1 +- Update to 20.0.0~rc3 + +* Sat Feb 08 2020 Pete Walter - 20.0.0~rc2-1 +- Update to 20.0.0~rc2 + +* Sat Feb 01 2020 Pete Walter - 20.0.0~rc1-1 +- Update to 20.0.0~rc1 + +* Wed Jan 29 2020 Pete Walter - 19.3.3-1 +- Update to 19.3.3 + +* Thu Jan 23 2020 Tom Stellard - 19.3.2-3 +- Link against libclang-cpp.so +- https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package + +* Thu Jan 23 2020 Tom Stellard - 19.3.2-2 +- Build with -fcommon until upstream fixes omx build with gcc10 + +* Fri Jan 10 2020 Pete Walter - 19.3.2-1 +- Update to 19.3.2 + +* Wed Dec 18 2019 Pete Walter - 19.3.1-1 +- Update to 19.3.1 + +* Mon Dec 16 2019 Pete Walter - 19.3.0-1 +- Update to 19.3.0 + +* Thu Dec 05 2019 Pete Walter - 19.3.0~rc6-1 +- Update to 19.3.0~rc6 + +* Thu Nov 28 2019 Pete Walter - 19.3.0~rc5-1 +- Update to 19.3.0~rc5 + +* Sun Nov 24 2019 Pete Walter - 19.3.0~rc4-1 +- Update to 19.3.0~rc4 + +* Thu Nov 14 2019 Pete Walter - 19.3.0~rc3-1 +- Update to 19.3.0~rc3 + +* Fri Nov 08 2019 Pete Walter - 19.3.0~rc2-1 +- Update to 19.3.0~rc2 + +* Thu Nov 07 2019 Pete Walter - 19.2.3-1 +- Update to 19.2.3 + +* Fri Oct 25 2019 Peter Robinson - 19.2.2-3 +- adjust mesa-khr-devel requires now provided by libglvnd + +* Fri Oct 25 2019 Peter Robinson - 19.2.2-2 +- Rebuild against libglvnd 1.2 +- Fix up and remove bits now in libglvnd + +* Fri Oct 25 2019 Pete Walter - 19.2.2-1 +- Update to 19.2.2 + +* Thu Oct 10 2019 Peter Robinson 19.2.1-1 +- Update to 19.2.1 + +* Tue Oct 1 2019 Gwyn Ciesla - 19.2.0-2 +- Rebuilt for new freeglut + +* Wed Sep 25 2019 Pete Walter - 19.2.0-1 +- Update to 19.2.0 + +* Wed Sep 18 2019 Pete Walter - 19.2.0~rc4-1 +- Update to 19.2.0~rc4 + +* Tue Sep 17 2019 Adam Jackson - 19.2.0~rc3-2 +- Build iris too + +* Thu Sep 12 2019 Pete Walter - 19.2.0~rc3-1 +- Update to 19.2.0~rc3 + +* Thu Sep 05 2019 Pete Walter - 19.2.0~rc2-1 +- Update to 19.2.0~rc2 + +* Tue Aug 27 2019 Adam Jackson 19.2.0~rc1-3 +- BuildRequire vulkan-headers not vulkan-devel to ease llvm updates + * Thu Aug 22 2019 Peter Robinson 19.2.0~rc1-2 - Bring back egl.pc for now diff --git a/sources b/sources index 0eab063..d08e0b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.2.0-rc1.tar.xz) = babafb6ec668834e041a62e966452fe315e4f5afef8e1f7d35e038993c73b32ea6ad9929399edae4686f44cd11704fd9a8801821befc1d1767bc0662d4c39fac +SHA512 (mesa-20.0.2.tar.xz) = d6ffc29bbc5b908cb0f08fa1b5a83e029b76c7b697c488a73e6bb60990a55beeb3ecdba1745868f6885ee2f660975f5debf7d2c9418e0a96e2f7049e83fd89ab