From ad20138a156417efc90c2da53647ac45864b5fe7 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 19 Dec 2021 12:31:32 -0600
Subject: [PATCH] Package updates. Update to mesa-21.3.2. Update to php-8.1.1.
 Update to gegl-0.4.34. Update to librsvg-2.52.5.

---
 general/graphlib/gegl.xml          |  6 +++---
 general/graphlib/librsvg.xml       |  8 ++++----
 general/prog/php.xml               |  6 ++++--
 introduction/welcome/changelog.xml | 16 ++++++++++++++++
 packages.ent                       |  8 ++++----
 x/installing/mesa.xml              |  4 ++--
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/general/graphlib/gegl.xml b/general/graphlib/gegl.xml
index 24533dd80e..d996f4544c 100644
--- a/general/graphlib/gegl.xml
+++ b/general/graphlib/gegl.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY gegl-download-http "https://download.gimp.org/pub/gegl/0.4/gegl-&gegl-version;.tar.xz">
   <!ENTITY gegl-download-ftp  " ">
-  <!ENTITY gegl-md5sum        "d560cc7d5b5b8c610f51b70f0e37a47d">
+  <!ENTITY gegl-md5sum        "3701f72771d2e8013c6877405cb409fe">
   <!ENTITY gegl-size          "5.4 MB">
-  <!ENTITY gegl-buildsize     "98 MB (with tests)">
-  <!ENTITY gegl-time          "0.6 SBU (Using parallelism=4; with tests)">
+  <!ENTITY gegl-buildsize     "99 MB (with tests)">
+  <!ENTITY gegl-time          "0.7 SBU (Using parallelism=4; with tests)">
 ]>
 
 <sect1 id="gegl" xreflabel="gegl-&gegl-version;">
diff --git a/general/graphlib/librsvg.xml b/general/graphlib/librsvg.xml
index 6139c9807d..c439395681 100644
--- a/general/graphlib/librsvg.xml
+++ b/general/graphlib/librsvg.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY librsvg-download-http "&gnome-download-http;/librsvg/2.52/librsvg-&librsvg-version;.tar.xz">
   <!ENTITY librsvg-download-ftp  "&gnome-download-ftp;/librsvg/2.52/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-md5sum        "7197aeebed0dd5c36d03fb92a3f5ee1d">
+  <!ENTITY librsvg-md5sum        "b667b319a33dafa825abf152a00e6c9b">
   <!ENTITY librsvg-size          "22 MB">
-  <!ENTITY librsvg-buildsize     "870 MB (26 MB installed), add 217 MB for tests">
-  <!ENTITY librsvg-time          "1.2 SBU (Using parallelism=4), add 1.9 SBU for tests">
+  <!ENTITY librsvg-buildsize     "865 MB (26 MB installed), add 211 MB for tests">
+  <!ENTITY librsvg-time          "1.6 SBU (Using parallelism=4), add 1.9 SBU for tests">
 ]>
 
 <sect1 id="librsvg" xreflabel="librsvg-&librsvg-version;">
@@ -118,7 +118,7 @@ make</userinput></screen>
       and perhaps harfbuzz differ from the versions on the system where the
       reference files were created. For this reason, running the tests is not
       recommended.
-      To test the results anyway, issue: <command>make check</command>.
+      To test the results anyway, issue: <command>make -k check</command>.
     </para>
 
     <para>
diff --git a/general/prog/php.xml b/general/prog/php.xml
index d0c2a2c682..3a4748bcf9 100644
--- a/general/prog/php.xml
+++ b/general/prog/php.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY php-download-http "https://www.php.net/distributions/php-&php-version;.tar.xz">
   <!ENTITY php-download-ftp  " ">
-  <!ENTITY php-md5sum        "552bc63901c6a1bad195e6a47be3c341">
+  <!ENTITY php-md5sum        "a0cd96c783b1700e5ebf1ebfd1454f80">
   <!ENTITY php-size          "11 MB">
   <!ENTITY php-buildsize     "479 MB (with documentation)">
-  <!ENTITY php-time          "1.8 SBU (with parallelism=4; add 1.9 SBU for tests)">
+  <!ENTITY php-time          "1.9 SBU (with parallelism=4; add 1.9 SBU for tests)">
   <!-- Tests were run for 8.0.1 at -j4, had two timeouts as well.
        Results were otherwise normal though, so I'm unsure of what caused the
        increase in time. -renodr
@@ -34,6 +34,8 @@ Tests passed    : 12517 ( 73.4%) ( 99.7%)
 
 Time taken      :  165 seconds
 
+Statst for tests changed slightly for 8.1.1, but not significantly.
+
 -->
 ]>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 38a09bc007..44c01b5645 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,22 @@
     <listitem>
       <para>December 19th, 2021</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to mesa-21.3.2. Fixes
+          <ulink url="&blfs-ticket-root;15873">#15873</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to php-8.1.1. Fixes
+          <ulink url="&blfs-ticket-root;15871">#15871</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gegl-0.4.34. Fixes
+          <ulink url="&blfs-ticket-root;15877">#15877</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to librsvg-2.52.5. Fixes
+          <ulink url="&blfs-ticket-root;15869">#15869</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to nspr-4.33. Fixes
           <ulink url="&blfs-ticket-root;15868">#15868</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 9bb6bde520..6ede0cdcfb 100644
--- a/packages.ent
+++ b/packages.ent
@@ -209,7 +209,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY freetype2-version            "2.11.1">
 <!ENTITY fontconfig-version           "2.13.1">  <!-- stable lt .90 micro version -->
 <!ENTITY fribidi-version              "1.0.11">
-<!ENTITY gegl-version                 "0.4.32">
+<!ENTITY gegl-version                 "0.4.34">
 <!ENTITY giflib-version               "5.2.1">
 <!ENTITY glm-version                  "0.9.9.8">
 <!ENTITY graphite2-version            "1.3.14">
@@ -224,7 +224,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY libmng-version               "2.0.3">
 <!ENTITY libmypaint-version           "1.6.1"> <!-- version 1 only -->
 <!ENTITY libpng-version               "1.6.37">
-<!ENTITY librsvg-version              "2.52.4">   <!-- Normally even minors -->
+<!ENTITY librsvg-version              "2.52.5">   <!-- Normally even minors -->
 <!ENTITY libraw-version               "0.20.2">
 <!ENTITY libspiro-version             "20200505">
 <!ENTITY libtiff-version              "4.3.0">
@@ -356,7 +356,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY nasm-version                 "2.15.05">
 <!ENTITY ninja-version                "1.9.0">
 <!ENTITY npapi-sdk-version            "0.27.2">
-<!ENTITY php-version                  "8.1.0">
+<!ENTITY php-version                  "8.1.1">
 
 <!ENTITY python2-majorver             "2.7">
 <!ENTITY python2-patch                "18">
@@ -713,7 +713,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY xcb-util-wm-version          "0.4.1">
 <!ENTITY xcb-util-cursor-version      "0.1.3">
 <!ENTITY mesa-major-minor             "21.3">
-<!ENTITY mesa-version                 "&mesa-major-minor;.1">
+<!ENTITY mesa-version                 "&mesa-major-minor;.2">
 <!ENTITY xbitmaps-version             "1.1.2">
 <!ENTITY xcursor-themes-version       "1.0.6">
 <!ENTITY xkeyboard-config-version     "2.34">
diff --git a/x/installing/mesa.xml b/x/installing/mesa.xml
index b5a55f40da..909af3438a 100644
--- a/x/installing/mesa.xml
+++ b/x/installing/mesa.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY mesa-download-http "https://mesa.freedesktop.org/archive/mesa-&mesa-version;.tar.xz">
   <!ENTITY mesa-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/mesa-&mesa-version;.tar.xz">
-  <!ENTITY mesa-md5sum        "d6efe1ecc0680cd1adb942f05600d884">
+  <!ENTITY mesa-md5sum        "7f25b99d152b8d4bc50a14811cdf269c">
   <!ENTITY mesa-size          "16 MB">
   <!ENTITY mesa-buildsize     "588 MB (with docs, add 389 MB for tests)">
-  <!ENTITY mesa-time          "3.4 SBU (Using parallelism=4; with docs, add 0.6 SBU for tests)">
+  <!ENTITY mesa-time          "3.5 SBU (Using parallelism=4; with docs, add 0.6 SBU for tests)">
 ]>
 
 <sect1 id="mesa" xreflabel="Mesa-&mesa-version;">