Author: igor
Date: Mon Jan 6 03:35:07 2014
New Revision: 12525
Log:
update to nasm-2.11
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/graphlib/libjpeg-turbo.xml
trunk/BOOK/general/prog/nasm.xml
trunk/BOOK/general/prog/yasm.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/audioutils/lame.xml
trunk/BOOK/multimedia/libdriv/flac.xml
trunk/BOOK/multimedia/libdriv/libvpx.xml
trunk/BOOK/multimedia/libdriv/sdl.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Sun Jan 5 18:01:52 2014 (r12524)
+++ trunk/BOOK/general.ent Mon Jan 6 03:35:07 2014 (r12525)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "05"> <!-- Always 2 digits -->
+<!ENTITY day "06"> <!-- Always 2 digits -->
<!ENTITY month "01"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "January 5th, &year;">
+<!ENTITY releasedate "January 6th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!--
version|testing|unstable|development] -->
@@ -374,7 +374,7 @@
<!ENTITY llvm-version "3.3">
<!ENTITY lua-version "5.2.3">
<!ENTITY mercurial-version "2.8.1">
-<!ENTITY NASM-version "2.10.09">
+<!ENTITY nasm-version "2.11">
<!ENTITY npapi-sdk-version "0.27.2">
<!ENTITY php-version "5.5.7">
<!ENTITY python2-version "2.7.6">
Modified: trunk/BOOK/general/graphlib/libjpeg-turbo.xml
==============================================================================
--- trunk/BOOK/general/graphlib/libjpeg-turbo.xml Sun Jan 5 18:01:52
2014 (r12524)
+++ trunk/BOOK/general/graphlib/libjpeg-turbo.xml Mon Jan 6 03:35:07
2014 (r12525)
@@ -77,7 +77,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="NASM"/> or <xref linkend="yasm"/>
+ <xref linkend="nasm"/> or <xref linkend="yasm"/>
</para>
<para condition="html" role="usernotes">User Notes:
Modified: trunk/BOOK/general/prog/nasm.xml
==============================================================================
--- trunk/BOOK/general/prog/nasm.xml Sun Jan 5 18:01:52 2014 (r12524)
+++ trunk/BOOK/general/prog/nasm.xml Mon Jan 6 03:35:07 2014 (r12525)
@@ -4,25 +4,25 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY NASM-download-http
"http://www.nasm.us/pub/nasm/releasebuilds/&NASM-version;/nasm-&NASM-version;.tar.xz";>
- <!ENTITY NASM-download-ftp " ">
- <!ENTITY NASM-md5sum "99ea44f338f45cf812fbf6e6d9296518">
- <!ENTITY NASM-size "676 KB">
- <!ENTITY NASM-buildsize "22 MB" >
- <!ENTITY NASM-time "0.1 SBU">
+ <!ENTITY nasm-download-http
"http://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;.tar.xz";>
+ <!ENTITY nasm-download-ftp " ">
+ <!ENTITY nasm-md5sum "099d62e48cd6d9b94f89ef430cd8525c">
+ <!ENTITY nasm-size "726 KB">
+ <!ENTITY nasm-buildsize "21 MB" >
+ <!ENTITY nasm-time "0.1 SBU">
]>
-<sect1 id="NASM" xreflabel="NASM-&NASM-version;">
- <?dbhtml filename="NASM.html" ?>
+<sect1 id="nasm" xreflabel="NASM-&nasm-version;">
+ <?dbhtml filename="nasm.html" ?>
<sect1info>
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
</sect1info>
- <title>NASM-&NASM-version;</title>
+ <title>NASM-&nasm-version;</title>
- <indexterm zone="NASM">
+ <indexterm zone="nasm">
<primary sortas="a-NASM">NASM</primary>
</indexterm>
@@ -38,22 +38,22 @@
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
- <para>Download (HTTP): <ulink url="&NASM-download-http;"/></para>
+ <para>Download (HTTP): <ulink url="&nasm-download-http;"/></para>
</listitem>
<listitem>
- <para>Download (FTP): <ulink url="&NASM-download-ftp;"/></para>
+ <para>Download (FTP): <ulink url="&nasm-download-ftp;"/></para>
</listitem>
<listitem>
- <para>Download MD5 sum: &NASM-md5sum;</para>
+ <para>Download MD5 sum: &nasm-md5sum;</para>
</listitem>
<listitem>
- <para>Download size: &NASM-size;</para>
+ <para>Download size: &nasm-size;</para>
</listitem>
<listitem>
- <para>Estimated disk space required: &NASM-buildsize;</para>
+ <para>Estimated disk space required: &nasm-buildsize;</para>
</listitem>
<listitem>
- <para>Estimated build time: &NASM-time;</para>
+ <para>Estimated build time: &nasm-time;</para>
</listitem>
</itemizedlist>
@@ -61,7 +61,7 @@
<itemizedlist spacing="compact">
<listitem>
<para>Optional documentation: <ulink
-
url="http://www.nasm.us/pub/nasm/releasebuilds/&NASM-version;/nasm-&NASM-version;-xdoc.tar.xz"/></para>
+
url="http://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;-xdoc.tar.xz"/></para>
</listitem>
</itemizedlist>
@@ -76,7 +76,7 @@
<para>If you downloaded the optional documentation, put it into the
source tree:</para>
-<screen><userinput>tar -xf ../nasm-&NASM-version;-xdoc.tar.xz
--strip-components=1</userinput></screen>
+<screen><userinput>tar -xf ../nasm-&nasm-version;-xdoc.tar.xz
--strip-components=1</userinput></screen>
<para>Install <application>NASM</application> by running
the following commands:</para>
@@ -88,15 +88,17 @@
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
+<!-- dev note: make INSTALLROOT=<DESTDIR> install -->
+
<screen role="root"><userinput>make install</userinput></screen>
<para>If you downloaded the optional documentation, install it with the
following instructions as the <systemitem
class="username">root</systemitem> user:</para>
-<screen role="root"><userinput>install -m755 -d
/usr/share/doc/nasm-&NASM-version;/html &&
-cp -v doc/html/*.html /usr/share/doc/nasm-&NASM-version;/html &&
-cp -v doc/*.{txt,ps,pdf} /usr/share/doc/nasm-&NASM-version; &&
+<screen role="root"><userinput>install -m755 -d
/usr/share/doc/nasm-&nasm-version;/html &&
+cp -v doc/html/*.html /usr/share/doc/nasm-&nasm-version;/html &&
+cp -v doc/*.{txt,ps,pdf} /usr/share/doc/nasm-&nasm-version; &&
cp -v doc/info/* /usr/share/info &&
install-info /usr/share/info/nasm.info /usr/share/info/dir</userinput></screen>
@@ -113,7 +115,7 @@
<seglistitem>
<seg>nasm and ndisasm</seg>
<seg>None</seg>
- <seg>/usr/share/doc/nasm-&NASM-version;</seg>
+ <seg>/usr/share/doc/nasm-&nasm-version;</seg>
</seglistitem>
</segmentedlist>
@@ -126,7 +128,7 @@
<term><command>nasm</command></term>
<listitem>
<para>is a portable 80x86 assembler.</para>
- <indexterm zone="NASM nasm-prog">
+ <indexterm zone="nasm nasm-prog">
<primary sortas="b-nasm">nasm</primary>
</indexterm>
</listitem>
@@ -136,7 +138,7 @@
<term><command>ndisasm</command></term>
<listitem>
<para>is an 80x86 binary file disassembler.</para>
- <indexterm zone="NASM ndisasm">
+ <indexterm zone="nasm ndisasm">
<primary sortas="b-ndisasm">ndisasm</primary>
</indexterm>
</listitem>
Modified: trunk/BOOK/general/prog/yasm.xml
==============================================================================
--- trunk/BOOK/general/prog/yasm.xml Sun Jan 5 18:01:52 2014 (r12524)
+++ trunk/BOOK/general/prog/yasm.xml Mon Jan 6 03:35:07 2014 (r12525)
@@ -30,7 +30,7 @@
<title>Introduction to yasm</title>
<para><application>Yasm</application> is a complete rewrite of the
- <xref linkend="NASM"/> assembler. It supports the x86 and AMD64 instruction
+ <xref linkend="nasm"/> assembler. It supports the x86 and AMD64 instruction
sets, accepts NASM and GAS assembler syntaxes and outputs binary, ELF32 and
ELF64 object formats.</para>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sun Jan 5 18:01:52
2014 (r12524)
+++ trunk/BOOK/introduction/welcome/changelog.xml Mon Jan 6 03:35:07
2014 (r12525)
@@ -44,6 +44,16 @@
-->
<listitem>
+ <para>January 6th, 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[igor] - Update to nasm-2.11. Fixes
+ <ulink url="&blfs-ticket-root;4519">#4519</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>January 5th, 2014</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/multimedia/audioutils/lame.xml
==============================================================================
--- trunk/BOOK/multimedia/audioutils/lame.xml Sun Jan 5 18:01:52 2014
(r12524)
+++ trunk/BOOK/multimedia/audioutils/lame.xml Mon Jan 6 03:35:07 2014
(r12525)
@@ -78,7 +78,7 @@
<ulink url="http://dmalloc.com/";>Dmalloc</ulink>,
<ulink url="http://perens.com/FreeSoftware/";>Electric Fence</ulink>,
<xref linkend="libsndfile"/> and
- <xref linkend="NASM"/>
+ <xref linkend="nasm"/>
</para>
<para condition="html" role="usernotes">User Notes:
@@ -122,7 +122,7 @@
<para>
<option>--enable-nasm</option>: Enable the use of
- <xref linkend="NASM"/> to compile optimized assembly routines.
+ <xref linkend="nasm"/> to compile optimized assembly routines.
</para>
</sect2>
Modified: trunk/BOOK/multimedia/libdriv/flac.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/flac.xml Sun Jan 5 18:01:52 2014
(r12524)
+++ trunk/BOOK/multimedia/libdriv/flac.xml Mon Jan 6 03:35:07 2014
(r12525)
@@ -71,7 +71,7 @@
<para role="optional">
<xref linkend="libogg"/>,
<!-- <xref linkend="xmms"/>, -->
- <xref linkend="NASM"/>,
+ <xref linkend="nasm"/>,
<xref linkend="docbook-utils"/>,
<xref linkend="doxygen"/> and
<ulink url="http://valgrind.org/";>Valgrind</ulink>
Modified: trunk/BOOK/multimedia/libdriv/libvpx.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/libvpx.xml Sun Jan 5 18:01:52 2014
(r12524)
+++ trunk/BOOK/multimedia/libdriv/libvpx.xml Mon Jan 6 03:35:07 2014
(r12525)
@@ -69,7 +69,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required"><xref linkend="yasm"/> (compiling with
- <xref linkend="NASM"/> is currently broken) and <xref linkend="which"/>
+ <xref linkend="nasm"/> is currently broken) and <xref linkend="which"/>
(so <command>configure</command> can find yasm)</para>
<bridgehead renderas="sect4">Optional</bridgehead>
Modified: trunk/BOOK/multimedia/libdriv/sdl.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/sdl.xml Sun Jan 5 18:01:52 2014
(r12524)
+++ trunk/BOOK/multimedia/libdriv/sdl.xml Mon Jan 6 03:35:07 2014
(r12525)
@@ -63,7 +63,7 @@
<para role="optional">
<xref linkend="alsa"/>,
<xref linkend='pulseaudio'/>
- <xref linkend="NASM"/>,
+ <xref linkend="nasm"/>,
<xref linkend="x-window-system"/>,
<xref linkend="aalib"/>,
<xref linkend="pth"/>,
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
