xorg-server rebuild

x11/server/xorg-server/files/34a430.patch

@@ -0,0 +1,39 @@
+From 34a430a16ec2cb9851b1f2bc7fc2117e19b9fcc7 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.
+---
+ fb/fb.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/fb/fb.h b/fb/fb.h
+index 08143a0d49..309f15294c 100644
+--- 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
+

x11/server/xorg-server/pspec.xml

@@ -69,7 +69,7 @@
         <Patches>
             <Patch level="1">xorg-server-1.12-unloadsubmodule.patch</Patch>
             <Patch level="1">xorg-server-1.18-support-multiple-Files-sections.patch</Patch>
-<!--             <Patch level="1">0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch</Patch> -->
+            <Patch level="1">34a430.patch</Patch>
 <!--             <Patch level="1">0002-xephyr_Dont_check_for_SeatId_anymore.patch</Patch> -->
 <!--             <Patch level="1">0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch</Patch> -->
 <!--             <Patch level="1">0004-present_Check_for_NULL_to_prevent_crash.patch</Patch> -->
@@ -318,6 +318,13 @@
     </Package>
 
     <History>
+        <Update release="35">
+            <Date>2024-01-10</Date>
+            <Version>21.1.10</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="34">
             <Date>2023-12-13</Date>
             <Version>21.1.10</Version>