SHA256
1
0
forked from pool/Mesa

Accepting request 791538 from home:duwe:branches:X11:XOrg

- Fix Weston launch on tumbleweed by backporting commit bfb9c08e

OBS-URL: https://build.opensuse.org/request/show/791538
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=942
This commit is contained in:
Stefan Dirsch 2020-04-05 15:34:04 +00:00 committed by Git OBS Bridge
parent ca48dfa15a
commit bc35cd9560
5 changed files with 44 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Apr 5 12:27:35 UTC 2020 - Torsten Duwe <duwe@suse.com>
- Fix Weston launch on tumbleweed by backporting commit bfb9c08e
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 3 15:25:42 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Fri Apr 3 15:25:42 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -126,6 +126,7 @@ Source6: %{name}-rpmlintrc
Source7: Mesa.keyring Source7: Mesa.keyring
Patch1: n_opencl_dep_libclang.patch Patch1: n_opencl_dep_libclang.patch
Patch2: n_add-Mesa-headers-again.patch Patch2: n_add-Mesa-headers-again.patch
Patch3: U_EGL-Add-eglSetDamageRegionKHR-to-GLVND-dispatch-list.patch
# never to be upstreamed # never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch Patch58: u_dep_xcb.patch
@ -744,6 +745,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif %endif
%endif %endif
%patch2 -p1 %patch2 -p1
%patch3 -p1
%patch54 -p1 %patch54 -p1
%patch58 -p1 %patch58 -p1

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Apr 5 12:27:35 UTC 2020 - Torsten Duwe <duwe@suse.com>
- Fix Weston launch on tumbleweed by backporting commit bfb9c08e
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 3 15:25:42 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Fri Apr 3 15:25:42 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -125,6 +125,7 @@ Source6: %{name}-rpmlintrc
Source7: Mesa.keyring Source7: Mesa.keyring
Patch1: n_opencl_dep_libclang.patch Patch1: n_opencl_dep_libclang.patch
Patch2: n_add-Mesa-headers-again.patch Patch2: n_add-Mesa-headers-again.patch
Patch3: U_EGL-Add-eglSetDamageRegionKHR-to-GLVND-dispatch-list.patch
# never to be upstreamed # never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch Patch58: u_dep_xcb.patch
@ -743,6 +744,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%endif %endif
%endif %endif
%patch2 -p1 %patch2 -p1
%patch3 -p1
%patch54 -p1 %patch54 -p1
%patch58 -p1 %patch58 -p1

View File

@ -0,0 +1,30 @@
From: Daniel Stone <daniels@collabora.com>
Git-commit: bfb9c08e5c5474688611c339135b8feeedc9bdd3
EGL: Add eglSetDamageRegionKHR to GLVND dispatch list
This was missed in the original conversion, which added support for
eglSetDamageRegionKHR to local EGL exports, but forgot to generate
updated dispatch for GLVND.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Fixes: 9827547313c7 ("egl/android: support for EGL_KHR_partial_update")
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4403>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4403>
Acked-By: Torsten Duwe <duwe@suse.de>
diff --git a/src/egl/generate/eglFunctionList.py b/src/egl/generate/eglFunctionList.py
index 192280f58f0..171e3ddc821 100644
--- a/src/egl/generate/eglFunctionList.py
+++ b/src/egl/generate/eglFunctionList.py
@@ -213,5 +213,8 @@ EGL_FUNCTIONS = (
_eglFunc("eglGetDisplayDriverName", "display"),
_eglFunc("eglGetDisplayDriverConfig", "display"),
+ # EGL_KHR_partial_update
+ _eglFunc("eglSetDamageRegionKHR", "display"),
+
)