From 5a2775619f23d1cb49574fbaee23694d27f05198 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 17 Jan 2017 18:21:21 +0000
Subject: multimedia/libvpx: grab and drop architecture whitelist

PR:		216191
Approved by:	ashish (previous maintainer)
MFH:		2017Q1
---
 multimedia/libvpx/Makefile                         | 37 +++++++---------------
 .../libvpx/files/extra-patch-build_make_Makefile   | 11 -------
 multimedia/libvpx/files/patch-configure            | 13 --------
 3 files changed, 12 insertions(+), 49 deletions(-)
 delete mode 100644 multimedia/libvpx/files/extra-patch-build_make_Makefile
 delete mode 100644 multimedia/libvpx/files/patch-configure

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index ec61448fede0..8a45eccd2787 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -6,7 +6,7 @@ DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.1
 CATEGORIES=	multimedia
 
-MAINTAINER=	ashish@FreeBSD.org
+MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	VP8/VP9 Codec SDK
 
 LICENSE=	BSD3CLAUSE
@@ -34,7 +34,17 @@ SHARED_DESC=	Enable shared-library support
 SIZE_LIMIT_DESC=Maximum size allowed by decoder: ${SIZE_LIMIT}
 
 ALL_TARGET=
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
+CONFIGURE_ENV=	ASFLAGS="${ASFLAGS}"
+# Only explicitly list ARCHs with SIMD optimizations
+CONFIGURE_ARGS_aarch64=	--target=arm64-linux-gcc
+CONFIGURE_ARGS_amd64=	--target=x86_64-linux-gcc
+CONFIGURE_ARGS_i386=	--target=x86-linux-gcc
+.if ${CFLAGS:M-march=armv[78]*}
+CONFIGURE_ARGS+=	--target=armv7-linux-gcc
+ASFLAGS+=		-meabi=5
+.endif
+CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} \
+		--prefix=${PREFIX} \
 		--disable-install-docs \
 		--disable-install-srcs \
 		--enable-pic \
@@ -58,29 +68,6 @@ THREADS_CONFIGURE_OFF=	--disable-multithread
 
 SHEBANG_FILES=	build/make/ads2gas.pl
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == "amd64"
-CONFIGURE_ARGS+=	--target=x86_64-linux-gcc
-.elif ${ARCH} == "i386"
-CONFIGURE_ARGS+=	--target=x86-linux-gcc
-.elif ${ARCH} == "ia64"
-CONFIGURE_ARGS+=	--target=ia64-linux-gcc
-.elif ${ARCH} == "powerpc"
-CONFIGURE_ARGS+=	--target=ppc32-linux-gcc
-.elif ${ARCH} == "powerpc64"
-CONFIGURE_ARGS+=	--target=ppc64-linux-gcc
-.elif ${ARCH} == "sparc64"
-CONFIGURE_ARGS+=	--target=sparc64-linux-gcc
-.elif ${ARCH} == "aarch64"
-CONFIGURE_ARGS+=	--target=arm64-linux-gcc
-.elif ${ARCH} == "armv6"
-CONFIGURE_ARGS+=	--target=armv6-linux-gcc --cpu=armv6
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-build_make_Makefile
-.else
-IGNORE=	no support for ${ARCH} the moment. testing/patches are welcome
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's|\(link_with_cc\)=gcc|\1=$${CC}|' \
 		${WRKSRC}/build/make/configure.sh
diff --git a/multimedia/libvpx/files/extra-patch-build_make_Makefile b/multimedia/libvpx/files/extra-patch-build_make_Makefile
deleted file mode 100644
index d66d97da32e3..000000000000
--- a/multimedia/libvpx/files/extra-patch-build_make_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/make/Makefile.orig	2013-11-18 22:18:52 UTC
-+++ build/make/Makefile
-@@ -68,7 +68,7 @@ BUILD_ROOT?=.
- VPATH=$(SRC_PATH_BARE)
- CFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT) -I$(SRC_PATH)
- CXXFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT) -I$(SRC_PATH)
--ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/
-+ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/ -meabi=5
- DIST_DIR?=dist
- HOSTCC?=gcc
- TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN)))
diff --git a/multimedia/libvpx/files/patch-configure b/multimedia/libvpx/files/patch-configure
deleted file mode 100644
index cb66768b36b3..000000000000
--- a/multimedia/libvpx/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2016-07-21 01:15:41 UTC
-+++ configure
-@@ -158,6 +158,10 @@ all_platforms="${all_platforms} x86_64-w
- all_platforms="${all_platforms} x86_64-win64-vs11"
- all_platforms="${all_platforms} x86_64-win64-vs12"
- all_platforms="${all_platforms} x86_64-win64-vs14"
-+all_platforms="${all_platforms} ia64-linux-gcc"
-+all_platforms="${all_platforms} ppc32-linux-gcc"
-+all_platforms="${all_platforms} ppc64-linux-gcc"
-+all_platforms="${all_platforms} sparc64-linux-gcc"
- all_platforms="${all_platforms} generic-gnu"
- 
- # all_targets is a list of all targets that can be configured