[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg/files: ffmpeg-0.7.6-fix_ppc64_32ul.patch

["Kacper Kowalik (xarthisius)" <xarthisius@gentoo.org>]

xarthisius    11/10/23 08:18:24

  Added:                ffmpeg-0.7.6-fix_ppc64_32ul.patch
  Log:
  (non-maintainer commit) Backport patch that allows build system to properly detect arch on ppc64 with 32ul. Fixes bug 341235 and 387207
  
  (Portage version: 2.2.0_alpha69/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/files/ffmpeg-0.7.6-fix_ppc64_32ul.patch?rev=1.1&content-type=text/plain

Index: ffmpeg-0.7.6-fix_ppc64_32ul.patch
===================================================================
Autodetect PowerPC vs. PowerPC64.

This is the same code as for x86_64.
This is necessary because uname returns PPC64 if the hardware
is 64 bit, however the userland can still be fully 32 bit.
In that case FFmpeg fails to compile because some macros in the
asm code are set up incorrectly.
For details see https://bugs.gentoo.org/show_bug.cgi?id=341235
https://bugs.gentoo.org/show_bug.cgi?id=387207

author: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

diff --git a/configure b/configure
index 6aa194c..0752d73 100755
--- a/configure
+++ b/configure
@@ -2188,13 +2188,9 @@ case "$arch" in
         arch="parisc"
         subarch="parisc64"
     ;;
-    "Power Macintosh"|ppc|powerpc)
+    "Power Macintosh"|ppc|powerpc|ppc64|powerpc64)
         arch="ppc"
     ;;
-    ppc64|powerpc64)
-        arch="ppc"
-        subarch="ppc64"
-    ;;
     s390|s390x)
         arch="s390"
     ;;
@@ -2392,6 +2388,11 @@ EOF
             spic=$shared
         fi
     ;;
+    ppc)
+        check_cc <<EOF && subarch="ppc64"
+        int test[(int)sizeof(char*) - 7];
+EOF
+    ;;
 esac
 
 enable $subarch