Author: bdubbs
Date: 2011-12-12 13:16:56 -0700 (Mon, 12 Dec 2011)
New Revision: 9104
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/prog/llvm.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/libdriv/alsa-lib.xml
trunk/BOOK/multimedia/libdriv/audiofile.xml
trunk/BOOK/server/major/apache.xml
trunk/bootscripts/ChangeLog
trunk/bootscripts/Makefile
Log:
Updated to audiofile-0.3.2
Updated to alsa-lib-1.0.24.1
Made bootscripts Makefile and appache page consistent using httpd (not apache).
Modified: trunk/BOOK/general/prog/llvm.xml
===================================================================
--- trunk/BOOK/general/prog/llvm.xml 2011-12-12 17:21:45 UTC (rev 9103)
+++ trunk/BOOK/general/prog/llvm.xml 2011-12-12 20:16:56 UTC (rev 9104)
@@ -82,7 +82,7 @@
commands:</para>
<screen><userinput>touch tools/edis/EnhancedDisassembly.exports
&&
-./configure --prefix=/opt/llvm &&
+./configure --prefix=/opt/llvm &&
find -name Makefile -exec \
sed -ir -e '/^LIBRARYNAME/a SHARED_LIBRARY = 1' \
-e 's#BUILD_ARCHIVE :*= 1#NO_&#' \
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2011-12-12 17:21:45 UTC (rev 9103)
+++ trunk/BOOK/general.ent 2011-12-12 20:16:56 UTC (rev 9104)
@@ -56,7 +56,7 @@
<!ENTITY lfs-vim-version "7.3">
<!-- End LFS versions -->
-<!ENTITY blfs-bootscripts-version "20111206">
+<!ENTITY blfs-bootscripts-version "20111212">
<!ENTITY blfs-bootscripts-download
"&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
<!ENTITY blfs-wiki "http://wiki.&lfs-domainname;/blfs/wiki";>
@@ -801,7 +801,7 @@
<!-- Part XII -->
<!-- Chapter 38 -->
-<!ENTITY alsa-version "1.0.21">
+<!ENTITY alsa-version "1.0.24.1">
<!ENTITY alsa-lib-version "&alsa-version;">
<!ENTITY alsa-plugins-version "&alsa-version;">
<!ENTITY alsa-utils-version "&alsa-version;">
@@ -810,7 +810,7 @@
<!ENTITY alsa-oss-version "1.0.17">
<!ENTITY alsa-download-http
"http://gd.tuwien.ac.at/opsys/linux/alsa";>
<!ENTITY alsa-download-ftp "ftp://ftp.alsa-project.org/pub";>
-<!ENTITY audiofile-version "0.2.7">
+<!ENTITY audiofile-version "0.3.2">
<!ENTITY esound-version "0.2.41">
<!ENTITY sdl-version "1.2.14">
<!ENTITY libao-version "0.8.8">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2011-12-12 17:21:45 UTC
(rev 9103)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2011-12-12 20:16:56 UTC
(rev 9104)
@@ -45,8 +45,14 @@
<para>December 12th, 2011</para>
<itemizedlist>
<listitem>
- <para>[abenton] - Updated Webkitgtk to 1.6.1.</para>
+ <para>[bdubbs] - Updated to audiofile-0.3.2.</para>
</listitem>
+ <listitem>
+ <para>[bdubbs] - Updated to alsa-lib-1.0.24.1.</para>
+ </listitem>
+ <listitem>
+ <para>[abenton] - Updated to Webkitgtk to 1.6.1.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/multimedia/libdriv/alsa-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/alsa-lib.xml 2011-12-12 17:21:45 UTC (rev
9103)
+++ trunk/BOOK/multimedia/libdriv/alsa-lib.xml 2011-12-12 20:16:56 UTC (rev
9104)
@@ -6,10 +6,10 @@
<!ENTITY alsa-lib-download-http
"&alsa-download-http;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
<!ENTITY alsa-lib-download-ftp
"&alsa-download-ftp;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
- <!ENTITY alsa-lib-md5sum "d8a556041a4cbeeae0c32eadeffb3c74">
- <!ENTITY alsa-lib-size "790 KB">
- <!ENTITY alsa-lib-buildsize "35 MB (additional 17 MB to build and
install docs)">
- <!ENTITY alsa-lib-time "0.7 SBU (less than 0.1 SBU to build and
install docs)">
+ <!ENTITY alsa-lib-md5sum "7cc05f25e1d5b65da8fb3fdcd540f226">
+ <!ENTITY alsa-lib-size "820 KB">
+ <!ENTITY alsa-lib-buildsize "32 MB (additional 17 MB to build and
install docs)">
+ <!ENTITY alsa-lib-time "0.3 SBU (less than 0.1 SBU to build and
install docs)">
]>
<sect1 id="alsa-lib" xreflabel="ALSA Library-&alsa-lib-version;">
@@ -33,7 +33,7 @@
the ALSA library. This is used by programs (including <application>ALSA
Utilities</application>) requiring access to the ALSA sound
interface.</para>
- &lfs65_checked;
+ &lfs70_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -106,7 +106,8 @@
<screen><userinput>make doc</userinput></screen>
- <para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
+ <para>Now, to install the API documentation, as the <systemitem
+ class="username">root</systemitem> user:</para>
<screen role="root"><userinput>install -v -d -m755
/usr/share/doc/alsa-&alsa-lib-version;/html &&
install -v -m644 doc/doxygen/html/*
/usr/share/doc/alsa-&alsa-lib-version;/html</userinput></screen>
Modified: trunk/BOOK/multimedia/libdriv/audiofile.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/audiofile.xml 2011-12-12 17:21:45 UTC (rev
9103)
+++ trunk/BOOK/multimedia/libdriv/audiofile.xml 2011-12-12 20:16:56 UTC (rev
9104)
@@ -6,10 +6,10 @@
<!ENTITY audiofile-download-http
"http://www.68k.org/~michael/audiofile/audiofile-&audiofile-version;.tar.gz";>
<!ENTITY audiofile-download-ftp " ">
- <!ENTITY audiofile-md5sum "a39be317a7b1971b408805dc5e371862">
- <!ENTITY audiofile-size "491 KB">
- <!ENTITY audiofile-buildsize "11 MB">
- <!ENTITY audiofile-time "0.3 SBU">
+ <!ENTITY audiofile-md5sum "cb2c4fe6e899e688ffe5d1568581cb63">
+ <!ENTITY audiofile-size "712 KB">
+ <!ENTITY audiofile-buildsize "101 MB">
+ <!ENTITY audiofile-time "0.6 SBU">
]>
<sect1 id="audiofile" xreflabel="Audio File-&audiofile-version;">
@@ -33,7 +33,7 @@
audio file libraries and two sound file support programs. These are useful
to support basic sound file formats.</para>
- &lfs65_checked;
+ &lfs70_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -57,6 +57,13 @@
</listitem>
</itemizedlist>
+ <bridgehead renderas="sect3">Audio File Dependencies</bridgehead>
+
+ <bridgehead renderas="sect4">Required</bridgehead>
+ <para role="required">
+ <xref linkend="alsa-lib"/>
+ </para>
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/audiofile"/></para>
Modified: trunk/BOOK/server/major/apache.xml
===================================================================
--- trunk/BOOK/server/major/apache.xml 2011-12-12 17:21:45 UTC (rev 9103)
+++ trunk/BOOK/server/major/apache.xml 2011-12-12 20:16:56 UTC (rev 9104)
@@ -268,19 +268,19 @@
</sect3>
- <sect3 id="apache-init">
+ <sect3 id="httpd-init">
<title>Boot Script</title>
<para>If you want the <application>Apache</application> server to
start automatically when the system is booted, install the
- <filename>/etc/rc.d/init.d/apache</filename> init script included
+ <filename>/etc/rc.d/init.d/httpd</filename> init script included
in the <xref linkend="bootscripts"/> package.</para>
- <indexterm zone="apache apache-init">
+ <indexterm zone="apache httpd-init">
<primary sortas="f-apache">apache</primary>
</indexterm>
-<screen role="root"><userinput>make install-apache</userinput></screen>
+<screen role="root"><userinput>make install-httpd</userinput></screen>
</sect3>
Modified: trunk/bootscripts/ChangeLog
===================================================================
--- trunk/bootscripts/ChangeLog 2011-12-12 17:21:45 UTC (rev 9103)
+++ trunk/bootscripts/ChangeLog 2011-12-12 20:16:56 UTC (rev 9104)
@@ -1,3 +1,6 @@
+2011-12-12 Bruce Dubbs <[email protected]>
+ * Fix Makefile for httpd for consistency
+
2011-12-05 Bruce Dubbs <[email protected]>
* Updated most scripts to be combatible with LFS 7.0.
See http://wiki.linuxfromscratch.org/blfs/browser/trunk/bootscripts
Modified: trunk/bootscripts/Makefile
===================================================================
--- trunk/bootscripts/Makefile 2011-12-12 17:21:45 UTC (rev 9103)
+++ trunk/bootscripts/Makefile 2011-12-12 20:16:56 UTC (rev 9104)
@@ -501,15 +501,15 @@
rm -f ${EXTDIR}/rc.d/rc1.d/K35alsa
rm -f ${EXTDIR}/rc.d/rc6.d/K35alsa
-uninstall-apache:
- rm -f ${EXTDIR}/rc.d/init.d/apache
- rm -f ${EXTDIR}/rc.d/rc0.d/K28apache
- rm -f ${EXTDIR}/rc.d/rc1.d/K28apache
- rm -f ${EXTDIR}/rc.d/rc2.d/K28apache
- rm -f ${EXTDIR}/rc.d/rc3.d/S32apache
- rm -f ${EXTDIR}/rc.d/rc4.d/S32apache
- rm -f ${EXTDIR}/rc.d/rc5.d/S32apache
- rm -f ${EXTDIR}/rc.d/rc6.d/K28apache
+uninstall-httpd:
+ rm -f ${EXTDIR}/rc.d/init.d/httpd
+ rm -f ${EXTDIR}/rc.d/rc0.d/K28httpd
+ rm -f ${EXTDIR}/rc.d/rc1.d/K28httpd
+ rm -f ${EXTDIR}/rc.d/rc2.d/K28httpd
+ rm -f ${EXTDIR}/rc.d/rc3.d/S32httpd
+ rm -f ${EXTDIR}/rc.d/rc4.d/S32httpd
+ rm -f ${EXTDIR}/rc.d/rc5.d/S32httpd
+ rm -f ${EXTDIR}/rc.d/rc6.d/K28httpd
uninstall-autofs:
rm -f $(EXTDIR)/rc.d/init.d/autofs
@@ -895,7 +895,7 @@
install-service-ipx \
install-service-pppoe \
install-alsa \
- install-apache \
+ install-httpd \
install-bind \
install-cups \
install-cyrus-sasl \
@@ -936,7 +936,7 @@
install-winbind \
install-xinetd \
uninstall-alsa \
- uninstall-apache \
+ uninstall-httpd \
uninstall-bind \
uninstall-cups \
uninstall-cyrus-sasl \
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
