- update to 20.2.0

* includes Intel Rocket Lake Platform Support 
    (jsc#SLE/SLE-12880, jsc#SLE/SLE-12882)
- adjusted/refreshed patches:
  * n_add-Mesa-headers-again.patch
  * n_drirc-disable-rgb10-for-chromium-on-amd.patch
  * u_dep_xcb.patch
- docs now available in .rst format (html before)

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

Mesa-drivers.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Sep 29 09:21:57 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- update to 20.2.0
+  * includes Intel Rocket Lake Platform Support 
+    (jsc#SLE/SLE-12880, jsc#SLE/SLE-12882)
+- adjusted/refreshed patches:
+  * n_add-Mesa-headers-again.patch
+  * n_drirc-disable-rgb10-for-chromium-on-amd.patch
+  * u_dep_xcb.patch
+- docs now available in .rst format (html before)
+
 -------------------------------------------------------------------
 Thu Sep 24 11:08:44 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
 

Mesa-drivers.spec

@@ -41,7 +41,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 20.1.8
+%define _version 20.2.0
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -109,7 +109,7 @@
 %endif
 
 Name:           Mesa-drivers
-Version:        20.1.8
+Version:        20.2.0
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -917,7 +917,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 
 %if !%{drivers}
 %files
-%license docs/license.html
+%license docs/license.rst
 %doc docs/README*
 %dir %{_datadir}/drirc.d
 %config %{_datadir}/drirc.d/*
@@ -1073,7 +1073,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %{_libdir}/pkgconfig/dri.pc
 
 %files devel
-%doc docs/*.html
+%doc docs/*.rst
 
 # !drivers
 %endif

Mesa.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Sep 29 09:21:57 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- update to 20.2.0
+  * includes Intel Rocket Lake Platform Support 
+    (jsc#SLE/SLE-12880, jsc#SLE/SLE-12882)
+- adjusted/refreshed patches:
+  * n_add-Mesa-headers-again.patch
+  * n_drirc-disable-rgb10-for-chromium-on-amd.patch
+  * u_dep_xcb.patch
+- docs now available in .rst format (html before)
+
 -------------------------------------------------------------------
 Thu Sep 24 11:08:44 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
 

Mesa.spec

@@ -40,7 +40,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 20.1.8
+%define _version 20.2.0
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -108,7 +108,7 @@
 %endif
 
 Name:           Mesa
-Version:        20.1.8
+Version:        20.2.0
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -916,7 +916,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 
 %if !%{drivers}
 %files
-%license docs/license.html
+%license docs/license.rst
 %doc docs/README*
 %dir %{_datadir}/drirc.d
 %config %{_datadir}/drirc.d/*
@@ -1072,7 +1072,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %{_libdir}/pkgconfig/dri.pc
 
 %files devel
-%doc docs/*.html
+%doc docs/*.rst
 
 # !drivers
 %endif

baselibs.conf

@@ -73,49 +73,12 @@ Mesa-libd3d
 	provides "d3dadapter9.so.1"
 Mesa-libd3d-devel
 	requires "Mesa-libd3d-<targettype> = <version>"
-libvulkan_intel
-	targetarch aarch64 +/usr/share/vulkan/icd.d/intel_icd.*.json
-	targetarch ppc64 +/usr/share/vulkan/icd.d/intel_icd.*.json
-	targetarch ppc64le +/usr/share/vulkan/icd.d/intel_icd.*.json
-	targetarch x86_64 +/usr/share/vulkan/icd.d/intel_icd.*.json
-libvulkan_radeon
-	targetarch aarch64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
-	targetarch ppc64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
-	targetarch ppc64le +/usr/share/vulkan/icd.d/radeon_icd.*.json
-	targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
-Mesa-libVulkan-devel
-	targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>"
-	targetarch aarch64 requires "libvulkan_radeon-<targettype> = <version>"
-	targetarch ppc64 requires "libvulkan_intel-<targettype> = <version>"
-	targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>"
-	targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>"
-	targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>"
-	targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>"
-	targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>"
 libXvMC_nouveau
 libXvMC_r600
 libvdpau_nouveau
 libvdpau_r300
 libvdpau_r600
 libvdpau_radeonsi
-Mesa-vulkan-device-select
-	targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>"
-	targetarch aarch64 requires "libvulkan_radeon-<targettype> = <version>"
-	targetarch ppc64 requires "libvulkan_intel-<targettype> = <version>"
-	targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>"
-	targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>"
-	targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>"
-	targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>"
-	targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>"
-Mesa-vulkan-overlay
-	targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>"
-	targetarch aarch64 requires "libvulkan_radeon-<targettype> = <version>"
-	targetarch ppc64 requires "libvulkan_intel-<targettype> = <version>"
-	targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>"
-	targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>"
-	targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>"
-	targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>"
-	targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>"
 Mesa-dri-vc4
 Mesa-dri-nouveau
 Mesa-dri

mesa-20.1.8.tar.xz

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

mesa-20.2.0.tar.xz

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

n_add-Mesa-headers-again.patch

@@ -1,9 +1,10 @@
-diff -dupr mesa-20.0.0.orig/include/meson.build mesa-20.0.0/include/meson.build
+Index: mesa-20.2.0/include/meson.build
---- mesa-20.0.0.orig/include/meson.build	2020-02-21 14:11:14.623397341 +0100
+===================================================================
-+++ mesa-20.0.0/include/meson.build	2020-02-21 14:13:05.620425210 +0100
+--- mesa-20.2.0.orig/include/meson.build
-@@ -22,10 +22,8 @@ inc_include = include_directories('.')
++++ mesa-20.2.0/include/meson.build
- inc_d3d9 = include_directories('D3D9')
+@@ -29,10 +29,8 @@ if with_android_stub
- inc_haikugl = include_directories('HaikuGL')
+   inc_include += [include_directories('android_stub')]
+ endif
  
 -if not with_glvnd
    if with_gles1 or with_gles2 or with_opengl or with_egl

n_drirc-disable-rgb10-for-chromium-on-amd.patch

@@ -1,7 +1,8 @@
-diff -dupr mesa-20.0.0.orig/src/util/00-mesa-defaults.conf mesa-20.0.0/src/util/00-mesa-defaults.conf
+Index: mesa-20.2.0/src/util/00-mesa-defaults.conf
---- mesa-20.0.0.orig/src/util/00-mesa-defaults.conf	2020-02-19 20:29:32.000000000 +0100
+===================================================================
-+++ mesa-20.0.0/src/util/00-mesa-defaults.conf	2020-02-22 12:10:47.118008543 +0100
+--- mesa-20.2.0.orig/src/util/00-mesa-defaults.conf
-@@ -556,6 +556,14 @@ TODO: document the other workarounds.
++++ mesa-20.2.0/src/util/00-mesa-defaults.conf
+@@ -633,6 +633,14 @@ TODO: document the other workarounds.
          <application name="DiRT Rally" executable="DirtRally">
              <option name="radeonsi_prim_restart_tri_strips_only" value="true"/>
          </application>

u_dep_xcb.patch

@@ -1,8 +1,8 @@
-Index: mesa-19.2.1/meson.build
+Index: mesa-20.2.0/meson.build
 ===================================================================
---- mesa-19.2.1.orig/meson.build
+--- mesa-20.2.0.orig/meson.build
-+++ mesa-19.2.1/meson.build
++++ mesa-20.2.0/meson.build
-@@ -1422,10 +1422,12 @@ if with_platform_x11
+@@ -1718,10 +1718,12 @@ if with_platform_x11
      endif
    endif
    if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
@@ -15,15 +15,16 @@ Index: mesa-19.2.1/meson.build
        dep_xcb_dri3 = dependency('xcb-dri3')
        dep_xcb_present = dependency('xcb-present')
        # until xcb-dri3 has been around long enough to make a hard-dependency:
-Index: mesa-19.2.1/src/loader/meson.build
+Index: mesa-20.2.0/src/loader/meson.build
 ===================================================================
---- mesa-19.2.1.orig/src/loader/meson.build
+--- mesa-20.2.0.orig/src/loader/meson.build
-+++ mesa-19.2.1/src/loader/meson.build
++++ mesa-20.2.0/src/loader/meson.build
-@@ -28,6 +28,7 @@ if with_platform_x11 and with_dri3
+@@ -28,7 +28,7 @@ if with_platform_x11 and with_dri3
      include_directories : [inc_include, inc_src],
      dependencies : [
        dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
-+      dep_xcb,
+-      dep_xcb_xfixes,
++      dep_xcb_xfixes, dep_xcb,
      ],
      build_by_default : false,
    )