Changeset aa9c0853 for xsoft/graphweb/chromium.xml

Timestamp:

03/24/2017 05:33:16 AM (7 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

2eb903f

Parents:

0acce93

Message:

Remove unneeded '-DLIB_INSTALL_DIR' from KF5 and Plasma build instructions, Clean up Chromium instructions. Thanks Bruce.

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

File:

• xsoft/graphweb/chromium.xml (modified) (4 diffs)

xsoft/graphweb/chromium.xml

@@ -166 +166 @@
     <para>Fix a build issue with GCC-6:</para>
 
-<screen><userinput>sed "s/^config(\"compiler\") {/&amp;\ncflags_cc = [ \"-fno-delete-null-pointer-checks\" ]/" \
+<screen><userinput>sed 's/^config("compiler") {/&amp;\ncflags_cc = [ "-fno-delete-null-pointer-checks" ]/' \
     -i build/config/linux/BUILD.gn</userinput></screen>
 
-    <para>If you'd like to enable the use of the
+    <para>Enable the use of the
     <ulink url="http://www.widevine.com/">WideVine</ulink> plugin, needed for
-    Netflix support (see the WideVine section below), you'll need to define an
+    Netflix support (see the WideVine section below). Define an
     available product name ("Pinkie Pie" in this case) with the following
     command:</para>
 
-<screen><userinput>sed "s/WIDEVINE_CDM_AVAILABLE/&amp;\n\n#define WIDEVINE_CDM_VERSION_STRING \"Pinkie Pie\"/" \
+<screen><userinput>sed 's/WIDEVINE_CDM_AVAILABLE/&amp;\n\n#define WIDEVINE_CDM_VERSION_STRING "Pinkie Pie"/' \
     -i third_party/widevine/cdm/stub/widevine_cdm_version.h</userinput></screen>
 
@@ -230 +230 @@
     </note>
 
-<screen><userinput>GN_CONFIG=("google_api_key=\"AIzaSyDxKL42zsPjbke5O8_rPVpVrLrJ8aeE9rQ\""
-"google_default_client_id=\"595013732528-llk8trb03f0ldpqq6nprjp1s79596646.apps.googleusercontent.com\""
-"google_default_client_secret=\"5ntt6GbbkjnTVXx-MSxbmx5e\""
+<screen><userinput>GN_CONFIG=('google_api_key="AIzaSyDxKL42zsPjbke5O8_rPVpVrLrJ8aeE9rQ"'
+'google_default_client_id="595013732528-llk8trb03f0ldpqq6nprjp1s79596646.apps.googleusercontent.com"'
+'google_default_client_secret="5ntt6GbbkjnTVXx-MSxbmx5e"'
 'clang_use_chrome_plugins=false'
 'enable_hangout_services_extension=true'
@@ -284 +284 @@
 ln -svf /usr/lib/chromium/chromedriver /usr/bin/              &amp;&amp;
 
-install -vm755 out/Release/libwidevinecdmadapter.so \
-               /usr/lib/chromium/                             &amp;&amp;
 install -vDm644 out/Release/gen/content/content_resources.pak \
                 /usr/lib/chromium/                            &amp;&amp;
@@ -338 +336 @@
 esac</userinput></screen>
 
-    <para>As the <systemitem class="username">root</systemitem> user, install
-    the WideVine plugin with the following command:</para>
-
-<screen role="root"><userinput>tar -xf data.tar.xz
-install -vm755 opt/google/chrome/libwidevinecdm.so \
-    /usr/lib/chromium/</userinput></screen>
+    <para>As the <systemitem class="username">root</systemitem> user, enable
+    the WideVine plugin with the following commands:</para>
+
+<!-- Note that libwidevinecdmadapter.so is not in the tarball.  It is
+created only if enable_widevine=true i sset in GN_CONFIG -->
+
+<screen role="root"><userinput>tar -xf data.tar.xz                                                        &amp;&amp;
+install -vm755 ../out/Release/libwidevinecdmadapter.so /usr/lib/chromium/  &amp;&amp;
+install -vm755 opt/google/chrome/libwidevinecdm.so  /usr/lib/chromium/</userinput></screen>
 
   </sect2>