Author: krejzi
Date: Mon Aug 4 06:24:55 2014
New Revision: 13826
Log:
Revert r13821, minor fixes to Qt5 deps, merged trunk.
Modified:
branches/systemd/general.ent
branches/systemd/general/graphlib/freetype2.xml
branches/systemd/general/sysutils/which.xml
branches/systemd/introduction/welcome/changelog.xml
branches/systemd/multimedia/videoutils/ffmpeg.xml
branches/systemd/packages.ent
branches/systemd/x/lib/qt5-systemd.xml
Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent Mon Aug 4 05:22:39 2014 (r13825)
+++ branches/systemd/general.ent Mon Aug 4 06:24:55 2014 (r13826)
@@ -6,7 +6,7 @@
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS systemd Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "August 3rd, &year;">
+<!ENTITY releasedate "August 4th, &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/graphlib/freetype2.xml
==============================================================================
--- branches/systemd/general/graphlib/freetype2.xml Mon Aug 4 05:22:39
2014 (r13825)
+++ branches/systemd/general/graphlib/freetype2.xml Mon Aug 4 06:24:55
2014 (r13826)
@@ -121,12 +121,6 @@
<sect2 role="installation">
<title>Installation of FreeType2</title>
- <note>
- <para>When building the first time you must add
- <parameter>--without-harfbuzz</parameter> to
- the below configure line.</para>
- </note>
-
<para>
If you downloaded the additional documentation, unpack it into the
source tree using the following command:
Modified: branches/systemd/general/sysutils/which.xml
==============================================================================
--- branches/systemd/general/sysutils/which.xml Mon Aug 4 05:22:39 2014
(r13825)
+++ branches/systemd/general/sysutils/which.xml Mon Aug 4 06:24:55 2014
(r13826)
@@ -4,7 +4,9 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY which-download-http
"http://www.xs4all.nl/~carlo17/which/which-&which-version;.tar.gz";>
+<!-- <!ENTITY which-download-http
"http://www.xs4all.nl/~carlo17/which/which-&which-version;.tar.gz";>-->
+
+ <!ENTITY which-download-http
"http:/ftp.gnu.org/gnu/which/which-&which-version;.tar.gz">
<!ENTITY which-download-ftp
"ftp://ftp.gnu.org/gnu/which/which-&which-version;.tar.gz";>
<!ENTITY which-md5sum "95be0501a466e515422cde4af46b2744">
<!ENTITY which-size "135 KB">
Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Mon Aug 4 05:22:39
2014 (r13825)
+++ branches/systemd/introduction/welcome/changelog.xml Mon Aug 4 06:24:55
2014 (r13826)
@@ -48,16 +48,12 @@
<para>August 4th, 2014</para>
<itemizedlist>
<listitem>
- <para>[cjg] - Added note to freetype page. Fixes
- <ulink url="&blfs-ticket-root;5331">#5331</ulink>.</para>
- </listitem>
- <listitem>
- <para>[name] - Another changelog entry.</para>
+ <para>[igor] - Update to ffmpeg-2.3.1. Fixes
+ <ulink url="&blfs-ticket-root;5312">#5312</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
-
<listitem>
<para>August 3rd, 2014</para>
<itemizedlist>
Modified: branches/systemd/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/ffmpeg.xml Mon Aug 4 05:22:39
2014 (r13825)
+++ branches/systemd/multimedia/videoutils/ffmpeg.xml Mon Aug 4 06:24:55
2014 (r13826)
@@ -6,7 +6,7 @@
<!ENTITY ffmpeg-download-http
"http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2";>
<!ENTITY ffmpeg-download-ftp " ">
- <!ENTITY ffmpeg-md5sum "00f98a030d21366b6583875d57d98c27">
+ <!ENTITY ffmpeg-md5sum "bb02e99c39941d7f3dc56658b9324a2b">
<!ENTITY ffmpeg-size "7.1 MB">
<!ENTITY ffmpeg-buildsize "119 MB (additional 764 MB for docs and 1813
MB to run the FATE tests)">
<!ENTITY ffmpeg-time "3.4 SBU (additional 1.2 SBU for docs and 7.2
SBU to run the FATE tests, after sample files are downloaded)">
Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent Mon Aug 4 05:22:39 2014 (r13825)
+++ branches/systemd/packages.ent Mon Aug 4 06:24:55 2014 (r13826)
@@ -655,7 +655,7 @@
<!ENTITY pnmixer-version "0.5.1">
<!-- Chapter 40 -->
-<!ENTITY ffmpeg-version "2.3">
+<!ENTITY ffmpeg-version "2.3.1">
<!ENTITY mplayer-version "1.1.1">
<!ENTITY xine-ui-version "0.99.8">
<!ENTITY transcode-version "1.1.7">
Modified: branches/systemd/x/lib/qt5-systemd.xml
==============================================================================
--- branches/systemd/x/lib/qt5-systemd.xml Mon Aug 4 05:22:39 2014
(r13825)
+++ branches/systemd/x/lib/qt5-systemd.xml Mon Aug 4 06:24:55 2014
(r13826)
@@ -102,6 +102,7 @@
<xref linkend="libmng"/>,
<xref linkend="libpng"/>,
<xref linkend="libtiff"/>,
+ <xref linkend="libxkbcommon"/>,
<xref linkend="mtdev"/>,
<xref linkend="openssl"/>,
<xref linkend="pcre"/>,
@@ -114,9 +115,8 @@
<xref linkend="geoclue"/>,
<xref linkend="gst10-plugins-base"/> (QtWebKit HTML5 Video Support),
<xref linkend="gtk2"/> (GTK+ Theme Support),
- <ulink url="https://code.google.com/p/ibus/";>IBus</ulink>,
- <ulink url="http://xkbcommon.org/";>libxkbcommon</ulink>,
- <xref linkend="mariadb"/> or <ulink
url="http://www.mysql.com/";>MySQL</ulink>,
+ <xref linkend="ibus"/>,
+ <xref linkend="mariadb"/>,
<xref linkend="postgresql"/>,
<xref linkend="pulseaudio"/>, and
<xref linkend="unixodbc"/>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
