Changeset 91e89cd

Timestamp:

01/09/2018 12:39:09 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

76cde6c0

Parents:

6c9625c

Message:

Don't use system ffmpeg for chromium.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/graphweb/chromium.xml (modified) (4 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "08">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 6th, &year;">
+<!ENTITY releasedate  "January 8th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
 -->
+    <listitem>
+      <para>January 9th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Remove instructions to delete ffmpeg sources in
+          Chromium source tree.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>January 5th, 2018</para>

xsoft/graphweb/chromium.xml

@@ -137 +137 @@
     <para role="recommended">
       <xref linkend="cacerts"/> (runtime),
-      <xref linkend="ffmpeg"/>,
+<!--      <xref linkend="ffmpeg"/>, -->
       <xref linkend="flac"/>,
       <xref linkend="git"/>,
@@ -157 +157 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="ffmpeg"/> (currently broken),
       <xref linkend="GConf"/>,
       <xref linkend="icu"/> (currently broken),
@@ -221 +222 @@
 <!-- Again, thanks to Arch, this is much better than listing all the needed
 shipped libs required to use the remove_bundled_files.py script -->
-<screen><userinput>for LIB in ffmpeg flac freetype harfbuzz-ng<!-- icu libevent--> libjpeg \
+<screen><userinput>for LIB in <!--ffmpeg -->flac freetype harfbuzz-ng<!-- icu libevent--> libjpeg \
            libjpeg_turbo libpng libwebp <!-- libxml libvpx-->libxslt yasm; do
     find -type f -path "*third_party/$LIB/*"      \
@@ -234 +235 @@
 
 python build/linux/unbundle/replace_gn_files.py                   \
-    --system-libraries ffmpeg flac <!-- harfbuzz-ng -->libjpeg libxml libevent \
+    --system-libraries<!-- ffmpeg--> flac <!-- harfbuzz-ng -->libjpeg libxml libevent \
                        libpng libwebp libxslt opus yasm <!-- freetype libxml libvpx-->      &amp;&amp;
 python third_party/libaddressinput/chromium/tools/update-strings.py</userinput></screen>