Changeset cbf7be5 for multimedia/libdriv/gst10-libav.xml

Timestamp:

05/31/2019 03:04:31 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

fb7ec07

Parents:

4d390d2

Message:

Merge to HEAD 21638.

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

File:

• multimedia/libdriv/gst10-libav.xml (modified) (5 diffs)

multimedia/libdriv/gst10-libav.xml

@@ -11 +11 @@
   <!ENTITY gst10-libav-buildsize     "87 MB">
   <!ENTITY gst10-libav-time          "less than 0.1 SBU (Using parallelism=4)">
-  <!-- A majority of the time spent compiling is ASM files. -->
 ]>
 
@@ -78 +77 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="ffmpeg"/> and
       <xref linkend="gst10-plugins-base"/>
     </para>
@@ -83 +83 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="ffmpeg"/> and
+      <!-- With 1.14.x and before, an internal copy of FFMPEG was used.
+      This is no longer the case, so it is now required. -->
       <xref linkend="yasm"/>
     </para>
@@ -101 +102 @@
     <title>Installation of GStreamer Libav</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gst10-objc-error.xml"/>
+    
     <para>
       Install <application>GStreamer Libav</application> by running the following
@@ -127 +131 @@
   </sect2>
 
+  <!-- No longer included with Meson change
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <option>--with-libav-extra-configure="--disable-yasm"</option>: Use this
+      <option>- -with-libav-extra-configure="- -disable-yasm"</option>: Use this
       switch if you don't have <application>yasm</application> installed.
     </para>
 
   </sect2>
+  -->
 
   <sect2 role="content">