linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-25 07:42:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update xorg-server and add xwayland

Browse Source 
xorg-server-21.1.1
xwayland-21.1.3
This commit is contained in:
Pierre Labastie 2021-11-21 11:42:53 +01:00
parent 2d3f7c4e88
commit ab5ea1f1c2
5 changed files with 306 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
introduction/welcome/changelog.xml
View File

@ -41,6 +41,20 @@
</itemizedlist>
</listitem>
-->
<listitem>
<para>November 21st, 2021</para>
<itemizedlist>
<listitem>
<para>[pierre] - Update to xorg-server-21.1.1. Fixes
<ulink url="&blfs-ticket-root;15709">#15709</ulink>.</para>
</listitem>
<listitem>
<para>[pierre] - Add xwayland-21.1.3. Part of
<ulink url="&blfs-ticket-root;15709">#15709</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>November 20th, 2021</para>
<itemizedlist>

3
packages.ent
View File

@ -713,7 +713,8 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY xbitmaps-version "1.1.2">
<!ENTITY xcursor-themes-version "1.0.6">
<!ENTITY xkeyboard-config-version "2.33">
<!ENTITY xorg-server-version "1.20.13">
<!ENTITY xorg-server-version "21.1.1">
<!ENTITY xwayland-version "21.1.3">
<!ENTITY twm-version "1.0.11">
<!ENTITY xterm-version "370">
<!ENTITY xclock-version "1.0.9">

1
x/installing/installing.xml
View File

@ -74,6 +74,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcursor-themes.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xwayland.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="twm.xml"/>

104
x/installing/xorg-server.xml
View File

@ -6,10 +6,10 @@
<!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.xz">
<!ENTITY xorg-server-download-ftp "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.xz">
<!ENTITY xorg-server-md5sum "9acb2a51507e6056b09e3d3f19565419">
<!ENTITY xorg-server-size "4.9 MB">
<!ENTITY xorg-server-buildsize "193 MB (with tests)">
<!ENTITY xorg-server-time "0.7 SBU (using parallelism=4; with tests)">
<!ENTITY xorg-server-md5sum "6d8e557a6dbd5a9923c3564b64af7d94">
<!ENTITY xorg-server-size "4.7 MB">
<!ENTITY xorg-server-buildsize "217 MB (with tests)">
<!ENTITY xorg-server-time "0.4 SBU (using parallelism=4; with tests)">
]>
<sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">
@ -85,7 +85,8 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
<xref linkend="pixman"/> and
<xref linkend="libxcvt"/>,
<xref linkend="pixman"/>,
<xref linkend="xorg7-font"/> (only font-util), and at runtime:
<xref role="runtime" linkend="xkeyboard-config"/>
</para>
@ -93,11 +94,10 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
<xref linkend="libepoxy"/> (needed for glamor and Xwayland),
<phrase revision="sysv"><xref role="runtime" linkend="polkit"/> (runtime),
</phrase><xref linkend="wayland"/> (needed for Xwayland),
<phrase revision="sysv"> and</phrase> <xref linkend="wayland-protocols"/>
<phrase revision="systemd">, and <xref linkend="systemd"/></phrase>
<xref linkend="libepoxy"/> (needed for glamor), and
<phrase revision="sysv"><xref role="runtime"
linkend="polkit"/> (runtime)</phrase>
<phrase revision="systemd"><xref linkend="systemd"/></phrase>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
@ -110,9 +110,10 @@
<xref linkend="xcb-util-keysyms"/>,
<xref linkend="xcb-util-image"/>,
<xref linkend="xcb-util-renderutil"/>,
<xref linkend="xcb-util-wm"/> (all three to build Xephyr),
<xref linkend="xcb-util-wm"/> (all four to build Xephyr),
<xref linkend="xmlto"/> (to build documentation),
<ulink url="http://download.savannah.gnu.org/releases/libunwind">libunwind</ulink>, and
<ulink url="https://gitlab.freedesktop.org/xorg/test/rendercheck">rendercheck</ulink> (for tests),
<ulink url="https://www.x.org/archive/individual/doc/">xorg-sgml-doctools</ulink> (to build documentation)
</para>
@ -135,14 +136,16 @@
Install the server by running the following commands:
</para>
<screen><userinput>./configure $XORG_CONFIG \
--enable-glamor \
--enable-suid-wrapper \
--with-xkb-output=/var/lib/xkb &amp;&amp;
make</userinput></screen>
<screen><userinput>mkdir build &amp;&amp;
cd build &amp;&amp;
meson --prefix=$XORG_PREFIX \
-Dsuid_wrapper=true \
-Dxkb_output_dir=/var/lib/xkb &amp;&amp;
ninja</userinput></screen>
<para>
To test the results, issue: <command>make check</command>. You
To test the results, issue: <command>ninja test</command>. You
will need to run <command>ldconfig</command> as the <systemitem
class="username">root</systemitem> user first or some tests may fail.
</para>
@ -152,49 +155,49 @@ make</userinput></screen>
user:
</para>
<screen role="root" revision="sysv"><userinput>make install &amp;&amp;
<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
mkdir -pv /etc/X11/xorg.conf.d &amp;&amp;
cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
<literal>/tmp/.ICE-unix dir 1777 root root
/tmp/.X11-unix dir 1777 root root</literal>
EOF</userinput></screen>
<screen role="root" revision="systemd"><userinput>make install &amp;&amp;
<screen role="root" revision="systemd"><userinput>ninja install &amp;&amp;
mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</sect2>
<sect2 role="commands">
<title>Command Explanations</title>
<!-- built by default now
<para>
<parameter>--enable-glamor</parameter>: Build the Glamor DIX (Device
<parameter>- -enable-glamor</parameter>: Build the Glamor DIX (Device
Independent X) module which is currently used by: R600 or later radeon
video chipsets, the modesetting driver (which is part of this package)
for hardware using KMS which offers acceleration, and (optionally) the
intel driver.
</para>
-->
<para>
<parameter>--enable-suid-wrapper</parameter>: Builds the suid-root
<parameter>-Dsuid_wrapper=true</parameter>: Builds the suid-root
wrapper for legacy driver support on rootless xserver systems.
</para>
<para>
<option>--disable-systemd-logind</option>:
<option>-Dsystemd_logind=false</option>:
This switch disables <phrase revision="systemd">systemd-logind</phrase>
<phrase revision="sysv">elogind</phrase> integration allowing Xorg Server
to work without having the <phrase revision="systemd">systemd</phrase>
<phrase revision="elogind">elogind</phrase> PAM module configured.
</para>
<!-- seems to be completely removed with meson build:
<para>
<option>--enable-install-setuid</option>:
<option>- -enable-install-setuid</option>:
This switch restores the setuid bit to the Xorg executable allowing Xorg
Server to work with a virtual terminal designated on the
<command>startx</command> command line.
</para>
-->
<para revision="sysv">
<command>cat &gt;&gt; /etc/sysconfig/createfiles...</command>: This
command creates the <filename class="directory">/tmp/.ICE-unix</filename>
@ -204,14 +207,8 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</para>
<para>
<option>--enable-dmx</option>: Builds the DMX (Distributed Multihead X)
server.
</para>
<para>
<option>--enable-kdrive</option>: This option allows the
<command>configure</command> script to enable Xephyr if its dependencies
are met.
<option>-Dxephyr=true</option>: This option allows the
build Xephyr if its dependencies are met.
</para>
</sect2>
@ -226,19 +223,20 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
<seglistitem>
<seg>
cvt, gtf, X, Xnest, Xorg, and Xvfb; optional: dmxaddinput,
dmxaddscreen, dmxinfo, dmxreconfig, dmxresize, dmxrminput,
dmxrmscreen, dmxtodmx, dmxwininfo, vdltodmx, Xdmx, xdmxconfig, Xephyr,
<!--Xfbdev--> and Xwayland
gtf, X, Xnest, Xorg, Xvfb, and optionally Xephyr
</seg>
<seg>
several under $XORG_PREFIX/lib/xorg/modules/{,drivers,extensions}
including modesetting_drv.so
several under $XORG_PREFIX/lib/xorg/modules/ including the
<filename class="libraryfile">modesetting_drv.so</filename>
driver
</seg>
<seg>
$XORG_PREFIX/{include/xorg,lib/xorg,share/X11/xorg.conf.d} and
/var/lib/xkb
/etc/X11/xorg.conf.d,
$XORG_PREFIX/include/xorg,
$XORG_PREFIX/lib/xorg, and
$XORG_PREFIX/share/X11/xorg.conf.d
</seg>
</seglistitem>
</segmentedlist>
@ -246,7 +244,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
<bridgehead renderas="sect3">Short Descriptions</bridgehead>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
<!-- Now in libxcvt:
<varlistentry id="cvt-x7">
<term><command>cvt</command></term>
<listitem>
@ -258,7 +256,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
Removed in this release:
<varlistentry id="dmx-x7">
<term><command>dmx*</command></term>
<listitem>
@ -270,7 +268,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
-->
<varlistentry id="gtf-x7">
<term><command>gtf</command></term>
<listitem>
@ -282,7 +280,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
<!-- No dmx in this release
<varlistentry id="vdltodmx-x7">
<term><command>vdltodmx</command></term>
<listitem>
@ -295,7 +293,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
-->
<varlistentry id="X-x7">
<term><command>X</command></term>
<listitem>
@ -307,7 +305,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
<!-- No dmx in this release
<varlistentry id="Xdmx">
<term><command>Xdmx</command></term>
<listitem>
@ -320,7 +318,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
-->
<varlistentry id="Xephyr-x7">
<term><command>Xephyr</command></term>
<listitem>
@ -368,7 +366,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
<!-- No dmx in this release
<varlistentry id="xdmxconfig-x7">
<term><command>xdmxconfig</command></term>
<listitem>
@ -380,7 +378,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
Xwayland has been separated to xwayland package
<varlistentry id="Xwayland-x7">
<term><command>Xwayland</command></term>
<listitem>
@ -394,7 +392,7 @@ mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
</indexterm>
</listitem>
</varlistentry>
-->
<varlistentry id="modesetting_drv-x7">
<term><filename class="libraryfile">modesetting_drv.so</filename></term>
<listitem>

238
x/installing/xwayland.xml Normal file
View File

@ -0,0 +1,238 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!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-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)">
]>
<sect1 id="xwayland" xreflabel="Xwayland-&xwayland-version;">
<?dbhtml filename="xwayland.html"?>
<sect1info>
<date>$Date$</date>
</sect1info>
<title>Xwayland-&xwayland-version;</title>
<indexterm zone="xwayland">
<primary sortas="a-xwayland">xwayland</primary>
</indexterm>
<sect2 role="package">
<title>Introduction to Xwayland</title>
<para>
The <application>Xwayland</application> package is an Xorg server
running on top of the wayland server. I has been separated from the
main Xorg server package. It allows running X clients inside a
wayland session.
</para>
&lfs110a_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>
Download (HTTP): <ulink url="&xwayland-download-http;"/>
</para>
</listitem>
<listitem>
<para>
Download (FTP): <ulink url="&xwayland-download-ftp;"/>
</para>
</listitem>
<listitem>
<para>
Download MD5 sum: &xwayland-md5sum;
</para>
</listitem>
<listitem>
<para>
Download size: &xwayland-size;
</para>
</listitem>
<listitem>
<para>
Estimated disk space required: &xwayland-buildsize;
</para>
</listitem>
<listitem>
<para>
Estimated build time: &xwayland-time;
</para>
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">Xwayland Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
<xref linkend="pixman"/>,
<xref linkend="wayland-protocols"/>, and
<xref linkend="xorg7-font"/> (only font-util)
</para>
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<xref linkend="libepoxy"/>,
<xref linkend="libtirpc"/>, and
<xref linkend="mesa"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="libgcrypt"/>,
<xref linkend="nettle"/>,
<xref linkend="xorg7-legacy"/>
(only bdftopcf, for building fonts required for the tests),
<ulink url="https://gitlab.freedesktop.org/xorg/test/rendercheck">rendercheck</ulink> (for tests), and
<ulink url="https://wayland.pages.freedesktop.org/weston/">weston</ulink> (for tests)
</para>
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/xwayland"/>
</para>
</sect2>
<sect2 role="installation">
<title>Installation of Xwayland</title>
<para>
Install <application>xwayland</application> by running the following
commands:
</para>
<screen><userinput>sed '/install_man/,$d' -i meson.build &amp;&amp;
mkdir build &amp;&amp;
cd build &amp;&amp;
meson --prefix=$XORG_PREFIX \
-Dxvfb=false \
-Dxkb_output_dir=/var/lib/xkb \
.. &amp;&amp;
ninja</userinput></screen>
<para>
Building the test framework needs some work. First,
<ulink url="https://wayland.pages.freedesktop.org/weston/">weston</ulink>
brings in several dependencies, but the number can be reduced by
disabling unneeded features. The <command>meson</command> command
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">
Upstream continuous integration build</ulink>.
</para>
<para>
Furthermore, an X server needs to be running during the build of
<application>xts</application>. If not running the tests in a
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>
<para>
Running the tests involves downloading two other frameworks, in addition
to the mentioned optional dependencies:
</para>
<screen remap="test"><userinput>mkdir tools &amp;&amp;
pushd tools &amp;&amp;
git clone https://gitlab.freedesktop.org/mesa/piglit.git --depth 1 &amp;&amp;
cat &gt; piglit/piglit.conf &lt;&lt; EOF &amp;&amp;
<literal>[xts]
path=$(pwd)/xts
EOF</literal>
git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1 &amp;&amp;
export DISPLAY=:22 &amp;&amp;
hw/vfb/Xvfb $DISPLAY &amp;
VFB_PID=$! &amp;&amp;
cd xts &amp;&amp;
CFLAGS=-fcommon ./autogen.sh &amp;&amp;
make &amp;&amp;
kill $VFB_PID &amp;&amp;
unset DISPLAY VFB_PID &amp;&amp;
popd</userinput></screen>
<para>
Then the tests can be run with:
</para>
<screen remap="test"><userinput>XTEST_DIR=$(pwd)/tools/xts PIGLIT_DIR=$(pwd)/tools/piglit ninja test</userinput></screen>
<para>
Now, as the <systemitem class="username">root</systemitem> user:
</para>
<screen role="root"><userinput>ninja install</userinput></screen>
</sect2>
<sect2 role="commands">
<title>Command Explanations</title>
<para>
<command>sed '/install_man/,$d' -i meson.build</command>: Prevents
installing a manual page for <command>Xserver</command>,
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
install the X server.
</para>
</sect2>
<sect2 role="content">
<title>Contents</title>
<segmentedlist>
<segtitle>Installed Program</segtitle>
<segtitle>Installed Library</segtitle>
<segtitle>Installed Directory</segtitle>
<seglistitem>
<seg>
Xwayland
</seg>
<seg>
None
</seg>
<seg>
None
</seg>
</seglistitem>
</segmentedlist>
<variablelist>
<bridgehead renderas="sect3">Short Descriptions</bridgehead>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
<varlistentry id="Xwayland">
<term><command>Xwayland</command></term>
<listitem>
<para>
Allows X client to run under wayland.
</para>
<indexterm zone="xwayland Xwayland">
<primary sortas="b-Xwayland">Xwayland</primary>
</indexterm>
</listitem>
</varlistentry>
</variablelist>
</sect2>
</sect1>