Accepting request 640131 from home:iznogood:branches:X11:XOrg

New stable release

OBS-URL: https://build.opensuse.org/request/show/640131
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=775

Mesa-drivers.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Oct  5 19:04:01 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to 18.2.2
+  * Different patches for the DirectX9 and DRI state trackers.
+  * A patch to implement vkAcquireNextImage2 in the Intel and AMD
+    vulkan drivers, as well as a patch for adding support for
+    protected memory properties in GetPhysicalDeviceProperties2()
+    for the former driver.
+  * RADV also gets a patch to fix some issues with reflections in
+    GTA V, and a patch to fix a GPU hang in SteamVR with Vega.
+  * Finally, there are more fixes for Radeonsi, nvc0, vc4, and
+    vulkan code.
+- Drop usage of sha1sum, use sig and keyring verification instead.
+  Following this, add key from Juan A. Suarez to keyring.
+- Drop u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
+  Fixed upstream.
+
 -------------------------------------------------------------------
 Fri Sep 21 20:38:47 UTC 2018 - Ondřej Súkup <mimi.vx@gmail.com>
 

Mesa-drivers.spec

@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 18.2.1
+%define _version 18.2.2
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -112,7 +112,7 @@
 %endif
 
 Name:           Mesa-drivers
-Version:        18.2.1
+Version:        18.2.2
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -123,8 +123,8 @@ URL:            http://www.mesa3d.org
 # Source:         ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz
 Source:         ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz
 # Source1:        ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz.sig
-# Source1:        ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig
-Source1:        %{_name_archive}-%{_version}.tar.xz.sha1sum
+Source1:        ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig
+# Source1:        %%{_name_archive}-%%{_version}.tar.xz.sha1sum
 Source2:        baselibs.conf
 Source3:        README.updates
 Source4:        manual-pages.tar.bz2
@@ -135,7 +135,6 @@ Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 # currently needed for libglvnd support
 Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 # Upstream
-Patch47:        u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
 Patch48:        mako_4_radv.patch
 
 Patch50:        U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch
@@ -727,7 +726,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch31 -p1
 %endif
 
-%patch47 -p1
 %patch48 -p1
 %patch50 -p1
 %patch51 -p1
@@ -996,8 +994,8 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 
 %files libGLESv3-devel
 %{_includedir}/GLES3
-#%_libdir/libGLESv3.so
-#%_libdir/pkgconfig/glesv3.pc
+#%%_libdir/libGLESv3.so
+#%%_libdir/pkgconfig/glesv3.pc
 
 %files -n libOSMesa8
 %{_libdir}/libOSMesa.so.8.0.0

Mesa.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Oct  5 19:04:01 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to 18.2.2
+  * Different patches for the DirectX9 and DRI state trackers.
+  * A patch to implement vkAcquireNextImage2 in the Intel and AMD
+    vulkan drivers, as well as a patch for adding support for
+    protected memory properties in GetPhysicalDeviceProperties2()
+    for the former driver.
+  * RADV also gets a patch to fix some issues with reflections in
+    GTA V, and a patch to fix a GPU hang in SteamVR with Vega.
+  * Finally, there are more fixes for Radeonsi, nvc0, vc4, and
+    vulkan code.
+- Drop usage of sha1sum, use sig and keyring verification instead.
+  Following this, add key from Juan A. Suarez to keyring.
+- Drop u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
+  Fixed upstream.
+
 -------------------------------------------------------------------
 Fri Sep 21 20:38:47 UTC 2018 - Ondřej Súkup <mimi.vx@gmail.com>
 

Mesa.keyring

@@ -5983,3 +5983,105 @@ c+ySywEAhp1VMo7r1mcCy5R97Eamu0ER36n4AUlWanHbNhXhzU0BAMGqQ5bzN1Wy
 ukC25btsJ0pEFojomfOv9LgvRTFBT7YA
 =rQnY
 -----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+7VQeKOrR3qSFObFF0Zde+tGDvy7p
+=tfFV
+-----END PGP PUBLIC KEY BLOCK-----
+

Mesa.spec

@@ -41,7 +41,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 18.2.1
+%define _version 18.2.2
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -111,7 +111,7 @@
 %endif
 
 Name:           Mesa
-Version:        18.2.1
+Version:        18.2.2
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -122,8 +122,8 @@ URL:            http://www.mesa3d.org
 # Source:         ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz
 Source:         ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz
 # Source1:        ftp://ftp.freedesktop.org/pub/mesa/%%{version}/%%{_name_archive}-%%{_version}.tar.xz.sig
-# Source1:        ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig
-Source1:        %{_name_archive}-%{_version}.tar.xz.sha1sum
+Source1:        ftp://ftp.freedesktop.org/pub/mesa/%{_name_archive}-%{_version}.tar.xz.sig
+# Source1:        %%{_name_archive}-%%{_version}.tar.xz.sha1sum
 Source2:        baselibs.conf
 Source3:        README.updates
 Source4:        manual-pages.tar.bz2
@@ -134,7 +134,6 @@ Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 # currently needed for libglvnd support
 Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 # Upstream
-Patch47:        u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
 Patch48:        mako_4_radv.patch
 
 Patch50:        U_intel-decoder-mark-total_length-as-MAYBE_UNUSED-in-g.patch
@@ -726,7 +725,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch31 -p1
 %endif
 
-%patch47 -p1
 %patch48 -p1
 %patch50 -p1
 %patch51 -p1
@@ -995,8 +993,8 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 
 %files libGLESv3-devel
 %{_includedir}/GLES3
-#%_libdir/libGLESv3.so
-#%_libdir/pkgconfig/glesv3.pc
+#%%_libdir/libGLESv3.so
+#%%_libdir/pkgconfig/glesv3.pc
 
 %files -n libOSMesa8
 %{_libdir}/libOSMesa.so.8.0.0

mesa-18.2.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9636dc6f3d188abdcca02da97cedd73640d9035224efd5db724187d062c81056
-size 11374476

mesa-18.2.1.tar.xz.sha1sum

@@ -1 +0,0 @@
-cfcaf550ab0915033bd27cc7a5968764510dbfc1  mesa-18.2.1.tar.xz

mesa-18.2.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3ba82b12a89d3d9fed2bdd96b4702dbb7ab675034650a8b1b718320daf073c4
+size 11375608

u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch

@@ -1,33 +0,0 @@
-Author: Michal Srb <msrb@suse.com>
-Subject: st/dri: don't set queryDmaBufFormats/queryDmaBufModifiers if the driver does not implement it
-Patch-mainline: To be upstreamed
-References: fdo#104926
-
-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
----
- 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;
--- 
-2.13.6
-