Changeset 2073464

Timestamp:

08/06/2023 05:58:11 PM (11 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.0, 12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

7b8b07f8

Parents:

46302d9

Message:

Fix building ffmpeg-6.0 with binutils-2.41

Add a patch from upstream.

Also clean up the xml by deleting a lot of old comments
that are not needed any more.

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/ffmpeg.xml (modified) (9 diffs)

introduction/welcome/changelog.xml

@@ -39 +39 @@
     </listitem>
     -->
+   <listitem>
+     <para>August 6th, 2023</para>
+     <itemizedlist>
+       <listitem>
+         <para>[bdubbs] - Add a patch rom upstream that allows 
+         ffmpeg-6.0 to build with binutils-2.41. Fixes
+         <ulink url="&blfs-ticket-root;18367">#18367</ulink>.</para>
+       </listitem>
+     </itemizedlist>
+   </listitem>
+
    <listitem>
      <para>August 5th, 2023</para>

multimedia/videoutils/ffmpeg.xml

@@ -80 +80 @@
           Required patch:
           <ulink url="&patch-root;/ffmpeg-&ffmpeg-version;-chromium_method-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/ffmpeg-&ffmpeg-version;-binutils_2.41-1.patch"/>
         </para>
       </listitem>
@@ -132 +138 @@
       <ulink url="https://github.com/festvox/flite">Flite</ulink>,
       <ulink url="https://www.quut.com/gsm/">GSM</ulink>,
-      <!--<ulink url="http://xhevc.com/en/hevc/decoder/download.jsp">HEVC/H.265</ulink>,-->
-      <!--<ulink url="http://www.ladspa.org/">LADSPA</ulink>,-->
       <ulink url="https://tipok.org.ua/node/17">libaacplus</ulink>,
       <ulink url="https://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
@@ -146 +150 @@
       <ulink url="https://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
       <ulink url="https://www.libssh.org/">libssh</ulink>,
-      <!--<ulink url="https://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),-->
       <ulink url="https://openal.org/">OpenAL</ulink>,
       <ulink url="https://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
@@ -154 +157 @@
       <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-aacenc/">vo-aaenc</ulink>,
       <ulink url="https://sourceforge.net/projects/opencore-amr/files/vo-amrwbenc/">vo-amrwbenc</ulink>, and
-      <!--<ulink url="http://www.videolan.org/developers/x265.html">x265 (H.265/MPEG-H HEVC)</ulink>, and-->
       <ulink url="https://zapping.sourceforge.net/ZVBI/">ZVBI</ulink>
     </para>
@@ -180 +182 @@
 
     <para>
+      Now, apply a patch that allows the package to build with binutils-2.41:
+      <!-- From upstream -->
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../ffmpeg-&ffmpeg-version;-binutils_2.41-1.patch</userinput></screen>
+
+    <para>
       Install <application>FFmpeg</application> by running the following
       commands:
     </para>
 
-<!--<screen><userinput>sed -i 's/-lflite"/-lflite -lasound"/' configure &amp;&amp;-->
 <screen><userinput>./configure --prefix=/usr        \
             --enable-gpl         \
@@ -216 +224 @@
     </para>
 
-<!-- sed -i '$s/$/\n\n@bye/' doc/{git-howto,nut,fate}.texi             &amp;&amp;
-sed -i '/machine:i386/ s/\\/@backslashchar{}/g' doc/platform.texi &amp;&amp; -->
 <screen remap="doc"><userinput>pushd doc &amp;&amp;
 for DOCNAME in `basename -s .html *.html`
@@ -372 +378 @@
     </para>
 
-    <!-- Library was removed in 5.0.1
-    <para>
-      <parameter>- -enable-avresample</parameter>: Enables
-      <xref linkend="transcode"/> to be compiled.
-    </para>
-    -->
-
     <para>
       <parameter>--enable-libaom</parameter>: Enables AV1 audio and video
@@ -473 +472 @@
 
   </sect2>
-
-<!-- ffserver has been removed
-  <sect2 role="configuration">
-    <title>Configuring FFmpeg</title>
-
-    <sect3 id="ffmpeg-config">
-      <title>Config Files</title>
-
-      <para>
-         <filename>/etc/ffserver.conf</filename>
-         <filename>~/.ffmpeg/ffserver-config</filename>
-      </para>
-
-      <indexterm zone="ffmpeg ffmpeg-config">
-        <primary
-        sortas="e-AA.ffmpeg-ffserver-config">~/.ffmpeg/ffserver-config</primary>
-      </indexterm>
-
-      <indexterm zone="ffmpeg ffmpeg-config">
-        <primary sortas="e-etc-ffserver.conf">/etc/ffserver.conf</primary>
-      </indexterm>
-
-      <para>
-        You'll find a sample <command>ffserver</command> configuration file at
-        <filename>doc/ffserver.conf</filename> in the source tree.
-      </para>
-
-    </sect3>
-
-  </sect2>
-  -->
 
   <sect2 role="content">
@@ -576 +544 @@
       </varlistentry>
 
-<!-- Not found in 4.3.2
-      <varlistentry id="ffserver">
-        <term><command>ffserver</command></term>
-        <listitem>
-          <para>
-            is a streaming server for everything that <command>ffmpeg</command>
-            could use as input (files, streams, TV card input, webcam, etc)
-          </para>
-          <indexterm zone="ffmpeg ffserver">
-            <primary sortas="b-ffserver">ffserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
       <varlistentry id="qt-faststart">
         <term><command>qt-faststart</command></term>