From 3df23984b4715e8446ed3bd7ebc9c018b03b78db Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Mon, 11 Jul 2022 22:32:06 -0500
Subject: [PATCH] ffmpeg5 update: Turn off ffmpeg support in transcode.

Since ffmpeg5 no longer carries libavresample, we can't build transcode without
disabling ffmpeg support.. With some rudimentary testing, it seems that this
doesn't have any negative impact.
---
 introduction/welcome/changelog.xml  |  5 +++++
 multimedia/videoutils/transcode.xml | 17 ++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 142b9e01bb..1381c39cc4 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,11 @@
     <listitem>
       <para>July 12th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Remove ffmpeg support from transcode since
+          libavresample has been removed from ffmpeg. This allows building and
+          using this package again.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Disable libva support in VLC so that it builds with
           ffmpeg-5. Upstream has said that no port will be available for VLC-3
diff --git a/multimedia/videoutils/transcode.xml b/multimedia/videoutils/transcode.xml
index 7fd0c206f1..c907ce8ca8 100644
--- a/multimedia/videoutils/transcode.xml
+++ b/multimedia/videoutils/transcode.xml
@@ -90,12 +90,14 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
+ <!--
       <listitem>
         <para>
           Required patch to fix API changes in ffmpeg:
           <ulink url="&patch-root;/transcode-&transcode-version;-ffmpeg4-1.patch"/>
         </para>
       </listitem>
+-->
       <listitem>
         <para>
           Required patch to fix some issues exposed by GCC 10 and later:
@@ -106,10 +108,12 @@
 
     <bridgehead renderas="sect3">Transcode Dependencies</bridgehead>
 
+<!-- ffmpeg does not carry libavresample anymore, so we'll work around it.
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="ffmpeg"/> (configured with --enable-avresample)
+      <xref linkend="ffmpeg"/> (configured with - -enable-avresample)
     </para>
+-->
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -155,6 +159,7 @@
   <sect2 role="installation">
     <title>Installation of Transcode</title>
 
+<!-- ffmpeg5 no longer carries libavresample.
     <note>
       <para>
         The details of how the <application>FFmpeg</application> libraries
@@ -173,6 +178,7 @@
         <command>ffmpeg</command> directly on the command line.
       </para>
     </note>
+-->
 
     <note>
       <para>
@@ -192,12 +198,12 @@
 <screen><userinput>sed -i 's|doc/transcode|&amp;-$(PACKAGE_VERSION)|' \
        $(find . -name Makefile.in -exec grep -l 'docsdir =' {} \;) &amp;&amp;
 
-patch -Np1 -i ../transcode-&transcode-version;-ffmpeg4-1.patch   &amp;&amp;
 patch -Np1 -i ../transcode-&transcode-version;-gcc10_fix-1.patch &amp;&amp;
 
 ./configure --prefix=/usr     \
             --enable-alsa     \
-            --enable-libmpeg2 &amp;&amp;
+            --enable-libmpeg2 \
+            --disable-ffmpeg  &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -219,6 +225,11 @@ make</userinput></screen>
       <command>sed -i ...</command>: Fixes install location for documentation.
     </para>
 
+    <para>
+      <parameter>--disable-ffmpeg</parameter>: This switch disables support for
+      ffmpeg because libavresample was removed in ffmpeg-5.x.
+    </para>
+
   </sect2>
 
   <sect2 role="content">