Changeset cbf7be5 for x

Timestamp:

05/31/2019 03:04:31 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

fb7ec07

Parents:

4d390d2

Message:

Merge to HEAD 21638.

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

Location:

x/installing

Files:

• mesa.xml (modified) (4 diffs)
• xterm.xml (modified) (1 diff)

x/installing/mesa.xml

@@ -84 +84 @@
           Recommended patch:
           <ulink
-            url="&patch-root;/mesa-&mesa-version;-add_xdemos-1.patch"/>
+            url="&patch-root;/mesa-&mesa-version;-add_xdemos-2.patch"/>
           (installs 2 demo programs for testing Mesa - not needed if you
           install the <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">
@@ -160 +160 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../mesa-&mesa-version;-add_xdemos-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../mesa-&mesa-version;-add_xdemos-2.patch</userinput></screen>
 
    <!-- Note that freedreno, vc4, and virgl all need special support from
@@ -239 +239 @@
 
     <para>
-      If you have applied the xdemos patch, build the demo programs by
-      running the following command:
-    </para>
-
-<screen><userinput>make -C ../xdemos DEMOS_PREFIX=$XORG_PREFIX LIBRARY_PATH=$PWD/src/glx</userinput></screen>
-
-    <para>
       If you built the tests (see 'Command Explanations'), to run them issue:
       <command>ninja test</command>.
@@ -255 +248 @@
 
 <screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you have built the demo programs, install them by running the
-      following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C ../xdemos DEMOS_PREFIX=$XORG_PREFIX install</userinput></screen>
 
     <para>

x/installing/xterm.xml

@@ -8 +8 @@
   <!--<!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">-->
   <!ENTITY xterm-download-ftp  " ">
-  <!ENTITY xterm-md5sum        "7bbc1059db91aec9ca584368d91db312">
+  <!ENTITY xterm-md5sum        "cc618dcd3654d5cfc29f5475e39c7aee">
   <!ENTITY xterm-size          "1.3 MB">
-  <!ENTITY xterm-buildsize     "13 MB">
+  <!ENTITY xterm-buildsize     "15 MB">
   <!ENTITY xterm-time          "0.2 SBU">
 ]>