From 197c2fd747a4ad35a089bbd706ee933951eeab46 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 5 Oct 2018 15:59:26 +0100 Subject: [PATCH] 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;