Changeset 43a3a17

Timestamp:

08/18/2014 07:22:12 PM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

4acf445

Parents:

2a1068f5

Message:

Update to ffmpeg-2.3.3. Some fixes for docummentation build. Thanks Bruce D. and Christopher G. for reporting. One fix was reported by Christopher G.
Update to libassuan-2.1.2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13950 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/genlib/libassuan.xml (modified) (1 diff)
• gnome.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/ffmpeg.xml (modified) (5 diffs)
• packages.ent (modified) (2 diffs)

general/genlib/libassuan.xml

@@ -8 +8 @@
   <!ENTITY libassuan-download-ftp
            "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-&libassuan-version;.tar.bz2">
-  <!ENTITY libassuan-md5sum        "757243cc4a71b30ed8d8dbe784035d36">
-  <!ENTITY libassuan-size          "532 KB">
-  <!ENTITY libassuan-buildsize     "7.3 MB">
+  <!ENTITY libassuan-md5sum        "1dc4c3e1dbfb3939bfa2d72db8e136ba">
+  <!ENTITY libassuan-size          "504 KB">
+  <!ENTITY libassuan-buildsize     " 5.6 MB (additional 0.1 MB for the tests and 2.1 MB to build and install documentation)">
   <!ENTITY libassuan-time          "less than 0.1 SBU">
 ]>

gnome.ent

@@ +1 @@
+<!-- $LastChangedBy$ $Date$ -->
+
 <!-- Chapter 30 -->
 <!-- Platform -->

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <para>August 18th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to libassuan-2.1.2. Fixes
+          <ulink url="&blfs-ticket-root;5395">#5395</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to ffmpeg-2.3.3. Some fixes for
+          docummentation build. Thanks Bruce D. and Christopher G. for
+          reporting. One fix was reported by Christopher G. Fixes
+          <ulink url="&blfs-ticket-root;5394">#5394</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - add libepoxy-1.2 from the systemd branch.</para>

multimedia/videoutils/ffmpeg.xml

@@ -7 +7 @@
   <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "651e5e82360baba41e4d1e426b4897f6">
-  <!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)">
+  <!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)">
 ]>
 
@@ -198 +198 @@
     </para>
 
-<screen><userinput>pushd doc &amp;&amp;
+<screen><userinput>sed -i '$s/$/\n\n@bye/' doc/{git-howto,nut,fate}.texi             &amp;&amp;
+sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &amp;&amp;
+
+pushd doc &amp;&amp;
 for DOCNAME in `basename -s .html *.html`
 do
@@ -219 +222 @@
       installed and follow the instructions for the
       <ulink url="http://www.ffmpeg.org/fate.html">
-      FFmpeg Automated Testing Environment</ulink> (FATE). First, over 760 MB
+      FFmpeg Automated Testing Environment</ulink> (FATE). First, about 872 MB
       of sample files used to run FATE are downloaded with the command:
     </para>
@@ -265 +268 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api &amp;&amp;
-install -v -m644    doc/doxy/html/* \
-                    /usr/share/doc/ffmpeg/api</userinput></screen>
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api                       &amp;&amp;
+cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg/api                    &amp;&amp;
+find /usr/share/doc/ffmpeg/api -type f -exec chmod -c 0644 "{}" ";" &amp;&amp;
+find /usr/share/doc/ffmpeg/api -type d -exec chmod -c 0755 "{}" ";"</userinput></screen>
 
   </sect2>
@@ -275 +279 @@
 
     <para>
-      <command>sed -i ...</command>: This command adds the
+      <command>sed -i ... configure</command>: This command adds the
       <application>ALSA</application> library to the
       <application>Flite</application> <envar>LDFLAGS</envar> variable and
       enables the discovery of <application>Flite</application>.
+    </para>
+
+    <para>
+      <command>sed -i ... texi</command>: Fix some .texi files for
+      documentation builds.
+    </para>
+
+    <para>
+      <command>find ... ";"</command>: Fix permissions of documentation files
+      and directories.
     </para>
 

packages.ent

@@ -100 +100 @@
 <!ENTITY keyutils-version             "1.5.9">
 <!ENTITY libarchive-version           "3.1.2">
-<!ENTITY libassuan-version            "2.1.1">
+<!ENTITY libassuan-version            "2.1.2">
 <!ENTITY libatasmart-version          "0.19">
 <!ENTITY libatomic_ops-version        "7.4.2">
@@ -657 +657 @@
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "2.3.2">
+<!ENTITY ffmpeg-version               "2.3.3">
 <!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.8">