From a447dfc271f2e27c5795329a7f7fc4cf4a754ada Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Tue, 14 Dec 2021 10:59:51 -0600
Subject: [PATCH 1/2] Fix building xf86-video-nouveau with the latest X server

---
 introduction/welcome/changelog.xml | 10 ++++++++++
 x/installing/x7driver-nouveau.xml  |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 8a4f522520..b980f5e6cb 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,16 @@
     </listitem>
     -->
 
+    <listitem>
+      <para>December 14th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix building the nouveau driver with the new
+          Xorg-Server.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>December 13th, 2021</para>
       <itemizedlist>
diff --git a/x/installing/x7driver-nouveau.xml b/x/installing/x7driver-nouveau.xml
index 0655fe46ce..c61e021960 100644
--- a/x/installing/x7driver-nouveau.xml
+++ b/x/installing/x7driver-nouveau.xml
@@ -116,6 +116,13 @@
     <sect3 role="installation">
       <title>Installation of Xorg Nouveau Driver</title>
 
+      <para>
+        First, fix the <application>Xorg Nouveau Driver</application> to build
+        with the latest Xorg Server:
+      </para>
+
+<screen><userinput remap="pre">grep -rl slave | xargs sed -i s/slave/secondary/</userinput></screen>
+ 
       <para>
         Install <application>Xorg Nouveau Driver</application> by running the following
         commands:

From 623b3bcfb4121ca4d4237fd5d8bd68f698f18611 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Tue, 14 Dec 2021 18:15:58 +0100
Subject: [PATCH 2/2] Add missing dependency libtirpc of xorg-server

---
 x/installing/xorg-server.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x/installing/xorg-server.xml b/x/installing/xorg-server.xml
index 58ca502ecc..4ee96b5314 100644
--- a/x/installing/xorg-server.xml
+++ b/x/installing/xorg-server.xml
@@ -94,7 +94,8 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="libepoxy"/> (needed for glamor), and
+      <xref linkend="libepoxy"/> (needed for glamor),
+      <xref linkend="libtirpc"/>, and
       <phrase revision="sysv"><xref role="runtime"
                                     linkend="polkit"/> (runtime)</phrase>
       <phrase revision="systemd"><xref linkend="systemd"/></phrase>