svn commit: r486565 - in head/multimedia/libvpx: . files

[Jan Beich]

Author: jbeich
Date: Tue Dec  4 00:51:44 2018
New Revision: 486565
URL: https://svnweb.freebsd.org/changeset/ports/486565

Log:
  multimedia/libvpx: assume NEON on armv7

Modified:
  head/multimedia/libvpx/Makefile   (contents, props changed)
  head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c   (contents, props changed)

Modified: head/multimedia/libvpx/Makefile
==============================================================================
--- head/multimedia/libvpx/Makefile	Tue Dec  4 00:51:30 2018	(r486564)
+++ head/multimedia/libvpx/Makefile	Tue Dec  4 00:51:44 2018	(r486565)
@@ -38,7 +38,6 @@ ALL_TARGET=	# empty
 
 OPTIONS_DEFINE=	DEBUG MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT TEST THREADS
 OPTIONS_DEFAULT=MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT THREADS
-OPTIONS_EXCLUDE_aarch64=RTCPU
 OPTIONS_EXCLUDE_powerpcspe=RTCPU
 OPTIONS_SUB=		yes
 

Modified: head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c
==============================================================================
--- head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c	Tue Dec  4 00:51:30 2018	(r486564)
+++ head/multimedia/libvpx/files/patch-vpx__ports_arm__cpudetect.c	Tue Dec  4 00:51:44 2018	(r486565)
@@ -1,5 +1,14 @@
 --- vpx_ports/arm_cpudetect.c.orig	2017-01-12 20:27:27 UTC
 +++ vpx_ports/arm_cpudetect.c
+@@ -38,7 +38,7 @@ static int arm_cpu_env_mask(void) {
+   return env && *env ? (int)strtol(env, NULL, 0) : ~0;
+ }
+ 
+-#if !CONFIG_RUNTIME_CPU_DETECT
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON)
+ 
+ int arm_cpu_caps(void) {
+   /* This function should actually be a no-op. There is no way to adjust any of
 @@ -147,7 +147,57 @@ int arm_cpu_caps(void) {
    }
    return flags & mask;