From 7e16421963f89e71c88f1e8e4a864b572549b585 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 19 Aug 2018 18:13:00 +0200 Subject: [PATCH 01/71] no radeon vulkan driver on arm Signed-off-by: Igor Gnatenko --- mesa.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mesa.spec b/mesa.spec index cd1db2a..932c89f 100644 --- a/mesa.spec +++ b/mesa.spec @@ -20,8 +20,10 @@ %define with_xa 1 %define vulkan_drivers --with-vulkan-drivers=intel,radeon %else +%ifnarch %{arm} %define vulkan_drivers --with-vulkan-drivers=radeon %endif +%endif %ifarch %{arm} aarch64 %define with_etnaviv 1 From b13b769fca904667f96bf4ea4b0200500442a3a0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 19 Aug 2018 19:51:09 +0200 Subject: [PATCH 02/71] correct files Signed-off-by: Igor Gnatenko --- mesa.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mesa.spec b/mesa.spec index 932c89f..f8477fb 100644 --- a/mesa.spec +++ b/mesa.spec @@ -616,9 +616,11 @@ popd %{_libdir}/libvulkan_intel.so %{_datadir}/vulkan/icd.d/intel_icd.*.json %endif +%ifnarch %{arm} %{_libdir}/libvulkan_radeon.so %{_datadir}/vulkan/icd.d/radeon_icd.*.json %endif +%endif %files vulkan-devel %{_includedir}/vulkan/ From 8ce34a59a77efab752f1892e636d1d92a20a9d8a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 21 Aug 2018 09:52:29 +0100 Subject: [PATCH 03/71] 18.2.0~rc3 --- Makefile | 2 +- mesa.spec | 11 +++++------ sources | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 38384b1..b181d74 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.2.0-rc2 +VERSION ?= 18.2.0-rc3 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index f8477fb..b1874c5 100644 --- a/mesa.spec +++ b/mesa.spec @@ -43,9 +43,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.2.0-rc2 +%global ver 18.2.0-rc3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 0.3%{?dist} License: MIT URL: http://www.mesa3d.org @@ -67,10 +67,6 @@ Patch4: 0004-bigendian-assert.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1560481 Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch -# glvnd support patches -# non-upstreamed ones -Patch10: glvnd-fix-gl-dot-pc.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: automake @@ -626,6 +622,9 @@ popd %{_includedir}/vulkan/ %changelog +* Mon Aug 20 2018 Peter Robinson 18.2.0~rc3-0.3 +- Update to 18.2.0~rc3 + * Sat Aug 11 2018 Igor Gnatenko - 18.2.0~rc2-1 - Update to 18.2.0~rc2 diff --git a/sources b/sources index b425012..ee78deb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.2.0-rc2.tar.xz) = 4210cb26c94ae4a070b3effa895ead78c65d28094fe100f930cde02324f22075482620a59152694f69a98ce3b4dd984b6af6f60638a9e51c0df7b7c967d1f0eb +SHA512 (mesa-18.2.0-rc3.tar.xz) = 6fbec32bf38d60c98d2902a634055e3bfd593ba30a3fcab9cc4803d91e49fb8a898ccb76650bf7de1c7dd0341d3a742b7a5c4cbb7858b879bc579f406c4656ec From 9c9ed483b320c2378383668c56bcb72cc1e371c0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 22 Aug 2018 09:06:33 +0200 Subject: [PATCH 04/71] Re-enable RadeonSI on ARM Signed-off-by: Igor Gnatenko --- mesa.spec | 8 ++------ sources | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mesa.spec b/mesa.spec index b1874c5..8e42007 100644 --- a/mesa.spec +++ b/mesa.spec @@ -20,10 +20,8 @@ %define with_xa 1 %define vulkan_drivers --with-vulkan-drivers=intel,radeon %else -%ifnarch %{arm} %define vulkan_drivers --with-vulkan-drivers=radeon %endif -%endif %ifarch %{arm} aarch64 %define with_etnaviv 1 @@ -45,7 +43,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 18.2.0-rc3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 0.3%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -612,17 +610,15 @@ popd %{_libdir}/libvulkan_intel.so %{_datadir}/vulkan/icd.d/intel_icd.*.json %endif -%ifnarch %{arm} %{_libdir}/libvulkan_radeon.so %{_datadir}/vulkan/icd.d/radeon_icd.*.json %endif -%endif %files vulkan-devel %{_includedir}/vulkan/ %changelog -* Mon Aug 20 2018 Peter Robinson 18.2.0~rc3-0.3 +* Mon Aug 20 2018 Peter Robinson 18.2.0~rc3-1 - Update to 18.2.0~rc3 * Sat Aug 11 2018 Igor Gnatenko - 18.2.0~rc2-1 diff --git a/sources b/sources index ee78deb..3457bf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.2.0-rc3.tar.xz) = 6fbec32bf38d60c98d2902a634055e3bfd593ba30a3fcab9cc4803d91e49fb8a898ccb76650bf7de1c7dd0341d3a742b7a5c4cbb7858b879bc579f406c4656ec +SHA512 (mesa-18.2.0-rc3.tar.xz) = 414075187ee77f9f2ad9f13c85b462c395556d8db7c4ca25e6a4653ee4477583678da10c00f333899b87d38d6d0bba3d931bb7b6510e5e5eab07beaaf4c81621 From 1176e8c491f3718c38c0ec217b21051f41779a93 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 2 Sep 2018 18:44:27 +0200 Subject: [PATCH 05/71] Update to 18.2.0~rc5 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 8e42007..2bf0646 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,7 +41,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.2.0-rc3 +%global ver 18.2.0-rc5 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -618,6 +618,9 @@ popd %{_includedir}/vulkan/ %changelog +* Sun Sep 2 2018 Hans de Goede - 18.2.0~rc5-1 +- Update to 18.2.0~rc5 + * Mon Aug 20 2018 Peter Robinson 18.2.0~rc3-1 - Update to 18.2.0~rc3 diff --git a/sources b/sources index 3457bf5..761f368 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.2.0-rc3.tar.xz) = 414075187ee77f9f2ad9f13c85b462c395556d8db7c4ca25e6a4653ee4477583678da10c00f333899b87d38d6d0bba3d931bb7b6510e5e5eab07beaaf4c81621 +SHA512 (mesa-18.2.0-rc5.tar.xz) = 6274100860bda5e0f6a38520e225a6085d89b6427e691e18ca14d2abd551e46628e1eafa8d1d012627701ad664f6040151dae20374fd1cd122ccb6089d934fd5 From f41482932df97968b997ed9db861eca05c97058e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 8 Sep 2018 12:00:17 +0100 Subject: [PATCH 06/71] 18.2.0 --- Makefile | 2 +- mesa.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b181d74..4f66f91 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.2.0-rc3 +VERSION ?= 18.2.0 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index 2bf0646..baeff24 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,7 +41,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.2.0-rc5 +%global ver 18.2.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -618,6 +618,9 @@ popd %{_includedir}/vulkan/ %changelog +* Sat Sep 8 2018 Peter Robinson 18.2.0-1 +- Update to 18.2.0 + * Sun Sep 2 2018 Hans de Goede - 18.2.0~rc5-1 - Update to 18.2.0~rc5 diff --git a/sources b/sources index 761f368..fd28242 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.2.0-rc5.tar.xz) = 6274100860bda5e0f6a38520e225a6085d89b6427e691e18ca14d2abd551e46628e1eafa8d1d012627701ad664f6040151dae20374fd1cd122ccb6089d934fd5 +SHA512 (mesa-18.2.0.tar.xz) = 0ee32ce17d60975103bb4415dc3103325c7035e272273c06891df682aefa9a1cf5754bf43fc803830ba332c65370556d12d9d6d11ced6bcd95863bd26a6896ae From 0e8e5c44f34f252a0ba42d59ea1a1eb0e7519b1d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 19 Sep 2018 12:28:26 -0700 Subject: [PATCH 07/71] Fix "HW cursor for format" error message flood with swrast --- mesa.spec | 9 ++++- ...f-the-driver-does-not-implement-it-1.patch | 39 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch diff --git a/mesa.spec b/mesa.spec index baeff24..611ae85 100644 --- a/mesa.spec +++ b/mesa.spec @@ -43,7 +43,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 18.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 @@ -65,6 +65,10 @@ Patch4: 0004-bigendian-assert.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1560481 Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=104926 +# https://patchwork.freedesktop.org/patch/210872 +Patch8: st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: automake @@ -618,6 +622,9 @@ popd %{_includedir}/vulkan/ %changelog +* Wed Sep 19 2018 Adam Williamson - 18.2.0-2 +- Fix "HW cursor for format" error message flood with swrast (FDO #104926) + * Sat Sep 8 2018 Peter Robinson 18.2.0-1 - Update to 18.2.0 diff --git a/st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch b/st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch new file mode 100644 index 0000000..6964715 --- /dev/null +++ b/st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch @@ -0,0 +1,39 @@ +From patchwork Thu Mar 15 16:27:57 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: st/dri: don't set queryDmaBufFormats/queryDmaBufModifiers if the + driver does not implement it +From: Michal Srb +X-Patchwork-Id: 210872 +Message-Id: <20180315162757.23862-1-msrb@suse.com> +To: mesa-dev@lists.freedesktop.org +Date: Thu, 15 Mar 2018 17:27:57 +0100 + +This is equivalent to commit a65db0ad1c3, but for dri_kms_init_screen. Without +this gbm_dri_is_format_supported always returns false. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104926 +Fixes: e14fe41e0bf ("st/dri: implement createImageFromRenderbuffer(2)") +Reviewed-by: Emil Velikov +--- + src/gallium/state_trackers/dri/dri2.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c +index 415002d2cd..59740b1301 100644 +--- a/src/gallium/state_trackers/dri/dri2.c ++++ b/src/gallium/state_trackers/dri/dri2.c +@@ -2162,8 +2162,10 @@ dri_kms_init_screen(__DRIscreen * sPriv) + dri2ImageExtension.createImageFromFds = dri2_from_fds; + dri2ImageExtension.createImageFromDmaBufs = dri2_from_dma_bufs; + dri2ImageExtension.createImageFromDmaBufs2 = dri2_from_dma_bufs2; +- dri2ImageExtension.queryDmaBufFormats = dri2_query_dma_buf_formats; +- dri2ImageExtension.queryDmaBufModifiers = dri2_query_dma_buf_modifiers; ++ if (pscreen->query_dmabuf_modifiers) { ++ dri2ImageExtension.queryDmaBufFormats = dri2_query_dma_buf_formats; ++ dri2ImageExtension.queryDmaBufModifiers = dri2_query_dma_buf_modifiers; ++ } + } + + sPriv->extensions = dri_screen_extensions; From 22363c157bdd8c94d942ab7c33adf85fe0d19470 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 21 Sep 2018 18:22:05 +0100 Subject: [PATCH 08/71] 18.2.1 --- Makefile | 2 +- mesa.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4f66f91..f291a6e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.2.0 +VERSION ?= 18.2.1 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index 611ae85..b16065c 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,9 +41,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.2.0 +%global ver 18.2.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -622,6 +622,9 @@ popd %{_includedir}/vulkan/ %changelog +* Fri Sep 21 2018 Peter Robinson 18.2.1-1 +- Update to 18.2.1 + * Wed Sep 19 2018 Adam Williamson - 18.2.0-2 - Fix "HW cursor for format" error message flood with swrast (FDO #104926) diff --git a/sources b/sources index fd28242..086aad9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.2.0.tar.xz) = 0ee32ce17d60975103bb4415dc3103325c7035e272273c06891df682aefa9a1cf5754bf43fc803830ba332c65370556d12d9d6d11ced6bcd95863bd26a6896ae +SHA512 (mesa-18.2.1.tar.xz) = 1098be850c9a0628c563d071cf79a06bc140f9db38860f5826a31a0ee0ba52f90ed38d5b4cee5b8d450af5dbd18c81718312eb3fb87c5121db44c2d2b36b43a6 From 197c2fd747a4ad35a089bbd706ee933951eeab46 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 5 Oct 2018 15:59:26 +0100 Subject: [PATCH 09/71] 18.2.2 --- Makefile | 2 +- mesa.spec | 9 ++--- sources | 2 +- ...f-the-driver-does-not-implement-it-1.patch | 39 ------------------- 4 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch diff --git a/Makefile b/Makefile index f291a6e..d6550fe 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.2.1 +VERSION ?= 18.2.2 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index b16065c..ee5a887 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,7 +41,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.2.1 +%global ver 18.2.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -65,10 +65,6 @@ Patch4: 0004-bigendian-assert.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1560481 Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch -# https://bugs.freedesktop.org/show_bug.cgi?id=104926 -# https://patchwork.freedesktop.org/patch/210872 -Patch8: st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: automake @@ -622,6 +618,9 @@ popd %{_includedir}/vulkan/ %changelog +* Fri Oct 5 2018 Peter Robinson 18.2.2-1 +- Update to 18.2.2 + * Fri Sep 21 2018 Peter Robinson 18.2.1-1 - Update to 18.2.1 diff --git a/sources b/sources index 086aad9..e5008fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.2.1.tar.xz) = 1098be850c9a0628c563d071cf79a06bc140f9db38860f5826a31a0ee0ba52f90ed38d5b4cee5b8d450af5dbd18c81718312eb3fb87c5121db44c2d2b36b43a6 +SHA512 (mesa-18.2.2.tar.xz) = 66b37fa723b45c3024072e875b136d1b69723ee8c9bfb105cb98e5afd9051f4e8c08b79dc4ce816613be95edb999afa5bd6df29d81bf5cddda7e3cf86cc799d6 diff --git a/st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch b/st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch deleted file mode 100644 index 6964715..0000000 --- a/st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModifiers-if-the-driver-does-not-implement-it-1.patch +++ /dev/null @@ -1,39 +0,0 @@ -From patchwork Thu Mar 15 16:27:57 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: st/dri: don't set queryDmaBufFormats/queryDmaBufModifiers if the - driver does not implement it -From: Michal Srb -X-Patchwork-Id: 210872 -Message-Id: <20180315162757.23862-1-msrb@suse.com> -To: mesa-dev@lists.freedesktop.org -Date: Thu, 15 Mar 2018 17:27:57 +0100 - -This is equivalent to commit a65db0ad1c3, but for dri_kms_init_screen. Without -this gbm_dri_is_format_supported always returns false. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104926 -Fixes: e14fe41e0bf ("st/dri: implement createImageFromRenderbuffer(2)") -Reviewed-by: Emil Velikov ---- - src/gallium/state_trackers/dri/dri2.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c -index 415002d2cd..59740b1301 100644 ---- a/src/gallium/state_trackers/dri/dri2.c -+++ b/src/gallium/state_trackers/dri/dri2.c -@@ -2162,8 +2162,10 @@ dri_kms_init_screen(__DRIscreen * sPriv) - dri2ImageExtension.createImageFromFds = dri2_from_fds; - dri2ImageExtension.createImageFromDmaBufs = dri2_from_dma_bufs; - dri2ImageExtension.createImageFromDmaBufs2 = dri2_from_dma_bufs2; -- dri2ImageExtension.queryDmaBufFormats = dri2_query_dma_buf_formats; -- dri2ImageExtension.queryDmaBufModifiers = dri2_query_dma_buf_modifiers; -+ if (pscreen->query_dmabuf_modifiers) { -+ dri2ImageExtension.queryDmaBufFormats = dri2_query_dma_buf_formats; -+ dri2ImageExtension.queryDmaBufModifiers = dri2_query_dma_buf_modifiers; -+ } - } - - sPriv->extensions = dri_screen_extensions; From 2c8c0e581092f6f74044bc458549d7c26bbea7f3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 31 Oct 2018 11:50:48 +0100 Subject: [PATCH 10/71] Update to 18.2.3 Signed-off-by: Igor Gnatenko --- Makefile | 2 +- mesa.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d6550fe..93443f3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.2.2 +VERSION ?= 18.2.3 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index ee5a887..480d189 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,7 +41,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.2.2 +%global ver 18.2.3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -618,6 +618,9 @@ popd %{_includedir}/vulkan/ %changelog +* Wed Oct 31 2018 Igor Gnatenko - 18.2.3-1 +- Update to 18.2.3 + * Fri Oct 5 2018 Peter Robinson 18.2.2-1 - Update to 18.2.2 diff --git a/sources b/sources index e5008fc..691417c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.2.2.tar.xz) = 66b37fa723b45c3024072e875b136d1b69723ee8c9bfb105cb98e5afd9051f4e8c08b79dc4ce816613be95edb999afa5bd6df29d81bf5cddda7e3cf86cc799d6 +SHA512 (mesa-18.2.3.tar.xz) = 54c3956e8513fdf7c94a3adeb36201da4fd5b072dc37a9a69429676e1e9a31806e33d875f7d890c2d02b803f26ae1d1230cfa432f0dab3108f8655059427ded4 From 1cfc7654933b172a21d49ef9f8eb64cfa9a54ac3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 1 Nov 2018 11:28:38 -0400 Subject: [PATCH 11/71] Update to 18.2.4 --- mesa.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index 480d189..2450f08 100644 --- a/mesa.spec +++ b/mesa.spec @@ -41,7 +41,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.2.3 +%global ver 18.2.4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -325,12 +325,13 @@ Requires: vulkan-devel Headers for development with the Vulkan API. %prep -%autosetup -n %{name}-%{ver} -p1 %if 0%{sanitize} +%setup -q -n %{name}-%{ver} cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c exit 0 %else +%autosetup -n %{name}-%{ver} -p1 cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c %endif @@ -345,7 +346,6 @@ cp %{SOURCE4} docs/ autoreconf -vfi %ifarch %{ix86} -# i do not have words for how much the assembly dispatch code infuriates me %global asm_flags --disable-asm %endif @@ -618,6 +618,9 @@ popd %{_includedir}/vulkan/ %changelog +* Thu Nov 01 2018 Adam Jackson 18.2.4-1 +- Update to 18.2.4 + * Wed Oct 31 2018 Igor Gnatenko - 18.2.3-1 - Update to 18.2.3 diff --git a/sources b/sources index 691417c..39ff665 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.2.3.tar.xz) = 54c3956e8513fdf7c94a3adeb36201da4fd5b072dc37a9a69429676e1e9a31806e33d875f7d890c2d02b803f26ae1d1230cfa432f0dab3108f8655059427ded4 +SHA512 (mesa-18.2.4.tar.xz) = 287950e9e1265c53d50f50b84de38cbea2ad1a027604fc7c4b6896481e9ad265ed8bd68c5bb1030dcf36a03d064ac41561064787f251521c63caa46c9e4d2273 From fcab6854c84487710a9d8f0e5aed66ca50628d83 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 6 Nov 2018 09:26:10 +1000 Subject: [PATCH 12/71] workaround bug with gcc 8.2.1-4 --- mesa.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index 2450f08..1356b18 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: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -349,6 +349,9 @@ 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 \ @@ -618,6 +621,9 @@ popd %{_includedir}/vulkan/ %changelog +* Tue Nov 06 2018 Dave Airlie - 18.2.4-2 +- workaround bug with gcc 8.2.1-4 + * Thu Nov 01 2018 Adam Jackson 18.2.4-1 - Update to 18.2.4 From dd7e950818b74d65a96fa9a01e26db984c00c040 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 6 Nov 2018 17:04:54 +0100 Subject: [PATCH 13/71] 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 14/71] 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 15/71] 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 16/71] 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 17/71] 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 18/71] 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 19/71] 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 20/71] 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 21/71] 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 22/71] 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 23/71] 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 24/71] 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 25/71] 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 From a3f576ae07e24dc6375515d99684739560c4b19a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 31 Jan 2019 02:27:12 +0100 Subject: [PATCH 26/71] Update to 19.0.0~rc1 Signed-off-by: Igor Gnatenko --- Makefile | 2 +- mesa.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a2d9817..b53e200 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.3.1 +VERSION ?= 19.0.0-rc1 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index 7d80aa9..f22fe8d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -47,7 +47,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 18.3.2 +%global ver 19.0.0-rc1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -81,7 +81,7 @@ BuildRequires: kernel-headers BuildRequires: pkgconfig(libdrm_intel) >= 2.4.75 %endif %if 0%{?with_radeonsi} -BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.95 +BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.97 %endif BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.71 BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.66 @@ -130,7 +130,7 @@ BuildRequires: pkgconfig(libomxil-bellagio) %endif BuildRequires: pkgconfig(libelf) BuildRequires: pkgconfig(libglvnd) >= 0.2.0 -BuildRequires: llvm-devel >= 6.0.0 +BuildRequires: llvm-devel >= 7.0.0 %if 0%{?with_opencl} BuildRequires: clang-devel BuildRequires: pkgconfig(libclc) @@ -628,6 +628,9 @@ popd %endif %changelog +* Thu Jan 31 2019 Igor Gnatenko - 19.0.0~rc1-1 +- Update to 19.0.0~rc1 + * Thu Jan 17 2019 Adam Jackson - 18.3.2-1 - Update to 18.3.2 diff --git a/sources b/sources index 6513452..00d7026 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-18.3.2.tar.xz) = fb128a089817cf94c9fbb7a73fc7fe97e2920d8cbfd9e395917d01323f8e943962f26814d28d9ba66728155dc67f9edca9347096c79772217ffa7764fe06104b +SHA512 (mesa-19.0.0-rc1.tar.xz) = 0ff6e1c76d92bdac74c7f144d1ec17edf46e8b94fe955730afdb130e9db49adb90ab3e72bc4368226965fd170ed91d78a753cae971b7d568916883c07e1aca92 From 741044487944b892236b89ce758febef3d2660de Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 31 Jan 2019 06:47:46 +0100 Subject: [PATCH 27/71] Switch imx to kmsro Signed-off-by: Igor Gnatenko --- mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index f22fe8d..044c434 100644 --- a/mesa.spec +++ b/mesa.spec @@ -376,7 +376,7 @@ cp %{SOURCE4} docs/ -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,imx}%{?with_tegra:,tegra}%{?with_vc4:,vc4} \ + -Dgallium-drivers=swrast,virgl,r300,nouveau%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv,kmsro}%{?with_tegra:,tegra}%{?with_vc4:,vc4,kmsro} \ %else -Dgallium-drivers=swrast,virgl \ %endif From c57bc5b9e8b05166137f07d69e191ac64ddea22c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 31 Jan 2019 15:40:55 +0000 Subject: [PATCH 28/71] add kmsro build option, add work around for missing files in 'make dist' (fixed upstream) --- freedreno-meson.build | 24 ++ ir3_cmdline.c | 497 ++++++++++++++++++++++++++++++++++++++++++ mesa.spec | 12 +- 3 files changed, 532 insertions(+), 1 deletion(-) create mode 100644 freedreno-meson.build create mode 100644 ir3_cmdline.c diff --git a/freedreno-meson.build b/freedreno-meson.build new file mode 100644 index 0000000..a3db4b1 --- /dev/null +++ b/freedreno-meson.build @@ -0,0 +1,24 @@ +# Copyright © 2018 Rob Clark + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +inc_freedreno = include_directories(['.', './registers']) + +subdir('drm') +subdir('ir3') diff --git a/ir3_cmdline.c b/ir3_cmdline.c new file mode 100644 index 0000000..364e62b --- /dev/null +++ b/ir3_cmdline.c @@ -0,0 +1,497 @@ +/* + * Copyright (C) 2014 Rob Clark + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Authors: + * Rob Clark + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "tgsi/tgsi_parse.h" +#include "tgsi/tgsi_text.h" +#include "tgsi/tgsi_dump.h" + +#include "ir3/ir3_compiler.h" +#include "ir3/ir3_gallium.h" +#include "ir3/ir3_nir.h" +#include "ir3/instr-a3xx.h" +#include "ir3/ir3.h" + +#include "compiler/glsl/standalone.h" +#include "compiler/glsl/glsl_to_nir.h" +#include "compiler/glsl/gl_nir.h" +#include "compiler/nir_types.h" +#include "compiler/spirv/nir_spirv.h" + +static void dump_info(struct ir3_shader_variant *so, const char *str) +{ + uint32_t *bin; + const char *type = ir3_shader_stage(so->shader); + bin = ir3_shader_assemble(so, so->shader->compiler->gpu_id); + debug_printf("; %s: %s\n", type, str); + ir3_shader_disasm(so, bin, stdout); + free(bin); +} + +static void +insert_sorted(struct exec_list *var_list, nir_variable *new_var) +{ + nir_foreach_variable(var, var_list) { + if (var->data.location > new_var->data.location) { + exec_node_insert_node_before(&var->node, &new_var->node); + return; + } + } + exec_list_push_tail(var_list, &new_var->node); +} + +static void +sort_varyings(struct exec_list *var_list) +{ + struct exec_list new_list; + exec_list_make_empty(&new_list); + nir_foreach_variable_safe(var, var_list) { + exec_node_remove(&var->node); + insert_sorted(&new_list, var); + } + exec_list_move_nodes_to(&new_list, var_list); +} + +static void +fixup_varying_slots(struct exec_list *var_list) +{ + nir_foreach_variable(var, var_list) { + if (var->data.location >= VARYING_SLOT_VAR0) { + var->data.location += 9; + } else if ((var->data.location >= VARYING_SLOT_TEX0) && + (var->data.location <= VARYING_SLOT_TEX7)) { + var->data.location += VARYING_SLOT_VAR0 - VARYING_SLOT_TEX0; + } + } +} + +static struct ir3_compiler *compiler; + +static nir_shader * +load_glsl(unsigned num_files, char* const* files, gl_shader_stage stage) +{ + static const struct standalone_options options = { + .glsl_version = 460, + .do_link = true, + }; + struct gl_shader_program *prog; + const nir_shader_compiler_options *nir_options = + ir3_get_compiler_options(compiler); + + prog = standalone_compile_shader(&options, num_files, files); + if (!prog) + errx(1, "couldn't parse `%s'", files[0]); + + nir_shader *nir = glsl_to_nir(prog, stage, nir_options); + + /* required NIR passes: */ + if (nir_options->lower_all_io_to_temps || + nir->info.stage == MESA_SHADER_VERTEX || + nir->info.stage == MESA_SHADER_GEOMETRY) { + NIR_PASS_V(nir, nir_lower_io_to_temporaries, + nir_shader_get_entrypoint(nir), + true, true); + } else if (nir->info.stage == MESA_SHADER_FRAGMENT) { + NIR_PASS_V(nir, nir_lower_io_to_temporaries, + nir_shader_get_entrypoint(nir), + true, false); + } + + NIR_PASS_V(nir, nir_lower_global_vars_to_local); + NIR_PASS_V(nir, nir_split_var_copies); + NIR_PASS_V(nir, nir_lower_var_copies); + + NIR_PASS_V(nir, nir_split_var_copies); + NIR_PASS_V(nir, nir_lower_var_copies); + nir_print_shader(nir, stdout); + NIR_PASS_V(nir, gl_nir_lower_atomics, prog, true); + NIR_PASS_V(nir, nir_lower_atomics_to_ssbo, 8); + nir_print_shader(nir, stdout); + + switch (stage) { + case MESA_SHADER_VERTEX: + nir_assign_var_locations(&nir->inputs, + &nir->num_inputs, + ir3_glsl_type_size); + + /* Re-lower global vars, to deal with any dead VS inputs. */ + NIR_PASS_V(nir, nir_lower_global_vars_to_local); + + sort_varyings(&nir->outputs); + nir_assign_var_locations(&nir->outputs, + &nir->num_outputs, + ir3_glsl_type_size); + fixup_varying_slots(&nir->outputs); + break; + case MESA_SHADER_FRAGMENT: + sort_varyings(&nir->inputs); + nir_assign_var_locations(&nir->inputs, + &nir->num_inputs, + ir3_glsl_type_size); + fixup_varying_slots(&nir->inputs); + nir_assign_var_locations(&nir->outputs, + &nir->num_outputs, + ir3_glsl_type_size); + break; + case MESA_SHADER_COMPUTE: + case MESA_SHADER_KERNEL: + break; + default: + errx(1, "unhandled shader stage: %d", stage); + } + + nir_assign_var_locations(&nir->uniforms, + &nir->num_uniforms, + ir3_glsl_type_size); + + NIR_PASS_V(nir, nir_lower_system_values); + NIR_PASS_V(nir, nir_lower_io, nir_var_all, ir3_glsl_type_size, 0); + NIR_PASS_V(nir, gl_nir_lower_samplers, prog); + + return nir; +} + +static int +read_file(const char *filename, void **ptr, size_t *size) +{ + int fd, ret; + struct stat st; + + *ptr = MAP_FAILED; + + fd = open(filename, O_RDONLY); + if (fd == -1) { + warnx("couldn't open `%s'", filename); + return 1; + } + + ret = fstat(fd, &st); + if (ret) + errx(1, "couldn't stat `%s'", filename); + + *size = st.st_size; + *ptr = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); + if (*ptr == MAP_FAILED) + errx(1, "couldn't map `%s'", filename); + + close(fd); + + return 0; +} + +static void debug_func(void *priv, enum nir_spirv_debug_level level, + size_t spirv_offset, const char *message) +{ +// printf("%s\n", message); +} + +static nir_shader * +load_spirv(const char *filename, const char *entry, gl_shader_stage stage) +{ + const struct spirv_to_nir_options spirv_options = { + /* these caps are just make-believe */ + .caps = { + .draw_parameters = true, + .float64 = true, + .image_read_without_format = true, + .image_write_without_format = true, + .int64 = true, + .variable_pointers = true, + }, + .lower_workgroup_access_to_offsets = true, + .lower_ubo_ssbo_access_to_offsets = true, + .debug = { + .func = debug_func, + } + }; + nir_function *entry_point; + void *buf; + size_t size; + + read_file(filename, &buf, &size); + + entry_point = spirv_to_nir(buf, size / 4, + NULL, 0, /* spec_entries */ + stage, entry, + &spirv_options, + ir3_get_compiler_options(compiler)); + + nir_print_shader(entry_point->shader, stdout); + + return entry_point->shader; +} + +static void print_usage(void) +{ + printf("Usage: ir3_compiler [OPTIONS]... \n"); + printf(" --verbose - verbose compiler/debug messages\n"); + printf(" --binning-pass - generate binning pass shader (VERT)\n"); + printf(" --color-two-side - emulate two-sided color (FRAG)\n"); + printf(" --half-precision - use half-precision\n"); + printf(" --saturate-s MASK - bitmask of samplers to saturate S coord\n"); + printf(" --saturate-t MASK - bitmask of samplers to saturate T coord\n"); + printf(" --saturate-r MASK - bitmask of samplers to saturate R coord\n"); + printf(" --astc-srgb MASK - bitmask of samplers to enable astc-srgb workaround\n"); + printf(" --stream-out - enable stream-out (aka transform feedback)\n"); + printf(" --ucp MASK - bitmask of enabled user-clip-planes\n"); + printf(" --gpu GPU_ID - specify gpu-id (default 320)\n"); + printf(" --help - show this message\n"); +} + +int main(int argc, char **argv) +{ + int ret = 0, n = 1; + char *filenames[2]; + int num_files = 0; + unsigned stage = 0; + struct ir3_shader_variant v; + struct ir3_shader s; + struct ir3_shader_key key = {}; + /* TODO cmdline option to target different gpus: */ + unsigned gpu_id = 320; + const char *info; + const char *entry; + void *ptr; + bool from_spirv = false; + size_t size; + + memset(&s, 0, sizeof(s)); + memset(&v, 0, sizeof(v)); + + /* cmdline args which impact shader variant get spit out in a + * comment on the first line.. a quick/dirty way to preserve + * that info so when ir3test recompiles the shader with a new + * compiler version, we use the same shader-key settings: + */ + debug_printf("; options:"); + + while (n < argc) { + if (!strcmp(argv[n], "--verbose")) { + ir3_shader_debug |= IR3_DBG_OPTMSGS | IR3_DBG_DISASM; + n++; + continue; + } + + if (!strcmp(argv[n], "--binning-pass")) { + debug_printf(" %s", argv[n]); + v.binning_pass = true; + n++; + continue; + } + + if (!strcmp(argv[n], "--color-two-side")) { + debug_printf(" %s", argv[n]); + key.color_two_side = true; + n++; + continue; + } + + if (!strcmp(argv[n], "--half-precision")) { + debug_printf(" %s", argv[n]); + key.half_precision = true; + n++; + continue; + } + + if (!strcmp(argv[n], "--saturate-s")) { + debug_printf(" %s %s", argv[n], argv[n+1]); + key.vsaturate_s = key.fsaturate_s = strtol(argv[n+1], NULL, 0); + n += 2; + continue; + } + + if (!strcmp(argv[n], "--saturate-t")) { + debug_printf(" %s %s", argv[n], argv[n+1]); + key.vsaturate_t = key.fsaturate_t = strtol(argv[n+1], NULL, 0); + n += 2; + continue; + } + + if (!strcmp(argv[n], "--saturate-r")) { + debug_printf(" %s %s", argv[n], argv[n+1]); + key.vsaturate_r = key.fsaturate_r = strtol(argv[n+1], NULL, 0); + n += 2; + continue; + } + + if (!strcmp(argv[n], "--astc-srgb")) { + debug_printf(" %s %s", argv[n], argv[n+1]); + key.vastc_srgb = key.fastc_srgb = strtol(argv[n+1], NULL, 0); + n += 2; + continue; + } + + if (!strcmp(argv[n], "--stream-out")) { + struct ir3_stream_output_info *so = &s.stream_output; + debug_printf(" %s", argv[n]); + /* TODO more dynamic config based on number of outputs, etc + * rather than just hard-code for first output: + */ + so->num_outputs = 1; + so->stride[0] = 4; + so->output[0].register_index = 0; + so->output[0].start_component = 0; + so->output[0].num_components = 4; + so->output[0].output_buffer = 0; + so->output[0].dst_offset = 2; + so->output[0].stream = 0; + n++; + continue; + } + + if (!strcmp(argv[n], "--ucp")) { + debug_printf(" %s %s", argv[n], argv[n+1]); + key.ucp_enables = strtol(argv[n+1], NULL, 0); + n += 2; + continue; + } + + if (!strcmp(argv[n], "--gpu")) { + debug_printf(" %s %s", argv[n], argv[n+1]); + gpu_id = strtol(argv[n+1], NULL, 0); + n += 2; + continue; + } + + if (!strcmp(argv[n], "--help")) { + print_usage(); + return 0; + } + + break; + } + debug_printf("\n"); + + while (n < argc) { + char *filename = argv[n]; + char *ext = strrchr(filename, '.'); + + if (strcmp(ext, ".tgsi") == 0) { + if (num_files != 0) + errx(1, "in TGSI mode, only a single file may be specified"); + s.from_tgsi = true; + } else if (strcmp(ext, ".spv") == 0) { + if (num_files != 0) + errx(1, "in SPIR-V mode, only a single file may be specified"); + stage = MESA_SHADER_COMPUTE; + from_spirv = true; + filenames[num_files++] = filename; + n++; + if (n == argc) + errx(1, "in SPIR-V mode, an entry point must be specified"); + entry = argv[n]; + n++; + } else if (strcmp(ext, ".comp") == 0) { + if (s.from_tgsi || from_spirv) + errx(1, "cannot mix GLSL/TGSI/SPIRV"); + if (num_files >= ARRAY_SIZE(filenames)) + errx(1, "too many GLSL files"); + stage = MESA_SHADER_COMPUTE; + } else if (strcmp(ext, ".frag") == 0) { + if (s.from_tgsi || from_spirv) + errx(1, "cannot mix GLSL/TGSI/SPIRV"); + if (num_files >= ARRAY_SIZE(filenames)) + errx(1, "too many GLSL files"); + stage = MESA_SHADER_FRAGMENT; + } else if (strcmp(ext, ".vert") == 0) { + if (s.from_tgsi) + errx(1, "cannot mix GLSL and TGSI"); + if (num_files >= ARRAY_SIZE(filenames)) + errx(1, "too many GLSL files"); + stage = MESA_SHADER_VERTEX; + } else { + print_usage(); + return -1; + } + + filenames[num_files++] = filename; + + n++; + } + + nir_shader *nir; + + compiler = ir3_compiler_create(NULL, gpu_id); + + if (s.from_tgsi) { + struct tgsi_token toks[65536]; + + ret = read_file(filenames[0], &ptr, &size); + if (ret) { + print_usage(); + return ret; + } + + if (ir3_shader_debug & IR3_DBG_OPTMSGS) + debug_printf("%s\n", (char *)ptr); + + if (!tgsi_text_translate(ptr, toks, ARRAY_SIZE(toks))) + errx(1, "could not parse `%s'", filenames[0]); + + if (ir3_shader_debug & IR3_DBG_OPTMSGS) + tgsi_dump(toks, 0); + + nir = ir3_tgsi_to_nir(compiler, toks); + NIR_PASS_V(nir, nir_lower_global_vars_to_local); + } else if (from_spirv) { + nir = load_spirv(filenames[0], entry, stage); + + NIR_PASS_V(nir, nir_lower_io, nir_var_all, ir3_glsl_type_size, + (nir_lower_io_options)0); + + /* TODO do this somewhere else */ + nir_lower_int64(nir, ~0); + nir_lower_system_values(nir); + } else if (num_files > 0) { + nir = load_glsl(num_files, filenames, stage); + } else { + print_usage(); + return -1; + } + + s.compiler = compiler; + s.nir = ir3_optimize_nir(&s, nir, NULL); + + v.key = key; + v.shader = &s; + s.type = v.type = nir->info.stage; + + info = "NIR compiler"; + ret = ir3_compile_shader_nir(s.compiler, &v); + if (ret) { + fprintf(stderr, "compiler failed!\n"); + return ret; + } + dump_info(&v, info); +} diff --git a/mesa.spec b/mesa.spec index 044c434..cea8c1e 100644 --- a/mesa.spec +++ b/mesa.spec @@ -22,6 +22,7 @@ %ifarch %{arm} aarch64 %global with_etnaviv 1 %global with_freedreno 1 +%global with_kmsro 1 %global with_tegra 1 %global with_vc4 1 %global with_xa 1 @@ -62,6 +63,8 @@ Source3: Makefile # Source4 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. Source4: Mesa-MLAA-License-Clarification-Email.txt +Source5: freedreno-meson.build +Source6: ir3_cmdline.c Patch3: 0003-evergreen-big-endian.patch @@ -364,6 +367,9 @@ Headers for development with the Vulkan API. %endif cp %{SOURCE4} docs/ +# Nasty hack to fix build, reported to upstream freedreno maintainer for upstream make dist fix +cp %{SOURCE5} src/freedreno/meson.build +cp %{SOURCE6} src/gallium/drivers/freedreno/ir3/ir3_cmdline.c %build %if !0%{sanitize} @@ -376,7 +382,7 @@ cp %{SOURCE4} docs/ -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,kmsro}%{?with_tegra:,tegra}%{?with_vc4:,vc4,kmsro} \ + -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_kmsro:,kmsro} \ %else -Dgallium-drivers=swrast,virgl \ %endif @@ -590,6 +596,10 @@ popd %dir %{_libdir}/gallium-pipe %{_libdir}/gallium-pipe/*.so %endif +%if 0%{?with_kmsro} +%{_libdir}/dri/hx8357d_dri.so +%{_libdir}/dri/pl111_dri.so +%endif %{_libdir}/dri/kms_swrast_dri.so %{_libdir}/dri/swrast_dri.so %{_libdir}/dri/virtio_gpu_dri.so From 0ab246e4d2d75e756245a0855cbc2c586a3c84e6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 6 Feb 2019 00:19:48 +0000 Subject: [PATCH 29/71] 19.0.0~rc2 --- Makefile | 2 +- freedreno-meson.build | 24 -- ir3_cmdline.c | 497 ------------------------------------------ mesa.spec | 10 +- 4 files changed, 5 insertions(+), 528 deletions(-) delete mode 100644 freedreno-meson.build delete mode 100644 ir3_cmdline.c diff --git a/Makefile b/Makefile index b53e200..5b64969 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 19.0.0-rc1 +VERSION ?= 19.0.0-rc2 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/freedreno-meson.build b/freedreno-meson.build deleted file mode 100644 index a3db4b1..0000000 --- a/freedreno-meson.build +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright © 2018 Rob Clark - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -inc_freedreno = include_directories(['.', './registers']) - -subdir('drm') -subdir('ir3') diff --git a/ir3_cmdline.c b/ir3_cmdline.c deleted file mode 100644 index 364e62b..0000000 --- a/ir3_cmdline.c +++ /dev/null @@ -1,497 +0,0 @@ -/* - * Copyright (C) 2014 Rob Clark - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * Authors: - * Rob Clark - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "tgsi/tgsi_parse.h" -#include "tgsi/tgsi_text.h" -#include "tgsi/tgsi_dump.h" - -#include "ir3/ir3_compiler.h" -#include "ir3/ir3_gallium.h" -#include "ir3/ir3_nir.h" -#include "ir3/instr-a3xx.h" -#include "ir3/ir3.h" - -#include "compiler/glsl/standalone.h" -#include "compiler/glsl/glsl_to_nir.h" -#include "compiler/glsl/gl_nir.h" -#include "compiler/nir_types.h" -#include "compiler/spirv/nir_spirv.h" - -static void dump_info(struct ir3_shader_variant *so, const char *str) -{ - uint32_t *bin; - const char *type = ir3_shader_stage(so->shader); - bin = ir3_shader_assemble(so, so->shader->compiler->gpu_id); - debug_printf("; %s: %s\n", type, str); - ir3_shader_disasm(so, bin, stdout); - free(bin); -} - -static void -insert_sorted(struct exec_list *var_list, nir_variable *new_var) -{ - nir_foreach_variable(var, var_list) { - if (var->data.location > new_var->data.location) { - exec_node_insert_node_before(&var->node, &new_var->node); - return; - } - } - exec_list_push_tail(var_list, &new_var->node); -} - -static void -sort_varyings(struct exec_list *var_list) -{ - struct exec_list new_list; - exec_list_make_empty(&new_list); - nir_foreach_variable_safe(var, var_list) { - exec_node_remove(&var->node); - insert_sorted(&new_list, var); - } - exec_list_move_nodes_to(&new_list, var_list); -} - -static void -fixup_varying_slots(struct exec_list *var_list) -{ - nir_foreach_variable(var, var_list) { - if (var->data.location >= VARYING_SLOT_VAR0) { - var->data.location += 9; - } else if ((var->data.location >= VARYING_SLOT_TEX0) && - (var->data.location <= VARYING_SLOT_TEX7)) { - var->data.location += VARYING_SLOT_VAR0 - VARYING_SLOT_TEX0; - } - } -} - -static struct ir3_compiler *compiler; - -static nir_shader * -load_glsl(unsigned num_files, char* const* files, gl_shader_stage stage) -{ - static const struct standalone_options options = { - .glsl_version = 460, - .do_link = true, - }; - struct gl_shader_program *prog; - const nir_shader_compiler_options *nir_options = - ir3_get_compiler_options(compiler); - - prog = standalone_compile_shader(&options, num_files, files); - if (!prog) - errx(1, "couldn't parse `%s'", files[0]); - - nir_shader *nir = glsl_to_nir(prog, stage, nir_options); - - /* required NIR passes: */ - if (nir_options->lower_all_io_to_temps || - nir->info.stage == MESA_SHADER_VERTEX || - nir->info.stage == MESA_SHADER_GEOMETRY) { - NIR_PASS_V(nir, nir_lower_io_to_temporaries, - nir_shader_get_entrypoint(nir), - true, true); - } else if (nir->info.stage == MESA_SHADER_FRAGMENT) { - NIR_PASS_V(nir, nir_lower_io_to_temporaries, - nir_shader_get_entrypoint(nir), - true, false); - } - - NIR_PASS_V(nir, nir_lower_global_vars_to_local); - NIR_PASS_V(nir, nir_split_var_copies); - NIR_PASS_V(nir, nir_lower_var_copies); - - NIR_PASS_V(nir, nir_split_var_copies); - NIR_PASS_V(nir, nir_lower_var_copies); - nir_print_shader(nir, stdout); - NIR_PASS_V(nir, gl_nir_lower_atomics, prog, true); - NIR_PASS_V(nir, nir_lower_atomics_to_ssbo, 8); - nir_print_shader(nir, stdout); - - switch (stage) { - case MESA_SHADER_VERTEX: - nir_assign_var_locations(&nir->inputs, - &nir->num_inputs, - ir3_glsl_type_size); - - /* Re-lower global vars, to deal with any dead VS inputs. */ - NIR_PASS_V(nir, nir_lower_global_vars_to_local); - - sort_varyings(&nir->outputs); - nir_assign_var_locations(&nir->outputs, - &nir->num_outputs, - ir3_glsl_type_size); - fixup_varying_slots(&nir->outputs); - break; - case MESA_SHADER_FRAGMENT: - sort_varyings(&nir->inputs); - nir_assign_var_locations(&nir->inputs, - &nir->num_inputs, - ir3_glsl_type_size); - fixup_varying_slots(&nir->inputs); - nir_assign_var_locations(&nir->outputs, - &nir->num_outputs, - ir3_glsl_type_size); - break; - case MESA_SHADER_COMPUTE: - case MESA_SHADER_KERNEL: - break; - default: - errx(1, "unhandled shader stage: %d", stage); - } - - nir_assign_var_locations(&nir->uniforms, - &nir->num_uniforms, - ir3_glsl_type_size); - - NIR_PASS_V(nir, nir_lower_system_values); - NIR_PASS_V(nir, nir_lower_io, nir_var_all, ir3_glsl_type_size, 0); - NIR_PASS_V(nir, gl_nir_lower_samplers, prog); - - return nir; -} - -static int -read_file(const char *filename, void **ptr, size_t *size) -{ - int fd, ret; - struct stat st; - - *ptr = MAP_FAILED; - - fd = open(filename, O_RDONLY); - if (fd == -1) { - warnx("couldn't open `%s'", filename); - return 1; - } - - ret = fstat(fd, &st); - if (ret) - errx(1, "couldn't stat `%s'", filename); - - *size = st.st_size; - *ptr = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); - if (*ptr == MAP_FAILED) - errx(1, "couldn't map `%s'", filename); - - close(fd); - - return 0; -} - -static void debug_func(void *priv, enum nir_spirv_debug_level level, - size_t spirv_offset, const char *message) -{ -// printf("%s\n", message); -} - -static nir_shader * -load_spirv(const char *filename, const char *entry, gl_shader_stage stage) -{ - const struct spirv_to_nir_options spirv_options = { - /* these caps are just make-believe */ - .caps = { - .draw_parameters = true, - .float64 = true, - .image_read_without_format = true, - .image_write_without_format = true, - .int64 = true, - .variable_pointers = true, - }, - .lower_workgroup_access_to_offsets = true, - .lower_ubo_ssbo_access_to_offsets = true, - .debug = { - .func = debug_func, - } - }; - nir_function *entry_point; - void *buf; - size_t size; - - read_file(filename, &buf, &size); - - entry_point = spirv_to_nir(buf, size / 4, - NULL, 0, /* spec_entries */ - stage, entry, - &spirv_options, - ir3_get_compiler_options(compiler)); - - nir_print_shader(entry_point->shader, stdout); - - return entry_point->shader; -} - -static void print_usage(void) -{ - printf("Usage: ir3_compiler [OPTIONS]... \n"); - printf(" --verbose - verbose compiler/debug messages\n"); - printf(" --binning-pass - generate binning pass shader (VERT)\n"); - printf(" --color-two-side - emulate two-sided color (FRAG)\n"); - printf(" --half-precision - use half-precision\n"); - printf(" --saturate-s MASK - bitmask of samplers to saturate S coord\n"); - printf(" --saturate-t MASK - bitmask of samplers to saturate T coord\n"); - printf(" --saturate-r MASK - bitmask of samplers to saturate R coord\n"); - printf(" --astc-srgb MASK - bitmask of samplers to enable astc-srgb workaround\n"); - printf(" --stream-out - enable stream-out (aka transform feedback)\n"); - printf(" --ucp MASK - bitmask of enabled user-clip-planes\n"); - printf(" --gpu GPU_ID - specify gpu-id (default 320)\n"); - printf(" --help - show this message\n"); -} - -int main(int argc, char **argv) -{ - int ret = 0, n = 1; - char *filenames[2]; - int num_files = 0; - unsigned stage = 0; - struct ir3_shader_variant v; - struct ir3_shader s; - struct ir3_shader_key key = {}; - /* TODO cmdline option to target different gpus: */ - unsigned gpu_id = 320; - const char *info; - const char *entry; - void *ptr; - bool from_spirv = false; - size_t size; - - memset(&s, 0, sizeof(s)); - memset(&v, 0, sizeof(v)); - - /* cmdline args which impact shader variant get spit out in a - * comment on the first line.. a quick/dirty way to preserve - * that info so when ir3test recompiles the shader with a new - * compiler version, we use the same shader-key settings: - */ - debug_printf("; options:"); - - while (n < argc) { - if (!strcmp(argv[n], "--verbose")) { - ir3_shader_debug |= IR3_DBG_OPTMSGS | IR3_DBG_DISASM; - n++; - continue; - } - - if (!strcmp(argv[n], "--binning-pass")) { - debug_printf(" %s", argv[n]); - v.binning_pass = true; - n++; - continue; - } - - if (!strcmp(argv[n], "--color-two-side")) { - debug_printf(" %s", argv[n]); - key.color_two_side = true; - n++; - continue; - } - - if (!strcmp(argv[n], "--half-precision")) { - debug_printf(" %s", argv[n]); - key.half_precision = true; - n++; - continue; - } - - if (!strcmp(argv[n], "--saturate-s")) { - debug_printf(" %s %s", argv[n], argv[n+1]); - key.vsaturate_s = key.fsaturate_s = strtol(argv[n+1], NULL, 0); - n += 2; - continue; - } - - if (!strcmp(argv[n], "--saturate-t")) { - debug_printf(" %s %s", argv[n], argv[n+1]); - key.vsaturate_t = key.fsaturate_t = strtol(argv[n+1], NULL, 0); - n += 2; - continue; - } - - if (!strcmp(argv[n], "--saturate-r")) { - debug_printf(" %s %s", argv[n], argv[n+1]); - key.vsaturate_r = key.fsaturate_r = strtol(argv[n+1], NULL, 0); - n += 2; - continue; - } - - if (!strcmp(argv[n], "--astc-srgb")) { - debug_printf(" %s %s", argv[n], argv[n+1]); - key.vastc_srgb = key.fastc_srgb = strtol(argv[n+1], NULL, 0); - n += 2; - continue; - } - - if (!strcmp(argv[n], "--stream-out")) { - struct ir3_stream_output_info *so = &s.stream_output; - debug_printf(" %s", argv[n]); - /* TODO more dynamic config based on number of outputs, etc - * rather than just hard-code for first output: - */ - so->num_outputs = 1; - so->stride[0] = 4; - so->output[0].register_index = 0; - so->output[0].start_component = 0; - so->output[0].num_components = 4; - so->output[0].output_buffer = 0; - so->output[0].dst_offset = 2; - so->output[0].stream = 0; - n++; - continue; - } - - if (!strcmp(argv[n], "--ucp")) { - debug_printf(" %s %s", argv[n], argv[n+1]); - key.ucp_enables = strtol(argv[n+1], NULL, 0); - n += 2; - continue; - } - - if (!strcmp(argv[n], "--gpu")) { - debug_printf(" %s %s", argv[n], argv[n+1]); - gpu_id = strtol(argv[n+1], NULL, 0); - n += 2; - continue; - } - - if (!strcmp(argv[n], "--help")) { - print_usage(); - return 0; - } - - break; - } - debug_printf("\n"); - - while (n < argc) { - char *filename = argv[n]; - char *ext = strrchr(filename, '.'); - - if (strcmp(ext, ".tgsi") == 0) { - if (num_files != 0) - errx(1, "in TGSI mode, only a single file may be specified"); - s.from_tgsi = true; - } else if (strcmp(ext, ".spv") == 0) { - if (num_files != 0) - errx(1, "in SPIR-V mode, only a single file may be specified"); - stage = MESA_SHADER_COMPUTE; - from_spirv = true; - filenames[num_files++] = filename; - n++; - if (n == argc) - errx(1, "in SPIR-V mode, an entry point must be specified"); - entry = argv[n]; - n++; - } else if (strcmp(ext, ".comp") == 0) { - if (s.from_tgsi || from_spirv) - errx(1, "cannot mix GLSL/TGSI/SPIRV"); - if (num_files >= ARRAY_SIZE(filenames)) - errx(1, "too many GLSL files"); - stage = MESA_SHADER_COMPUTE; - } else if (strcmp(ext, ".frag") == 0) { - if (s.from_tgsi || from_spirv) - errx(1, "cannot mix GLSL/TGSI/SPIRV"); - if (num_files >= ARRAY_SIZE(filenames)) - errx(1, "too many GLSL files"); - stage = MESA_SHADER_FRAGMENT; - } else if (strcmp(ext, ".vert") == 0) { - if (s.from_tgsi) - errx(1, "cannot mix GLSL and TGSI"); - if (num_files >= ARRAY_SIZE(filenames)) - errx(1, "too many GLSL files"); - stage = MESA_SHADER_VERTEX; - } else { - print_usage(); - return -1; - } - - filenames[num_files++] = filename; - - n++; - } - - nir_shader *nir; - - compiler = ir3_compiler_create(NULL, gpu_id); - - if (s.from_tgsi) { - struct tgsi_token toks[65536]; - - ret = read_file(filenames[0], &ptr, &size); - if (ret) { - print_usage(); - return ret; - } - - if (ir3_shader_debug & IR3_DBG_OPTMSGS) - debug_printf("%s\n", (char *)ptr); - - if (!tgsi_text_translate(ptr, toks, ARRAY_SIZE(toks))) - errx(1, "could not parse `%s'", filenames[0]); - - if (ir3_shader_debug & IR3_DBG_OPTMSGS) - tgsi_dump(toks, 0); - - nir = ir3_tgsi_to_nir(compiler, toks); - NIR_PASS_V(nir, nir_lower_global_vars_to_local); - } else if (from_spirv) { - nir = load_spirv(filenames[0], entry, stage); - - NIR_PASS_V(nir, nir_lower_io, nir_var_all, ir3_glsl_type_size, - (nir_lower_io_options)0); - - /* TODO do this somewhere else */ - nir_lower_int64(nir, ~0); - nir_lower_system_values(nir); - } else if (num_files > 0) { - nir = load_glsl(num_files, filenames, stage); - } else { - print_usage(); - return -1; - } - - s.compiler = compiler; - s.nir = ir3_optimize_nir(&s, nir, NULL); - - v.key = key; - v.shader = &s; - s.type = v.type = nir->info.stage; - - info = "NIR compiler"; - ret = ir3_compile_shader_nir(s.compiler, &v); - if (ret) { - fprintf(stderr, "compiler failed!\n"); - return ret; - } - dump_info(&v, info); -} diff --git a/mesa.spec b/mesa.spec index cea8c1e..e4ee3ec 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.0-rc1 +%global ver 19.0.0-rc2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -63,8 +63,6 @@ Source3: Makefile # Source4 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. Source4: Mesa-MLAA-License-Clarification-Email.txt -Source5: freedreno-meson.build -Source6: ir3_cmdline.c Patch3: 0003-evergreen-big-endian.patch @@ -367,9 +365,6 @@ Headers for development with the Vulkan API. %endif cp %{SOURCE4} docs/ -# Nasty hack to fix build, reported to upstream freedreno maintainer for upstream make dist fix -cp %{SOURCE5} src/freedreno/meson.build -cp %{SOURCE6} src/gallium/drivers/freedreno/ir3/ir3_cmdline.c %build %if !0%{sanitize} @@ -638,6 +633,9 @@ popd %endif %changelog +* Tue Feb 5 2019 Peter Robinson 19.0.0~rc2-1 +- Update to 19.0.0~rc2 + * Thu Jan 31 2019 Igor Gnatenko - 19.0.0~rc1-1 - Update to 19.0.0~rc1 From f346245e43de4f9345e3c48783888408de284aba Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 6 Feb 2019 00:21:39 +0000 Subject: [PATCH 30/71] update 19.0.0~rc2 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 00d7026..9c62f8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.0-rc1.tar.xz) = 0ff6e1c76d92bdac74c7f144d1ec17edf46e8b94fe955730afdb130e9db49adb90ab3e72bc4368226965fd170ed91d78a753cae971b7d568916883c07e1aca92 +SHA512 (mesa-19.0.0-rc2.tar.xz) = 28880b941ed978944298eecb7fdb2e6fb23a2f86a26d9603c5aed9394470e3fe62dac99e62217cc6791eb7a9020f531e815123e07efce3e5c09ceb00ce561c13 From a04754fe8e8c1444cc105aeb19ba778675e24bbd Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 8 Feb 2019 12:08:28 +0000 Subject: [PATCH 31/71] Add back accidentally lost patch to disable rgb10 configs by default (#1650929) This was dropped in commit b708cfc. --- ...ium-Disable-rgb10-configs-by-default.patch | 27 +++++++++++++++++++ mesa.spec | 9 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create 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 new file mode 100644 index 0000000..09593a0 --- /dev/null +++ b/0001-gallium-Disable-rgb10-configs-by-default.patch @@ -0,0 +1,27 @@ +From b33c8b56abcc4837f96f7f106b108681858482e0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Tue, 24 Apr 2018 09:46:41 +0200 +Subject: [PATCH] gallium: Disable rgb10 configs by default + +Applications tend to not handle rgb10 configs very well, so lets +disable it for now. + +https://bugzilla.redhat.com/show_bug.cgi?id=1560481 +--- + src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +index 21dc599dc2..23f9194149 100644 +--- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h ++++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +@@ -33,5 +33,5 @@ DRI_CONF_SECTION_END + DRI_CONF_SECTION_MISCELLANEOUS + DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER("false") + DRI_CONF_GLSL_ZERO_INIT("false") +- DRI_CONF_ALLOW_RGB10_CONFIGS("true") ++ DRI_CONF_ALLOW_RGB10_CONFIGS("false") + DRI_CONF_SECTION_END +-- +2.17.0 + diff --git a/mesa.spec b/mesa.spec index e4ee3ec..5157826 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.0.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 @@ -66,6 +66,10 @@ Source4: 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 + # 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 @@ -633,6 +637,9 @@ popd %endif %changelog +* Fri Feb 08 2019 Pete Walter - 19.0.0~rc2-2 +- Add back accidentally lost patch to disable rgb10 configs by default (#1650929) + * Tue Feb 5 2019 Peter Robinson 19.0.0~rc2-1 - Update to 19.0.0~rc2 From bfa55eb65cf2ed4818b4fa1e9210a224e53417ab Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 12 Feb 2019 19:14:28 +0100 Subject: [PATCH 32/71] Fix radv vulkan Signed-off-by: Igor Gnatenko --- ...-radv-fix-compiler-issues-with-GCC-9.patch | 133 ++++++++++++++++++ mesa.spec | 8 +- 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 0001-radv-fix-compiler-issues-with-GCC-9.patch diff --git a/0001-radv-fix-compiler-issues-with-GCC-9.patch b/0001-radv-fix-compiler-issues-with-GCC-9.patch new file mode 100644 index 0000000..90f2d7e --- /dev/null +++ b/0001-radv-fix-compiler-issues-with-GCC-9.patch @@ -0,0 +1,133 @@ +From 129a9f4937b8f2adb4d37999677d748d816d611c Mon Sep 17 00:00:00 2001 +From: Samuel Pitoiset +Date: Mon, 11 Feb 2019 10:17:52 +0100 +Subject: [PATCH] radv: fix compiler issues with GCC 9 + +"The C standard says that compound literals which occur inside of +the body of a function have automatic storage duration associated +with the enclosing block. Older GCC releases were putting such +compound literals into the scope of the whole function, so their +lifetime actually ended at the end of containing function. This +has been fixed in GCC 9. Code that relied on this extended lifetime +needs to be fixed, move the compound literals to whatever scope +they need to accessible in." + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109543 +Cc: +Signed-off-by: Samuel Pitoiset +Reviewed-by: Gustaw Smolarczyk +Reviewed-by: Bas Nieuwenhuizen +--- + src/amd/vulkan/radv_meta_blit.c | 90 ++++++++++++++++++--------------- + 1 file changed, 48 insertions(+), 42 deletions(-) + +diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/radv_meta_blit.c +index a2ba7e45022..5af9c4a303f 100644 +--- a/src/amd/vulkan/radv_meta_blit.c ++++ b/src/amd/vulkan/radv_meta_blit.c +@@ -849,54 +849,60 @@ build_pipeline(struct radv_device *device, + .subpass = 0, + }; + +- switch(aspect) { +- case VK_IMAGE_ASPECT_COLOR_BIT: +- vk_pipeline_info.pColorBlendState = &(VkPipelineColorBlendStateCreateInfo) { +- .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, +- .attachmentCount = 1, +- .pAttachments = (VkPipelineColorBlendAttachmentState []) { +- { .colorWriteMask = +- VK_COLOR_COMPONENT_A_BIT | +- VK_COLOR_COMPONENT_R_BIT | +- VK_COLOR_COMPONENT_G_BIT | +- VK_COLOR_COMPONENT_B_BIT }, ++ VkPipelineColorBlendStateCreateInfo color_blend_info = { ++ .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, ++ .attachmentCount = 1, ++ .pAttachments = (VkPipelineColorBlendAttachmentState []) { ++ { ++ .colorWriteMask = VK_COLOR_COMPONENT_A_BIT | ++ VK_COLOR_COMPONENT_R_BIT | ++ VK_COLOR_COMPONENT_G_BIT | ++ VK_COLOR_COMPONENT_B_BIT }, + } + }; ++ ++ VkPipelineDepthStencilStateCreateInfo depth_info = { ++ .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, ++ .depthTestEnable = true, ++ .depthWriteEnable = true, ++ .depthCompareOp = VK_COMPARE_OP_ALWAYS, ++ }; ++ ++ VkPipelineDepthStencilStateCreateInfo stencil_info = { ++ .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, ++ .depthTestEnable = false, ++ .depthWriteEnable = false, ++ .stencilTestEnable = true, ++ .front = { ++ .failOp = VK_STENCIL_OP_REPLACE, ++ .passOp = VK_STENCIL_OP_REPLACE, ++ .depthFailOp = VK_STENCIL_OP_REPLACE, ++ .compareOp = VK_COMPARE_OP_ALWAYS, ++ .compareMask = 0xff, ++ .writeMask = 0xff, ++ .reference = 0 ++ }, ++ .back = { ++ .failOp = VK_STENCIL_OP_REPLACE, ++ .passOp = VK_STENCIL_OP_REPLACE, ++ .depthFailOp = VK_STENCIL_OP_REPLACE, ++ .compareOp = VK_COMPARE_OP_ALWAYS, ++ .compareMask = 0xff, ++ .writeMask = 0xff, ++ .reference = 0 ++ }, ++ .depthCompareOp = VK_COMPARE_OP_ALWAYS, ++ }; ++ ++ switch(aspect) { ++ case VK_IMAGE_ASPECT_COLOR_BIT: ++ vk_pipeline_info.pColorBlendState = &color_blend_info; + break; + case VK_IMAGE_ASPECT_DEPTH_BIT: +- vk_pipeline_info.pDepthStencilState = &(VkPipelineDepthStencilStateCreateInfo) { +- .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, +- .depthTestEnable = true, +- .depthWriteEnable = true, +- .depthCompareOp = VK_COMPARE_OP_ALWAYS, +- }; ++ vk_pipeline_info.pDepthStencilState = &depth_info; + break; + case VK_IMAGE_ASPECT_STENCIL_BIT: +- vk_pipeline_info.pDepthStencilState = &(VkPipelineDepthStencilStateCreateInfo) { +- .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, +- .depthTestEnable = false, +- .depthWriteEnable = false, +- .stencilTestEnable = true, +- .front = { +- .failOp = VK_STENCIL_OP_REPLACE, +- .passOp = VK_STENCIL_OP_REPLACE, +- .depthFailOp = VK_STENCIL_OP_REPLACE, +- .compareOp = VK_COMPARE_OP_ALWAYS, +- .compareMask = 0xff, +- .writeMask = 0xff, +- .reference = 0 +- }, +- .back = { +- .failOp = VK_STENCIL_OP_REPLACE, +- .passOp = VK_STENCIL_OP_REPLACE, +- .depthFailOp = VK_STENCIL_OP_REPLACE, +- .compareOp = VK_COMPARE_OP_ALWAYS, +- .compareMask = 0xff, +- .writeMask = 0xff, +- .reference = 0 +- }, +- .depthCompareOp = VK_COMPARE_OP_ALWAYS, +- }; ++ vk_pipeline_info.pDepthStencilState = &stencil_info; + break; + default: + unreachable("Unhandled aspect"); +-- +2.20.1 + diff --git a/mesa.spec b/mesa.spec index 5157826..b715e65 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.0.0-rc2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.mesa3d.org @@ -74,6 +74,9 @@ Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1650929 Patch10: 0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch +# https://gitlab.freedesktop.org/mesa/mesa/commit/129a9f4937b8f2adb4d37999677d748d816d611c +Patch20: 0001-radv-fix-compiler-issues-with-GCC-9.patch + BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ @@ -637,6 +640,9 @@ popd %endif %changelog +* Tue Feb 12 2019 Igor Gnatenko - 19.0.0~rc2-3 +- Fix radv vulkan + * Fri Feb 08 2019 Pete Walter - 19.0.0~rc2-2 - Add back accidentally lost patch to disable rgb10 configs by default (#1650929) From 9dcda4b1faac9dc7ce1a7dc4974ad682e1b3f75c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 14 Feb 2019 11:17:07 +0100 Subject: [PATCH 33/71] Update to 19.0.0~rc4 Signed-off-by: Igor Gnatenko --- ...-radv-fix-compiler-issues-with-GCC-9.patch | 133 ------------------ Makefile | 2 +- mesa.spec | 10 +- sources | 2 +- 4 files changed, 7 insertions(+), 140 deletions(-) delete mode 100644 0001-radv-fix-compiler-issues-with-GCC-9.patch diff --git a/0001-radv-fix-compiler-issues-with-GCC-9.patch b/0001-radv-fix-compiler-issues-with-GCC-9.patch deleted file mode 100644 index 90f2d7e..0000000 --- a/0001-radv-fix-compiler-issues-with-GCC-9.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 129a9f4937b8f2adb4d37999677d748d816d611c Mon Sep 17 00:00:00 2001 -From: Samuel Pitoiset -Date: Mon, 11 Feb 2019 10:17:52 +0100 -Subject: [PATCH] radv: fix compiler issues with GCC 9 - -"The C standard says that compound literals which occur inside of -the body of a function have automatic storage duration associated -with the enclosing block. Older GCC releases were putting such -compound literals into the scope of the whole function, so their -lifetime actually ended at the end of containing function. This -has been fixed in GCC 9. Code that relied on this extended lifetime -needs to be fixed, move the compound literals to whatever scope -they need to accessible in." - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109543 -Cc: -Signed-off-by: Samuel Pitoiset -Reviewed-by: Gustaw Smolarczyk -Reviewed-by: Bas Nieuwenhuizen ---- - src/amd/vulkan/radv_meta_blit.c | 90 ++++++++++++++++++--------------- - 1 file changed, 48 insertions(+), 42 deletions(-) - -diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/radv_meta_blit.c -index a2ba7e45022..5af9c4a303f 100644 ---- a/src/amd/vulkan/radv_meta_blit.c -+++ b/src/amd/vulkan/radv_meta_blit.c -@@ -849,54 +849,60 @@ build_pipeline(struct radv_device *device, - .subpass = 0, - }; - -- switch(aspect) { -- case VK_IMAGE_ASPECT_COLOR_BIT: -- vk_pipeline_info.pColorBlendState = &(VkPipelineColorBlendStateCreateInfo) { -- .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, -- .attachmentCount = 1, -- .pAttachments = (VkPipelineColorBlendAttachmentState []) { -- { .colorWriteMask = -- VK_COLOR_COMPONENT_A_BIT | -- VK_COLOR_COMPONENT_R_BIT | -- VK_COLOR_COMPONENT_G_BIT | -- VK_COLOR_COMPONENT_B_BIT }, -+ VkPipelineColorBlendStateCreateInfo color_blend_info = { -+ .sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO, -+ .attachmentCount = 1, -+ .pAttachments = (VkPipelineColorBlendAttachmentState []) { -+ { -+ .colorWriteMask = VK_COLOR_COMPONENT_A_BIT | -+ VK_COLOR_COMPONENT_R_BIT | -+ VK_COLOR_COMPONENT_G_BIT | -+ VK_COLOR_COMPONENT_B_BIT }, - } - }; -+ -+ VkPipelineDepthStencilStateCreateInfo depth_info = { -+ .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, -+ .depthTestEnable = true, -+ .depthWriteEnable = true, -+ .depthCompareOp = VK_COMPARE_OP_ALWAYS, -+ }; -+ -+ VkPipelineDepthStencilStateCreateInfo stencil_info = { -+ .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, -+ .depthTestEnable = false, -+ .depthWriteEnable = false, -+ .stencilTestEnable = true, -+ .front = { -+ .failOp = VK_STENCIL_OP_REPLACE, -+ .passOp = VK_STENCIL_OP_REPLACE, -+ .depthFailOp = VK_STENCIL_OP_REPLACE, -+ .compareOp = VK_COMPARE_OP_ALWAYS, -+ .compareMask = 0xff, -+ .writeMask = 0xff, -+ .reference = 0 -+ }, -+ .back = { -+ .failOp = VK_STENCIL_OP_REPLACE, -+ .passOp = VK_STENCIL_OP_REPLACE, -+ .depthFailOp = VK_STENCIL_OP_REPLACE, -+ .compareOp = VK_COMPARE_OP_ALWAYS, -+ .compareMask = 0xff, -+ .writeMask = 0xff, -+ .reference = 0 -+ }, -+ .depthCompareOp = VK_COMPARE_OP_ALWAYS, -+ }; -+ -+ switch(aspect) { -+ case VK_IMAGE_ASPECT_COLOR_BIT: -+ vk_pipeline_info.pColorBlendState = &color_blend_info; - break; - case VK_IMAGE_ASPECT_DEPTH_BIT: -- vk_pipeline_info.pDepthStencilState = &(VkPipelineDepthStencilStateCreateInfo) { -- .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, -- .depthTestEnable = true, -- .depthWriteEnable = true, -- .depthCompareOp = VK_COMPARE_OP_ALWAYS, -- }; -+ vk_pipeline_info.pDepthStencilState = &depth_info; - break; - case VK_IMAGE_ASPECT_STENCIL_BIT: -- vk_pipeline_info.pDepthStencilState = &(VkPipelineDepthStencilStateCreateInfo) { -- .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, -- .depthTestEnable = false, -- .depthWriteEnable = false, -- .stencilTestEnable = true, -- .front = { -- .failOp = VK_STENCIL_OP_REPLACE, -- .passOp = VK_STENCIL_OP_REPLACE, -- .depthFailOp = VK_STENCIL_OP_REPLACE, -- .compareOp = VK_COMPARE_OP_ALWAYS, -- .compareMask = 0xff, -- .writeMask = 0xff, -- .reference = 0 -- }, -- .back = { -- .failOp = VK_STENCIL_OP_REPLACE, -- .passOp = VK_STENCIL_OP_REPLACE, -- .depthFailOp = VK_STENCIL_OP_REPLACE, -- .compareOp = VK_COMPARE_OP_ALWAYS, -- .compareMask = 0xff, -- .writeMask = 0xff, -- .reference = 0 -- }, -- .depthCompareOp = VK_COMPARE_OP_ALWAYS, -- }; -+ vk_pipeline_info.pDepthStencilState = &stencil_info; - break; - default: - unreachable("Unhandled aspect"); --- -2.20.1 - diff --git a/Makefile b/Makefile index 5b64969..883a194 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 19.0.0-rc2 +VERSION ?= 19.0.0-rc4 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index b715e65..de51248 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,9 +48,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.0-rc2 +%global ver 19.0.0-rc4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 3%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -74,9 +74,6 @@ Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1650929 Patch10: 0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch -# https://gitlab.freedesktop.org/mesa/mesa/commit/129a9f4937b8f2adb4d37999677d748d816d611c -Patch20: 0001-radv-fix-compiler-issues-with-GCC-9.patch - BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ @@ -640,6 +637,9 @@ popd %endif %changelog +* Thu Feb 14 2019 Igor Gnatenko - 19.0.0~rc4-1 +- Update to 19.0.0~rc4 + * Tue Feb 12 2019 Igor Gnatenko - 19.0.0~rc2-3 - Fix radv vulkan diff --git a/sources b/sources index 9c62f8a..b1841a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.0-rc2.tar.xz) = 28880b941ed978944298eecb7fdb2e6fb23a2f86a26d9603c5aed9394470e3fe62dac99e62217cc6791eb7a9020f531e815123e07efce3e5c09ceb00ce561c13 +SHA512 (mesa-19.0.0-rc4.tar.xz) = b4a4d8e635dde19f08db1fcfe46c01083649fa5bdc60403bb9d691fbd142c558eeeb5cf0f3fd165f746c8f5ad39c80bd3c1c95a6d0420032405fd51bdc54a5d3 From 64d6a36ff84a870e57079c3d5c3066bf39d52ddc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 14 Feb 2019 11:18:33 +0100 Subject: [PATCH 34/71] relax dependency of xcb-randr Signed-off-by: Igor Gnatenko --- mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index de51248..b37ac6f 100644 --- a/mesa.spec +++ b/mesa.spec @@ -120,7 +120,7 @@ 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(xcb-randr) BuildRequires: pkgconfig(xrandr) >= 1.3 BuildRequires: bison BuildRequires: flex From 2835d9ff3bc541901274cdc5bd8240fd001ccf26 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 14 Feb 2019 17:22:34 +0100 Subject: [PATCH 35/71] Update EGL patch Signed-off-by: Igor Gnatenko --- ...l-Ensure-EGL-surface-is-resized-on-DRI-upd.patch | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 index e257006..7c4f059 100644 --- 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 @@ -1,4 +1,4 @@ -From 0f0d7cd2ecf20d0f74df6c6ec7d04bb3b7156c30 Mon Sep 17 00:00:00 2001 +From 99914164455a589756186085b9b66d23f1318ee2 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 @@ -19,8 +19,11 @@ 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. +v2: Added the 'Fixes' tag + https://bugzilla.redhat.com/show_bug.cgi?id=1650929 +Fixes: a9fb331ea7d ("wayland/egl: update surface size on window resize") Signed-off-by: Carlos Garnacho Tested-by: Bastien Nocera --- @@ -28,10 +31,10 @@ Tested-by: Bastien Nocera 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 +index c3ca1b6f7bc..3025e34ba63 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) +@@ -637,10 +637,8 @@ update_buffers(struct dri2_egl_surface *dri2_surf) struct dri2_egl_display *dri2_dpy = dri2_egl_display(dri2_surf->base.Resource.Display); @@ -44,7 +47,7 @@ index 34e09d7ec1..474a13316b 100644 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) +@@ -648,6 +646,11 @@ update_buffers(struct dri2_egl_surface *dri2_surf) dri2_surf->dy = dri2_surf->wl_win->dy; } @@ -57,5 +60,5 @@ index 34e09d7ec1..474a13316b 100644 _eglError(EGL_BAD_ALLOC, "failed to allocate color buffer"); return -1; -- -2.20.0.rc2 +2.20.1 From 1e37af6af60e456beca0a7ce473a760600656a72 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 20 Feb 2019 13:05:27 +0000 Subject: [PATCH 36/71] 19.0.0~rc5 --- Makefile | 2 +- mesa.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 883a194..c816533 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 19.0.0-rc4 +VERSION ?= 19.0.0-rc5 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index b37ac6f..ee41ef9 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.0-rc4 +%global ver 19.0.0-rc5 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -637,6 +637,9 @@ popd %endif %changelog +* Wed Feb 20 2019 Peter Robinson 19.0.0~rc5-1 +- Update to 19.0.0~rc5 + * Thu Feb 14 2019 Igor Gnatenko - 19.0.0~rc4-1 - Update to 19.0.0~rc4 diff --git a/sources b/sources index b1841a6..43cc1e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.0-rc4.tar.xz) = b4a4d8e635dde19f08db1fcfe46c01083649fa5bdc60403bb9d691fbd142c558eeeb5cf0f3fd165f746c8f5ad39c80bd3c1c95a6d0420032405fd51bdc54a5d3 +SHA512 (mesa-19.0.0-rc5.tar.xz) = 7196a5f4b60a8d6935c55b93ba4bdbcbe5bb7226fe12df68e0594d56a51720d15b67235d41059f483da7c0e04332f2d20b3f8ffb92a15a3d06181b01b961e6fe From efe4f93dbb1d65fc564402c3f9a17821e5c07eea Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 27 Feb 2019 01:34:35 +0000 Subject: [PATCH 37/71] Update to 19.0.0~rc6 --- ...re-EGL-surface-is-resized-on-DRI-upd.patch | 64 ------------------- Makefile | 2 +- mesa.spec | 9 ++- sources | 2 +- 4 files changed, 6 insertions(+), 71 deletions(-) delete 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 deleted file mode 100644 index 7c4f059..0000000 --- a/0001-wayland-egl-Ensure-EGL-surface-is-resized-on-DRI-upd.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 99914164455a589756186085b9b66d23f1318ee2 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. - -v2: Added the 'Fixes' tag - -https://bugzilla.redhat.com/show_bug.cgi?id=1650929 - -Fixes: a9fb331ea7d ("wayland/egl: update surface size on window resize") -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 c3ca1b6f7bc..3025e34ba63 100644 ---- a/src/egl/drivers/dri2/platform_wayland.c -+++ b/src/egl/drivers/dri2/platform_wayland.c -@@ -637,10 +637,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; -@@ -648,6 +646,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.1 - diff --git a/Makefile b/Makefile index c816533..ff2eee6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 19.0.0-rc5 +VERSION ?= 19.0.0-rc6 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index ee41ef9..92c9f74 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.0-rc5 +%global ver 19.0.0-rc6 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -70,10 +70,6 @@ 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: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ @@ -637,6 +633,9 @@ popd %endif %changelog +* Wed Feb 27 2019 Pete Walter - 19.0.0~rc6-1 +- Update to 19.0.0~rc6 + * Wed Feb 20 2019 Peter Robinson 19.0.0~rc5-1 - Update to 19.0.0~rc5 diff --git a/sources b/sources index 43cc1e9..f1f6a36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.0-rc5.tar.xz) = 7196a5f4b60a8d6935c55b93ba4bdbcbe5bb7226fe12df68e0594d56a51720d15b67235d41059f483da7c0e04332f2d20b3f8ffb92a15a3d06181b01b961e6fe +SHA512 (mesa-19.0.0-rc6.tar.xz) = 5788a8c4315f1f7bdc28069930688726577a0fe1febfb366c060e96d73d906004ef777f597139c03e23f641d98727d0efeccf31793024ae1bb3870b0b9ebc984 From 70c61a82188fb7b1a847b20e988cfc4b61d9fb6d Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 7 Mar 2019 09:56:49 +0000 Subject: [PATCH 38/71] Update to 19.0.0~rc7 --- Makefile | 2 +- mesa.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ff2eee6..e948f6b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 19.0.0-rc6 +VERSION ?= 19.0.0-rc7 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index 92c9f74..14843e0 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.0-rc6 +%global ver 19.0.0-rc7 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -633,6 +633,9 @@ popd %endif %changelog +* Thu Mar 07 2019 Pete Walter - 19.0.0~rc7-1 +- Update to 19.0.0~rc7 + * Wed Feb 27 2019 Pete Walter - 19.0.0~rc6-1 - Update to 19.0.0~rc6 diff --git a/sources b/sources index f1f6a36..bb857ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.0-rc6.tar.xz) = 5788a8c4315f1f7bdc28069930688726577a0fe1febfb366c060e96d73d906004ef777f597139c03e23f641d98727d0efeccf31793024ae1bb3870b0b9ebc984 +SHA512 (mesa-19.0.0-rc7.tar.xz) = 8fb59f26451b802fe30bef05dbe5b0a9c0aaeccb115145d3e446f8c3555386918766654ce5c854c241fd021bd8df7f557dea7cc0d81ad15143177c29146b72e5 From 3cee7e41af39be283cc010dd1ff3f755f8da6d0f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 13 Mar 2019 23:05:34 +0000 Subject: [PATCH 39/71] 19.0.0 --- Makefile | 2 +- mesa.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e948f6b..8d57d5e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 19.0.0-rc7 +VERSION ?= 19.0.0 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index 14843e0..bc03627 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.0-rc7 +%global ver 19.0.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -633,6 +633,9 @@ popd %endif %changelog +* Wed Mar 13 2019 Peter Robinson 19.0.0-1 +- Update to 19.0.0 + * Thu Mar 07 2019 Pete Walter - 19.0.0~rc7-1 - Update to 19.0.0~rc7 diff --git a/sources b/sources index bb857ab..166619c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.0-rc7.tar.xz) = 8fb59f26451b802fe30bef05dbe5b0a9c0aaeccb115145d3e446f8c3555386918766654ce5c854c241fd021bd8df7f557dea7cc0d81ad15143177c29146b72e5 +SHA512 (mesa-19.0.0.tar.xz) = c8756709bb42cb4af18f3291fc67bd2c260b300c1a868a82eae246609ab896488b708db7bddbfb611c167fb5b65e356ca844a65606ef839ff45cbd6d5b084f96 From a8742f03dd88b64cbe3316ab23e60e1bf6394594 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 25 Mar 2019 17:09:05 +0100 Subject: [PATCH 40/71] Rebuild with -Db_ndebug=true Signed-off-by: Igor Gnatenko --- mesa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index bc03627..db76bd8 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.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 @@ -633,6 +633,9 @@ popd %endif %changelog +* Mon Mar 25 2019 Igor Gnatenko - 19.0.0-2 +- Rebuild with -Db_ndebug=true + * Wed Mar 13 2019 Peter Robinson 19.0.0-1 - Update to 19.0.0 From 2ad0c6e76f487f18adf65d406a0c3378c3b303d4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 27 Mar 2019 22:04:26 +0100 Subject: [PATCH 41/71] Update to 19.0.1 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 8d57d5e..b01b925 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 19.0.0 +VERSION ?= 19.0.1 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index db76bd8..5381505 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,9 +48,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.0 +%global ver 19.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 @@ -633,6 +633,9 @@ popd %endif %changelog +* Wed Mar 27 2019 Igor Gnatenko - 19.0.1-1 +- Update to 19.0.1 + * Mon Mar 25 2019 Igor Gnatenko - 19.0.0-2 - Rebuild with -Db_ndebug=true diff --git a/sources b/sources index 166619c..3335e81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.0.tar.xz) = c8756709bb42cb4af18f3291fc67bd2c260b300c1a868a82eae246609ab896488b708db7bddbfb611c167fb5b65e356ca844a65606ef839ff45cbd6d5b084f96 +SHA512 (mesa-19.0.1.tar.xz) = f4e0efba01040466d95d18585aac6221067aa2919dcd73fcc2a927305ede4eaaae7e2f9665fe1f5265cfddd30fec3c8ddf253bfc6a6f53f5195c456ae552f217 From 6fb4a533ef32d560370a42dbffc48816e7f511e7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 4 Apr 2019 15:15:40 -0400 Subject: [PATCH 42/71] Nuke rpath from installed DRI drivers --- mesa.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index 5381505..e2f1ea4 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.0.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -74,6 +74,7 @@ BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: chrpath %if 0%{?with_hardware} BuildRequires: kernel-headers @@ -429,6 +430,9 @@ for i in libOSMesa*.so libGL.so ; do done popd +# Fixed by aa7afe324c2092fb31f9498cb3eda47dda96e6f2, temporary workaround +chrpath -d -k %{buildroot}%{_libdir}/dri/*.so + %files filesystem %doc docs/Mesa-MLAA-License-Clarification-Email.txt %dir %{_libdir}/dri @@ -633,6 +637,9 @@ popd %endif %changelog +* Thu Apr 04 2019 Adam Jackson 19.0.1-2 +- Nuke rpath from installed DRI drivers + * Wed Mar 27 2019 Igor Gnatenko - 19.0.1-1 - Update to 19.0.1 From 878fbd153013b07308b8b53a027b295f3907fbef Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 11 Apr 2019 08:54:09 +0200 Subject: [PATCH 43/71] Update to 19.0.2 Signed-off-by: Igor Gnatenko --- Makefile | 2 +- mesa.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b01b925..9b9850c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 19.0.1 +VERSION ?= 19.0.2 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index e2f1ea4..b8674ba 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,9 +48,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.1 +%global ver 19.0.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -430,9 +430,6 @@ for i in libOSMesa*.so libGL.so ; do done popd -# Fixed by aa7afe324c2092fb31f9498cb3eda47dda96e6f2, temporary workaround -chrpath -d -k %{buildroot}%{_libdir}/dri/*.so - %files filesystem %doc docs/Mesa-MLAA-License-Clarification-Email.txt %dir %{_libdir}/dri @@ -637,6 +634,9 @@ chrpath -d -k %{buildroot}%{_libdir}/dri/*.so %endif %changelog +* Thu Apr 11 08:48:37 CEST 2019 Igor Gnatenko - 19.0.2-1 +- Update to 19.0.2 + * Thu Apr 04 2019 Adam Jackson 19.0.1-2 - Nuke rpath from installed DRI drivers diff --git a/sources b/sources index 3335e81..db360f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.1.tar.xz) = f4e0efba01040466d95d18585aac6221067aa2919dcd73fcc2a927305ede4eaaae7e2f9665fe1f5265cfddd30fec3c8ddf253bfc6a6f53f5195c456ae552f217 +SHA512 (mesa-19.0.2.tar.xz) = 44745125e5051a020d6abd92eb5dbff5b0f3e8186f65a0f689fe9daa6964a0e186e73ebdf80ce6920402b6e861422b0b17c1ed02cbc931af1d0aa4a5d05efa99 From fd591dd76ac975794d148f7f9dba57a9ca0e2ec8 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 11 Apr 2019 14:35:02 -0400 Subject: [PATCH 44/71] Drop the mpeg1/2 sanitize hack Switch to upstream tarball since we no longer need to do the above --- mesa.spec | 27 ++++++--------------------- sources | 2 +- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/mesa.spec b/mesa.spec index b8674ba..c3140da 100644 --- a/mesa.spec +++ b/mesa.spec @@ -44,20 +44,15 @@ %global dri_drivers %{?base_drivers}%{?platform_drivers} -%global sanitize 0 - Name: mesa Summary: Mesa graphics libraries %global ver 19.0.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org -#Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz -Source0: %{name}-%{ver}.tar.xz -Source1: vl_decoder.c -Source2: vl_mpeg12_decoder.c +Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz Source3: Makefile # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license. # Source4 contains email correspondence clarifying the license terms. @@ -354,24 +349,10 @@ Requires: vulkan-devel Headers for development with the Vulkan API. %prep -%if 0%{sanitize} -%setup -q -n %{name}-%{ver} - cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c - cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c - exit 0 -%else %autosetup -n %{name}-%{ver} -p1 - cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c - cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c -%endif - cp %{SOURCE4} docs/ %build -%if !0%{sanitize} - cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c - cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c -%endif %meson -Dcpp_std=gnu++11 \ -Dplatforms=x11,wayland,drm,surfaceless \ @@ -634,6 +615,10 @@ popd %endif %changelog +* Thu Apr 11 2019 Adam Jackson - 19.0.2-2 +- Drop the mpeg1/2 sanitize hack +- Switch to upstream tarball since we no longer need to do the above + * Thu Apr 11 08:48:37 CEST 2019 Igor Gnatenko - 19.0.2-1 - Update to 19.0.2 diff --git a/sources b/sources index db360f9..5fe2603 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.2.tar.xz) = 44745125e5051a020d6abd92eb5dbff5b0f3e8186f65a0f689fe9daa6964a0e186e73ebdf80ce6920402b6e861422b0b17c1ed02cbc931af1d0aa4a5d05efa99 +SHA512 (mesa-19.0.2.tar.xz) = 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51 From 97869146053d7df33b3e87215c75495555d90c6a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 14 Apr 2019 11:14:27 +0200 Subject: [PATCH 45/71] Remove unneeded sources Signed-off-by: Igor Gnatenko --- Makefile | 23 ----------------------- mesa.spec | 7 +++---- vl_decoder.c | 20 -------------------- vl_mpeg12_decoder.c | 7 ------- 4 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 Makefile delete mode 100644 vl_decoder.c delete mode 100644 vl_mpeg12_decoder.c diff --git a/Makefile b/Makefile deleted file mode 100644 index 9b9850c..0000000 --- a/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -VERSION ?= 19.0.2 -SANITIZE ?= 1 - -DIRNAME = mesa-${VERSION} - -all: archive - -clean: - rm -rf $(DIRNAME)/ - rm -f mesa-${VERSION}.tar.xz - -clone: clean - curl -O https://mesa.freedesktop.org/archive/mesa-${VERSION}.tar.xz - tar xf mesa-${VERSION}.tar.xz - -sanitize: clone vl_mpeg12_decoder.c vl_decoder.c -ifdef SANITIZE - cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c - cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c -endif - -archive: clone sanitize - tar caf ${DIRNAME}.tar.xz ${DIRNAME} diff --git a/mesa.spec b/mesa.spec index c3140da..f460f3b 100644 --- a/mesa.spec +++ b/mesa.spec @@ -53,11 +53,10 @@ License: MIT URL: http://www.mesa3d.org Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz -Source3: Makefile # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license. -# Source4 contains email correspondence clarifying the license terms. +# 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. -Source4: Mesa-MLAA-License-Clarification-Email.txt +Source1: Mesa-MLAA-License-Clarification-Email.txt Patch3: 0003-evergreen-big-endian.patch @@ -350,7 +349,7 @@ Headers for development with the Vulkan API. %prep %autosetup -n %{name}-%{ver} -p1 -cp %{SOURCE4} docs/ +cp %{SOURCE1} docs/ %build diff --git a/vl_decoder.c b/vl_decoder.c deleted file mode 100644 index 1e715b6..0000000 --- a/vl_decoder.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "vl_decoder.h" -bool -vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile, - enum pipe_video_entrypoint entrypoint) -{ - return false; -} - -int -vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile) -{ - return 0; -} - -struct pipe_video_codec * -vl_create_decoder(struct pipe_context *pipe, - const struct pipe_video_codec *templat) -{ - return NULL; -} diff --git a/vl_mpeg12_decoder.c b/vl_mpeg12_decoder.c deleted file mode 100644 index 85ac2c9..0000000 --- a/vl_mpeg12_decoder.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "vl_mpeg12_decoder.h" -struct pipe_video_codec * -vl_create_mpeg12_decoder(struct pipe_context *context, - const struct pipe_video_codec *templat) -{ - return NULL; -} From ec6c645d39b08bc560178774f1f5d994e7d12354 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 15 Apr 2019 14:31:16 +0100 Subject: [PATCH 46/71] Remove unneeded chrpath build dep --- mesa.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index f460f3b..54cd84d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -68,7 +68,6 @@ BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gettext -BuildRequires: chrpath %if 0%{?with_hardware} BuildRequires: kernel-headers From 0bea054b307aa47d437df510d77a6676052edc59 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 16 Apr 2019 12:03:21 -0700 Subject: [PATCH 47/71] Rebuild with Meson fix for #1699099 --- mesa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index 54cd84d..2e2af01 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.0.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.mesa3d.org @@ -613,6 +613,9 @@ popd %endif %changelog +* Tue Apr 16 2019 Adam Williamson - 19.0.2-3 +- Rebuild with Meson fix for #1699099 + * Thu Apr 11 2019 Adam Jackson - 19.0.2-2 - Drop the mpeg1/2 sanitize hack - Switch to upstream tarball since we no longer need to do the above From 01a131cfa9237d929d7fbdcbb8162e800e32741f Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 25 Apr 2019 10:56:35 +0100 Subject: [PATCH 48/71] Update to 19.0.3 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 2e2af01..8da9cd1 100644 --- a/mesa.spec +++ b/mesa.spec @@ -46,9 +46,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.2 +%global ver 19.0.3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 3%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -613,6 +613,9 @@ popd %endif %changelog +* Thu Apr 25 2019 Pete Walter - 19.0.3-1 +- Update to 19.0.3 + * Tue Apr 16 2019 Adam Williamson - 19.0.2-3 - Rebuild with Meson fix for #1699099 diff --git a/sources b/sources index 5fe2603..8ca17ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.2.tar.xz) = 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51 +SHA512 (mesa-19.0.3.tar.xz) = aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0 From e83e90968fdca65b8b386d3ff08ebc99321b04ad Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 8 May 2019 10:23:19 +1000 Subject: [PATCH 49/71] Update to 19.1.0-rc1 drop glesv2.pc since we don't install at lib files and meson build dropped it. --- mesa.spec | 6 ++++-- sources | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 8da9cd1..2fb995d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -46,7 +46,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.0.3 +%global ver 19.1.0-rc1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -464,7 +464,6 @@ popd %{_includedir}/GLES3/gl3ext.h %{_includedir}/GLES3/gl31.h %{_includedir}/GLES3/gl32.h -%{_libdir}/pkgconfig/glesv2.pc %ldconfig_scriptlets libglapi %files libglapi @@ -613,6 +612,9 @@ popd %endif %changelog +* Wed May 08 2019 Dave Airlie - 19.1.0~rc1-1 +- Update to 19.1.0-rc1 + * Thu Apr 25 2019 Pete Walter - 19.0.3-1 - Update to 19.0.3 diff --git a/sources b/sources index 8ca17ae..420c1d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.0.3.tar.xz) = aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0 +SHA512 (mesa-19.1.0-rc1.tar.xz) = a56215882a7c22b7b8fe57d5703914d674841e4045676e2cc2e7834d17f4d5a765516bec4f01eea6772c50e1d979cc430e032302f38c6e7a4274bc43a4d647b1 From 5c279f473bcf2204945ecf8a7dc5228e61ad68d6 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 8 May 2019 11:36:56 +1000 Subject: [PATCH 50/71] add missing kmsro drivers --- mesa.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mesa.spec b/mesa.spec index 2fb995d..c4a773d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -571,8 +571,18 @@ popd %{_libdir}/gallium-pipe/*.so %endif %if 0%{?with_kmsro} +%{_libdir}/dri/armada-drm_dri.so %{_libdir}/dri/hx8357d_dri.so +%{_libdir}/dri/ili9225_dri.so +%{_libdir}/dri/ili9341_dri.so +%{_libdir}/dri/meson_dri.so +%{_libdir}/dri/mi8023qt_dri.so %{_libdir}/dri/pl111_dri.so +%{_libdir}/dri/repaper_dri.so +%{_libdir}/dri/rockchip_dri.so +%{_libdir}/dri/st5786_dri.so +%{_libdir}/dri/st7735r_dri.so +%{_libdir}/dri/sun4i-drm_dri.so %endif %{_libdir}/dri/kms_swrast_dri.so %{_libdir}/dri/swrast_dri.so From 76b6b251a752cab974f394846894704fe5c4e116 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 8 May 2019 12:39:48 +1000 Subject: [PATCH 51/71] fix missing kmsro --- ...-_dri.so-to-two-of-the-kmsro-drivers.patch | 27 +++++++++++++++++++ mesa.spec | 7 +++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch diff --git a/0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch b/0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch new file mode 100644 index 0000000..3239440 --- /dev/null +++ b/0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch @@ -0,0 +1,27 @@ +From 817f895823a11d6b3cef90dc4f5262d98715499e Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Wed, 8 May 2019 12:38:18 +1000 +Subject: [PATCH] kmsro: add _dri.so to two of the kmsro drivers. + +--- + src/gallium/targets/dri/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build +index dd40969a166..45daf647960 100644 +--- a/src/gallium/targets/dri/meson.build ++++ b/src/gallium/targets/dri/meson.build +@@ -78,8 +78,8 @@ foreach d : [[with_gallium_kmsro, [ + 'pl111_dri.so', + 'repaper_dri.so', + 'rockchip_dri.so', +- 'st7586.so', +- 'st7735r.so', ++ 'st7586_dri.so', ++ 'st7735r_dri.so', + 'sun4i-drm_dri.so', + ]], + [with_gallium_radeonsi, 'radeonsi_dri.so'], +-- +2.20.1 + diff --git a/mesa.spec b/mesa.spec index c4a773d..4c72275 100644 --- a/mesa.spec +++ b/mesa.spec @@ -58,6 +58,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 +# sent upstream should be in rc2 +Patch1: 0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch + Patch3: 0003-evergreen-big-endian.patch # Disable rgb10 configs by default: @@ -576,11 +579,11 @@ popd %{_libdir}/dri/ili9225_dri.so %{_libdir}/dri/ili9341_dri.so %{_libdir}/dri/meson_dri.so -%{_libdir}/dri/mi8023qt_dri.so +%{_libdir}/dri/mi0283qt_dri.so %{_libdir}/dri/pl111_dri.so %{_libdir}/dri/repaper_dri.so %{_libdir}/dri/rockchip_dri.so -%{_libdir}/dri/st5786_dri.so +%{_libdir}/dri/st7586_dri.so %{_libdir}/dri/st7735r_dri.so %{_libdir}/dri/sun4i-drm_dri.so %endif From 10c91826d20a078635e4803542f2699eb78460a0 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 8 May 2019 13:55:24 +1000 Subject: [PATCH 52/71] add missing exynos driver --- mesa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mesa.spec b/mesa.spec index 4c72275..ebae455 100644 --- a/mesa.spec +++ b/mesa.spec @@ -575,6 +575,7 @@ popd %endif %if 0%{?with_kmsro} %{_libdir}/dri/armada-drm_dri.so +%{_libdir}/dri/exynos_dri.so %{_libdir}/dri/hx8357d_dri.so %{_libdir}/dri/ili9225_dri.so %{_libdir}/dri/ili9341_dri.so From e9969b5feccf16793af70bcbc0057d9505695937 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 9 May 2019 11:15:31 -0400 Subject: [PATCH 53/71] Add some more stuff to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index c558d92..bfac055 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ .build* /mesa-*.tar.bz2 /mesa-*.tar.xz +x86_64/ +results_mesa/ +mesa-*/ From fbee2edeafd30ad00a32fc6b6d4e6e74dd99a93e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 9 May 2019 12:42:44 -0400 Subject: [PATCH 54/71] Enable lima --- mesa.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index ebae455..edca323 100644 --- a/mesa.spec +++ b/mesa.spec @@ -23,6 +23,7 @@ %global with_etnaviv 1 %global with_freedreno 1 %global with_kmsro 1 +%global with_lima 1 %global with_tegra 1 %global with_vc4 1 %global with_xa 1 @@ -48,7 +49,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.1.0-rc1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -360,7 +361,7 @@ cp %{SOURCE1} docs/ -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_kmsro:,kmsro} \ + -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_kmsro:,kmsro}%{?with_lima:,lima} \ %else -Dgallium-drivers=swrast,virgl \ %endif @@ -559,6 +560,9 @@ popd %if 0%{?with_tegra} %{_libdir}/dri/tegra_dri.so %endif +%if 0%{?with_lima} +%{_libdir}/dri/lima_dri.so +%endif %{_libdir}/dri/nouveau_dri.so %if 0%{?with_vmware} %{_libdir}/dri/vmwgfx_dri.so @@ -626,6 +630,9 @@ popd %endif %changelog +* Thu May 09 2019 Adam Jackson -19.1.0~rc1-2 +- Enable lima + * Wed May 08 2019 Dave Airlie - 19.1.0~rc1-1 - Update to 19.1.0-rc1 From f2ad1e14933e46aaf6ef62b20b4ed2d35c12b8e6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 11 May 2019 20:53:40 +0100 Subject: [PATCH 55/71] Enable panfrost --- mesa.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index edca323..3fd53c9 100644 --- a/mesa.spec +++ b/mesa.spec @@ -24,6 +24,7 @@ %global with_freedreno 1 %global with_kmsro 1 %global with_lima 1 +%global with_panfrost 1 %global with_tegra 1 %global with_vc4 1 %global with_xa 1 @@ -49,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.1.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 @@ -361,7 +362,7 @@ cp %{SOURCE1} docs/ -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_kmsro:,kmsro}%{?with_lima:,lima} \ + -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_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost} \ %else -Dgallium-drivers=swrast,virgl \ %endif @@ -563,6 +564,9 @@ popd %if 0%{?with_lima} %{_libdir}/dri/lima_dri.so %endif +%if 0%{?with_panfrost} +%{_libdir}/dri/panfrost_dri.so +%endif %{_libdir}/dri/nouveau_dri.so %if 0%{?with_vmware} %{_libdir}/dri/vmwgfx_dri.so @@ -630,6 +634,9 @@ popd %endif %changelog +* Fri May 10 2019 Peter Robinson 19.1.0~rc1-3 +- Enable panfrost + * Thu May 09 2019 Adam Jackson -19.1.0~rc1-2 - Enable lima From 1260598b623bfc8a84c1e244ebb232cdce5b9571 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 15 May 2019 06:54:35 +1000 Subject: [PATCH 56/71] Bring back glesv2.pc for now --- glesv2.pc | 10 ++++++++++ mesa.spec | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 glesv2.pc diff --git a/glesv2.pc b/glesv2.pc new file mode 100644 index 0000000..7af1555 --- /dev/null +++ b/glesv2.pc @@ -0,0 +1,10 @@ +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 3fd53c9..03aa961 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,7 +50,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.1.0-rc1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: http://www.mesa3d.org @@ -60,6 +60,8 @@ 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 +Source2: glesv2.pc + # sent upstream should be in rc2 Patch1: 0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch @@ -355,6 +357,8 @@ Headers for development with the Vulkan API. %autosetup -n %{name}-%{ver} -p1 cp %{SOURCE1} docs/ +cp %{SOURCE2} . + %build %meson -Dcpp_std=gnu++11 \ @@ -395,6 +399,8 @@ cp %{SOURCE1} docs/ %install %meson_install +install glesv2.pc %{buildroot}%{_libdir}/pkgconfig/ + # libvdpau opens the versioned name, don't bother including the unversioned rm -vf %{buildroot}%{_libdir}/vdpau/*.so # likewise glvnd @@ -469,6 +475,7 @@ popd %{_includedir}/GLES3/gl3ext.h %{_includedir}/GLES3/gl31.h %{_includedir}/GLES3/gl32.h +%{_libdir}/pkgconfig/glesv2.pc %ldconfig_scriptlets libglapi %files libglapi @@ -634,6 +641,9 @@ popd %endif %changelog +* Wed May 15 2019 Dave Airlie - 19.1.0~rc1-4 +- Bring back glesv2.pc for now + * Fri May 10 2019 Peter Robinson 19.1.0~rc1-3 - Enable panfrost From 6b02ba7b6ac483f3c19346eeb89ccb8bfe41d276 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 15 May 2019 07:51:15 +1000 Subject: [PATCH 57/71] Update to 19.1.0-rc2 --- mesa.spec | 10 +++++----- sources | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mesa.spec b/mesa.spec index 03aa961..46c24f5 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,9 +48,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.0-rc1 +%global ver 19.1.0-rc2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 4%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -62,9 +62,6 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt Source2: glesv2.pc -# sent upstream should be in rc2 -Patch1: 0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch - Patch3: 0003-evergreen-big-endian.patch # Disable rgb10 configs by default: @@ -641,6 +638,9 @@ popd %endif %changelog +* Wed May 15 2019 Dave Airlie - 19.1.0~rc2-1 +- Update to 19.1.0-rc2 + * Wed May 15 2019 Dave Airlie - 19.1.0~rc1-4 - Bring back glesv2.pc for now diff --git a/sources b/sources index 420c1d2..9c0755d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.0-rc1.tar.xz) = a56215882a7c22b7b8fe57d5703914d674841e4045676e2cc2e7834d17f4d5a765516bec4f01eea6772c50e1d979cc430e032302f38c6e7a4274bc43a4d647b1 +SHA512 (mesa-19.1.0-rc2.tar.xz) = 4d04bec48cbfb17d6dbe7b7700083612e46cbaad3e3630d6219fd1988f5e793cdb5100b8c2531a94b6078f8bb239fef27ed440122d12a2473be5be8648b6a8b1 From f5d1a45049a83e7f2775a558ed20f92af28ce60d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 21 May 2019 14:09:00 -0400 Subject: [PATCH 58/71] Delete unused patch --- ...-_dri.so-to-two-of-the-kmsro-drivers.patch | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch diff --git a/0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch b/0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch deleted file mode 100644 index 3239440..0000000 --- a/0001-kmsro-add-_dri.so-to-two-of-the-kmsro-drivers.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 817f895823a11d6b3cef90dc4f5262d98715499e Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 8 May 2019 12:38:18 +1000 -Subject: [PATCH] kmsro: add _dri.so to two of the kmsro drivers. - ---- - src/gallium/targets/dri/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build -index dd40969a166..45daf647960 100644 ---- a/src/gallium/targets/dri/meson.build -+++ b/src/gallium/targets/dri/meson.build -@@ -78,8 +78,8 @@ foreach d : [[with_gallium_kmsro, [ - 'pl111_dri.so', - 'repaper_dri.so', - 'rockchip_dri.so', -- 'st7586.so', -- 'st7735r.so', -+ 'st7586_dri.so', -+ 'st7735r_dri.so', - 'sun4i-drm_dri.so', - ]], - [with_gallium_radeonsi, 'radeonsi_dri.so'], --- -2.20.1 - From 552cdae9e6988263f8a37914c1210f16bf46905e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 22 May 2019 10:47:36 +1000 Subject: [PATCH 59/71] Update to 19.1.0-rc3 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 46c24f5..7b7e58d 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.0-rc2 +%global ver 19.1.0-rc3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -638,6 +638,9 @@ popd %endif %changelog +* Wed May 22 2019 Dave Airlie - 19.1.0~rc3-1 +- Update to 19.1.0-rc3 + * Wed May 15 2019 Dave Airlie - 19.1.0~rc2-1 - Update to 19.1.0-rc2 diff --git a/sources b/sources index 9c0755d..6441134 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.0-rc2.tar.xz) = 4d04bec48cbfb17d6dbe7b7700083612e46cbaad3e3630d6219fd1988f5e793cdb5100b8c2531a94b6078f8bb239fef27ed440122d12a2473be5be8648b6a8b1 +SHA512 (mesa-19.1.0-rc3.tar.xz) = 740d5d13458b54e1942bfe7165938ec414aa7949aa60109ba872236f3b483c7305ac76b1b48c38dc6fd7691748106447757ac081f364952cc9e00f45fa9e2ea5 From cff677c5ddf4664fa98ef77bf283422570da843b Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 30 May 2019 08:32:37 +0100 Subject: [PATCH 60/71] Update to 19.1.0~rc4 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 7b7e58d..3bf0d50 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.0-rc3 +%global ver 19.1.0-rc4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -638,6 +638,9 @@ popd %endif %changelog +* Thu May 30 2019 Pete Walter - 19.1.0~rc4-1 +- Update to 19.1.0~rc4 + * Wed May 22 2019 Dave Airlie - 19.1.0~rc3-1 - Update to 19.1.0-rc3 diff --git a/sources b/sources index 6441134..666b447 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.0-rc3.tar.xz) = 740d5d13458b54e1942bfe7165938ec414aa7949aa60109ba872236f3b483c7305ac76b1b48c38dc6fd7691748106447757ac081f364952cc9e00f45fa9e2ea5 +SHA512 (mesa-19.1.0-rc4.tar.xz) = 04cc5a537d803359b9eb3207f7b7ab1357126fe78ae0a0ba24df51d2fbbf4e0cf1815a60f99a10b33c822c08af0c84adef44849e73c883f5ce30fdae142c5b61 From 895029979f5b45ed6e9ceaf94f9524c1d881a042 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 7 Jun 2019 09:18:38 +0100 Subject: [PATCH 61/71] Update to 19.1.0~rc5 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 3bf0d50..7520102 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.0-rc4 +%global ver 19.1.0-rc5 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -638,6 +638,9 @@ popd %endif %changelog +* Fri Jun 07 2019 Pete Walter - 19.1.0~rc5-1 +- Update to 19.1.0~rc5 + * Thu May 30 2019 Pete Walter - 19.1.0~rc4-1 - Update to 19.1.0~rc4 diff --git a/sources b/sources index 666b447..a5afd75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.0-rc4.tar.xz) = 04cc5a537d803359b9eb3207f7b7ab1357126fe78ae0a0ba24df51d2fbbf4e0cf1815a60f99a10b33c822c08af0c84adef44849e73c883f5ce30fdae142c5b61 +SHA512 (mesa-19.1.0-rc5.tar.xz) = 033920bbbf395104bfb6ffe9482e0f504b5cb0009be25bb1b0a4269bc6cf9c737de82350e994d568f454ed5b3206fc23927122032b3702122fe7edbc2d749e6d From 7c81ae59114202a27aed07c023f9b4aed168b24c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 12 Jun 2019 09:46:05 +0200 Subject: [PATCH 62/71] Update to 19.1.0 Signed-off-by: Igor Gnatenko --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 7520102..4df69d2 100644 --- a/mesa.spec +++ b/mesa.spec @@ -48,7 +48,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.0-rc5 +%global ver 19.1.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -638,6 +638,9 @@ popd %endif %changelog +* Wed Jun 12 2019 Igor Gnatenko - 19.1.0-1 +- Update to 19.1.0 + * Fri Jun 07 2019 Pete Walter - 19.1.0~rc5-1 - Update to 19.1.0~rc5 diff --git a/sources b/sources index a5afd75..1ed9f07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.0-rc5.tar.xz) = 033920bbbf395104bfb6ffe9482e0f504b5cb0009be25bb1b0a4269bc6cf9c737de82350e994d568f454ed5b3206fc23927122032b3702122fe7edbc2d749e6d +SHA512 (mesa-19.1.0.tar.xz) = 25b186ae8037dedea5691e0b77b22f2065f3c877838378651726dfa1b34ef49dcc56f1dbd124e99285e5f14489db936a886a6740495b5b279e8363424bfb3433 From 51d65ab6707da7f884f10510c6af602e49988855 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 24 Jun 2019 18:41:44 +0100 Subject: [PATCH 63/71] Enable v3d driver --- mesa.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 4df69d2..141b3bc 100644 --- a/mesa.spec +++ b/mesa.spec @@ -27,6 +27,7 @@ %global with_panfrost 1 %global with_tegra 1 %global with_vc4 1 +%global with_v3d 1 %global with_xa 1 %endif @@ -50,7 +51,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 19.1.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -363,7 +364,7 @@ cp %{SOURCE2} . -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_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost} \ + -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} \ %else -Dgallium-drivers=swrast,virgl \ %endif @@ -554,6 +555,9 @@ popd %if 0%{?with_vc4} %{_libdir}/dri/vc4_dri.so %endif +%if 0%{?with_v3d} +%{_libdir}/dri/v3d_dri.so +%endif %if 0%{?with_freedreno} %{_libdir}/dri/kgsl_dri.so %{_libdir}/dri/msm_dri.so @@ -638,6 +642,9 @@ popd %endif %changelog +* Mon Jun 24 2019 Peter Robinson 19.1.0-2 +- Enable v3d driver + * Wed Jun 12 2019 Igor Gnatenko - 19.1.0-1 - Update to 19.1.0 From 788f3c1014313bb9e6eeb5aee8b454eaadc2646b Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 26 Jun 2019 09:02:31 +0100 Subject: [PATCH 64/71] Update to 19.1.1 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 141b3bc..e97d8d0 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,9 +49,9 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.0 +%global ver 19.1.1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 2%{?dist} +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org @@ -642,6 +642,9 @@ popd %endif %changelog +* Wed Jun 26 2019 Pete Walter - 19.1.1-1 +- Update to 19.1.1 + * Mon Jun 24 2019 Peter Robinson 19.1.0-2 - Enable v3d driver diff --git a/sources b/sources index 1ed9f07..e7f1d16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.0.tar.xz) = 25b186ae8037dedea5691e0b77b22f2065f3c877838378651726dfa1b34ef49dcc56f1dbd124e99285e5f14489db936a886a6740495b5b279e8363424bfb3433 +SHA512 (mesa-19.1.1.tar.xz) = 73b190eeb0b5809217c04f39d90edc0844dac476d8284543013a4a8889a4be805bc15b43c91bbf0d3a36f35dc576e7085255f7012d207c74466e81cee7f67922 From 05bea87ce8b568af3068cf79016a2ffad0baf859 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 9 Jul 2019 11:42:01 +0100 Subject: [PATCH 65/71] Update to 19.1.2 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index e97d8d0..ea0aea1 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,7 +49,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.1 +%global ver 19.1.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -642,6 +642,9 @@ popd %endif %changelog +* Tue Jul 09 2019 Pete Walter - 19.1.2-1 +- Update to 19.1.2 + * Wed Jun 26 2019 Pete Walter - 19.1.1-1 - Update to 19.1.1 diff --git a/sources b/sources index e7f1d16..d00c493 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.1.tar.xz) = 73b190eeb0b5809217c04f39d90edc0844dac476d8284543013a4a8889a4be805bc15b43c91bbf0d3a36f35dc576e7085255f7012d207c74466e81cee7f67922 +SHA512 (mesa-19.1.2.tar.xz) = cab30694a409a5037996dd50cef1567eb9e0b83ed69cdb4fbc893a844ed35434fcd05023d48fce2831219866fa420500b53650c791bea286233f4cd6c2703e19 From c7b1d0e96c5cc0abc933c1aad3ae5e3866a29e3f Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 24 Jul 2019 11:22:46 +0100 Subject: [PATCH 66/71] Update to 19.1.3 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index ea0aea1..1c113c8 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,7 +49,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.2 +%global ver 19.1.3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -642,6 +642,9 @@ popd %endif %changelog +* Wed Jul 24 2019 Pete Walter - 19.1.3-1 +- Update to 19.1.3 + * Tue Jul 09 2019 Pete Walter - 19.1.2-1 - Update to 19.1.2 diff --git a/sources b/sources index d00c493..fcedee9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.2.tar.xz) = cab30694a409a5037996dd50cef1567eb9e0b83ed69cdb4fbc893a844ed35434fcd05023d48fce2831219866fa420500b53650c791bea286233f4cd6c2703e19 +SHA512 (mesa-19.1.3.tar.xz) = 787310c43089142209ff7db298489b0815b630577680d5ce1bc3f796eed3772ba41f03e5e773b77ae084c191ed4e365eac1753166ce60f12b8f5974d55762eeb From c3a6a261442ee981e9511c57c43ee7da1cb250d5 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 8 Aug 2019 12:26:19 +0100 Subject: [PATCH 67/71] Update to 19.1.4 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 1c113c8..62684b2 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,7 +49,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.3 +%global ver 19.1.4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -642,6 +642,9 @@ popd %endif %changelog +* Thu Aug 08 2019 Pete Walter - 19.1.4-1 +- Update to 19.1.4 + * Wed Jul 24 2019 Pete Walter - 19.1.3-1 - Update to 19.1.3 diff --git a/sources b/sources index fcedee9..7dcc52c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.3.tar.xz) = 787310c43089142209ff7db298489b0815b630577680d5ce1bc3f796eed3772ba41f03e5e773b77ae084c191ed4e365eac1753166ce60f12b8f5974d55762eeb +SHA512 (mesa-19.1.4.tar.xz) = 234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5 From 79749b404ca558eb76bef5f25e95f6397478ff62 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 Aug 2019 08:37:53 +0100 Subject: [PATCH 68/71] 19.2.0~rc1 --- mesa.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 62684b2..972f958 100644 --- a/mesa.spec +++ b/mesa.spec @@ -49,7 +49,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 19.1.4 +%global ver 19.2.0-rc1 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT @@ -642,6 +642,9 @@ popd %endif %changelog +* Wed Aug 21 2019 Peter Robinson 19.2.0~rc1-1 +- Update to 19.2.0~rc1 + * Thu Aug 08 2019 Pete Walter - 19.1.4-1 - Update to 19.1.4 diff --git a/sources b/sources index 7dcc52c..0eab063 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-19.1.4.tar.xz) = 234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5 +SHA512 (mesa-19.2.0-rc1.tar.xz) = babafb6ec668834e041a62e966452fe315e4f5afef8e1f7d35e038993c73b32ea6ad9929399edae4686f44cd11704fd9a8801821befc1d1767bc0662d4c39fac From 845287db528a3cd8f5c879c53a28a1dcb2aa00e8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 Aug 2019 09:29:05 +0100 Subject: [PATCH 69/71] pkgconfig/egl.pc no longer shipped --- mesa.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index 972f958..65f056b 100644 --- a/mesa.spec +++ b/mesa.spec @@ -458,7 +458,6 @@ popd %{_includedir}/EGL/eglmesaext.h %{_includedir}/EGL/eglplatform.h %{_includedir}/EGL/eglextchromium.h -%{_libdir}/pkgconfig/egl.pc %files libGLES # No files, all provided by libglvnd From 9bab7bdf2ef0099eb6c5c7bb8d6844d6eb58ecfe Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 Aug 2019 10:40:27 +0100 Subject: [PATCH 70/71] add mxsfb-drm_dri and stm_dri drivers for arm platforms --- mesa.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mesa.spec b/mesa.spec index 65f056b..7a43071 100644 --- a/mesa.spec +++ b/mesa.spec @@ -551,6 +551,10 @@ popd %{_libdir}/dri/i915_dri.so %{_libdir}/dri/i965_dri.so %endif +%ifarch %{arm} aarch64 +%{_libdir}/dri/mxsfb-drm_dri.so +%{_libdir}/dri/stm_dri.so +%endif %if 0%{?with_vc4} %{_libdir}/dri/vc4_dri.so %endif From c5cbb9a96fa670aa276915b7fa4236ee9f67c42b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 22 Aug 2019 18:35:43 +0100 Subject: [PATCH 71/71] Bring back egl.pc for now --- egl.pc | 11 +++++++++++ mesa.spec | 14 ++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 egl.pc diff --git a/egl.pc b/egl.pc new file mode 100644 index 0000000..8459099 --- /dev/null +++ b/egl.pc @@ -0,0 +1,11 @@ +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/mesa.spec b/mesa.spec index 7a43071..7871766 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: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -60,8 +60,8 @@ 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 +Source2: glesv2.pc +Source3: egl.pc Patch3: 0003-evergreen-big-endian.patch @@ -354,8 +354,8 @@ Headers for development with the Vulkan API. %prep %autosetup -n %{name}-%{ver} -p1 cp %{SOURCE1} docs/ - cp %{SOURCE2} . +cp %{SOURCE3} . %build @@ -399,6 +399,8 @@ cp %{SOURCE2} . 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 @@ -458,6 +460,7 @@ popd %{_includedir}/EGL/eglmesaext.h %{_includedir}/EGL/eglplatform.h %{_includedir}/EGL/eglextchromium.h +%{_libdir}/pkgconfig/egl.pc %files libGLES # No files, all provided by libglvnd @@ -645,6 +648,9 @@ popd %endif %changelog +* Thu Aug 22 2019 Peter Robinson 19.2.0~rc1-2 +- Bring back egl.pc for now + * Wed Aug 21 2019 Peter Robinson 19.2.0~rc1-1 - Update to 19.2.0~rc1