From 6d6825429db1a483887698663b31e6d3f8de0691 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 27 Aug 2019 13:43:21 -0400 Subject: [PATCH 01/34] BuildRequire vulkan-headers not vulkan-devel to ease llvm updates --- mesa.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 7871766..bc83e16 100644 --- a/mesa.spec +++ b/mesa.spec @@ -51,7 +51,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.2.0-rc1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.mesa3d.org @@ -141,7 +141,7 @@ BuildRequires: pkgconfig(valgrind) BuildRequires: python3-devel BuildRequires: python3-mako %if 0%{?with_hardware} -BuildRequires: vulkan-devel +BuildRequires: vulkan-headers %endif %description @@ -648,6 +648,9 @@ popd %endif %changelog +* 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 From c274ae1f8f7a6ac7a2aaaa624a1fc5ceeeceb1f1 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 5 Sep 2019 09:37:48 +0100 Subject: [PATCH 02/34] Update to 19.2.0~rc2 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index bc83e16..6409fe7 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,9 +49,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.2.0-rc1 +%global ver 19.2.0-rc2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 3%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -648,6 +648,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 0eab063..fb7530a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.2.0-rc1.tar.xz) = babafb6ec668834e041a62e966452fe315e4f5afef8e1f7d35e038993c73b32ea6ad9929399edae4686f44cd11704fd9a8801821befc1d1767bc0662d4c39fac +SHA512 (mesa-19.2.0-rc2.tar.xz) = a42f7add01afd327838bd57ea4086ad4b9de669c6caf443129e325171bc53e3321c898d8d0075c7e50c4e0fdd094d66a60e35a0620e25e6c52648c5ac0008dcc From 8acfe9ee2809a709e2b1e471020f70564128ee90 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 12 Sep 2019 15:17:30 +0100 Subject: [PATCH 03/34] Update to 19.2.0~rc3 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 6409fe7..529155b 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,7 +49,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.2.0-rc2 +%global ver 19.2.0-rc3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -648,6 +648,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index fb7530a..f8189cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.2.0-rc2.tar.xz) = a42f7add01afd327838bd57ea4086ad4b9de669c6caf443129e325171bc53e3321c898d8d0075c7e50c4e0fdd094d66a60e35a0620e25e6c52648c5ac0008dcc +SHA512 (mesa-19.2.0-rc3.tar.xz) = 378bb27073d99032c489a0fcc44157017d27d01c24c3bb7e3e32f59b298cf0c7409351d18fbbfb1ccfb799e02f9166450dc73390e98a026f60a4ab0583944d68 From 5d0d2710aaa3ac0073f4bf94d5f6fc980d98634b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 17 Sep 2019 15:38:37 -0400 Subject: [PATCH 04/34] Build iris too --- mesa.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 529155b..1a484db 100644 --- a/mesa.spec +++ b/mesa.spec @@ -10,6 +10,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,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.2.0-rc3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -364,7 +365,7 @@ cp %{SOURCE3} . -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 @@ -553,6 +554,7 @@ 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/mxsfb-drm_dri.so @@ -648,6 +650,9 @@ popd %endif %changelog +* 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 From 296e0ae82c62f35b9b9cc3e0ab567d493d258771 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 18 Sep 2019 20:18:56 +0100 Subject: [PATCH 05/34] Update to 19.2.0~rc4 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 1a484db..ea05b1c 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,9 +50,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.2.0-rc3 +%global ver 19.2.0-rc4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -650,6 +650,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index f8189cb..1ea868a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.2.0-rc3.tar.xz) = 378bb27073d99032c489a0fcc44157017d27d01c24c3bb7e3e32f59b298cf0c7409351d18fbbfb1ccfb799e02f9166450dc73390e98a026f60a4ab0583944d68 +SHA512 (mesa-19.2.0-rc4.tar.xz) = a00422b4278951e4706671fe1507d5ba323a3badaceb03649dde425216fbb3cd83a21785374c75135e90fc5c6c67963f8aad0c33dac1cedaed3b69f2cd9f1c9b From 9c21301809e1c9506e54d30edcf1c50f436acc11 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 25 Sep 2019 19:42:41 +0100 Subject: [PATCH 06/34] Update to 19.2.0 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index ea05b1c..1a34d4e 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.2.0-rc4 +%global ver 19.2.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -650,6 +650,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 1ea868a..e3979fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.2.0-rc4.tar.xz) = a00422b4278951e4706671fe1507d5ba323a3badaceb03649dde425216fbb3cd83a21785374c75135e90fc5c6c67963f8aad0c33dac1cedaed3b69f2cd9f1c9b +SHA512 (mesa-19.2.0.tar.xz) = 7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0 From bb914bd1b937366725fe19a0dbbd33091ca85e51 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 4 Oct 2019 07:41:29 -0500 Subject: [PATCH 07/34] Rebuild for new freeglut. --- mesa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index 1a34d4e..da7af39 100644 --- a/mesa.spec +++ b/mesa.spec @@ -52,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.2.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -650,6 +650,9 @@ popd %endif %changelog +* 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 From 7b0cc19117000a85c325991674ee58a7a144b970 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 10 Oct 2019 09:50:49 +0100 Subject: [PATCH 08/34] 19.2.1 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index da7af39..b5c1921 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.2.0 +%global ver 19.2.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 2%{?dist} License: MIT @@ -650,6 +650,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index e3979fe..afe23fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.2.0.tar.xz) = 7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0 +SHA512 (mesa-19.2.1.tar.xz) = decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d From 155b1d1b2e7006ebbe5e710ee1e0de164561cf85 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 25 Oct 2019 02:31:46 +0100 Subject: [PATCH 09/34] Update to 19.2.2 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index b5c1921..3456580 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,9 +50,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.2.1 +%global ver 19.2.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -650,6 +650,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index afe23fa..f14e932 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.2.1.tar.xz) = decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d +SHA512 (mesa-19.2.2.tar.xz) = a3269052c2dfb5404180d1aebd68f5b9b0cc136d634ba89fed3f60fcc9b279072e09ee2db9b485375d39e886209053841df920c9d0b975e0de2825e3da4164a5 From af4fc7304be94af89f2af7ab84f6d5901c51622e Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 25 Oct 2019 02:54:48 +0100 Subject: [PATCH 10/34] Update files lists --- mesa.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 3456580..ac510d2 100644 --- a/mesa.spec +++ b/mesa.spec @@ -439,10 +439,8 @@ popd %{_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 From 6e80d6369cd16a4cba94b644061eb6cd1001c684 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 25 Oct 2019 08:36:00 +0100 Subject: [PATCH 11/34] rebuild against libglvnd 1.2 --- mesa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index ac510d2..639cffb 100644 --- a/mesa.spec +++ b/mesa.spec @@ -52,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.2.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -648,6 +648,9 @@ popd %endif %changelog +* Fri Oct 25 2019 Peter Robinson - 19.2.2-2 +- rebuild against libglvnd 1.2 + * Fri Oct 25 2019 Pete Walter - 19.2.2-1 - Update to 19.2.2 From 3474d0a62b6b5cc08838e5700af8af341504e5de Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 25 Oct 2019 12:06:17 +0100 Subject: [PATCH 12/34] Fix up and remove bits now in libglvnd --- egl.pc | 11 ---------- glesv2.pc | 10 --------- mesa.spec | 66 ++----------------------------------------------------- 3 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 egl.pc delete mode 100644 glesv2.pc 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 639cffb..0a5c78d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -61,8 +61,6 @@ 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 @@ -156,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} @@ -174,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} @@ -199,25 +190,6 @@ 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} @@ -355,8 +327,6 @@ Headers for development with the Vulkan API. %prep %autosetup -n %{name}-%{ver} -p1 cp %{SOURCE1} docs/ -cp %{SOURCE2} . -cp %{SOURCE3} . %build @@ -398,10 +368,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 @@ -430,51 +396,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/glext.h -%{_includedir}/GL/glx.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 @@ -649,7 +586,8 @@ popd %changelog * Fri Oct 25 2019 Peter Robinson - 19.2.2-2 -- rebuild against libglvnd 1.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 From 08c3236612fa56ab37959d3b6e0ccf21c998db16 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 25 Oct 2019 13:59:09 +0100 Subject: [PATCH 13/34] adjust mesa-khr-devel requires now provided by libglvnd --- mesa.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 0a5c78d..e2cb8d2 100644 --- a/mesa.spec +++ b/mesa.spec @@ -52,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.2.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.mesa3d.org @@ -183,7 +183,7 @@ 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} @@ -585,6 +585,9 @@ popd %endif %changelog +* 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 From d27097db949611046d4e8fbb5f56932c0c1d8432 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 7 Nov 2019 17:45:06 +0000 Subject: [PATCH 14/34] Update to 19.2.3 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index e2cb8d2..b89f354 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,9 +50,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.2.2 +%global ver 19.2.3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 3%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -585,6 +585,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index f14e932..88ee138 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.2.2.tar.xz) = a3269052c2dfb5404180d1aebd68f5b9b0cc136d634ba89fed3f60fcc9b279072e09ee2db9b485375d39e886209053841df920c9d0b975e0de2825e3da4164a5 +SHA512 (mesa-19.2.3.tar.xz) = a64a6b508c28a61b9f5a50f639d0cdca2546caa2118c2478100e3535961d76bf3877357d4a7ddd7dc1d3dfc617883c8ee188915523b003aed8db03e0d5e1c007 From feef06f322a0c96e3de50bd495cb31cc83662514 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 8 Nov 2019 10:15:52 +0000 Subject: [PATCH 15/34] Update to 19.3.0~rc2 --- ...ium-Disable-rgb10-configs-by-default.patch | 27 ------------------- mesa.spec | 11 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 0001-gallium-Disable-rgb10-configs-by-default.patch 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/mesa.spec b/mesa.spec index b89f354..ba8bcdc 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.2.3 +%global ver 19.3.0-rc2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -64,10 +64,6 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt 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 - BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ @@ -330,7 +326,7 @@ cp %{SOURCE1} docs/ %build -%meson -Dcpp_std=gnu++11 \ +%meson -Dcpp_std=gnu++14 \ -Dplatforms=x11,wayland,drm,surfaceless \ -Ddri3=true \ -Ddri-drivers=%{?dri_drivers} \ @@ -585,6 +581,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 88ee138..2c76d33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.2.3.tar.xz) = a64a6b508c28a61b9f5a50f639d0cdca2546caa2118c2478100e3535961d76bf3877357d4a7ddd7dc1d3dfc617883c8ee188915523b003aed8db03e0d5e1c007 +SHA512 (mesa-19.3.0-rc2.tar.xz) = bc198c8cb625b59e11e7bc15e4021ac42733f297f30eb5a08e6fe9830df6f47416a5e8239a249ec2ce5038928fe63aacf5c6647edadf0ef8bb98ff2e9f85a66a From c664beb5a650c51db7358a1bcc1610b7b5719c04 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 12 Nov 2019 13:31:24 +0000 Subject: [PATCH 16/34] Fix the build on arm https://gitlab.freedesktop.org/mesa/mesa/issues/2042 --- fix-arm-build.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ mesa.spec | 3 +++ 2 files changed, 47 insertions(+) create mode 100644 fix-arm-build.patch diff --git a/fix-arm-build.patch b/fix-arm-build.patch new file mode 100644 index 0000000..6e29f6b --- /dev/null +++ b/fix-arm-build.patch @@ -0,0 +1,44 @@ +From 0cb5c96a83e3da2986fc8219b10671a7caea9ee5 Mon Sep 17 00:00:00 2001 +From: Luis Mendes +Date: Sat, 9 Nov 2019 23:21:05 +0000 +Subject: [PATCH] radv: fix radv secure compile feature breaks compilation on + armhf EABI and aarch64 + +__NR_select is not defined the same way across architectures, sometimes is +not even defined, like in armhf EABI and aarch64. + +Signed-off-by: Luis Mendes + +Acked-by: Timothy Arceri + +Acked-by: Samuel Pitoiset + +Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2042 +--- + src/amd/vulkan/radv_device.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c +index 93763c4ae4c..a608c39c5e5 100644 +--- a/src/amd/vulkan/radv_device.c ++++ b/src/amd/vulkan/radv_device.c +@@ -2006,8 +2006,16 @@ static int install_seccomp_filter() { + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, AUDIT_ARCH_X86_64, 0, 12), + + /* Futex is required for mutex locks */ ++ #if defined __NR__newselect ++ BPF_STMT(BPF_LD + BPF_W + BPF_ABS, (offsetof(struct seccomp_data, nr))), ++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, __NR__newselect, 11, 0), ++ #elif defined __NR_select + BPF_STMT(BPF_LD + BPF_W + BPF_ABS, (offsetof(struct seccomp_data, nr))), + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, __NR_select, 11, 0), ++ #else ++ BPF_STMT(BPF_LD + BPF_W + BPF_ABS, (offsetof(struct seccomp_data, nr))), ++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, __NR_pselect6, 11, 0), ++ #endif + + /* Allow system exit calls for the forked process */ + BPF_STMT(BPF_LD + BPF_W + BPF_ABS, (offsetof(struct seccomp_data, nr))), +-- +2.22.0 + diff --git a/mesa.spec b/mesa.spec index ba8bcdc..884c486 100644 --- a/mesa.spec +++ b/mesa.spec @@ -62,6 +62,9 @@ Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz # 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 +# https://gitlab.freedesktop.org/mesa/mesa/issues/2042 +Patch0: fix-arm-build.patch + Patch3: 0003-evergreen-big-endian.patch BuildRequires: meson >= 0.45 From 4d507c6840bb4ffbbf4c83335a11f16322645911 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 14 Nov 2019 09:33:09 +0000 Subject: [PATCH 17/34] Update to 19.3.0~rc3 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 884c486..54ca541 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.3.0-rc2 +%global ver 19.3.0-rc3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -584,6 +584,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 2c76d33..8c3d4fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.3.0-rc2.tar.xz) = bc198c8cb625b59e11e7bc15e4021ac42733f297f30eb5a08e6fe9830df6f47416a5e8239a249ec2ce5038928fe63aacf5c6647edadf0ef8bb98ff2e9f85a66a +SHA512 (mesa-19.3.0-rc3.tar.xz) = a95318f8778c79f611b2915e48bb6270e02735a2325b3538825012bd5ea06477f395b683c63e21b6f1635122f7002d819c8239a36d8e34e0331cec019f4a8c99 From e3793d2b0fd18aaba21ceee58a13bdc327bbe51c Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 24 Nov 2019 21:22:55 +0000 Subject: [PATCH 18/34] Update to 19.3.0~rc4 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 54ca541..75f0108 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.3.0-rc3 +%global ver 19.3.0-rc4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -584,6 +584,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 8c3d4fc..7b4c0aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.3.0-rc3.tar.xz) = a95318f8778c79f611b2915e48bb6270e02735a2325b3538825012bd5ea06477f395b683c63e21b6f1635122f7002d819c8239a36d8e34e0331cec019f4a8c99 +SHA512 (mesa-19.3.0-rc4.tar.xz) = 4f0cda6302f6069e6e3ea1d8bf1eed865702c0554667c580cc48f9ebbd23cdf7391de5219bb1b34c7dde04c2bd0816a8d23f9339537e06be6f5735b526905f49 From e252ca97bcf79d47bfdbcd3751cb1188342b13da Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 28 Nov 2019 11:11:47 +0000 Subject: [PATCH 19/34] Update to 19.3.0~rc5 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 75f0108..101d3d5 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.3.0-rc4 +%global ver 19.3.0-rc5 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -584,6 +584,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 7b4c0aa..7f247da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.3.0-rc4.tar.xz) = 4f0cda6302f6069e6e3ea1d8bf1eed865702c0554667c580cc48f9ebbd23cdf7391de5219bb1b34c7dde04c2bd0816a8d23f9339537e06be6f5735b526905f49 +SHA512 (mesa-19.3.0-rc5.tar.xz) = 25d59baabddafe63512d9998e3ac21f847a32a2639d6b7f106729a3dc7112fec334e3634bda6a17fd0ce8b993e6bc35a5d15fa33a4c9006aaa941db9f5366424 From c91c204f63906ea09306ae6ef7b7a23146251ebb Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 5 Dec 2019 08:14:47 +0000 Subject: [PATCH 20/34] Update to 19.3.0~rc6 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 101d3d5..c288e42 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.3.0-rc5 +%global ver 19.3.0-rc6 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -584,6 +584,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 7f247da..8336b1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.3.0-rc5.tar.xz) = 25d59baabddafe63512d9998e3ac21f847a32a2639d6b7f106729a3dc7112fec334e3634bda6a17fd0ce8b993e6bc35a5d15fa33a4c9006aaa941db9f5366424 +SHA512 (mesa-19.3.0-rc6.tar.xz) = 44b6629a5181c64a7dc141299f4ef7a68cd4d5c339952a94a0aea774e8495b2a7b206a86e42cee965ac27eddd9549d09cf253bbeb7048ddff20ed5cec6d36f80 From 78c38a46dbd47d8c797abfe72ad0fd98f36b5d77 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 16 Dec 2019 03:21:30 +0000 Subject: [PATCH 21/34] Update to 19.3.0 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index c288e42..b93225a 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.3.0-rc6 +%global ver 19.3.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -584,6 +584,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 8336b1c..809273f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.3.0-rc6.tar.xz) = 44b6629a5181c64a7dc141299f4ef7a68cd4d5c339952a94a0aea774e8495b2a7b206a86e42cee965ac27eddd9549d09cf253bbeb7048ddff20ed5cec6d36f80 +SHA512 (mesa-19.3.0.tar.xz) = 69c4519540118fb3d50d718d92f443051c149633cf4291a07706c6d45cd6ad1f6f3b91446de2d31a9082efe9e3b4ce35b7472830e152ba655d83a91c2ed3c042 From 0860841e06251e18e7649fb3269221a6aef4d51d Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 18 Dec 2019 22:00:33 +0000 Subject: [PATCH 22/34] Update to 19.3.1 --- fix-arm-build.patch | 44 -------------------------------------------- mesa.spec | 8 ++++---- sources | 2 +- 3 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 fix-arm-build.patch diff --git a/fix-arm-build.patch b/fix-arm-build.patch deleted file mode 100644 index 6e29f6b..0000000 --- a/fix-arm-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0cb5c96a83e3da2986fc8219b10671a7caea9ee5 Mon Sep 17 00:00:00 2001 -From: Luis Mendes -Date: Sat, 9 Nov 2019 23:21:05 +0000 -Subject: [PATCH] radv: fix radv secure compile feature breaks compilation on - armhf EABI and aarch64 - -__NR_select is not defined the same way across architectures, sometimes is -not even defined, like in armhf EABI and aarch64. - -Signed-off-by: Luis Mendes - -Acked-by: Timothy Arceri - -Acked-by: Samuel Pitoiset - -Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2042 ---- - src/amd/vulkan/radv_device.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c -index 93763c4ae4c..a608c39c5e5 100644 ---- a/src/amd/vulkan/radv_device.c -+++ b/src/amd/vulkan/radv_device.c -@@ -2006,8 +2006,16 @@ static int install_seccomp_filter() { - BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, AUDIT_ARCH_X86_64, 0, 12), - - /* Futex is required for mutex locks */ -+ #if defined __NR__newselect -+ BPF_STMT(BPF_LD + BPF_W + BPF_ABS, (offsetof(struct seccomp_data, nr))), -+ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, __NR__newselect, 11, 0), -+ #elif defined __NR_select - BPF_STMT(BPF_LD + BPF_W + BPF_ABS, (offsetof(struct seccomp_data, nr))), - BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, __NR_select, 11, 0), -+ #else -+ BPF_STMT(BPF_LD + BPF_W + BPF_ABS, (offsetof(struct seccomp_data, nr))), -+ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, __NR_pselect6, 11, 0), -+ #endif - - /* Allow system exit calls for the forked process */ - BPF_STMT(BPF_LD + BPF_W + BPF_ABS, (offsetof(struct seccomp_data, nr))), --- -2.22.0 - diff --git a/mesa.spec b/mesa.spec index b93225a..ba4fc15 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.3.0 +%global ver 19.3.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -62,9 +62,6 @@ Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz # 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 -# https://gitlab.freedesktop.org/mesa/mesa/issues/2042 -Patch0: fix-arm-build.patch - Patch3: 0003-evergreen-big-endian.patch BuildRequires: meson >= 0.45 @@ -584,6 +581,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 809273f..0bcd287 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.3.0.tar.xz) = 69c4519540118fb3d50d718d92f443051c149633cf4291a07706c6d45cd6ad1f6f3b91446de2d31a9082efe9e3b4ce35b7472830e152ba655d83a91c2ed3c042 +SHA512 (mesa-19.3.1.tar.xz) = 338d2e37122ef22cc4e27a2f3c39e23e419703a507ace99383c749a563936c5f0428cce9a68ac80d0bd2ff57be8a55f42aee0ed6d16bf6b77b4e59d428729568 From 88f2b16b7ae7b35a506dc8f4dc9b506f4cfe3fa1 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 10 Jan 2020 10:33:15 +0000 Subject: [PATCH 23/34] Update to 19.3.2 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index ba4fc15..a90d3c9 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.3.1 +%global ver 19.3.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -581,6 +581,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 0bcd287..3494e13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.3.1.tar.xz) = 338d2e37122ef22cc4e27a2f3c39e23e419703a507ace99383c749a563936c5f0428cce9a68ac80d0bd2ff57be8a55f42aee0ed6d16bf6b77b4e59d428729568 +SHA512 (mesa-19.3.2.tar.xz) = fb69999fa7a15cd6f2c254fb6e8fe635e56dc49a5c2c762a96c77815cbad77060b8f81a02e67ac9ec58092ab866e080fb928086a5ac1e61c3efe882e5825cd28 From dfa8e8664d48c487a7a85249e1ddbdd754f6d1b5 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 23 Jan 2020 19:10:49 +0000 Subject: [PATCH 24/34] Build with -fcommon until upstream fixes omx build with gcc10 --- mesa.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index a90d3c9..5de5f5a 100644 --- a/mesa.spec +++ b/mesa.spec @@ -52,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.3.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -326,6 +326,10 @@ cp %{SOURCE1} docs/ %build +# 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 \ @@ -581,6 +585,9 @@ popd %endif %changelog +* 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 From 2208aa87d79bc68b2f12fd4cf0def9582d73fd4b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 13 Dec 2019 18:30:51 +0000 Subject: [PATCH 25/34] Link against libclang-cpp.so https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package --- 0001-Link-with-libclang-cpp.patch | 37 +++++++++++++++++++++++++++++++ mesa.spec | 8 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0001-Link-with-libclang-cpp.patch 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/mesa.spec b/mesa.spec index 5de5f5a..fab805c 100644 --- a/mesa.spec +++ b/mesa.spec @@ -52,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.3.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.mesa3d.org @@ -63,6 +63,8 @@ Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz Source1: Mesa-MLAA-License-Clarification-Email.txt Patch3: 0003-evergreen-big-endian.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 @@ -585,6 +587,10 @@ popd %endif %changelog +* 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 From cb726e7752091feb0c61d1d05f60ed00f900145c Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 29 Jan 2020 07:40:49 +0000 Subject: [PATCH 26/34] Update to 19.3.3 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index fab805c..ee5cda3 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,9 +50,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.3.2 +%global ver 19.3.3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 3%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -587,6 +587,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 3494e13..e46471f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.3.2.tar.xz) = fb69999fa7a15cd6f2c254fb6e8fe635e56dc49a5c2c762a96c77815cbad77060b8f81a02e67ac9ec58092ab866e080fb928086a5ac1e61c3efe882e5825cd28 +SHA512 (mesa-19.3.3.tar.xz) = 1f792fbde71132afd4a43d6abe6a3d640f375e83641c6144c82312774434c9588ffba65a3ba38394947bd753656aa85213b6cd9f745cec0040c0559eb41f0dc9 From 244b45ba4e26e27cd2fd6c7b3881a7a0feb8f141 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 1 Feb 2020 22:42:02 +0000 Subject: [PATCH 27/34] Update to 20.0.0~rc1 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index ee5cda3..90a822d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.3.3 +%global ver 20.0.0-rc1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -587,6 +587,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index e46471f..346b847 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.3.3.tar.xz) = 1f792fbde71132afd4a43d6abe6a3d640f375e83641c6144c82312774434c9588ffba65a3ba38394947bd753656aa85213b6cd9f745cec0040c0559eb41f0dc9 +SHA512 (mesa-20.0.0-rc1.tar.xz) = 1b1d5408768b7eec313083ec12218dfaef1f6bb0e209ee7e49b8974af0cdbfdf71860516e459c6933647ec8895ed61f54db64a26662e3e6500e27560f7d98746 From 17714718d4b5433e43898be9e468b89e8b2c240a Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 2 Feb 2020 20:52:23 +0000 Subject: [PATCH 28/34] Update files list for arm drivers --- mesa.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mesa.spec b/mesa.spec index 90a822d..df26d59 100644 --- a/mesa.spec +++ b/mesa.spec @@ -494,6 +494,8 @@ popd %{_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 From def7df7fd0075ee7fa3e9ac9febcfe733f90a8c3 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 8 Feb 2020 20:15:27 +0000 Subject: [PATCH 29/34] Update to 20.0.0~rc2 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index df26d59..fd1573a 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 20.0.0-rc1 +%global ver 20.0.0-rc2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -589,6 +589,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 346b847..4a24696 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-20.0.0-rc1.tar.xz) = 1b1d5408768b7eec313083ec12218dfaef1f6bb0e209ee7e49b8974af0cdbfdf71860516e459c6933647ec8895ed61f54db64a26662e3e6500e27560f7d98746 +SHA512 (mesa-20.0.0-rc2.tar.xz) = 27e23925ce7e3a38954088db47d564776c4ac7e028d30ef5c58229b3182b461ece37863a69bc42ea4ff0a4817c46c0b0ca8d70f6fafddb5c3fe60bd9c429563b From a3e188c7f16b7ff93157f390d6a21253e75d97c4 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 14 Feb 2020 20:43:28 +0000 Subject: [PATCH 30/34] Update to 20.0.0~rc3 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index fd1573a..7facf72 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 20.0.0-rc2 +%global ver 20.0.0-rc3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -589,6 +589,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 4a24696..9dbb76a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-20.0.0-rc2.tar.xz) = 27e23925ce7e3a38954088db47d564776c4ac7e028d30ef5c58229b3182b461ece37863a69bc42ea4ff0a4817c46c0b0ca8d70f6fafddb5c3fe60bd9c429563b +SHA512 (mesa-20.0.0-rc3.tar.xz) = df873cf961e641b9d9e9a6ce7eccde1a865e9125507e304b1600c6c28f15f89f9b66898a5a474f08a8ad05781d46db532fc7aedf92de3bb73b9ed1f2ba24b6cb From a02bf61649bbe676d1b6cc01dedfce57d0b011aa Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 20 Feb 2020 10:37:35 +0000 Subject: [PATCH 31/34] Update to 20.0.0 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 7facf72..f96db83 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 20.0.0-rc3 +%global ver 20.0.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -589,6 +589,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 9dbb76a..5de7a7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-20.0.0-rc3.tar.xz) = df873cf961e641b9d9e9a6ce7eccde1a865e9125507e304b1600c6c28f15f89f9b66898a5a474f08a8ad05781d46db532fc7aedf92de3bb73b9ed1f2ba24b6cb +SHA512 (mesa-20.0.0.tar.xz) = 3968820029434682fb6644947c76e12b6bb991a3d05cb519a6ea971ecc4aa9b21d03f84b9a452cc21cc77a7981db9e40dd2dfd3ea3dee85b3dd88a59b4842bbb From bd392f431cc481ea754581d3052959bb7454ca5b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 26 Feb 2020 17:12:18 +0100 Subject: [PATCH 32/34] Fix the build with llvm 10 Make sure the build uses gnu++14 as llvm 10 headers require that. https://bugzilla.redhat.com/show_bug.cgi?id=1803351 --- mesa.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index f96db83..33555f9 100644 --- a/mesa.spec +++ b/mesa.spec @@ -52,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 20.0.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -326,6 +326,9 @@ Headers for development with the Vulkan API. %autosetup -n %{name}-%{ver} -p1 cp %{SOURCE1} docs/ +# 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 # Build with -fcommon until the omx build with gcc10 is fixed upstream @@ -589,6 +592,9 @@ popd %endif %changelog +* 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 From 691cc08a957369357cd8355f5a192433a7d49182 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 6 Mar 2020 09:34:14 +0000 Subject: [PATCH 33/34] Update to 20.0.1 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 33555f9..c131215 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,9 +50,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 20.0.0 +%global ver 20.0.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -592,6 +592,9 @@ popd %endif %changelog +* 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) diff --git a/sources b/sources index 5de7a7a..2c7044e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-20.0.0.tar.xz) = 3968820029434682fb6644947c76e12b6bb991a3d05cb519a6ea971ecc4aa9b21d03f84b9a452cc21cc77a7981db9e40dd2dfd3ea3dee85b3dd88a59b4842bbb +SHA512 (mesa-20.0.1.tar.xz) = 9e005ebbb699c1ad83b73c503c467907958a3d9cad644d8f7ac95804fd265debcf563784a1054c8e0bf40106e33b13185607e8270a197e9ddc34c50b1b2c4d82 From 6ce6c8d5e10b575aeb9a3431cd1907f1b8e14e71 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 19 Mar 2020 13:29:41 +0000 Subject: [PATCH 34/34] Update to 20.0.2 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index c131215..cb76f8e 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 20.0.1 +%global ver 20.0.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -592,6 +592,9 @@ popd %endif %changelog +* 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 diff --git a/sources b/sources index 2c7044e..d08e0b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-20.0.1.tar.xz) = 9e005ebbb699c1ad83b73c503c467907958a3d9cad644d8f7ac95804fd265debcf563784a1054c8e0bf40106e33b13185607e8270a197e9ddc34c50b1b2c4d82 +SHA512 (mesa-20.0.2.tar.xz) = d6ffc29bbc5b908cb0f08fa1b5a83e029b76c7b697c488a73e6bb60990a55beeb3ecdba1745868f6885ee2f660975f5debf7d2c9418e0a96e2f7049e83fd89ab