git: 0cbae2d0ef0a - main - multimedia/mplayer: fix build on powerpc*

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Thu, 16 May 2024 22:19:55 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0cbae2d0ef0aa7edec0bffa9a6371d5c0bc5c535

commit 0cbae2d0ef0aa7edec0bffa9a6371d5c0bc5c535
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-05-16 22:18:18 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2024-05-16 22:19:50 +0000

    multimedia/mplayer: fix build on powerpc*
    
    cc: error: unsupported option '-mabi=' for target 'powerpc64-unknown-freebsd14.1'
---
 multimedia/mplayer/files/patch-configure | 33 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index e9feca44baaa..b84374f958d5 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2023-02-20 22:41:00 UTC
+--- configure.orig	2024-05-16 21:54:48 UTC
 +++ configure
-@@ -666,7 +666,7 @@ armthumb=auto
+@@ -666,7 +666,7 @@ _altivec=auto
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
@@ -26,7 +26,7 @@
      ;;
  
    esac
-@@ -1529,40 +1528,6 @@ rm -f "$TMPLOG"
+@@ -1529,40 +1528,6 @@ echo >> "$TMPLOG"
  echo configuration: $configuration > "$TMPLOG"
  echo >> "$TMPLOG"
  
@@ -76,7 +76,7 @@
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -1970,7 +1935,11 @@ echocheck "working compiler"
+@@ -1970,7 +1935,11 @@ echo "yes"
  cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
  echo "yes"
  
@@ -89,7 +89,7 @@
  
  if test -z "$_target" ; then
    cat > $TMPC << EOF
-@@ -3100,7 +3069,7 @@ if x86_32 ; then
+@@ -3109,7 +3078,7 @@ if x86_32 ; then
      _pref_as_version='2.16.92'
      echo 'pabsd %xmm0, %xmm1' >> $TMPS
    fi
@@ -98,7 +98,18 @@
  
    if test "$as_verc_fail" != yes ; then
      echores "ok"
-@@ -3367,6 +3336,13 @@ if arm ; then
+@@ -3269,8 +3238,8 @@ if ppc && ( test "$_altivec" = yes || test "$_runtime_
+ 
+     # check if AltiVec is supported by the compiler, and how to enable it
+     echocheck "GCC AltiVec flags"
+-    if $(cflag_check -maltivec -mabi=altivec) ; then
+-    _altivec_gcc_flags="-maltivec -mabi=altivec"
++    if $(cflag_check -maltivec) ; then
++    _altivec_gcc_flags="-maltivec"
+     # check if <altivec.h> should be included
+         if $(header_check altivec.h $_altivec_gcc_flags) ; then
+             def_altivec_h='#define HAVE_ALTIVEC_H 1'
+@@ -3376,6 +3345,13 @@ if arm ; then
    fi
    echores "$setend"
  
@@ -112,7 +123,7 @@
    echocheck "softfloat ABI"
    softfloat=yes
    cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
-@@ -4277,7 +4253,7 @@ echocheck "pthread"
+@@ -4286,7 +4262,7 @@ elif freebsd || netbsd || openbsd || bsdos ; then
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
@@ -121,7 +132,7 @@
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -4287,7 +4263,7 @@ int main(void) { pthread_t tid; return pthread_create(
+@@ -4296,7 +4272,7 @@ if ! hpux ; then
  EOF
  _pthreads=no
  if ! hpux ; then
@@ -192,7 +203,7 @@
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -7391,6 +7359,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
+@@ -7399,6 +7367,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
@@ -209,7 +220,7 @@
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7808,7 +7786,7 @@ echores "$_mp3lame"
+@@ -7816,7 +7794,7 @@ if test "$_mencoder" = no ; then
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@@ -218,7 +229,7 @@
  fi
  echores "$_mencoder"
  
-@@ -8414,7 +8392,7 @@ libs_mplayer=$ld_tmp
+@@ -8422,7 +8400,7 @@ libs_mplayer=$ld_tmp
  
  #############################################################################