NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/xdriver_xf86-video-fbturbo: fix struct _Window::backStorage related compile failure

Browse Source 
Add patch to fix struct _Window::backStorage related compile failure.

Since xserver commit 'dix: Remove WindowRec::backStorage ' ([1])
struct _Window::backStorage is gone, use struct _Window::backingStore instead.

Fixes:

  backing_store_tuner.c: In function 'xPostValidateTree':
  backing_store_tuner.c:112:48: error: 'struct _Window' has no member named 'backStorage'
    112 |     if (!private->ForceBackingStore && focusWin->backStorage) {
        |                                                ^~
  backing_store_tuner.c:128:20: error: 'struct _Window' has no member named 'backStorage'
    128 |         if (!curWin->backStorage && (private->ForceBackingStore ||
        |                    ^~
  backing_store_tuner.c: In function 'xReparentWindow':
  backing_store_tuner.c:161:46: error: 'struct _Window' has no member named 'backStorage'
    161 |     if (pPriorParent == pScreen->root && pWin->backStorage) {
        |                                              ^~

[1] 6975807945

Reported-by: Jürgen Wack <juergen.wack@gmx.de>
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Peter Seiderer 2021-12-13 20:57:23 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent caa5a7ea07
commit 303f3e95d3
1 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
package/x11r7/xdriver_xf86-video-fbturbo/0005-backing_store_tuner-struct-_Window-backStorage-is-go.patch Normal file
View File

@ -0,0 +1,65 @@
From 93631c1f68678bf3e860b1bbc6192c8b6ac4c563 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Mon, 13 Dec 2021 19:55:08 +0100
Subject: [PATCH] backing_store_tuner: struct _Window::backStorage is gone
Fix struct _Window::backStorage related compile failure.
Since xserver commit 'dix: Remove WindowRec::backStorage ' ([1])
struct _Window::backStorage is gone, use struct _Window::backingStore instead.
Fixes:
backing_store_tuner.c: In function 'xPostValidateTree':
backing_store_tuner.c:112:48: error: 'struct _Window' has no member named 'backStorage'
112 | if (!private->ForceBackingStore && focusWin->backStorage) {
| ^~
backing_store_tuner.c:128:20: error: 'struct _Window' has no member named 'backStorage'
128 | if (!curWin->backStorage && (private->ForceBackingStore ||
| ^~
backing_store_tuner.c: In function 'xReparentWindow':
backing_store_tuner.c:161:46: error: 'struct _Window' has no member named 'backStorage'
161 | if (pPriorParent == pScreen->root && pWin->backStorage) {
| ^~
[1] https://gitlab.freedesktop.org/xorg/xserver/-/commit/6975807945d12c07f00e18df7fafeff43efa0267
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
src/backing_store_tuner.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/backing_store_tuner.c b/src/backing_store_tuner.c
index 067c05f..13f7ec3 100644
--- a/src/backing_store_tuner.c
+++ b/src/backing_store_tuner.c
@@ -109,7 +109,7 @@ xPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
private->PostValidateTreeNestingLevel++;
/* Disable backing store for the focus window */
- if (!private->ForceBackingStore && focusWin->backStorage) {
+ if (!private->ForceBackingStore && (focusWin->backingStore != NotUseful)) {
DebugMsg("Disable backing store for the focus window 0x%x\n",
(unsigned int)focusWin->drawable.id);
pScreen->backingStoreSupport = Always;
@@ -125,7 +125,7 @@ xPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
/* And enable backing store for all the other children of root */
curWin = pScreen->root->firstChild;
while (curWin) {
- if (!curWin->backStorage && (private->ForceBackingStore ||
+ if ((curWin->backingStore == NotUseful) && (private->ForceBackingStore ||
curWin != focusWin)) {
DebugMsg("Enable backing store for window 0x%x\n",
(unsigned int)curWin->drawable.id);
@@ -158,7 +158,7 @@ xReparentWindow(WindowPtr pWin, WindowPtr pPriorParent)
}
/* We only want backing store set for direct children of root */
- if (pPriorParent == pScreen->root && pWin->backStorage) {
+ if (pPriorParent == pScreen->root && (pWin->backingStore != NotUseful)) {
DebugMsg("Reparent window 0x%x from root, disabling backing store\n",
(unsigned int)pWin->drawable.id);
pScreen->backingStoreSupport = Always;
--
2.34.1