Changeset ad9325e7

Timestamp:

09/04/2024 10:27:56 PM (2 weeks ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

trunk

Children:

72b6848

Parents:

ec08dbb (diff), 5a681cb4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/libdriv/taglib.xml (modified) (1 diff)
• networking/netprogs/nfs-utils.xml (modified) (2 diffs)
• x/installing/mesa.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -70 +70 @@
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to apr-1.7.5. Fixes
+          <para>[bdubbs] - Update to apr-1.7.5 (Security Update). Fixes
           <ulink url="&blfs-ticket-root;20273">20273</ulink>.</para>
         </listitem>

multimedia/libdriv/taglib.xml

@@ -29 +29 @@
       <application>Taglib</application> is a library used for reading,
       writing and manipulating audio file tags and is used by applications
-      such as <application>Amarok</application> and
-      <application>VLC</application>.
+      such as <application>VLC</application>.
     </para>
 

networking/netprogs/nfs-utils.xml

@@ -74 +74 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="libevent"/>,
       <xref linkend="libtirpc"/>,
-      <xref linkend="libevent"/>,
       <xref linkend="rpcsvc-proto"/>, and
       <xref linkend="sqlite"/>
@@ -83 +83 @@
     <para role="optional">
       <xref linkend="cyrus-sasl"/> (for SASL authentication),
+      <xref linkend="libnsl"/> (for NIS client support),
       <xref linkend="lvm2"/> (libdevmapper for NFSv4 support),
       <!--<xref linkend="libnfsidmap"/> (for NFSv4 support),
       This is now built in, as of 2.2.1-->
-      <xref linkend="libnsl"/> (for NIS client support),
       <xref linkend="openldap"/> (for LDAP authentication),
       <xref linkend="mitkrb"/> or

x/installing/mesa.xml

@@ -79 +79 @@
         <para>
           Recommended patch:
-          <ulink url="&patch-root;/mesa-add_xdemos-2.patch"/>
+          <ulink url="&patch-root;/mesa-add_xdemos-3.patch"/>
           (installs 2 demo programs for testing Mesa - not needed if you
           install the <ulink url="https://archive.mesa3d.org/demos/">
@@ -310 +310 @@
 
 <!--<screen><userinput>patch -Np1 -i ../mesa-&mesa-version;-add_xdemos-1.patch</userinput></screen>-->
-<screen><userinput>patch -Np1 -i ../mesa-add_xdemos-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../mesa-add_xdemos-3.patch</userinput></screen>
 
    <!-- Note that freedreno, vc4, and virgl all need special support from