svn commit: r372003 - head/multimedia/mplayer/files

[Thomas Zander]

Author: riggs
Date: Sat Nov  1 11:09:00 2014
New Revision: 372003
URL: https://svnweb.freebsd.org/changeset/ports/372003
QAT: https://qat.redports.org/buildarchive/r372003/

Log:
  Fix build on armv6
  - Merge patch to configure script from upstream r37258
  
  PR:		194687
  Submitted by:	mikael.urankar at gmail.com
  Reviewed by:	riggs
  MFH:		2014Q4

Modified:
  head/multimedia/mplayer/files/patch-configure

Modified: head/multimedia/mplayer/files/patch-configure
==============================================================================
--- head/multimedia/mplayer/files/patch-configure	Sat Nov  1 11:05:24 2014	(r372002)
+++ head/multimedia/mplayer/files/patch-configure	Sat Nov  1 11:09:00 2014	(r372003)
@@ -1,6 +1,12 @@
---- configure.orig	2014-08-05 13:12:59.000000000 +0200
-+++ configure	2014-08-15 17:48:16.698117164 +0200
-@@ -649,7 +649,7 @@
+--- configure.orig	2014-08-23 15:59:32.000000000 +0200
++++ configure	2014-11-01 11:03:04.283806013 +0100
+@@ -644,12 +644,13 @@
+ _armv6t2=auto
+ _armvfp=auto
+ vfpv3=auto
++setend=auto
+ neon=auto
+ armthumb=auto
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
@@ -9,7 +15,7 @@
  _ranlib=ranlib
  _windres=windres
  _cc=cc
-@@ -999,7 +999,7 @@
+@@ -999,7 +1000,7 @@
      ld_static=''
      ;;
    --enable-profile)
@@ -18,7 +24,7 @@
      ;;
    --disable-profile)
      _profile=
-@@ -1474,7 +1474,6 @@
+@@ -1474,7 +1475,6 @@
  
    *)
      echo "Unknown parameter: $ac_option"
@@ -26,7 +32,7 @@
      ;;
  
    esac
-@@ -1727,7 +1726,7 @@
+@@ -1727,7 +1727,7 @@
    case "$1" in
        x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
        ia64) host_arch=ia64 ;;
@@ -35,7 +41,7 @@
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -1843,7 +1842,11 @@
+@@ -1843,7 +1843,11 @@
  cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
  echo "yes"
  
@@ -48,7 +54,38 @@
  
  if test -z "$_target" ; then
    cat > $TMPC << EOF
-@@ -3882,7 +3885,7 @@
+@@ -3152,6 +3156,13 @@
+   fi
+   echores "$vfpv3"
+ 
++  echocheck "ARM setend"
++  if test $setend = "auto" ; then
++    setend=no
++    inline_asm_check '"setend be"' && setend=yes
++  fi
++  echores "$setend"
++
+   echocheck "softfloat ABI"
+   softfloat=yes
+   cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
+@@ -3190,7 +3201,7 @@
+   echores "$_iwmmxt"
+ fi
+ 
+-cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 NEON IWMMXT MMI VIS MVI'
++cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI'
+ test "$_altivec"   = yes && cpuexts="ALTIVEC $cpuexts"
+ test "$_mmx"       = yes && cpuexts="MMX $cpuexts"
+ test "$_mmxext"    = yes && cpuexts="MMX2 $cpuexts"
+@@ -3216,6 +3227,7 @@
+ test "$_armv6t2"   = yes && cpuexts="ARMV6T2 $cpuexts"
+ test "$_armvfp"    = yes && cpuexts="VFP $cpuexts"
+ test "$vfpv3"      = yes && cpuexts="VFPV3 $cpuexts"
++test "$setend"     = yes && cpuexts="SETEND $cpuexts"
+ test "$neon"       = yes && cpuexts="NEON $cpuexts"
+ test "$_iwmmxt"    = yes && cpuexts="IWMMXT $cpuexts"
+ test "$_vis"       = yes && cpuexts="VIS $cpuexts"
+@@ -3882,7 +3894,7 @@
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
@@ -57,7 +94,7 @@
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -3892,7 +3895,7 @@
+@@ -3892,7 +3904,7 @@
  EOF
  _pthreads=no
  if ! hpux ; then
@@ -66,7 +103,7 @@
      # for crosscompilation, we cannot execute the program, be happy if we can link statically
      cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
    done
-@@ -4044,7 +4047,7 @@
+@@ -4044,7 +4056,7 @@
    # NOTE: -L/usr/lib is a hack to avoid issues due to a
    # broken libiconv that e.g. macports installs into /opt/local/lib
    # which might get addded to the search path later by e.g. SDL
@@ -75,7 +112,7 @@
      cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
        ld_iconv="$ld_tmp" && _iconv=yes && break
    done
-@@ -5996,7 +5999,7 @@
+@@ -5996,7 +6008,7 @@
  elif dragonfly ; then
    default_cdrom_device="/dev/cd0"
  elif freebsd ; then
@@ -84,7 +121,7 @@
  elif openbsd ; then
    default_cdrom_device="/dev/rcd0c"
  elif sunos ; then
-@@ -6009,7 +6012,7 @@
+@@ -6009,7 +6021,7 @@
    default_cdrom_device="/dev/cdrom"
  fi
  
@@ -93,7 +130,7 @@
    default_dvd_device=$default_cdrom_device
  elif darwin ; then
    default_dvd_device="/dev/rdiskN"
-@@ -6608,7 +6611,7 @@
+@@ -6609,7 +6621,7 @@
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
@@ -102,7 +139,7 @@
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -7093,6 +7096,16 @@
+@@ -7094,6 +7106,16 @@
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
@@ -119,7 +156,7 @@
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7492,7 +7505,7 @@
+@@ -7493,7 +7515,7 @@
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@@ -128,7 +165,7 @@
  fi
  echores "$_mencoder"
  
-@@ -8421,7 +8434,7 @@
+@@ -8422,7 +8444,7 @@
  EXESUF      = $_exesuf
  EXESUFS_ALL = .exe