Changeset a7787e3

Timestamp:

07/22/2024 03:57:57 PM (8 weeks ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

12.2, lazarus, trunk, xry111/for-12.3, xry111/spidermonkey128

Children:

3981c8d

Parents:

1d706cd2

Message:

Allow QtWebEngine to use the system version of ffmpeg.

This required a patch and a sed to work correctly, the patch being
required for ffmpeg support and the sed being because the BLFS build of
ffmpeg does not use OpenH264

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qtwebengine.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -42 +42 @@
       <para>July 22nd, 2024</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Adapt QtWebEngine to use system ffmpeg. Fixes
+          <ulink url="&blfs-ticket-root;20102">#20102</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to intel-media-24.2.5/intel-gmmlib-22.4.1. Fixes

x/lib/qtwebengine.xml

@@ -115 +115 @@
     </itemizedlist>
 
-<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
+          <!-- keep links for releases and git versions as a reminder
+               that the tarball names names differ
+          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/>-->
+          <!--<ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-5.15.7-1.patch"/>-->
       <listitem>
         <para>
           Required patch:
-          <!\-\- keep links for releases and git versions as a reminder
-               that the tarball names names differ
-          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> \-\->
-
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-5.15.7-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-2.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-ffmpeg5_fixes-1.patch"/>
-        </para>
-      </listitem>
-  
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-icu_73-1.patch"/>
+          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-ffmpeg7_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
 
     <bridgehead renderas="sect3">qtwebengine Dependencies</bridgehead>
@@ -197 +177 @@
   <sect2 role="installation">
     <title>Installation of qtwebengine</title>
+
+    <para>
+     First, adapt the bundled copy of Chromium to the latest version of ffmpeg:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -d src/3rdparty/chromium &lt; ../qtwebengine-&qtwebengine-version;-ffmpeg7_fixes-1.patch</userinput></screen>
+
+    <para>
+      Next, fix a build failure that occurs because the BLFS build of ffmpeg
+      does not use OpenH264:
+    </para>
+
+<screen><userinput remap="pre">sed -e '189 s/=/&amp; false/' \
+    -e '190 d'            \
+    -i.orig src/3rdparty/chromium/third_party/webrtc/webrtc.gni</userinput></screen>
+
     <para>
       Install <application>qtwebengine</application> by running the following
@@ -202 +198 @@
     </para>
 
-
-<!-- Note to whoever is updating this next, test to see if it FTBFS/Runtime Errors with 
-system FFMpeg, I can't get it to work on 6.7.0 and FFMpeg 7.0 [rahul] -->
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
 cmake -D CMAKE_MESSAGE_LOG_LEVEL=STATUS             \
-      -D QT_FEATURE_webengine_system_ffmpeg=OFF     \
+      -D QT_FEATURE_webengine_system_ffmpeg=ON      \
       -D QT_FEATURE_webengine_system_icu=ON         \
       -D QT_FEATURE_webengine_system_libevent=ON    \