From dd7e950818b74d65a96fa9a01e26db984c00c040 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 6 Nov 2018 17:04:54 +0100 Subject: [PATCH 01/13] Rebuild without workaround Signed-off-by: Igor Gnatenko --- mesa.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index 1356b18..911c08d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -43,7 +43,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 18.2.4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.mesa3d.org @@ -349,9 +349,6 @@ autoreconf -vfi %global asm_flags --disable-asm %endif -#workaround store merging bug in gcc 8.2.1-4 (#1645400) -export CFLAGS="%{optflags} -fno-store-merging" -export CXXFLAGS="%{optflags} -fno-store-merging" %configure \ %{?asm_flags} \ --enable-libglvnd \ @@ -621,6 +618,9 @@ popd %{_includedir}/vulkan/ %changelog +* Tue Nov 06 2018 Igor Gnatenko - 18.2.4-3 +- Remove workaround + * Tue Nov 06 2018 Dave Airlie - 18.2.4-2 - workaround bug with gcc 8.2.1-4 From 652f89b81e3b1b4c7d1a9e79656d3e5fb76e6d24 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 14 Nov 2018 12:07:44 -0500 Subject: [PATCH 02/13] Update to 18.3.0 RC2 Re-enable 10bpc fbconfigs, clutter apps seem to work now Drop now-unnecessary big-endian compilation fix --- 0004-bigendian-assert.patch | 27 --------------------------- mesa.spec | 19 ++++++++++--------- sources | 2 +- 3 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 0004-bigendian-assert.patch diff --git a/0004-bigendian-assert.patch b/0004-bigendian-assert.patch deleted file mode 100644 index 8de9975..0000000 --- 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/mesa.spec b/mesa.spec index 911c08d..94c5a72 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,9 +41,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.2.4 +%global ver 18.3.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 @@ -59,11 +59,10 @@ Source4: Mesa-MLAA-License-Clarification-Email.txt Patch1: 0001-llvm-SONAME-without-version.patch Patch3: 0003-evergreen-big-endian.patch -Patch4: 0004-bigendian-assert.patch # Disable rgb10 configs by default: # https://bugzilla.redhat.com/show_bug.cgi?id=1560481 -Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch +#Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -388,10 +387,6 @@ autoreconf -vfi %install %make_install -%if !%{with_hardware} -rm -f %{buildroot}%{_sysconfdir}/drirc -%endif - # libvdpau opens the versioned name, don't bother including the unversioned rm -f %{buildroot}%{_libdir}/vdpau/*.so # likewise glvnd @@ -539,8 +534,9 @@ popd %endif %files dri-drivers +%dir %{_datadir}/drirc.d +%{_datadir}/drirc.d/00-mesa-defaults.conf %if %{with_hardware} -%config(noreplace) %{_sysconfdir}/drirc %{_libdir}/dri/radeon_dri.so %{_libdir}/dri/r200_dri.so %{_libdir}/dri/nouveau_vieux_dri.so @@ -618,6 +614,11 @@ popd %{_includedir}/vulkan/ %changelog +* Wed Nov 14 2018 Adam Jackson 18.3.0~rc2.1 +- Update to 18.3.0 RC2 +- Re-enable 10bpc fbconfigs, clutter apps seem to work now +- Drop now-unnecessary big-endian compilation fix + * Tue Nov 06 2018 Igor Gnatenko - 18.2.4-3 - Remove workaround diff --git a/sources b/sources index 39ff665..35a41a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.2.4.tar.xz) = 287950e9e1265c53d50f50b84de38cbea2ad1a027604fc7c4b6896481e9ad265ed8bd68c5bb1030dcf36a03d064ac41561064787f251521c63caa46c9e4d2273 +SHA512 (mesa-18.3.0-rc2.tar.xz) = 57970fcfc9a99c826283759acb681c7db7287704e874d5e4c0b38172acf92165068360030f435aa01df3a74f73f1e3a9f72d26fbe91101bbb1a9a2b0cafa8b11 From 3e58ffc41c59fdd9293cdadf0ea8c82f30a31f90 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 15 Nov 2018 12:54:18 -0500 Subject: [PATCH 03/13] Add mesa-khr-devel subpackage to hold , and make mesa-lib{GL,GLES,EGL}-devel Require it. --- mesa.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index 94c5a72..faeaa59 100644 --- a/mesa.spec +++ b/mesa.spec @@ -43,7 +43,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 18.3.0-rc2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -136,6 +136,12 @@ 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} @@ -148,6 +154,7 @@ 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} @@ -165,6 +172,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} Provides: libEGL-devel Provides: libEGL-devel%{?_isa} @@ -183,6 +191,7 @@ Requires: libglvnd-gles%{?_isa} 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} @@ -426,6 +435,10 @@ 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* @@ -453,8 +466,6 @@ popd %{_includedir}/EGL/eglmesaext.h %{_includedir}/EGL/eglplatform.h %{_includedir}/EGL/eglextchromium.h -%dir %{_includedir}/KHR -%{_includedir}/KHR/khrplatform.h %{_libdir}/pkgconfig/egl.pc %files libGLES @@ -614,7 +625,11 @@ popd %{_includedir}/vulkan/ %changelog -* Wed Nov 14 2018 Adam Jackson 18.3.0~rc2.1 +* Thu Nov 15 2018 Adam Jackson 18.3.0~rc2-2 +- Add mesa-khr-devel subpackage to hold , and make + mesa-lib{GL,GLES,EGL}-devel Require it. + +* Wed Nov 14 2018 Adam Jackson 18.3.0~rc2-1 - Update to 18.3.0 RC2 - Re-enable 10bpc fbconfigs, clutter apps seem to work now - Drop now-unnecessary big-endian compilation fix From 8c69d04266f3e90858be36a132c0c5839eb3a437 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 27 Nov 2018 14:33:56 +0100 Subject: [PATCH 04/13] Update to 18.3.0~rc4 Signed-off-by: Igor Gnatenko --- Makefile | 2 +- mesa.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 93443f3..3b50dbc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.2.3 +VERSION ?= 18.3.0-rc4 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index faeaa59..a876202 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,9 +41,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.3.0-rc2 +%global ver 18.3.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 @@ -625,6 +625,9 @@ popd %{_includedir}/vulkan/ %changelog +* Tue Nov 27 2018 Igor Gnatenko - 18.3.0~rc4-1 +- Update to 18.3.0~rc4 + * Thu Nov 15 2018 Adam Jackson 18.3.0~rc2-2 - Add mesa-khr-devel subpackage to hold , and make mesa-lib{GL,GLES,EGL}-devel Require it. diff --git a/sources b/sources index 35a41a2..4d7cd92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.3.0-rc2.tar.xz) = 57970fcfc9a99c826283759acb681c7db7287704e874d5e4c0b38172acf92165068360030f435aa01df3a74f73f1e3a9f72d26fbe91101bbb1a9a2b0cafa8b11 +SHA512 (mesa-18.3.0-rc4.tar.xz) = 46f493b07d079b6eecdf957909be57bedea54d86253914cc08a1c457168149fac7cdadba5023122dbe939ef56fcc413b537b712a4441918fe2b844159726f92e From fa32bd11e263cf2c4251c8bac36458225e7a9651 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 4 Dec 2018 02:58:24 +0000 Subject: [PATCH 05/13] 18.3.0 rc5 --- Makefile | 2 +- mesa.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b50dbc..f4356de 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.3.0-rc4 +VERSION ?= 18.3.0-rc5 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index a876202..27b8dd6 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,7 +41,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.3.0-rc4 +%global ver 18.3.0-rc5 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -625,6 +625,9 @@ popd %{_includedir}/vulkan/ %changelog +* Tue Dec 4 2018 Peter Robinson 18.3.0~rc5-1 +- Update to 18.3.0~rc5 + * Tue Nov 27 2018 Igor Gnatenko - 18.3.0~rc4-1 - Update to 18.3.0~rc4 diff --git a/sources b/sources index 4d7cd92..ece6bdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.3.0-rc4.tar.xz) = 46f493b07d079b6eecdf957909be57bedea54d86253914cc08a1c457168149fac7cdadba5023122dbe939ef56fcc413b537b712a4441918fe2b844159726f92e +SHA512 (mesa-18.3.0-rc5.tar.xz) = 0e6008390d04fc65b8e4d0d6df8fbf57606fd703c1a85277d0a3a0002f703feb005556bdacbcb65760b5ff322218a0a06a8dd7e1029ad9999cd29de31c028c8e From b133108f508294e35b1639985eb8f2ce0463ddcc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 4 Dec 2018 12:17:16 +0100 Subject: [PATCH 06/13] Backport patch to fix totem Signed-off-by: Igor Gnatenko --- ...re-EGL-surface-is-resized-on-DRI-upd.patch | 61 +++++++++++++++++++ mesa.spec | 9 ++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch diff --git a/0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch b/0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch new file mode 100644 index 0000000..e257006 --- /dev/null +++ b/0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch @@ -0,0 +1,61 @@ +From 0f0d7cd2ecf20d0f74df6c6ec7d04bb3b7156c30 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho +Date: Tue, 20 Nov 2018 18:06:38 +0100 +Subject: [PATCH] wayland/egl: Ensure EGL surface is resized on DRI + update_buffers() + +Fullscreening and unfullscreening a totem window while playing a video +sometimes results in the video subsurface not changing size along. This +is also reproducible with epiphany. + +If a surface gets resized while we have an active back buffer for it, the +resized dimensions won't get neither immediately applied on the resize +callback, nor correctly synchronized on update_buffers(), as the +(now stale) surface size and currently attached buffer size still do match. + +There's actually 2 things to synchronize here, first the surface query +size might not be updated yet to the wl_egl_window's (i.e. resize_callback +happened while there is a back buffer), and second the wayland buffers +would need dropping if new surface size differs with the currently attached +buffer. These are done in separate steps now. + +https://bugzilla.redhat.com/show_bug.cgi?id=1650929 + +Signed-off-by: Carlos Garnacho +Tested-by: Bastien Nocera +--- + src/egl/drivers/dri2/platform_wayland.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c +index 34e09d7ec1..474a13316b 100644 +--- a/src/egl/drivers/dri2/platform_wayland.c ++++ b/src/egl/drivers/dri2/platform_wayland.c +@@ -597,10 +597,8 @@ update_buffers(struct dri2_egl_surface *dri2_surf) + struct dri2_egl_display *dri2_dpy = + dri2_egl_display(dri2_surf->base.Resource.Display); + +- if (dri2_surf->base.Width != dri2_surf->wl_win->attached_width || +- dri2_surf->base.Height != dri2_surf->wl_win->attached_height) { +- +- dri2_wl_release_buffers(dri2_surf); ++ if (dri2_surf->base.Width != dri2_surf->wl_win->width || ++ dri2_surf->base.Height != dri2_surf->wl_win->height) { + + dri2_surf->base.Width = dri2_surf->wl_win->width; + dri2_surf->base.Height = dri2_surf->wl_win->height; +@@ -608,6 +606,11 @@ update_buffers(struct dri2_egl_surface *dri2_surf) + dri2_surf->dy = dri2_surf->wl_win->dy; + } + ++ if (dri2_surf->base.Width != dri2_surf->wl_win->attached_width || ++ dri2_surf->base.Height != dri2_surf->wl_win->attached_height) { ++ dri2_wl_release_buffers(dri2_surf); ++ } ++ + if (get_back_bo(dri2_surf) < 0) { + _eglError(EGL_BAD_ALLOC, "failed to allocate color buffer"); + return -1; +-- +2.20.0.rc2 + diff --git a/mesa.spec b/mesa.spec index 27b8dd6..7768a4e 100644 --- a/mesa.spec +++ b/mesa.spec @@ -43,7 +43,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 18.3.0-rc5 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -64,6 +64,10 @@ Patch3: 0003-evergreen-big-endian.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1560481 #Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch +# https://lists.freedesktop.org/archives/mesa-dev/2018-November/210797.html +# https://bugzilla.redhat.com/show_bug.cgi?id=1650929 +Patch10: 0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: automake @@ -625,6 +629,9 @@ popd %{_includedir}/vulkan/ %changelog +* Tue Dec 04 2018 Igor Gnatenko - 18.3.0~rc5-2 +- Backport patch to fix totem + * Tue Dec 4 2018 Peter Robinson 18.3.0~rc5-1 - Update to 18.3.0~rc5 From 5f47246ad66550cebffaef3d5e2d8dd0d80cef8c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 7 Dec 2018 17:48:06 +0100 Subject: [PATCH 07/13] Remove unused patches Signed-off-by: Igor Gnatenko --- glvnd-fix-gl-dot-pc.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 glvnd-fix-gl-dot-pc.patch diff --git a/glvnd-fix-gl-dot-pc.patch b/glvnd-fix-gl-dot-pc.patch deleted file mode 100644 index 68118f4..0000000 --- a/glvnd-fix-gl-dot-pc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in ---- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500 -+++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400 -@@ -7,7 +7,7 @@ Name: gl - Description: Mesa OpenGL library - Requires.private: @GL_PC_REQ_PRIV@ - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -l@GL_LIB@ -+Libs: -L${libdir} -lGL - Libs.private: @GL_PC_LIB_PRIV@ - Cflags: -I${includedir} @GL_PC_CFLAGS@ - glx_tls: @GLX_TLS@ From 2eeaa037c1c287fb32df748976881c11e217905a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 7 Dec 2018 17:47:22 +0100 Subject: [PATCH 08/13] Update to 18.3.0 Signed-off-by: Igor Gnatenko --- Makefile | 2 +- mesa.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f4356de..7a86e01 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.3.0-rc5 +VERSION ?= 18.3.0 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index 7768a4e..9ca37cf 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,9 +41,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.3.0-rc5 +%global ver 18.3.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -629,6 +629,9 @@ popd %{_includedir}/vulkan/ %changelog +* Fri Dec 07 2018 Igor Gnatenko - 18.3.0-1 +- Update to 18.3.0 + * Tue Dec 04 2018 Igor Gnatenko - 18.3.0~rc5-2 - Backport patch to fix totem diff --git a/sources b/sources index ece6bdb..2af956a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.3.0-rc5.tar.xz) = 0e6008390d04fc65b8e4d0d6df8fbf57606fd703c1a85277d0a3a0002f703feb005556bdacbcb65760b5ff322218a0a06a8dd7e1029ad9999cd29de31c028c8e +SHA512 (mesa-18.3.0.tar.xz) = 0737311f2848176370c7227926208f3de58c6088b019813880715645b861c969f80735bd29dcdc43dad16682eb56139dd578a26b680c1949aa2373b911098d41 From 9b0b893a3cd24581c7461fe8e1858ce1146ca1f7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 18 Dec 2018 14:58:00 +0100 Subject: [PATCH 09/13] Update to 18.3.1 Signed-off-by: Igor Gnatenko --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 2af956a..e177009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.3.0.tar.xz) = 0737311f2848176370c7227926208f3de58c6088b019813880715645b861c969f80735bd29dcdc43dad16682eb56139dd578a26b680c1949aa2373b911098d41 +SHA512 (mesa-18.3.1.tar.xz) = 3582d19877d7a3e495da86925cf867627a2042418f00f0b1b4f26b3584420e84f59df950abaee637ad115802f9cfc2321e8906d5f218079b00b0fe44dfffab59 From d07e7ed999bf4f1af8ac6964a3b059ebb4656c15 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 18 Dec 2018 14:59:44 +0100 Subject: [PATCH 10/13] commit spec changes Signed-off-by: Igor Gnatenko --- Makefile | 2 +- mesa.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7a86e01..a2d9817 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.3.0 +VERSION ?= 18.3.1 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index 9ca37cf..173f769 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,7 +41,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.3.0 +%global ver 18.3.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -629,6 +629,9 @@ popd %{_includedir}/vulkan/ %changelog +* Tue Dec 18 2018 Igor Gnatenko - 18.3.1-1 +- Update to 18.3.1 + * Fri Dec 07 2018 Igor Gnatenko - 18.3.0-1 - Update to 18.3.0 From b708cfc9f31217d275abe667b72267104bba0ea7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 4 Dec 2018 15:30:12 +0100 Subject: [PATCH 11/13] Switch to meson buildsystem Signed-off-by: Igor Gnatenko --- ...ium-Disable-rgb10-configs-by-default.patch | 27 -- 0001-llvm-SONAME-without-version.patch | 26 -- mesa.spec | 275 +++++++++--------- 3 files changed, 140 insertions(+), 188 deletions(-) delete mode 100644 0001-gallium-Disable-rgb10-configs-by-default.patch delete mode 100644 0001-llvm-SONAME-without-version.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/0001-llvm-SONAME-without-version.patch b/0001-llvm-SONAME-without-version.patch deleted file mode 100644 index cb91094..0000000 --- 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/mesa.spec b/mesa.spec index 173f769..e30fc3e 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,41 +1,50 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=1546714 %undefine _annotated_build -%ifarch s390x -%define with_hardware 0 -%define base_drivers swrast -%else -%define with_hardware 1 -%define with_vdpau 1 -%define with_vaapi 1 -%define with_nine 1 -%define with_omx 1 -%define with_opencl 1 -%define base_drivers swrast,nouveau,radeon,r200 +%ifnarch s390x +%global with_hardware 1 +%global with_vdpau 1 +%global with_vaapi 1 +%global with_nine 1 +%global with_omx 1 +%global with_opencl 1 +%global base_drivers nouveau,r100,r200 %endif %ifarch %{ix86} x86_64 -%define platform_drivers ,i915,i965 -%define with_vmware 1 -%define with_xa 1 -%define vulkan_drivers --with-vulkan-drivers=intel,radeon +%global platform_drivers ,i915,i965 +%global with_vmware 1 +%global with_xa 1 +%global vulkan_drivers intel,amd %else -%define vulkan_drivers --with-vulkan-drivers=radeon +%ifnarch s390x +%global vulkan_drivers amd +%endif %endif %ifarch %{arm} aarch64 -%define with_etnaviv 1 -%define with_freedreno 1 -%define with_tegra 1 -%define with_vc4 1 -%define with_xa 1 +%global with_etnaviv 1 +%global with_freedreno 1 +%global with_tegra 1 +%global with_vc4 1 +%global with_xa 1 %endif %ifnarch %{arm} s390x -%define with_radeonsi 1 +%global with_radeonsi 1 %endif -%define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers} +%ifnarch %{x86} +%global with_asm 1 +%endif + +%ifarch %{valgrind_arches} +%bcond_without valgrind +%else +%bcond_with valgrind +%endif + +%global dri_drivers %{?base_drivers}%{?platform_drivers} %global sanitize 0 @@ -43,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 18.3.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -57,77 +66,86 @@ Source3: Makefile # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source4: Mesa-MLAA-License-Clarification-Email.txt -Patch1: 0001-llvm-SONAME-without-version.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://lists.freedesktop.org/archives/mesa-dev/2018-November/210797.html # https://bugzilla.redhat.com/show_bug.cgi?id=1650929 Patch10: 0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch +BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: libtool +BuildRequires: gettext -%if %{with_hardware} +%if 0%{?with_hardware} BuildRequires: kernel-headers %endif -BuildRequires: libdrm-devel >= 2.4.42 -BuildRequires: libXxf86vm-devel -BuildRequires: expat-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: makedepend -BuildRequires: libselinux-devel -BuildRequires: pkgconfig(xrandr) -BuildRequires: libXext-devel -BuildRequires: libXfixes-devel -BuildRequires: libXdamage-devel -BuildRequires: libXi-devel -BuildRequires: libXmu-devel -BuildRequires: libxshmfence-devel -BuildRequires: elfutils -BuildRequires: python3 -BuildRequires: python2 -BuildRequires: gettext -BuildRequires: llvm-devel >= 3.4-7 -%if 0%{?with_opencl} -BuildRequires: clang-devel >= 3.0 +%ifarch %{ix86} x86_64 +BuildRequires: pkgconfig(libdrm_intel) >= 2.4.75 %endif -BuildRequires: elfutils-libelf-devel -BuildRequires: python3-libxml2 -BuildRequires: python2-libxml2 -BuildRequires: libudev-devel -BuildRequires: bison flex -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wayland-protocols) +%if 0%{?with_radeonsi} +BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.95 +%endif +BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.71 +BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.66 +%if 0%{?with_etnaviv} +BuildRequires: pkgconfig(libdrm_etnaviv) >= 2.4.89 +%endif +%if 0%{?with_vc4} +BuildRequires: pkgconfig(libdrm) >= 2.4.89 +%endif +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(zlib) >= 1.2.3 +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(wayland-scanner) +BuildRequires: pkgconfig(wayland-protocols) >= 1.8 +BuildRequires: pkgconfig(wayland-client) >= 1.11 +BuildRequires: pkgconfig(wayland-server) >= 1.11 +BuildRequires: pkgconfig(wayland-egl-backend) >= 3 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xdamage) >= 1.1 +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xcb-glx) >= 1.8.1 +BuildRequires: pkgconfig(xxf86vm) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(x11-xcb) +BuildRequires: pkgconfig(xcb-dri2) >= 1.8 +BuildRequires: pkgconfig(xcb-dri3) +BuildRequires: pkgconfig(xcb-present) +BuildRequires: pkgconfig(xcb-sync) +BuildRequires: pkgconfig(xshmfence) >= 1.1 +BuildRequires: pkgconfig(dri2proto) >= 2.8 +BuildRequires: pkgconfig(glproto) >= 1.4.14 +BuildRequires: pkgconfig(xcb-xfixes) +BuildRequires: pkgconfig(xcb-randr) >= 1.12 +BuildRequires: pkgconfig(xrandr) >= 1.3 +BuildRequires: bison +BuildRequires: flex %if 0%{?with_vdpau} -BuildRequires: libvdpau-devel +BuildRequires: pkgconfig(vdpau) >= 1.1 %endif %if 0%{?with_vaapi} -BuildRequires: libva-devel >= 0.39.0 +BuildRequires: pkgconfig(libva) >= 0.38.0 %endif -BuildRequires: pkgconfig(zlib) %if 0%{?with_omx} -BuildRequires: libomxil-bellagio-devel +BuildRequires: pkgconfig(libomxil-bellagio) %endif +BuildRequires: pkgconfig(libelf) +BuildRequires: pkgconfig(libglvnd) >= 0.2.0 +BuildRequires: llvm-devel >= 6.0.0 %if 0%{?with_opencl} -BuildRequires: libclc-devel opencl-filesystem +BuildRequires: clang-devel +BuildRequires: pkgconfig(libclc) %endif +%if %{with valgrind} +BuildRequires: pkgconfig(valgrind) +%endif +BuildRequires: python3-devel +BuildRequires: python3-mako %if 0%{?with_hardware} -BuildRequires: vulkan-devel +BuildRequires: vulkan-devel %endif -BuildRequires: python3-mako -BuildRequires: python2-mako -%ifarch %{valgrind_arches} -BuildRequires: pkgconfig(valgrind) -%endif -BuildRequires: pkgconfig(libglvnd) >= 0.2.0 %description %{summary}. @@ -355,74 +373,57 @@ cp %{SOURCE4} docs/ cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c %endif -autoreconf -vfi -%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 \ - %{?with_vdpau:--enable-vdpau} \ - %{?with_vaapi:--enable-va} \ - --with-platforms=x11,drm,surfaceless,wayland \ - --enable-shared-glapi \ - --enable-gbm \ - %{?with_omx:--enable-omx-bellagio} \ - %{?with_opencl:--enable-opencl --enable-opencl-icd} %{!?with_opencl:--disable-opencl} \ - --enable-glx-tls \ - --enable-texture-float=yes \ +%meson -Dcpp_std=gnu++11 \ + -Dplatforms=x11,wayland,drm,surfaceless \ + -Ddri3=true \ + -Ddri-drivers=%{?dri_drivers} \ %if 0%{?with_hardware} - %{?vulkan_drivers} \ -%endif - --enable-llvm \ - --enable-llvm-shared-libs \ - --enable-dri \ -%if %{with_hardware} - %{?with_xa:--enable-xa} \ - %{?with_nine:--enable-nine} \ - --with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,r600,}swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_tegra:tegra,}%{?with_vc4:vc4,}virgl,r300,nouveau \ + -Dgallium-drivers=swrast,virgl,r300,nouveau%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv,imx}%{?with_tegra:,tegra}%{?with_vc4:,vc4} \ %else - --with-gallium-drivers=swrast,virgl \ + -Dgallium-drivers=swrast,virgl \ %endif - %{?dri_drivers} - -%make_build MKDEP=/bin/true V=1 + -Dgallium-vdpau=%{?with_vdpau:true}%{!?with_vdpau:false} \ + -Dgallium-xvmc=false \ + -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \ + -Dgallium-va=%{?with_vaapi:true}%{!?with_vaapi:false} \ + -Dgallium-xa=%{?with_xa:true}%{!?with_xa:false} \ + -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \ + -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 # libvdpau opens the versioned name, don't bother including the unversioned -rm -f %{buildroot}%{_libdir}/vdpau/*.so +rm -vf %{buildroot}%{_libdir}/vdpau/*.so # likewise glvnd -rm -f %{buildroot}%{_libdir}/libGLX_mesa.so -rm -f %{buildroot}%{_libdir}/libEGL_mesa.so +rm -vf %{buildroot}%{_libdir}/libGLX_mesa.so +rm -vf %{buildroot}%{_libdir}/libEGL_mesa.so # XXX can we just not build this -rm -f %{buildroot}%{_libdir}/libGLES* +rm -vf %{buildroot}%{_libdir}/libGLES* # glvnd needs a default provider for indirect rendering where it cannot # determine the vendor ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0 -# strip out useless headers -rm -f %{buildroot}%{_includedir}/GL/w*.h - -# these are shipped already in vulkan-devel -mkdir -p %{buildroot}/%{_includedir}/vulkan/ -rm -f %{buildroot}/%{_includedir}/vulkan/vk_platform.h -rm -f %{buildroot}/%{_includedir}/vulkan/vulkan.h - -# remove .la files -find %{buildroot} -name '*.la' -delete - # this keeps breaking, check it early. note that the exit from eu-ftr is odd. pushd %{buildroot}%{_libdir} for i in libOSMesa*.so libGL.so ; do @@ -433,7 +434,7 @@ popd %files filesystem %doc docs/Mesa-MLAA-License-Clarification-Email.txt %dir %{_libdir}/dri -%if %{with_hardware} +%if 0%{?with_hardware} %if 0%{?with_vdpau} %dir %{_libdir}/vdpau %endif @@ -513,13 +514,13 @@ popd %if 0%{?with_xa} %ldconfig_scriptlets libxatracker %files libxatracker -%if %{with_hardware} +%if 0%{?with_hardware} %{_libdir}/libxatracker.so.2 %{_libdir}/libxatracker.so.2.* %endif %files libxatracker-devel -%if %{with_hardware} +%if 0%{?with_hardware} %{_libdir}/libxatracker.so %{_includedir}/xa_tracker.h %{_includedir}/xa_composite.h @@ -551,7 +552,7 @@ popd %files dri-drivers %dir %{_datadir}/drirc.d %{_datadir}/drirc.d/00-mesa-defaults.conf -%if %{with_hardware} +%if 0%{?with_hardware} %{_libdir}/dri/radeon_dri.so %{_libdir}/dri/r200_dri.so %{_libdir}/dri/nouveau_vieux_dri.so @@ -596,7 +597,7 @@ popd %{_libdir}/dri/swrast_dri.so %{_libdir}/dri/virtio_gpu_dri.so -%if %{with_hardware} +%if 0%{?with_hardware} %if 0%{?with_omx} %files omx-drivers %{_libdir}/bellagio/libomx_mesa.so @@ -609,9 +610,6 @@ popd %{_libdir}/vdpau/libvdpau_r600.so.1* %{_libdir}/vdpau/libvdpau_radeonsi.so.1* %endif -%if 0%{?with_tegra} -%{_libdir}/vdpau/libvdpau_tegra.so.1* -%endif %endif %endif @@ -626,9 +624,16 @@ popd %endif %files vulkan-devel -%{_includedir}/vulkan/ +%if 0%{?with_hardware} +%ifarch %{ix86} x86_64 +%{_includedir}/vulkan/vulkan_intel.h +%endif +%endif %changelog +* Wed Dec 19 2018 Igor Gnatenko - 18.3.1-2 +- Switch to meson buildsystem + * Tue Dec 18 2018 Igor Gnatenko - 18.3.1-1 - Update to 18.3.1 From 14fb58e0bdb56319f9852243fa395bd0e1e1d98d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 19 Dec 2018 11:50:57 +0100 Subject: [PATCH 12/13] Enable annotated build Signed-off-by: Igor Gnatenko --- mesa.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index e30fc3e..43ba258 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,6 +1,3 @@ -# https://bugzilla.redhat.com/show_bug.cgi?id=1546714 -%undefine _annotated_build - %ifnarch s390x %global with_hardware 1 %global with_vdpau 1 @@ -52,7 +49,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 18.3.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.mesa3d.org @@ -631,6 +628,9 @@ popd %endif %changelog +* Wed Dec 19 2018 Igor Gnatenko - 18.3.1-3 +- Enable annotated build + * Wed Dec 19 2018 Igor Gnatenko - 18.3.1-2 - Switch to meson buildsystem From 0794d42c873e34934863759388940d93f8ee1571 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 17 Jan 2019 10:35:17 -0500 Subject: [PATCH 13/13] Update to 18.3.2 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 43ba258..7d80aa9 100644 --- a/mesa.spec +++ b/mesa.spec @@ -47,9 +47,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.3.1 +%global ver 18.3.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 3%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -628,6 +628,9 @@ popd %endif %changelog +* Thu Jan 17 2019 Adam Jackson - 18.3.2-1 +- Update to 18.3.2 + * Wed Dec 19 2018 Igor Gnatenko - 18.3.1-3 - Enable annotated build diff --git a/sources b/sources index e177009..6513452 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.3.1.tar.xz) = 3582d19877d7a3e495da86925cf867627a2042418f00f0b1b4f26b3584420e84f59df950abaee637ad115802f9cfc2321e8906d5f218079b00b0fe44dfffab59 +SHA512 (mesa-18.3.2.tar.xz) = fb128a089817cf94c9fbb7a73fc7fe97e2920d8cbfd9e395917d01323f8e943962f26814d28d9ba66728155dc67f9edca9347096c79772217ffa7764fe06104b