From eecab6113d03c0ad3014ec2313de70c9f55de584 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 17 Apr 2014 22:36:51 +0000
Subject: [PATCH] Update to libjpeg-turbo-1.3.1 Update to libgpg-error-1.13

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12976 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 general/genlib/libgpg-error.xml    |  8 ++++----
 general/graphlib/libjpeg-turbo.xml | 33 ++++++++++++++++++++----------
 introduction/welcome/changelog.xml | 10 ++++++++-
 networking/netprogs/samba.xml      |  3 ---
 5 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/general.ent b/general.ent
index c65427e2e6..011ee48ef2 100644
--- a/general.ent
+++ b/general.ent
@@ -246,7 +246,7 @@ export -f as_root</userinput></screen>
 <!ENTITY libgcrypt-version            "1.6.1">
 <!ENTITY libgee-version               "0.6.8">
 <!ENTITY libglade-version             "2.6.4">
-<!ENTITY libgpg-error-version         "1.12">
+<!ENTITY libgpg-error-version         "1.13">
 <!ENTITY libgsf-version               "1.14.30">
 <!ENTITY libgusb-version              "0.1.6">
 <!ENTITY libical-version              "1.0">
@@ -295,7 +295,7 @@ export -f as_root</userinput></screen>
 <!ENTITY lcms2-version                "2.6">
 <!ENTITY libexif-version              "0.6.21">
 <!ENTITY libjpeg-version              "8d">
-<!ENTITY libjpeg-turbo-version        "1.3.0">
+<!ENTITY libjpeg-turbo-version        "1.3.1">
 <!ENTITY libmng-version               "2.0.2">
 <!ENTITY libpng-version               "1.6.10">
 <!ENTITY librsvg-version              "2.40.2">   <!-- Normally even minors
diff --git a/general/genlib/libgpg-error.xml b/general/genlib/libgpg-error.xml
index 9d569091c1..4b0a4be22f 100644
--- a/general/genlib/libgpg-error.xml
+++ b/general/genlib/libgpg-error.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libgpg-error-download-http " ">
   <!ENTITY libgpg-error-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
-  <!ENTITY libgpg-error-md5sum        "8f0eb41a344d19ac2aa9bd101dfb9ce6">
+  <!ENTITY libgpg-error-md5sum        "fe0cfa7e15262ef8fdeee366109e9ff6">
   <!ENTITY libgpg-error-size          "484 KB">
-  <!ENTITY libgpg-error-buildsize     "5.6 MB">
+  <!ENTITY libgpg-error-buildsize     "6.9 MB">
   <!ENTITY libgpg-error-time          "less than 0.1 SBU">
 ]>
 
@@ -41,8 +41,8 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-Download (HTTP): <ulink url="&libgpg-error-download-http;"/>
-</para>
+          Download (HTTP): <ulink url="&libgpg-error-download-http;"/>
+        </para>
       </listitem>
       <listitem>
         <para>
diff --git a/general/graphlib/libjpeg-turbo.xml b/general/graphlib/libjpeg-turbo.xml
index d73a61c777..cb75f6f8b5 100644
--- a/general/graphlib/libjpeg-turbo.xml
+++ b/general/graphlib/libjpeg-turbo.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libjpeg-download-http "&sourceforge-repo;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
   <!ENTITY libjpeg-download-ftp  " ">
-  <!ENTITY libjpeg-md5sum        "e1e65cc711a1ade1322c06ad4a647741">
+  <!ENTITY libjpeg-md5sum        "2c3a68129dac443a72815ff5bb374b05">
   <!ENTITY libjpeg-size          "1.3 MB">
-  <!ENTITY libjpeg-buildsize     "13 MB">
+  <!ENTITY libjpeg-buildsize     "14 MB">
   <!ENTITY libjpeg-time          "0.3 SBU">
 ]>
 
@@ -93,12 +93,13 @@
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>sed -i -e '/^docdir/     s:$:/libjpeg-turbo-&libjpeg-turbo-version;:' \
+       -e '/^exampledir/ s:$:/libjpeg-turbo-&libjpeg-turbo-version;:' Makefile.in &amp;&amp;
+
+./configure --prefix=/usr           \
             --mandir=/usr/share/man \
-            --with-jpeg8 \
+            --with-jpeg8            \
             --disable-static &amp;&amp;
-sed -i -e '/^docdir/ s/$/\/libjpeg-turbo-&libjpeg-turbo-version;/' \
-       -e '/^exampledir/ s/$/\/libjpeg-turbo-&libjpeg-turbo-version;/' Makefile &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -117,13 +118,13 @@ make</userinput></screen>
     <title>Command Explanations</title>
 
     <para>
-      <parameter>--with-jpeg8</parameter>: This switch enables compatibility
-      with <application>libjpeg</application> version 8.
+      <command>sed -i -e ...</command> This command fixes Makefile.in to install
+      documentation and examples in a version specific directory.
     </para>
 
     <para>
-      <command>sed -i -e ...</command> This command fixes Makefile to install
-      documentation and examples in a separate directory.
+      <parameter>--with-jpeg8</parameter>: This switch enables compatibility
+      with <application>libjpeg</application> version 8.
     </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -141,7 +142,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>
-          cjpeg, djpeg, jpegtran, rdjpgcom, tjbench and wrjpgcom
+          cjpeg, djpeg, jpegtran, rdjpgcom, tjbench, and wrjpgcom
         </seg>
         <seg>
           libjpeg.so and libturbojpeg.so
@@ -202,6 +203,16 @@ make</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="tjbench">
+        <term><command>tjbench</command></term>
+        <listitem>
+          <para>is used to benchmark the performance of libjpeg-turbo.</para>
+          <indexterm zone="libjpeg tjbench">
+            <primary sortas="b-tjbench">tjbench</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="wrjpgcom">
         <term><command>wrjpgcom</command></term>
         <listitem>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ad4290cb0c..f992b042d7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,7 +47,15 @@
     <listitem>
       <para>April 17th, 2014</para>
       <itemizedlist>
-       <listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to libjpeg-turbo-1.3.1. Fixes
+          <ulink url="&blfs-ticket-root;4970">#4970</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to libgpg-error-1.13. Fixes
+          <ulink url="&blfs-ticket-root;4967">#4967</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Updated to samba-4.1.7. Fixes
           <ulink url="&blfs-ticket-root;4972">#4972</ulink>.</para>
         </listitem>
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index e8f5c8fff7..fafb0e5d38 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -164,9 +164,6 @@ install -v -m644    lib/ntdb/doc/design.pdf \
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed -e "s:(Functon ...</command>: Fix build with
-    <application>readline-6.x</application> (x > 2).</para>
-
     <para><parameter>--enable-fhs</parameter>: Assigns all other file paths in
     a manner compliant with the Filesystem Hierarchy Standard (FHS).</para>