make this build on arm64. just needed to be able to map from

evbarm -> arm|aarch64.

actually works pretty well.

2 files changed, 22 insertions, 32 deletions

diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index dc4b659f0ce..89c89ff0f36 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.94 2018/05/27 15:27:13 tsutsui Exp $
+$NetBSD: distinfo,v 1.95 2018/11/10 03:48:51 mrg Exp $
 
 SHA1 (mplayer/MPlayer-1.3.0.tar.xz) = 11db20434a4e1aabb9c52f7712241dae1b3730e3
 RMD160 (mplayer/MPlayer-1.3.0.tar.xz) = b6688b186f41267ca3cec59c67afe34396c51ade
 SHA512 (mplayer/MPlayer-1.3.0.tar.xz) = 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
 Size (mplayer/MPlayer-1.3.0.tar.xz) = 13278984 bytes
 SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
-SHA1 (patch-aa) = bd9b8a10923a7aa8ace18cb848727044e72d937d
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
+SHA1 (patch-configure) = afbc92006fc9594ef54e89ad56fe0937f0577e26
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-configure
index 2938c61066f..986bfa438ed 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.35 2018/05/27 15:27:14 tsutsui Exp $
+$NetBSD: patch-configure,v 1.1 2018/11/10 03:48:51 mrg Exp $
 
-o Handle properly sh3 and evbarm ports on NetBSD.
+o Handle properly sh3, evbarm, and arm64 ports on NetBSD.
 o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
   (please see also kern/25076).
 o Delete not needed -Iffmpeg from the CFLAGS.
@@ -10,9 +10,9 @@ o Add necessary libs for aalib support even if the aa option is turned on with
 o Add support for dvb capture on NetBSD.
 o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
 
---- configure.orig	2016-02-13 21:05:42.000000000 +0000
-+++ configure
-@@ -1640,7 +1640,7 @@ else
+--- configure.orig	2016-02-13 13:05:42.000000000 -0800
++++ configure	2018-11-09 19:30:35.590280805 -0800
+@@ -1640,7 +1640,7 @@
        cc_name=$cc_name_tmp
        echocheck "$_cc version"
        cc_vendor=gnu
@@ -21,19 +21,23 @@ o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
        case $cc_version in
          2.96*)
            cc_fail=yes
-@@ -1717,8 +1717,9 @@ if test -z "$_target" ; then
+@@ -1717,8 +1717,13 @@
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
        aarch64*) host_arch=aarch64 ;;
 -      arm*|zaurus|cats) host_arch=arm ;;
 -      sh3|sh4|sh4a) host_arch=sh ;;
-+      arm*|zaurus|cats|evbarm) host_arch=arm ;;
++      arm*|zaurus|cats|evbarm)
++        case "$(uname -p 2>&1)" in
++          aarch64*) host_arch=aarch64 ;;
++          *) host_arch=arm ;;
++        esac ;;
 +      sh3*) host_arch=sh ;;
-+	  sh4|sh4a) host_arch=sh4 ;;
++      sh4|sh4a) host_arch=sh4 ;;
        s390) host_arch=s390 ;;
        s390x) host_arch=s390x ;;
        *mips*) host_arch=mips ;;
-@@ -1930,7 +1931,7 @@ if x86 ; then
+@@ -1930,7 +1935,7 @@
    # gather more CPU information
    pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1)
    pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1)
@@ -42,7 +46,7 @@ o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
    pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
    pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
  
-@@ -2446,7 +2447,12 @@ case "$host_arch" in
+@@ -2446,7 +2451,12 @@
      test $_fast_clz = "auto" && _fast_clz=yes
      ;;
  
@@ -56,7 +60,7 @@ o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
      arch='sh4'
      iproc='sh4'
      ;;
-@@ -2806,23 +2812,23 @@ fi # if darwin && test "$cc_vendor" = "g
+@@ -2806,23 +2816,23 @@
  _install_strip="-s"
  if test -z "$CFLAGS" || test "$_profile" != "" || test "$_debug" != ""; then
    if test "$cc_vendor" = "intel" ; then
@@ -86,7 +90,7 @@ o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
      WARNFLAGS="-W -Wall $WARNFLAGS"
      _install_strip=
    fi
-@@ -2830,8 +2836,8 @@ else
+@@ -2830,8 +2840,8 @@
    warn_cflags=yes
  fi
  
@@ -97,21 +101,7 @@ o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
  
  # On glibc, add some more CPPFLAGS for enabling required functionality.
  cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -2878,10 +2884,11 @@ if test $relocatable = "auto" ; then
-   elif win32 && ! wine ; then
-     relocatable=no
-     res_comment="unnecessary and broken on win32"
--  elif x86_32 && cflag_check -pie ; then
-+  elif x86_32 && cflag_check -fpic -fpie ; then
-     extra_ldflags="$extra_ldflags -pie"
-+    extra_cflags="$extra_cflags -fpic -fpie"
-     relocatable=yes
--    res_comment="non-PIC"
-+    res_comment="fast PIC"
-   elif x86_64 && cflag_check -fpie -pie ; then
-     extra_ldflags="$extra_ldflags -fpie -pie"
-     extra_cflags="$extra_cflags -fpie"
-@@ -4615,7 +4622,11 @@ if test "$_x11" = auto && test "$_x11_he
+@@ -4615,7 +4625,11 @@
             -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
             -L/usr/lib ; do
      if netbsd; then
@@ -124,7 +114,7 @@ o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
      else
        ld_tmp="$I -lXext -lX11 $ld_pthread"
      fi
-@@ -5018,6 +5029,8 @@ if test "$_aa" = yes ; then
+@@ -5018,6 +5032,8 @@
    def_aa='#define CONFIG_AA 1'
    if cygwin ; then
      libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
@@ -133,7 +123,7 @@ o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
    fi
    vomodules="aa $vomodules"
  else
-@@ -5105,7 +5118,6 @@ EOF
+@@ -5105,7 +5121,6 @@
        extra_cflags="$extra_cflags $inc_tmp" && break
    done
  fi
@@ -141,7 +131,7 @@ o Explicitly enable PIE to avoid text relocations on NetBSD/i386 8.x
  if test "$_dvb" = yes ; then
    _dvbin=yes
    inputmodules="dvb $inputmodules"
-@@ -5114,14 +5126,29 @@ if test "$_dvb" = yes ; then
+@@ -5114,14 +5129,29 @@
    aomodules="mpegpes(dvb) $aomodules"
    vomodules="mpegpes(dvb) $vomodules"
  else