Changeset b690f72

Timestamp:

02/09/2012 03:35:21 PM (12 years ago)

Author:

Andrew Benton <andy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f940aa8

Parents:

5fd18326

Message:

libpng-1.5.8

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

Files:

• general.ent (modified) (1 diff)
• general/genlib/pcre.xml (modified) (1 diff)
• general/graphlib/libpng.xml (modified) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -244 +244 @@
 <!-- Chapter 9 -->
 <!ENTITY libjpeg-version              "8c">
-<!ENTITY libpng-version               "1.5.7">
+<!ENTITY libpng-version               "1.5.8">
 <!ENTITY libtiff-version              "4.0.0">
 <!ENTITY giflib-version               "4.1.6">

general/genlib/pcre.xml

@@ -78 +78 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Note:
-    The third set of the tests cannot be run if the "fr_FR" locale is missing
-    from the system.</para>
+    <para>To test the results, issue: <command>make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

general/graphlib/libpng.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY libpng-download-http "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.bz2">
+  <!ENTITY libpng-download-http
+  "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.xz">
   <!ENTITY libpng-download-ftp  " ">
-  <!ENTITY libpng-md5sum        "590ecbecd6286810184fd3e66f151de3">
-  <!ENTITY libpng-size          "839 KB">
-  <!ENTITY libpng-buildsize     "12 MB">
+  <!ENTITY libpng-md5sum        "0f7ae352beadaff78073733905613041">
+  <!ENTITY libpng-size          "685 KB">
+  <!ENTITY libpng-buildsize     "8.3 MB">
   <!ENTITY libpng-time          "0.1 SBU">
-  <!ENTITY apng-patch           "&sourceforge-repo2;/projects/libpng-apng/files/libpng15/1.5.7/libpng-1.5.7-apng.patch.gz">
+  <!ENTITY apng-patch
+  "&sourceforge-repo2;/projects/libpng-apng/files/libpng15/&libpng-version;/libpng-&libpng-version;-apng.patch.gz">
 ]>
 
@@ -32 +34 @@
 
     <para>The <application>libpng</application> package contains libraries used
-    by other programs for reading and writing PNG files.</para>
+    by other programs for reading and writing PNG files. The PNG format was
+    designed as a replacement for GIF and, to a lesser extent, TIFF, with many
+    improvements and extensions and lack of patent problems.</para>
 
     &lfs70_checked;
@@ -59 +63 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
+    <itemizedlist spacing="compact">
       <listitem>
-        <para>Optional patch to include apng functionality in
+        <para>Optional patch to include animated png functionality in
         <application>libpng</application> : <ulink url="&apng-patch;"/></para>
         <para>The patch is required if you want to use the system
@@ -79 +83 @@
     patch:</para>
 
-<screen><userinput>gunzip --stdout ../libpng-&libpng-version;-apng.patch.gz | patch -Np1</userinput></screen>
+<screen><userinput>gzip -cd ../libpng-&libpng-version;-apng.patch.gz | patch -p1 &amp;&amp;
+awk '/10[0-2][0-9],/{ gsub(/,png/, ", png")
+  gsub(/PNG_EXPORT./, "")
+  gsub(/,/, "")
+  print " " $3 " @" $1 }' png.h >> scripts/symbols.def &amp;&amp;
+sed -i 's#ORDINAL(233)#ORDINAL(1020)#' png.h &amp;&amp;
+sed -i 's#"error"#"ignore"#' scripts/checksym.awk &amp;&amp;</userinput></screen>
 
     <para>Install <application>libpng</application> by running the following
@@ -93 +103 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/libpng-&libpng-version; &amp;&amp;
-install -v -m644    README libpng-manual.txt \
-                    /usr/share/doc/libpng-&libpng-version;</userinput></screen>
+mkdir /usr/share/doc/libpng-&libpng-version; &amp;&amp;
+cp README libpng-manual.txt /usr/share/doc/libpng-&libpng-version;</userinput></screen>
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para><command>awk '/10[0-2][0-9] ...</command>, <command>sed -i 's#ORDINAL
+    ...</command> and <command>sed -i 's#"error" ...</command>: These commands
+    massage the test suite to accept the animated png functions.</para>
 
     <para><option>--disable-static</option>: This option prevents it compiling
@@ -149 +161 @@
 
       <varlistentry id="libpng15">
-        <term><filename class='libraryfile'>libpng.so and
+        <term><filename class="libraryfile">libpng.so and
         libpng15.so</filename></term>
         <listitem>
-          <para>are a collection of routines used to create and manipulate PNG
-          format graphics files. The PNG format was designed as a replacement
-          for GIF and, to a lesser extent, TIFF, with many improvements and
-          extensions and lack of patent problems.</para>
+          <para>contain routines used to create and manipulate PNG format
+          graphics files.</para>
           <indexterm zone="libpng libpng15">
             <primary sortas="c-libpng15">libpng15.so</primary>

introduction/welcome/changelog.xml

@@ -51 +51 @@
           <para>[ken] - merge libxklavier-51 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - libpng 1.5.8.</para>
+        </listitem>
       </itemizedlist>
     </listitem>