[lfs-fr] r5142 - in trunk/blfs: . multimedia/videoutils traduc/commits

myou72 at orange.fr myou72 at orange.fr
Sam 23 Nov 06:29:07 PST 2013


Author: myou72
Date: 2013-11-23 15:29:07 +0100 (Sat, 23 Nov 2013)
New Revision: 5142

Added:
   trunk/blfs/traduc/commits/r12265.txt
Modified:
   trunk/blfs/general.ent
   trunk/blfs/multimedia/videoutils/ffmpeg.xml
Log:
[BLFS-EN] r12265.txt

Modified: trunk/blfs/general.ent
===================================================================
--- trunk/blfs/general.ent	2013-11-23 14:27:43 UTC (rev 5141)
+++ trunk/blfs/general.ent	2013-11-23 14:29:07 UTC (rev 5142)
@@ -893,7 +893,7 @@
 
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "2.1">
+<!ENTITY ffmpeg-version               "2.1.1">
 <!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.7">
 <!ENTITY transcode-version            "1.1.7">

Modified: trunk/blfs/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/blfs/multimedia/videoutils/ffmpeg.xml	2013-11-23 14:27:43 UTC (rev 5141)
+++ trunk/blfs/multimedia/videoutils/ffmpeg.xml	2013-11-23 14:29:07 UTC (rev 5142)
@@ -6,10 +6,12 @@
   <!ENTITY ffmpeg-download-http
            "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "4ec1cedd4c7753512462f70b347c338a">
+  <!ENTITY ffmpeg-md5sum        "2719ab2b3311ac3775b9cdeb66c54849">
   <!ENTITY ffmpeg-size          "6.4 Mo">
-  <!ENTITY ffmpeg-buildsize     "106 Mo (additional 710 Mo for docs)">
-  <!ENTITY ffmpeg-time          "2.4 SBU (additional 0.6 SBU for docs)">
+  <!ENTITY ffmpeg-buildsize     "114 Mo (additional 710 Mo for docs and 1.5 Go
+                                 for tests)">
+  <!ENTITY ffmpeg-time          "3.1 SBU (additional 0.6 SBU for docs 12.3 to
+                                 run the tests, after test files are downloaded)">
 ]>
 <sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
   <?dbhtml filename="ffmpeg.html"?>
@@ -146,22 +148,7 @@
 <screen>
 <userinput>patch -Np1 -i ../ffmpeg-&ffmpeg-version;-libavformat_cookies-1.patch &&
 sed -i 's/-lflite"/-lflite -lasound"/' configure &&
-./configure --prefix=/usr        \
-            --enable-gpl         \
-            --enable-version3    \
-            --enable-nonfree     \
-            --disable-static     \
-            --enable-shared      \
-            --disable-debug      \
-            --enable-libass      \
-            --enable-libfdk-aac  \
-            --enable-libmp3lame  \
-            --enable-libopus     \
-            --enable-libtheora   \
-            --enable-libvorbis   \
-            --enable-libvpx      \
-            --enable-libx264     \
-            --enable-x11grab     &&
+./configure --prefix=/usr                    --enable-gpl                     --enable-version3                --enable-nonfree                 --disable-static                 --enable-shared                  --disable-debug                  --enable-libass                  --enable-libfdk-aac              --enable-libmp3lame              --enable-libopus                 --enable-libtheora               --enable-libvorbis               --enable-libvpx                  --enable-libx264                 --enable-x11grab     &&
 make &&
 gcc tools/qt-faststart.c -o tools/qt-faststart &&
 unset LIBRARY_PATH</userinput>
@@ -181,8 +168,7 @@
 do
     texi2pdf -b $DOCNAME.texi &&
     texi2dvi -b $DOCNAME.texi &&
-    dvips -o    $DOCNAME.ps   \
-                $DOCNAME.dvi
+    dvips -o    $DOCNAME.ps                   $DOCNAME.dvi
 done                          &&
 popd                          &&
 unset DOCNAME</userinput>
@@ -202,15 +188,13 @@
 <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>
+install -v -m644    doc/*.txt                     /usr/share/doc/ffmpeg</userinput>
 </screen>
     <para>
 	Si la documentation HTML est construite, tapez la commande suivante pour l'installer:
     </para>
 <screen role="root">
-<userinput>install -v -m644 doc/*.html \
-                 /usr/share/doc/ffmpeg</userinput>
+<userinput>install -v -m644 doc/*.html                  /usr/share/doc/ffmpeg</userinput>
 </screen>
     <para>Si vous avez utilisé <command>doxygen</command> pour créer la 
     documentation de l'API, installez-la (300 Mo d'espace en plus) en
@@ -218,8 +202,7 @@
     <systemitem class="username">root</systemitem> :</para>
 <screen role="root">
 <userinput>install -v -m755 -d /usr/share/doc/ffmpeg/api &&
-install -v -m644    doc/doxy/html/* \
-                    /usr/share/doc/ffmpeg/api</userinput>
+install -v -m644    doc/doxy/html/*                     /usr/share/doc/ffmpeg/api</userinput>
 </screen>
    </sect2>
   <sect2 role="commands">

Added: trunk/blfs/traduc/commits/r12265.txt
===================================================================
--- trunk/blfs/traduc/commits/r12265.txt	                        (rev 0)
+++ trunk/blfs/traduc/commits/r12265.txt	2013-11-23 14:29:07 UTC (rev 5142)
@@ -0,0 +1,89 @@
+Révision 12265
+
+fichiers modifiés :
+   multimedia/videoutils/ffmpeg.xml
+   general.ent
+   introduction/welcome/changelog.xml
+
+Log :
+Update to ffmpeg-2.1.1.
+
+Le robot a traité 21 % du commit anglais
+Index: introduction/welcome/changelog.xml
+===================================================================
+--- introduction/welcome/changelog.xml	(révision 12264)
++++ introduction/welcome/changelog.xml	(révision 12265)
+@@ -47,6 +47,10 @@
+       <para>November 21st, 2013</para>
+       <itemizedlist>
+         <listitem>
++          <para>[fernando] - Update to ffmpeg-2.1.1. Fixes
++          <ulink url="&blfs-ticket-root;4356">#4356</ulink>.</para>
++        </listitem>
++        <listitem>
+           <para>[igor] - Update to krb5-1.11.4. Fixes
+           <ulink url="&blfs-ticket-root;4344">#4344</ulink>.</para>
+         </listitem>
+
+Index: multimedia/videoutils/ffmpeg.xml
+===================================================================
+--- multimedia/videoutils/ffmpeg.xml	(révision 12264)
++++ multimedia/videoutils/ffmpeg.xml	(révision 12265)
+@@ -7,10 +7,12 @@
+            "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
+   <!ENTITY ffmpeg-download-ftp  " ">
+   <!ENTITY ffmpeg-size          "6.4 MB">
++                                 for tests)">
++                                 run the tests, after test files are downloaded)">
+ ]>
+ 
+ <sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
+@@ -78,16 +80,6 @@
+       </listitem>
+     </itemizedlist>
+ 
+-<bridgehead renderas="sect3">Additional Downloads</bridgehead>
+-<itemizedlist spacing="compact">
+-<listitem>
+-<para>
+-Required patch:
+-<ulink url="&patch-root;/ffmpeg-&ffmpeg-version;-libavformat_cookies-1.patch"/>
+-</para>
+-</listitem>
+-</itemizedlist>
+     <bridgehead renderas="sect3">FFmpeg Dependencies</bridgehead>
+ 
+     <bridgehead renderas="sect4">Recommended</bridgehead>
+@@ -173,8 +165,7 @@
+       commands:
+     </para>
+ 
+-<screen><userinput>patch -Np1 -i ../ffmpeg-&ffmpeg-version;-libavformat_cookies-1.patch &&
+-sed -i 's/-lflite"/-lflite -lasound"/' configure &&
++<screen><userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &&
+ ./configure --prefix=/usr        \
+             --enable-gpl         \
+             --enable-version3    \
+@@ -218,7 +209,7 @@
+ 
+     <para>
+       If you have <xref linkend="doxygen"/> installed and wish to create the API
+-documentation (takes about 300 MB of space), issue the command
++      documentation (takes about 350 MB of space), issue the command
+       <command>doxygen doc/Doxyfile</command>.
+     </para>
+ 
+@@ -226,8 +217,10 @@
+       To properly test the installation you must have <xref linkend="rsync"/>
+       installed and follow the instructions for the
+       <ulink url="http://ffmpeg.org/fate.html">
+-FFmpeg Automated Testing Environment</ulink>. Note that the BLFS team has
+-not performed this regression testing.
++      FFmpeg Automated Testing Environment</ulink> (fate). First, files used
++      for the tests are downloaded, this can take about 30 min, depending on
++      the connection speeds. Estimated values in "Package Information" do not
++      include this download time. Next, the tests are executed.
+     </para>
+ 
+     <para>
+




More information about the lfs-traducfr mailing list