Author: randy
Date: 2006-08-04 13:54:32 -0600 (Fri, 04 Aug 2006)
New Revision: 6272

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/libpng.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to libpng-1.2.12

Modified: trunk/BOOK/general/graphlib/libpng.xml
===================================================================
--- trunk/BOOK/general/graphlib/libpng.xml      2006-08-04 16:59:15 UTC (rev 
6271)
+++ trunk/BOOK/general/graphlib/libpng.xml      2006-08-04 19:54:32 UTC (rev 
6272)
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!ENTITY libpng-download-http 
"http://prdownloads.sourceforge.net/libpng/libpng-&libpng-version;.tar.bz2";>
-  <!ENTITY libpng-download-ftp " ">
-  <!ENTITY libpng-md5sum "00cea4539bea4bd34cbf8b82ff9589cd">
-  <!ENTITY libpng-size "376 KB">
-  <!ENTITY libpng-buildsize "5.75 MB">
-  <!ENTITY libpng-time "0.13 SBU">
+  <!ENTITY libpng-download-ftp  " ">
+  <!ENTITY libpng-md5sum        "2287cfaad53a714acdf6eb75a7c1d15f">
+  <!ENTITY libpng-size          "621 KB">
+  <!ENTITY libpng-buildsize     "12.0 MB">
+  <!ENTITY libpng-time          "0.3 SBU">
 ]>
 
 <sect1 id="libpng" xreflabel="libpng-&libpng-version;">
@@ -20,14 +20,14 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>Libpng-&libpng-version;</title>
+  <title>libpng-&libpng-version;</title>
 
   <indexterm zone="libpng">
     <primary sortas="a-Libpng">Libpng</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Libpng</title>
+    <title>Introduction to libpng</title>
 
     <para>The <application>libpng</application> package contains libraries used
     by other programs for reading and writing PNG files.</para>
@@ -54,14 +54,14 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
         <para>Required Patch to explicitly link
         <application>libpng</application> against system libraries: <ulink
         
url="&patch-root;/libpng-&libpng-version;-link_to_proper_libs-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libpng"/></para>
@@ -69,25 +69,29 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Libpng</title>
+    <title>Installation of libpng</title>
 
     <para>Install <application>libpng</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i 
../libpng-&libpng-version;-link_to_proper_libs-1.patch &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+<!-- patch -Np1 -i ../libpng-&libpng-version;-link_to_proper_libs-1.patch 
&amp;&amp;
 make prefix=/usr ZLIBINC= \
-    ZLIBLIB= -f scripts/makefile.linux</userinput></screen>
+    ZLIBLIB= -f scripts/makefile.linux -->
 
-    <para>To test the results, issue: <command>make -f scripts/makefile.linux
-    test</command>.</para>
+    <para>To test the results, issue: <command>make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
 
-<screen role="root"><userinput>make prefix=/usr install -f 
scripts/makefile.linux</userinput></screen>
+<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.txt 
/usr/share/doc/libpng-&libpng-version;</userinput></screen>
 
   </sect2>
 
-  <sect2 role="commands">
+  <!-- <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para><parameter>ZLIBINC=; ZLIBLIB=</parameter>: This
@@ -102,10 +106,10 @@
     an <application>Autoconf</application> routine. Instead, it has various
     <filename>Makefile</filename>s for different platforms.</para>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="configuration">
-    <title>Configuring Libpng</title>
+    <title>Configuring libpng</title>
 
     <sect3>
       <title>Configuration Information</title>
@@ -127,8 +131,9 @@
 
       <seglistitem>
         <seg>libpng-config and libpng12-config</seg>
-        <seg>libpng.{so,a} and libpng12.{so,a}</seg>
-        <seg>/usr/include/libpng12</seg>
+        <seg>libpng.so and libpng12.{so,a}</seg>
+        <seg>/usr/include/libpng12 and
+        /usr/share/doc/libpng-&libpng-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -159,7 +164,7 @@
       </varlistentry>
 
       <varlistentry id="libpng12">
-        <term><filename class='libraryfile'>libpng.{so,a} and
+        <term><filename class='libraryfile'>libpng.so and
         libpng12.{so,a}</filename></term>
         <listitem>
           <para>are a collection of routines used to create and manipulate PNG
@@ -167,7 +172,7 @@
           GIF and, to a lesser extent, TIFF, with many improvements and 
extensions
           and lack of patent problems.</para>
           <indexterm zone="libpng libpng12">
-            <primary sortas="c-libpng">libpng.{so,a}</primary>
+            <primary sortas="c-libpng12">libpng12.{so,a}</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2006-08-04 16:59:15 UTC (rev 6271)
+++ trunk/BOOK/general.ent      2006-08-04 19:54:32 UTC (rev 6272)
@@ -114,7 +114,7 @@
 
 <!-- Chapter 9 -->
 <!ENTITY libjpeg-version              "6b">
-<!ENTITY libpng-version               "1.2.8">
+<!ENTITY libpng-version               "1.2.12">
 <!ENTITY libtiff-version              "3.8.2">
 <!-- <!ENTITY libungif-version             "4.1.3"> -->
 <!ENTITY giflib-version               "4.1.4">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2006-08-04 16:59:15 UTC 
(rev 6271)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2006-08-04 19:54:32 UTC 
(rev 6272)
@@ -45,6 +45,9 @@
       <para>August 4th, 2006</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to libpng-1.2.12.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to libIDL-0.8.7.</para>
         </listitem>
         <listitem>

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to