Changeset cecac4d for x/installing

Timestamp:

02/13/2016 07:48:09 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

ab88249

Parents:

5f0df0c

Message:

Merge several recent changes from trunk - sync relevant changes to r16949.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16960 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• x/installing/xorg-server.xml (modified) (5 diffs)

x/installing/xorg-server.xml

@@ -7 +7 @@
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "3c1c1057d3ad27380d8dd87ffcc182cd">
+  <!ENTITY xorg-server-md5sum        "1b9e85420c3790dd487addd50313f4da">
   <!ENTITY xorg-server-size          "5.6 MB">
-  <!ENTITY xorg-server-buildsize     "516 MB (with tests)">
-  <!ENTITY xorg-server-time          "1.6 SBU (with tests)">
+  <!ENTITY xorg-server-buildsize     "544 MB (with tests)">
+  <!ENTITY xorg-server-time          "1.8 SBU (with tests)">
 ]>
 
@@ -77 +77 @@
           Optional patch:
           <ulink url="&patch-root;/xorg-server-&xorg-server-version;-add_prime_support-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Recommended patch (required by <xref linkend="wayland"/>):
+          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-wayland_190-1.patch"/>
         </para>
       </listitem>
@@ -108 +114 @@
       <xref linkend="fop"/>, (to build documentation),
       <xref linkend="gs"/> (to build documentation),
+      <xref linkend="xcb-util-keysyms"/> (used by Xnest),
       <xref linkend="xcb-util-image"/>,
       <xref linkend="xcb-util-renderutil"/>,
@@ -129 +136 @@
 
 <screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
+
+    <para>
+      If you have downloaded the recommended patch, apply it by running the
+      following command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-wayland_190-1.patch</userinput></screen>
 
     <para>
@@ -207 +221 @@
       <seglistitem>
         <seg>
-          cvt, dmxaddinput, dmxaddscreen, dmxinfo, dmxreconfig, dmxresize,
-          dmxrminput, dmxrmscreen, dmxtodmx, dmxwininfo, gtf, vdltodmx, X,
-          Xdmx, xdmxconfig, Xephyr, Xfbdev, Xnest, Xorg, Xvfb and Xwayland
+          cvt, gtf, X, Xnest, Xorg, and Xvfb; optional: dmxaddinput,
+          dmxaddscreen, dmxinfo, dmxreconfig, dmxresize, dmxrminput,
+          dmxrmscreen, dmxtodmx, dmxwininfo, vdltodmx, Xdmx, xdmxconfig, Xephyr,
+          and Xfbdev
         </seg>
         <seg>