summaryrefslogtreecommitdiff
path: root/x11-base/xorg-server/files/xorg-server-21.1.10-c99.patch
blob: 12a48e611329d57b1608be0f7d660e1fe32e92ec (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
https://bugs.gentoo.org/885763
https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1114
https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1222
https://gitlab.freedesktop.org/xorg/xserver/-/commit/34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7

From f3cb68d274c4536130683d28182620fbbf1b287d Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 13 Apr 2023 15:45:58 +0200
Subject: [PATCH] fb: Declare wfbFinishScreenInit, wfbScreenInit for
 !FB_ACCESS_WRAPPER

xf86-video-nouveau calls wfbScreenInit without defining
FB_ACCESS_WRAPPER (which has other unintended side effects).
Presently, this compiles and links because compilers still support
implicit function declarations, but this is going to change fairly
soon.  This seems to be the most straightforward change to keep
the driver building.

(cherry picked from commit 34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7)
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1027,7 +1027,6 @@ extern _X_EXPORT Bool
                int dpiy, int width,     /* pixel width of frame buffer */
                int bpp);        /* bits per pixel of frame buffer */
 
-#ifdef FB_ACCESS_WRAPPER
 extern _X_EXPORT Bool
 wfbFinishScreenInit(ScreenPtr pScreen,
                     void *pbits,
@@ -1049,7 +1048,6 @@ wfbScreenInit(ScreenPtr pScreen,
               int width,
               int bpp,
               SetupWrapProcPtr setupWrap, FinishWrapProcPtr finishWrap);
-#endif
 
 extern _X_EXPORT Bool
 fbFinishScreenInit(ScreenPtr pScreen,
-- 
GitLab