Changeset aebb5271

Timestamp:

07/12/2022 05:58:32 AM (22 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

86bb3fe8

Parents:

dafe226

Message:

ffmpeg5 update: Fix building QtWebEngine with ffmpeg-5.

Files:

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

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>July 12th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix building QtWebEngine with ffmpeg-5.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to audacious and audacious-plugins-4.2.

x/lib/qtwebengine.xml

@@ -239 +239 @@
       <listitem>
         <para>
-          Required patch:-->
+          Required patch:
           <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-ffmpeg5_fixes-1.patch"/>
         </para>
       </listitem>
@@ -333 +339 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-1.patch</userinput></screen>
+
+    <para>
+      Apply a patch that resolves problems when building with ffmpeg-5:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-ffmpeg5_fixes-1.patch</userinput></screen>
 
 <!-- start of commands for git versions only -->