Changeset 78ff3a8 for multimedia/videoutils/ffmpeg.xml

Timestamp:

10/05/2014 01:04:43 PM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

kde5-14686, systemd-13485

Children:

f87a1fd

Parents:

9d8d0ca

Message:

Merge more updates from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14498 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• multimedia/videoutils/ffmpeg.xml (modified) (8 diffs)

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        "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)">
 ]>
 
@@ -140 +140 @@
       <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>
 
@@ -172 +173 @@
             --enable-libvpx      \
             --enable-libx264     \
-            --enable-x11grab     &amp;&amp;
+            --enable-x11grab     \
+            --docdir=/usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
 make &amp;&amp;
 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:
@@ -210 +208 @@
       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>
@@ -227 +225 @@
       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>
 
@@ -239 +237 @@
 <screen role="root"><userinput>make install &amp;&amp;
 install -v -m755    tools/qt-faststart /usr/bin &amp;&amp;
-install -v -m755 -d /usr/share/doc/ffmpeg &amp;&amp;
 install -v -m644    doc/*.txt \
-                    /usr/share/doc/ffmpeg</userinput></screen>
-
-    <para>
-      If HTML documentation was built, issue the following command to install it:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 doc/*.html \
-                 /usr/share/doc/ffmpeg</userinput></screen>
+                    /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
+
+    <para>
+      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/*. pdf \
+                 /usr/share/doc/ffmpeg-&ffmpeg-version; &amp;&amp;
+install -v -m644 doc/*.ps   \
+                 /usr/share/doc/ffmpeg-&ffmpeg-version;</userinput></screen>
 
     <para>
@@ -256 +257 @@
     </para>
 
-<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>
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/ffmpeg-&ffmpeg-version;/api                       &amp;&amp;
+cp -vr doc/doxy/html/* /usr/share/doc/ffmpeg-&ffmpeg-version;/api                    &amp;&amp;
+find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type f -exec chmod -c 0644 "{}" ";" &amp;&amp;
+find /usr/share/doc/ffmpeg-&ffmpeg-version;/api -type d -exec chmod -c 0755 "{}" ";"</userinput></screen>
 
   </sect2>
@@ -428 +429 @@
           /usr/include/libswscale,
           /usr/share/ffmpeg, and
-          /usr/share/doc/ffmpeg
+          /usr/share/doc/ffmpeg-&ffmpeg-version;
         </seg>
       </seglistitem>