Author: krejzi
Date: Wed Aug  6 03:44:24 2014
New Revision: 13841

Log:
Merged trunk.

Modified:
   branches/systemd/general.ent
   branches/systemd/general/prog/cmake-systemd.xml
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/lxde/desktop/menu-cache.xml
   branches/systemd/multimedia/audioutils/audacious.xml
   branches/systemd/multimedia/libdriv/alsa-utils-systemd.xml
   branches/systemd/multimedia/libdriv/libdvdcss.xml
   branches/systemd/packages.ent
   branches/systemd/x/installing/libxcb.xml
   branches/systemd/x/installing/xcb-proto.xml

Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent        Wed Aug  6 03:39:23 2014        (r13840)
+++ branches/systemd/general.ent        Wed Aug  6 03:44:24 2014        (r13841)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "06">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 5th, &year;">
+<!ENTITY releasedate  "August 6th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">              <!-- svn|[release #] -->
 <!ENTITY lfs-version  "systemd">              <!-- x.y|development] -->

Modified: branches/systemd/general/prog/cmake-systemd.xml
==============================================================================
--- branches/systemd/general/prog/cmake-systemd.xml     Wed Aug  6 03:39:23 
2014        (r13840)
+++ branches/systemd/general/prog/cmake-systemd.xml     Wed Aug  6 03:44:24 
2014        (r13841)
@@ -6,10 +6,10 @@
 
   <!ENTITY cmake-download-http 
"http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz";>
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "21a1c85e1a3b803c4b48e7ff915a863e">
+  <!ENTITY cmake-md5sum        "e2e05d84cb44a42f1371d9995631dcf5">
   <!ENTITY cmake-size          "5.3 MB">
-  <!ENTITY cmake-buildsize     "236 MB (additional 199 MB for tests)">
-  <!ENTITY cmake-time          "1.6 SBU (additional 4.4 SBU for tests)">
+  <!ENTITY cmake-buildsize     "237 MB (additional 195 MB for tests)">
+  <!ENTITY cmake-time          "1.8 SBU (additional 4.4 SBU for tests)">
 ]>
 
 <sect1 id="cmake" xreflabel="CMake-&cmake-version;">
@@ -84,10 +84,10 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="subversion"/> (for testing),
+      <xref linkend="qt4"/> or <xref linkend="qt5"/> (for the Qt-based GUI),
+      <xref linkend="subversion"/> (for testing), and
        <ulink url="http://pypi.python.org/pypi/Sphinx";>Sphinx</ulink>
-       (for building documents), and
-      <xref linkend="qt4"/> or <xref linkend="qt5"/> (for the Qt-based GUI)
+       (for building documents)
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Wed Aug  6 03:39:23 
2014        (r13840)
+++ branches/systemd/introduction/welcome/changelog.xml Wed Aug  6 03:44:24 
2014        (r13841)
@@ -45,6 +45,42 @@
 -->
 
     <listitem>
+      <para>August 6th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[igor] - Update to libxcb-1.11. Fixes
+          <ulink url="&blfs-ticket-root;5323">#5323</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[igor] - Update to xcb-proto-1.11. Fixes
+          <ulink url="&blfs-ticket-root;5322">#5322</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>August 5th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to libdvdcss-1.3.0. Fixes
+          <ulink url="&blfs-ticket-root;5335">#5335</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to cmake-3.0.1. Fixes
+          <ulink url="&blfs-ticket-root;5334">#5334</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Add the description of the alsaucm bin.
+          Thanks Denis M.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Add option to build audacious-plugins without mpg123
+          (new behaviour in 3.5.1, configure used to test for it).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 4th, 2014</para>
       <itemizedlist>
         <listitem>

Modified: branches/systemd/lxde/desktop/menu-cache.xml
==============================================================================
--- branches/systemd/lxde/desktop/menu-cache.xml        Wed Aug  6 03:39:23 
2014        (r13840)
+++ branches/systemd/lxde/desktop/menu-cache.xml        Wed Aug  6 03:44:24 
2014        (r13841)
@@ -118,14 +118,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <note>
-      <para>With this switch, parallel build is not supported. Use
-      <command>make -j1</command> if you have MAKEFLAGS set to value larger
-      than unity.</para>
-    </note>
+    <para>
+      <option>--enable-gtk-doc</option>: Use this option if
+      <application>GTK-Doc</application> is installed and you wish to build and
+      install the API documentation. With this option enabled, the
+      package doesn't support parallel build.
+    </para>
 
   </sect2>
 

Modified: branches/systemd/multimedia/audioutils/audacious.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/audacious.xml        Wed Aug  6 
03:39:23 2014        (r13840)
+++ branches/systemd/multimedia/audioutils/audacious.xml        Wed Aug  6 
03:44:24 2014        (r13841)
@@ -259,6 +259,9 @@
     <para><parameter>--with-buildstamp</parameter>: This switch appends 
     the given text to the version string.</para>
 
+    <para><option>--disable-mp3</option>: Use this for the plugins if you have
+    not installed mpg123 and do not wish to play mp3 files.</para>
+
     <para><option>--enable-valgrind</option>: Allow better Valgrind leak 
checks.</para>
 
   </sect2>

Modified: branches/systemd/multimedia/libdriv/alsa-utils-systemd.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/alsa-utils-systemd.xml  Wed Aug  6 
03:39:23 2014        (r13840)
+++ branches/systemd/multimedia/libdriv/alsa-utils-systemd.xml  Wed Aug  6 
03:44:24 2014        (r13841)
@@ -81,8 +81,8 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="libsamplerate"/>,
-      <ulink url="http://hightek.org/dialog/";>Dialog</ulink> and
-      <xref linkend="xmlto"/>
+      <xref linkend="xmlto"/> and
+      <ulink url="http://hightek.org/dialog/";>Dialog</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -275,6 +275,18 @@
           </indexterm>
         </listitem>
       </varlistentry>
+
+      <varlistentry id="alsaucm">
+        <term><command>alsaucm</command></term>
+        <listitem>
+          <para>
+          allows applications to access the hardware in an abstracted manner
+          </para>
+          <indexterm zone="alsa-utils alsaucm">
+            <primary sortas="b-alsaucm">alsaucm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="amidi">
         <term><command>amidi</command></term>

Modified: branches/systemd/multimedia/libdriv/libdvdcss.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/libdvdcss.xml   Wed Aug  6 03:39:23 
2014        (r13840)
+++ branches/systemd/multimedia/libdriv/libdvdcss.xml   Wed Aug  6 03:44:24 
2014        (r13841)
@@ -6,9 +6,9 @@
 
   <!ENTITY libdvdcss-download-http 
"http://www.videolan.org/pub/libdvdcss/&libdvdcss-version;/libdvdcss-&libdvdcss-version;.tar.bz2";>
   <!ENTITY libdvdcss-download-ftp  " ">
-  <!ENTITY libdvdcss-md5sum        "53cfc52a60a156763c425572e5179273">
-  <!ENTITY libdvdcss-size          "332 KB">
-  <!ENTITY libdvdcss-buildsize     "4.0 MB">
+  <!ENTITY libdvdcss-md5sum        "7f0fdb3ff91d638f5e45ed7536f7eb67">
+  <!ENTITY libdvdcss-size          "348 KB">
+  <!ENTITY libdvdcss-buildsize     "3.6 MB">
   <!ENTITY libdvdcss-time          "less than 0.1 SBU">
 ]>
 

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Wed Aug  6 03:39:23 2014        (r13840)
+++ branches/systemd/packages.ent       Wed Aug  6 03:44:24 2014        (r13841)
@@ -238,7 +238,7 @@
 <!ENTITY bazaar-version               "2.5.1">
 <!ENTITY check-version                "0.9.14">
 <!ENTITY cmake-major-version          "3.0">
-<!ENTITY cmake-minor-version          "0">
+<!ENTITY cmake-minor-version          "1">
 <!ENTITY cmake-version                
"&cmake-major-version;.&cmake-minor-version;">
 <!ENTITY cvs-version                  "1.11.23">
 <!ENTITY dejagnu-version              "1.5.1">
@@ -398,8 +398,8 @@
 <!ENTITY libXau-version               "1.0.8">
 <!ENTITY libXdmcp-version             "1.1.1">
 <!ENTITY libpthread-stubs-version     "0.3">
-<!ENTITY xcb-proto-version            "1.10">
-<!ENTITY libxcb-version               "1.10">
+<!ENTITY xcb-proto-version            "1.11">
+<!ENTITY libxcb-version               "1.11">
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.4">
 <!ENTITY xkeyboard-config-version     "2.12">
@@ -609,7 +609,7 @@
 <!ENTITY libass-version               "0.11.2">
 <!ENTITY libcanberra-version          "0.30">
 <!ENTITY libdiscid-version            "0.6.1">
-<!ENTITY libdvdcss-version            "1.2.13">
+<!ENTITY libdvdcss-version            "1.3.0">
 <!ENTITY libdvdread-version           "4.9.9">
 <!ENTITY libdvdnav-version            "4.2.1">
 <!ENTITY libdv-version                "1.0.0">

Modified: branches/systemd/x/installing/libxcb.xml
==============================================================================
--- branches/systemd/x/installing/libxcb.xml    Wed Aug  6 03:39:23 2014        
(r13840)
+++ branches/systemd/x/installing/libxcb.xml    Wed Aug  6 03:44:24 2014        
(r13841)
@@ -6,11 +6,11 @@
 
   <!ENTITY libxcb-download-http 
"http://xcb.freedesktop.org/dist/libxcb-&libxcb-version;.tar.bz2";>
   <!ENTITY libxcb-download-ftp  " ">
-  <!ENTITY libxcb-md5sum        "074c335cc4453467eeb234e3dadda700">
-  <!ENTITY libxcb-size          "468 KB">
-  <!ENTITY libxcb-buildsize     "42 MB (124 MB with doxygen
+  <!ENTITY libxcb-md5sum        "5a873ebd383d1a60612dd6ec6b42c781">
+  <!ENTITY libxcb-size          "506 KB">
+  <!ENTITY libxcb-buildsize     "41 MB (124 MB with doxygen
                                  generated documentation)">
-  <!ENTITY libxcb-time          "0.3 SBU (additional 0.1 to generate
+  <!ENTITY libxcb-time          "0.2 SBU (additional 0.1 to generate
                                  API documentation)">
 ]>
 

Modified: branches/systemd/x/installing/xcb-proto.xml
==============================================================================
--- branches/systemd/x/installing/xcb-proto.xml Wed Aug  6 03:39:23 2014        
(r13840)
+++ branches/systemd/x/installing/xcb-proto.xml Wed Aug  6 03:44:24 2014        
(r13841)
@@ -6,7 +6,7 @@
 
   <!ENTITY xcb-proto-download-http 
"http://xcb.freedesktop.org/dist/xcb-proto-&xcb-proto-version;.tar.bz2";>
   <!ENTITY xcb-proto-download-ftp  " ">
-  <!ENTITY xcb-proto-md5sum        "ade74b8e9c870dc7515adfa209e66063">
+  <!ENTITY xcb-proto-md5sum        "6bf2797445dc6d43e9e4707c082eff9c">
   <!ENTITY xcb-proto-size          "136 KB">
   <!ENTITY xcb-proto-buildsize     "2.1 MB">
   <!ENTITY xcb-proto-time          "0.1 SBU">
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to