Changes in x/installing/xwayland.xml [6c6b4190:2b4ea67]

File:

• x/installing/xwayland.xml (modified) (13 diffs)

x/installing/xwayland.xml

@@ -7 +7 @@
   <!ENTITY xwayland-download-http "&xorg-download-http;/xserver/xwayland-&xwayland-version;.tar.xz">
   <!ENTITY xwayland-download-ftp  "&xorg-download-ftp;/xserver/xwayland-&xwayland-version;.tar.xz">
-  <!ENTITY xwayland-md5sum        "ab422f8225dfeee2b09943fd991a5cee">
+  <!ENTITY xwayland-md5sum        "a814892a54e15d17eb096b8c3dd88b5d">
   <!ENTITY xwayland-size          "1.2 MB">
-  <!ENTITY xwayland-buildsize     "84 MB (add 350 MB for test)">
-  <!ENTITY xwayland-time          "0.3 SBU (with paralellism=4; add 0.8 SBU for test, not including clone time)">
+  <!ENTITY xwayland-buildsize     "76 MB (add 357 MB for tests)">
+  <!ENTITY xwayland-time          "0.2 SBU (with parallelism=4; add 1.0 SBU for tests, not including clone time)">
 ]>
 
@@ -16 +16 @@
   <?dbhtml filename="xwayland.html"?>
 
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
 
   <title>Xwayland-&xwayland-version;</title>
@@ -36 +33 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76 +73 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="libxcvt"/>,
       <xref linkend="pixman"/>,
       <xref linkend="wayland-protocols"/>, and
@@ -90 +88 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="git"/> (to download packages needed for the tests),
       <xref linkend="libgcrypt"/>,
       <xref linkend="nettle"/>,
+      <xref linkend="xmlto"/>,
       <xref linkend="xorg7-legacy"/>
          (only bdftopcf, for building fonts required for the tests),
@@ -117 +117 @@
 
 meson --prefix=$XORG_PREFIX         \
-      -Dxvfb=false                  \
       -Dxkb_output_dir=/var/lib/xkb \
       ..                            &amp;&amp;
@@ -129 +128 @@
       for a stripped down build of <application>weston</application> is shown
       in <ulink
-      url="https://gitlab.freedesktop.org/xorg/xserver/-/blob/xwayland-21.1/.gitlab-ci/debian-install.sh">
+      url="https://gitlab.freedesktop.org/xorg/xserver/-/blob/xwayland-22.1/.gitlab-ci/debian-install.sh">
       Upstream continuous integration build</ulink>.
     </para>
-
+<!--
     <para>
       Furthermore, an X server needs to be running during the build of
@@ -138 +137 @@
       graphical environment, you'll need to enable <command>Xvfb</command>
       by removing the <parameter>-Dxvfb=false</parameter> above. The
-      instructions below suppose this has been done.
-    </para>
-
+      instructions below expect this has been done.
+    </para>
+-->
     <para>
       Running the tests involves downloading two other frameworks, in addition
@@ -158 +157 @@
 
 export DISPLAY=:22           &amp;&amp;
-hw/vfb/Xvfb $DISPLAY &amp;
+../hw/vfb/Xvfb $DISPLAY &amp;
 VFB_PID=$!                   &amp;&amp;
 cd xts                       &amp;&amp;
@@ -173 +172 @@
 <screen remap="test"><userinput>XTEST_DIR=$(pwd)/tools/xts PIGLIT_DIR=$(pwd)/tools/piglit ninja test</userinput></screen>
 
+    <!-- The xfontset tests fail on my system -renodr -->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -186 +186 @@
 mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
 
+    <para>
+      If <xref linkend='xorg-server'/> is not installed and you do not plan
+      to install it later, you can install <command>Xvfb</command> from this
+      package.  As the &root; user:
+    </para>
+
+<screen role="nodump"><userinput>install -vm755 hw/vfb/Xvfb /usr/bin</userinput></screen>
+
   </sect2>
 
@@ -196 +204 @@
       which is not part of this package.
     </para>
-
+<!--
     <para>
       <parameter>-Dxvfb=false</parameter>: Prevents building the
       <command>xvfb</command> program, which is also installed by
-      <xref linkend="xorg-server"/>. Remove if you do not plan to
+      <xref linkend="xorg-server"/>. Remove this option if you do not plan to
       install the X server.
     </para>
-
+-->
     <para>
       <command>mkdir -pv /etc/X11/xorg.conf.d</command>: This directory is
@@ -250 +258 @@
         <listitem>
           <para>
-            Allows X client to run under wayland.
+            Allows X clients to run under wayland
           </para>
           <indexterm zone="xwayland Xwayland">