Author: andy
Date: 2012-02-09 08:35:21 -0700 (Thu, 09 Feb 2012)
New Revision: 9333
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genlib/pcre.xml
trunk/BOOK/general/graphlib/libpng.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
libpng-1.5.8
Modified: trunk/BOOK/general/genlib/pcre.xml
===================================================================
--- trunk/BOOK/general/genlib/pcre.xml 2012-02-09 15:13:42 UTC (rev 9332)
+++ trunk/BOOK/general/genlib/pcre.xml 2012-02-09 15:35:21 UTC (rev 9333)
@@ -77,9 +77,7 @@
--enable-pcregrep-libz --enable-pcregrep-libbz2 &&
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>
Modified: trunk/BOOK/general/graphlib/libpng.xml
===================================================================
--- trunk/BOOK/general/graphlib/libpng.xml 2012-02-09 15:13:42 UTC (rev
9332)
+++ trunk/BOOK/general/graphlib/libpng.xml 2012-02-09 15:35:21 UTC (rev
9333)
@@ -4,13 +4,15 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%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">
]>
<sect1 id="libpng" xreflabel="libpng-&libpng-version;">
@@ -31,7 +33,9 @@
<title>Introduction to libpng</title>
<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;
@@ -58,9 +62,9 @@
</itemizedlist>
<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
<application>libpng</application> in
@@ -78,7 +82,13 @@
<para>If you want to patch libpng to support apng files, apply the
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 &&
+awk '/10[0-2][0-9],/{ gsub(/,png/, ", png")
+ gsub(/PNG_EXPORT./, "")
+ gsub(/,/, "")
+ print " " $3 " @" $1 }' png.h >> scripts/symbols.def &&
+sed -i 's#ORDINAL(233)#ORDINAL(1020)#' png.h &&
+sed -i 's#"error"#"ignore"#' scripts/checksym.awk
&&</userinput></screen>
<para>Install <application>libpng</application> by running the following
commands:</para>
@@ -92,15 +102,17 @@
user:</para>
<screen role="root"><userinput>make install &&
-
-install -v -m755 -d /usr/share/doc/libpng-&libpng-version; &&
-install -v -m644 README libpng-manual.txt \
- /usr/share/doc/libpng-&libpng-version;</userinput></screen>
+mkdir /usr/share/doc/libpng-&libpng-version; &&
+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
the static archive versions of the libraries.</para>
</sect2>
@@ -148,13 +160,11 @@
</varlistentry>
<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>
</indexterm>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-02-09 15:13:42 UTC (rev 9332)
+++ trunk/BOOK/general.ent 2012-02-09 15:35:21 UTC (rev 9333)
@@ -243,7 +243,7 @@
<!-- 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">
<!ENTITY lcms-version "1.19">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-02-09 15:13:42 UTC
(rev 9332)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-02-09 15:35:21 UTC
(rev 9333)
@@ -50,6 +50,9 @@
<listitem>
<para>[ken] - merge libxklavier-51 from Wayne.</para>
</listitem>
+ <listitem>
+ <para>[abenton] - libpng 1.5.8.</para>
+ </listitem>
</itemizedlist>
</listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
