Author: cjg
Date: Sun Oct 5 06:04:43 2014
New Revision: 14498
Log:
Merge more updates from trunk.
Modified:
branches/systemd/general.ent
branches/systemd/introduction/welcome/changelog.xml
branches/systemd/multimedia/videoutils/ffmpeg.xml
branches/systemd/multimedia/videoutils/transcode.xml
branches/systemd/multimedia/videoutils/vlc.xml
branches/systemd/packages.ent
branches/systemd/x/installing/x7driver-synaptics.xml
branches/systemd/x/lib/webkitgtk2-systemd.xml
Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent Sun Oct 5 01:48:37 2014 (r14497)
+++ branches/systemd/general.ent Sun Oct 5 06:04:43 2014 (r14498)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "04"> <!-- Always 2 digits -->
+<!ENTITY day "05"> <!-- Always 2 digits -->
<!ENTITY month "10"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS systemd Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "October 4th, &year;">
+<!ENTITY releasedate "October 5th, &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/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sun Oct 5 01:48:37
2014 (r14497)
+++ branches/systemd/introduction/welcome/changelog.xml Sun Oct 5 06:04:43
2014 (r14498)
@@ -44,6 +44,135 @@
-->
<listitem>
+ <para>October 4th, 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[fernando] - VLC-2.1.5 and Transcode-1.1.7: fix build with
+ ffmpeg-2.4.1. Thanks Armin.</para>
+ </listitem>
+ <listitem>
+ <para>[fernando] - Update to ffmpeg-2.4.1. Fixes
+ <ulink url="&blfs-ticket-root;5513">#5513</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[fernando] - Update to samba-4.1.12. Fixes
+ <ulink url="&blfs-ticket-root;5485">#5485</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[igor] - Update to xf86-input-synaptics-1.8.1. Fixes
+ <ulink url="&blfs-ticket-root;5530">#5530</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[igor] - Update to libevdev-1.3. Fixes
+ <ulink url="&blfs-ticket-root;5487">#5487</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>October 3rd, 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to git-2.1.2. Fixes
+ <ulink url="&blfs-ticket-root;5614">#5614</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[fernando] - Update to openldap-2.4.40. Fixes
+ <ulink url="&blfs-ticket-root;5608">#5608</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to nfs-utils-1.3.1. Fixes
+ <ulink url="&blfs-ticket-root;5589">#5589</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to icu4c-54_1. Fixes
+ <ulink url="&blfs-ticket-root;5515">#5515</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to at_3.1.16. Fixes
+ <ulink url="&blfs-ticket-root;5516">#5516</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[igor] - Update to xf86-video-ati-7.5.0. Fixes
+ <ulink url="&blfs-ticket-root;5618">#5618</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to qt-everywhere-opensource-src-5.3.2. Fixes
+ <ulink url="&blfs-ticket-root;5526">#5526</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[igor] - Update to xorg-server-1.16.1. Fixes
+ <ulink url="&blfs-ticket-root;5539">#5539</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[fernando] - Thunar-1.6.3, Firefox-32.0.1 and SeaMonkey-2.29.1:
+ fixes and tweaks.</para>
+ </listitem>
+ <listitem>
+ <para>[fernando] - Update to thunderbird-31.1.2. Fixes
+ <ulink url="&blfs-ticket-root;5577">#5577</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>October 2nd, 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[fernando] - Thunar-1.6.3 and xfce4-settings-4.10.1: fix
+ dependencies.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - GTK+-2.24.24, GTK+-3.14.1, Nautilus-3.14.0,
+ PCManFM-1.2.2, gnome-system-monitor-3.14.0, baobab-3.14.0 and
+ eog-3.14.0: add, or replace gnome-icon-theme by, adwaita-icon-theme.
+ Fixes <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - Update to totem-3.14.0. Partially fixes
+ <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - Update to seahorse-3.14.0. Partially fixes
+ <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - Update to nautilus-3.14.0. Partially fixes
+ <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - Update to gucharmap-3.14.0. Partially fixes
+ <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - Update to gnome-terminal-3.14.0. Partially fixes
+ <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - Update to gnome-system-monitor-3.14.0.
+ Partially fixes
+ <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - Update to gnome-screenshot-3.14.0. Partially fixes
+ <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - Update to gnome-calculator-3.14.0. Partially fixes
+ <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[cjg] - Update to file-roller-3.14.0. Partially fixes
+ <ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[igor] - Update to xkeyboard-config-2.13. Fixes
+ <ulink url="&blfs-ticket-root;5613">#5613</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>October 1st, 2014</para>
<itemizedlist>
<listitem>
Modified: branches/systemd/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/ffmpeg.xml Sun Oct 5 01:48:37
2014 (r14497)
+++ branches/systemd/multimedia/videoutils/ffmpeg.xml Sun Oct 5 06:04:43
2014 (r14498)
@@ -6,10 +6,10 @@
<!ENTITY ffmpeg-download-http
"http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2";>
<!ENTITY ffmpeg-download-ftp " ">
- <!ENTITY ffmpeg-md5sum "72361d3b8717b6db3ad2b9da8df7af5e">
- <!ENTITY ffmpeg-size "7.2 MB">
- <!ENTITY ffmpeg-buildsize "128 MB (additional 857 MB for docs and 1871
MB to run the FATE tests)">
- <!ENTITY ffmpeg-time "3.3 SBU (additional 0.9 SBU for docs and 4.5
SBU to run the FATE tests, after sample files are downloaded)">
+ <!ENTITY ffmpeg-md5sum "c36caa8d29b3677dcb7bd8c546890c9d">
+ <!ENTITY ffmpeg-size "7.1 MB">
+ <!ENTITY ffmpeg-buildsize "130 MB (additional 870 MB for docs and 1903
MB to run the FATE tests)">
+ <!ENTITY ffmpeg-time "3.5 SBU (additional 0.9 SBU for docs and 5
SBU to run the FATE tests, after sample files are downloaded)">
]>
<sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
@@ -139,8 +139,9 @@
<ulink url="http://linuxtv.org/downloads/v4l-utils/";>Video4Linux</ulink>,
<ulink
url="http://sourceforge.net/projects/opencore-amr/files/vo-aacenc/";>vo-aaenc</ulink>,
<ulink
url="http://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/";>vo-amrwbenc</ulink>,
- <ulink url="http://www.videolan.org/developers/x265.html";>x265
(H.265/MPEG-H HEVC)</ulink>, and
- <ulink url="http://zapping.sourceforge.net/ZVBI/";>ZVBI</ulink>
+ <ulink url="http://xavs.sourceforge.net/";>libxavs</ulink> (SVN checkout),
+ <ulink
url="http://kcat.strangesoft.net/openal-releases/";>OpenAL</ulink>, and
+ <ulink url="http://www.videolan.org/developers/x265.html";>x265
(H.265/MPEG-H HEVC)</ulink>
</para>
<para condition="html" role="usernotes">
@@ -171,16 +172,13 @@
--enable-libvorbis \
--enable-libvpx \
--enable-libx264 \
- --enable-x11grab &&
+ --enable-x11grab \
+ --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &&
make &&
gcc tools/qt-faststart.c -o tools/qt-faststart</userinput></screen>
<para>
- HTML documentation was built in the previous step if
- <ulink url="http://www.nongnu.org/texi2html";>texi2html</ulink> is
- installed. If the HTML was built (check for any
- <filename class="extension">.html</filename> files in the
- <filename class="directory">doc</filename> directory) and you have
+ HTML documentation was built in the previous step. If you have
<xref linkend="texlive"/> installed and wish to build PDF and
Postscript versions of the documentation, issue the following commands:
</para>
@@ -209,7 +207,7 @@
To properly test the installation you must have <xref linkend="rsync"/>
installed and follow the instructions for the
<ulink url="http://www.ffmpeg.org/fate.html";>
- FFmpeg Automated Testing Environment</ulink> (FATE). First, about 872 MB
+ FFmpeg Automated Testing Environment</ulink> (FATE). First, about 879 MB
of sample files used to run FATE are downloaded with the command:
</para>
@@ -226,7 +224,7 @@
repository. Now, the download size and time are drastically reduced.
Estimated values in "Package Information" do not include the download
SBU. Next, FATE is executed, with the commands (you obtain a number of
- tests greater than 1900):
+ tests greater than 2000):
</para>
<screen><userinput>make fate SAMPLES=fate-suite/ | tee ../fate.log &&
@@ -238,16 +236,19 @@
<screen role="root"><userinput>make install &&
install -v -m755 tools/qt-faststart /usr/bin &&
-install -v -m755 -d /usr/share/doc/ffmpeg &&
install -v -m644 doc/*.txt \
- /usr/share/doc/ffmpeg</userinput></screen>
+ /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
<para>
- If HTML documentation was built, issue the following command to install
it:
+ If PDF and Postscript documentations were built, issue the following
+ commands, as the <systemitem class="username">root</systemitem> user, to
+ install them:
</para>
-<screen role="root"><userinput>install -v -m644 doc/*.html \
- /usr/share/doc/ffmpeg</userinput></screen>
+<screen role="root"><userinput>install -v -m644 doc/*. pdf \
+ /usr/share/doc/ffmpeg-&ffmpeg-version; &&
+install -v -m644 doc/*.ps \
+ /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
<para>
If you used <command>doxygen</command> to create the API documentation,
@@ -255,10 +256,10 @@
as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api
&&
-cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg/api &&
-find /usr/share/doc/ffmpeg/api -type f -exec chmod -c 0644 "{}" ";" &&
-find /usr/share/doc/ffmpeg/api -type d -exec chmod -c 0755 "{}"
";"</userinput></screen>
+<screen role="root"><userinput>install -v -m755 -d
/usr/share/doc/ffmpeg-&ffmpeg-version;/api &&
+cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api
&&
+find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type f -exec chmod -c 0644
"{}" ";" &&
+find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type d -exec chmod -c 0755
"{}" ";"</userinput></screen>
</sect2>
@@ -427,7 +428,7 @@
/usr/include/libswresample
/usr/include/libswscale,
/usr/share/ffmpeg, and
- /usr/share/doc/ffmpeg
+ /usr/share/doc/ffmpeg-&ffmpeg-version;
</seg>
</seglistitem>
</segmentedlist>
Modified: branches/systemd/multimedia/videoutils/transcode.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/transcode.xml Sun Oct 5
01:48:37 2014 (r14497)
+++ branches/systemd/multimedia/videoutils/transcode.xml Sun Oct 5
06:04:43 2014 (r14498)
@@ -163,7 +163,11 @@
<screen><userinput>sed -i 's|doc/transcode|&-$(PACKAGE_VERSION)|' \
$(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &&
-patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch &&
+sed -i "s:av_close_input_file:avformat_close_input:g" \
+ import/probe_ffmpeg.c &&
+
+patch -Np1 -i ../transcode-&transcode-version;-ffmpeg2-1.patch
&&
+&transcode-version;
./configure --prefix=/usr \
--enable-alsa \
--enable-libmpeg2 &&
@@ -189,6 +193,11 @@
</para>
<para>
+ <command>sed ... import/probe_ffmpeg.c</command>: This sed fixes
+ compilation with <application>ffmpeg</application> 2.4.
+ </para>
+
+ <para>
Support for most of the dependency packages requires using
options passed to the <command>configure</command> script. View the
<filename>INSTALL</filename> file and the output from
Modified: branches/systemd/multimedia/videoutils/vlc.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/vlc.xml Sun Oct 5 01:48:37
2014 (r14497)
+++ branches/systemd/multimedia/videoutils/vlc.xml Sun Oct 5 06:04:43
2014 (r14498)
@@ -211,7 +211,10 @@
Install <application>VLC</application> by running the following commands:
</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>sed -i 's:libsmbclient.h:samba-4.0/&:'
modules/access/smb.c &&
+./bootstrap &&
+sed "s:< 56:< 57:g" -i configure &&
+./configure --prefix=/usr &&
make</userinput></screen>
<para>
@@ -233,6 +236,11 @@
<title>Command Explanations</title>
<para>
+ <command>sed ... configure</command>: This sed fixes compilation with
+ <application>ffmpeg</application> 2.4.
+ </para>
+
+ <para>
<option>--disable-lua</option>: Use this switch if you don't have
<application>Lua</application> installed.
</para>
Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent Sun Oct 5 01:48:37 2014 (r14497)
+++ branches/systemd/packages.ent Sun Oct 5 06:04:43 2014 (r14498)
@@ -64,7 +64,7 @@
<!ENTITY zsh-version "5.0.6">
<!-- Chapter 8 Virtualization -->
-<!ENTITY qemu-version "2.1.0">
+<!ENTITY qemu-version "2.1.2">
<!-- Part III -->
<!-- Chapter 9 -->
@@ -476,7 +476,7 @@
<!ENTITY qt5-version "5.3.1">
<!ENTITY shared-mime-info-version "1.3">
<!ENTITY startup-notification-version "0.12">
-<!ENTITY webkitgtk2-version "2.4.5"> <!-- Even minors only -->
+<!ENTITY webkitgtk2-version "2.4.6"> <!-- Even minors only -->
<!ENTITY webkitgtk26-version "2.6.0">
<!ENTITY gtk2-libdir "2.0/2.10.0">
<!ENTITY qt4-dir "$QT4DIR">
@@ -686,7 +686,7 @@
<!ENTITY pnmixer-version "0.5.1">
<!-- Chapter 40 -->
-<!ENTITY ffmpeg-version "2.3.3">
+<!ENTITY ffmpeg-version "2.4.1">
<!ENTITY mplayer-version "1.1.1">
<!ENTITY xine-ui-version "0.99.9">
<!ENTITY transcode-version "1.1.7">
Modified: branches/systemd/x/installing/x7driver-synaptics.xml
==============================================================================
--- branches/systemd/x/installing/x7driver-synaptics.xml Sun Oct 5
01:48:37 2014 (r14497)
+++ branches/systemd/x/installing/x7driver-synaptics.xml Sun Oct 5
06:04:43 2014 (r14498)
@@ -4,14 +4,14 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY xorg-synaptics-driver-version "1.8.0">
+ <!ENTITY xorg-synaptics-driver-version "1.8.1">
<!ENTITY xorg-synaptics-driver-download-http
"&xorg-download-http;/driver/xf86-input-synaptics-&xorg-synaptics-driver-version;.tar.bz2">
<!ENTITY xorg-synaptics-driver-download-ftp
"&xorg-download-ftp;/driver/xf86-input-synaptics-&xorg-synaptics-driver-version;.tar.bz2">
- <!ENTITY xorg-synaptics-driver-md5sum
"27a3f2b31606a13dd6b58d419978d64f">
- <!ENTITY xorg-synaptics-driver-size "440 KB">
- <!ENTITY xorg-synaptics-driver-buildsize "4.8 MB">
- <!ENTITY xorg-synaptics-driver-time "less than 0.1 SBU">
+ <!ENTITY xorg-synaptics-driver-md5sum
"ed70d0cba94262a4008dcef654ab34a9">
+ <!ENTITY xorg-synaptics-driver-size "468 KB">
+ <!ENTITY xorg-synaptics-driver-buildsize "5.5 MB">
+ <!ENTITY xorg-synaptics-driver-time "0.1 SBU">
]>
<!-- Begin Xorg Synaptics Driver -->
@@ -92,8 +92,7 @@
commands:
</para>
-<screen><userinput>sed -i "/unistd/i #include <xorg-server.h>"
src/synproto.h &&
-./configure $XORG_CONFIG &&
+<screen><userinput>./configure $XORG_CONFIG &&
make</userinput></screen>
<para>
@@ -108,16 +107,6 @@
</sect3>
- <sect3>
- <title>Command Explanations</title>
-
- <para>
- <command>sed -i ...</command>: This sed fixes building with latest
- version of <application>Glibc</application>.
- </para>
-
- </sect3>
-
<sect3 role="content">
<title>Contents</title>
Modified: branches/systemd/x/lib/webkitgtk2-systemd.xml
==============================================================================
--- branches/systemd/x/lib/webkitgtk2-systemd.xml Sun Oct 5 01:48:37
2014 (r14497)
+++ branches/systemd/x/lib/webkitgtk2-systemd.xml Sun Oct 5 06:04:43
2014 (r14498)
@@ -6,10 +6,10 @@
<!ENTITY webkitgtk2-download-http
"http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz";>
<!ENTITY webkitgtk2-download-ftp " ">
- <!ENTITY webkitgtk2-md5sum "c2e1687bb0314a0948fbf78e2d1e931f">
- <!ENTITY webkitgtk2-size "9.4 MB">
- <!ENTITY webkitgtk2-buildsize "819.4 MB">
- <!ENTITY webkitgtk2-time "57.7 SBU">
+ <!ENTITY webkitgtk2-md5sum "b0d019777754bb5779de8b9ad1dd6bfe">
+ <!ENTITY webkitgtk2-size "9.5 MB">
+ <!ENTITY webkitgtk2-buildsize "1.5 GB">
+ <!ENTITY webkitgtk2-time "157 SBU">
]>
<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;">
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
