From 2415b9446dfd02c1435e66c821d2904954991a22 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 21 Aug 2023 11:45:24 -0500
Subject: [PATCH] Fix mplayer-1.5 FTBFS with binutils-2.41

There are actually two patches for MPlayer-1.5 needed related to ffmpeg.
One is also related to binutils-2.41.
This fix adds those patches and fixes ticket #18381.
---
 multimedia/videoutils/mplayer.xml | 38 ++++++++++++++++---------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/multimedia/videoutils/mplayer.xml b/multimedia/videoutils/mplayer.xml
index 92012aae0e..fb91330558 100644
--- a/multimedia/videoutils/mplayer.xml
+++ b/multimedia/videoutils/mplayer.xml
@@ -44,18 +44,8 @@
       can play video files without an <application>X Window System</application>
       installed.
     </para>
-    <!--
-    <note>
-      <para>The latest <quote>stable</quote> version was released in April
-      2019. That version no longer builds properly with the latest build tools
-      and system libraries. The version below is a snapshot that may not be
-      available on the upstream server but was uploaded
-      to our file server.  If you want to test a later version, check
-      <ulink url="https://mplayerhq.hu/MPlayer/releases/"/>.
-      </para>
-    </note>
-    -->
-    &lfs113_checked;
+
+    &lfs120_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -91,16 +81,21 @@
       </listitem>
     </itemizedlist>
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-<!--
+
     <itemizedlist spacing='compact'>
-      <title>Required Patch</title>
+      <title>Required Patches</title>
       <listitem>
         <para>
-          <ulink url="&patch-root;/MPlayer-1.3.0-x264_fix-1.patch"/>
+          <ulink url="&patch-root;/MPlayer-1.5-upstream_ffmpg6_fixes-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <ulink url="&patch-root;/ffmpeg-6.0-binutils_2.41-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <itemizedlist spacing='compact'>
       <title>Skins</title>
       <listitem>
@@ -252,6 +247,14 @@
     <sect3>
       <title>Main MPlayer Installation</title>
 
+      <para>
+        There are two patches related to <xref linkend="ffmpeg"/>
+        that need to be applied.  Do that now:
+      </para>
+
+<screen><userinput>patch -Np1 -i ../MPlayer-1.5-upstream_ffmpg6_fixes-1.patch &amp;&amp;
+patch -Np1 -d ffmpeg -i ../ffmpeg-6.0-binutils_2.41-1.patch</userinput></screen>
+
       <note>
         <para>
           The package maintainers recommend building without any
@@ -275,8 +278,7 @@
             --confdir=/etc/mplayer        \
             --enable-dynamic-plugins      \
             --disable-libmpeg2-internal   \
-<!--            - -disable-ffmpeg_a            \
--->            --enable-menu                 \
+            --enable-menu                 \
             --enable-runtime-cpudetection \
             --enable-gui                  &amp;&amp;
 make</userinput></screen>