From 358f6aacd80ebbee2372494cbe897f5a3cae873d Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 8 Dec 2019 22:25:37 +0000
Subject: [PATCH] Update to lm-sensors-3-6-0. Update to
 intel-vaapi-driver-2.4.0.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22452 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/sysutils/lm_sensors.xml    | 20 ++++++++++----------
 introduction/welcome/changelog.xml |  8 ++++++++
 packages.ent                       |  4 ++--
 x/installing/libva.xml             |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/general/sysutils/lm_sensors.xml b/general/sysutils/lm_sensors.xml
index 695105f154..a92132c769 100644
--- a/general/sysutils/lm_sensors.xml
+++ b/general/sysutils/lm_sensors.xml
@@ -4,15 +4,15 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY lm_sensors-download-http "https://ftp.gwdg.de/pub/linux/misc/lm-sensors/lm_sensors-&lm_sensors-version;.tar.bz2">
-  <!ENTITY lm_sensors-download-ftp  "ftp://ftp.gwdg.de/pub/linux/misc/lm-sensors/lm_sensors-&lm_sensors-version;.tar.bz2">
-  <!ENTITY lm_sensors-md5sum        "c03675ae9d43d60322110c679416901a">
-  <!ENTITY lm_sensors-size          "172 KB">
-  <!ENTITY lm_sensors-buildsize     "2.4 MB">
+  <!ENTITY lm_sensors-download-http "https://github.com/lm-sensors/lm-sensors/archive/V&lm-sensors-version;/lm-sensors-&lm-sensors-version;.tar.gz">
+  <!ENTITY lm_sensors-download-ftp  " ">
+  <!ENTITY lm_sensors-md5sum        "f60e47b5eb50bbeed48a9f43bb08dd5e">
+  <!ENTITY lm_sensors-size          "268 KB">
+  <!ENTITY lm_sensors-buildsize     "2.6 MB">
   <!ENTITY lm_sensors-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="lm_sensors" xreflabel="lm_sensors-&lm_sensors-version;">
+<sect1 id="lm_sensors" xreflabel="lm-sensors-&lm-sensors-version;">
   <?dbhtml filename="lm_sensors.html"?>
 
   <sect1info>
@@ -20,7 +20,7 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>lm_sensors-&lm_sensors-version;</title>
+  <title>lm-sensors-&lm-sensors-version;</title>
 
   <indexterm zone="lm_sensors">
     <primary sortas="a-lm_sensors">lm_sensors</primary>
@@ -162,9 +162,9 @@ Seems to be automatically selected and invisible on linux 3.17:
      BUILD_STATIC_LIB=0 \
      MANDIR=/usr/share/man install &amp;&amp;
 
-install -v -m755 -d /usr/share/doc/lm_sensors-&lm_sensors-version; &amp;&amp;
+install -v -m755 -d /usr/share/doc/lm_sensors-&lm-sensors-version; &amp;&amp;
 cp -rv              README INSTALL doc/* \
-                    /usr/share/doc/lm_sensors-&lm_sensors-version;</userinput></screen>
+                    /usr/share/doc/lm_sensors-&lm-sensors-version;</userinput></screen>
   </sect2>
 
   <sect2 role="commands">
@@ -243,7 +243,7 @@ cp -rv              README INSTALL doc/* \
         <seg>
           /etc/sensors.d,
           /usr/include/sensors and
-          /usr/share/doc/lm_sensors-&lm_sensors-version;
+          /usr/share/doc/lm_sensors-&lm-sensors-version;
         </seg>
       </seglistitem>
     </segmentedlist>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 6075281ad6..235b35e61b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,14 @@
      <listitem>
        <para>December 8th, 2019</para>
        <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Update to lm-sensors-3-6-0. Fixes
+           <ulink url="&blfs-ticket-root;12881">#12881</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Update to intel-vaapi-driver-2.4.0. Fixes
+           <ulink url="&blfs-ticket-root;12878">#12878</ulink>.</para>
+         </listitem>
          <listitem>
            <para>[thomas] - Update to iptables-1.8.4. Fixes
            <ulink url="&blfs-ticket-root;12852">#12852</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index ab74302f9e..7f47ffed9e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -277,7 +277,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY gpm-version                  "1.20.7">
 <!ENTITY hdparm-version               "9.58">
 <!ENTITY hdwids-version               "20141022">
-<!ENTITY lm_sensors-version           "3.4.0">
+<!ENTITY lm-sensors-version           "3-6-0">
 <!ENTITY logrotate-version            "3.15.1">
 <!ENTITY lsb-tools-version            "0.5">
 <!ENTITY mc-version                   "4.8.23">
@@ -672,7 +672,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY xinit-version                "1.4.1">
 
 <!ENTITY libva-version                "2.5.0">
-<!ENTITY libva-intel-driver-version   "2.3.0"> <!-- intel-vaapi-driver -->
+<!ENTITY libva-intel-driver-version   "2.4.0"> <!-- intel-vaapi-driver -->
 <!ENTITY libvdpau-version             "1.3">
 <!ENTITY libvdpau-va-gl-version       "0.4.0">
 
diff --git a/x/installing/libva.xml b/x/installing/libva.xml
index edc58f4acb..4c19529149 100644
--- a/x/installing/libva.xml
+++ b/x/installing/libva.xml
@@ -14,7 +14,7 @@
 
   <!ENTITY libva-intel-driver-download-http "https://github.com/intel/intel-vaapi-driver/releases/download/&libva-intel-driver-version;/intel-vaapi-driver-&libva-intel-driver-version;.tar.bz2">
   <!ENTITY libva-intel-driver-download-ftp  " ">
-  <!ENTITY libva-intel-driver-md5sum        "9d835d1a3f7a9ef394f0f4c348cd4b3e">
+  <!ENTITY libva-intel-driver-md5sum        "731dd9aaf9f5ef1b9c906ce82ef0220b">
   <!ENTITY libva-intel-driver-size          "2.8 MB">
   <!ENTITY libva-intel-driver-buildsize     "97 MB">
   <!ENTITY libva-intel-driver-time          "0.3 SBU">