Author: dj Date: Mon Jan 8 16:39:09 2018 New Revision: 19657 Log: Don't use system ffmpeg for chromium.
Modified: trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/xsoft/graphweb/chromium.xml Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Mon Jan 8 15:12:18 2018 (r19656) +++ trunk/BOOK/general.ent Mon Jan 8 16:39:09 2018 (r19657) @@ -1,12 +1,12 @@ <!-- $LastChangedBy$ $Date$ --> -<!ENTITY day "06"> <!-- Always 2 digits --> +<!ENTITY day "08"> <!-- Always 2 digits --> <!ENTITY month "01"> <!-- Always 2 digits --> <!ENTITY year "2018"> <!ENTITY copyrightdate "2001-&year;"> <!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 #] --> <!ENTITY lfs-version "development"> <!-- x.y|development --> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Mon Jan 8 15:12:18 2018 (r19656) +++ trunk/BOOK/introduction/welcome/changelog.xml Mon Jan 8 16:39:09 2018 (r19657) @@ -42,6 +42,16 @@ </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> <itemizedlist> <listitem> Modified: trunk/BOOK/xsoft/graphweb/chromium.xml ============================================================================== --- trunk/BOOK/xsoft/graphweb/chromium.xml Mon Jan 8 15:12:18 2018 (r19656) +++ trunk/BOOK/xsoft/graphweb/chromium.xml Mon Jan 8 16:39:09 2018 (r19657) @@ -136,7 +136,7 @@ <bridgehead renderas="sect4">Recommended</bridgehead> <para role="recommended"> <xref linkend="cacerts"/> (runtime), - <xref linkend="ffmpeg"/>, +<!-- <xref linkend="ffmpeg"/>, --> <xref linkend="flac"/>, <xref linkend="git"/>, <!-- <xref linkend="icu"/>, --> @@ -156,6 +156,7 @@ <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"> + <xref linkend="ffmpeg"/> (currently broken), <xref linkend="GConf"/>, <xref linkend="icu"/> (currently broken), <xref linkend="gnome-keyring"/>, @@ -220,7 +221,7 @@ <!-- 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/*" \ \! -path "*third_party/$LIB/chromium/*" \ @@ -233,7 +234,7 @@ done && 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--> && python third_party/libaddressinput/chromium/tools/update-strings.py</userinput></screen> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page