Index: branches/2015Q4/multimedia/openh264/Makefile
===================================================================
--- branches/2015Q4/multimedia/openh264/Makefile	(revision 400713)
+++ branches/2015Q4/multimedia/openh264/Makefile	(revision 400714)
@@ -1,67 +1,71 @@
 # $FreeBSD$
 
 PORTNAME=	openh264
 PORTVERSION=	1.4.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Cisco implementation of H.264 codec
 
 LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cisco
 
-USES=		cpe gmake
+USES=		compiler cpe gmake
 CPE_VENDOR=	cisco
 USE_LDCONFIG=	yes
+ASFLAGS+=	${ASFLAGS_${MACHINE}_${CHOSEN_COMPILER_TYPE}}
+ASFLAGS_arm_clang=	-no-integrated-as
+ASFLAGS_arm64_clang=	-no-integrated-as
 MAKE_ARGS=	OS=freebsd ARCH="${ARCH:S/amd64/x86_64/}" \
+		CCASFLAGS='$$(CFLAGS) ${ASFLAGS}' \
 		CFLAGS_OPT="" CFLAGS_DEBUG=""
 ALL_TARGET=	all
 
 OPTIONS_DEFINE=	DEBUG PLUGINS TEST
 OPTIONS_DEFAULT=PLUGINS
 OPTIONS_SUB=	yes
 
 DEBUG_BUILD_DEPENDS_OFF=	${DEBUG_BUILD_DEPENDS_OFF_${ARCH}}
 DEBUG_BUILD_DEPENDS_OFF_amd64=	nasm:${PORTSDIR}/devel/nasm
 DEBUG_BUILD_DEPENDS_OFF_i386=	nasm:${PORTSDIR}/devel/nasm
 DEBUG_MAKE_ARGS=BUILDTYPE=Debug
 PLUGINS_BUILD_DEPENDS=gmp-api>=34.0:${PORTSDIR}/multimedia/gmp-api
 #			gmp-api<36.0:${PORTSDIR}/multimedia/gmp-api
 PLUGINS_CFLAGS=	-I${LOCALBASE}/include/gmp-api
 PLUGINS_MAKE_ARGS=HAVE_GMP_API=Yes
 PLUGINS_ALL_TARGET=plugin
 PLUGINS_USES=	webplugin:gecko
 WEBPLUGIN_NAME=	gmp-gmp${PORTNAME}
 WEBPLUGIN_FILES=gmp${PORTNAME}.info libgmp${PORTNAME}.so
 SUB_FILES+=	gmp${PORTNAME}.js
 SUB_LIST+=	PORTVERSION=${PORTVERSION} TIMESTAMP="`date +%s`"
 
 TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest
 TEST_CFLAGS=	-I${LOCALBASE}/include
 TEST_MAKE_ARGS=	HAVE_GTEST=Yes
 TEST_ALL_TARGET=test
 
 post-patch:
 	${REINPLACE_CMD} -e '/gtest-targets\.mk/d' \
 		-e '/pkgconfig/s/lib/libdata/' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's,@prefix@,${PREFIX},' \
 		${WRKSRC}/${PORTNAME}.pc.in
 
 pre-build:
 	${LN} -sf ${LOCALBASE}/lib/libgtest.so ${WRKSRC}/libgtest.a
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.0
 
 post-install-PLUGINS-on:
 	${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_DATA} ${WRKSRC}/gmp${PORTNAME}.info ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_LIB} ${WRKSRC}/libgmp${PORTNAME}.so ${STAGEDIR}${WEBPLUGIN_DIR}
 	${INSTALL_DATA} ${WRKDIR}/gmp${PORTNAME}.js ${STAGEDIR}${WEBPLUGIN_DIR}
 
 .include <bsd.port.mk>
Index: branches/2015Q4/multimedia/openh264/files/patch-build_arch.mk
===================================================================
--- branches/2015Q4/multimedia/openh264/files/patch-build_arch.mk	(revision 400713)
+++ branches/2015Q4/multimedia/openh264/files/patch-build_arch.mk	(nonexistent)
@@ -1,11 +0,0 @@
---- build/arch.mk.orig	2015-08-09 21:14:55 UTC
-+++ build/arch.mk
-@@ -1,7 +1,7 @@
- ifneq ($(filter %86 x86_64, $(ARCH)),)
- include $(SRC_PATH)build/x86-common.mk
- endif
--ifneq ($(filter-out arm64, $(filter arm%, $(ARCH))),)
-+ifneq ($(filter-out armv6 arm64, $(filter arm%, $(ARCH))),)
- ifeq ($(USE_ASM), Yes)
- ASM_ARCH = arm
- ASMFLAGS += -I$(SRC_PATH)codec/common/arm/

Property changes on: branches/2015Q4/multimedia/openh264/files/patch-build_arch.mk
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2015Q4/multimedia/openh264/files/patch-codec_common_src_cpu.cpp
===================================================================
--- branches/2015Q4/multimedia/openh264/files/patch-codec_common_src_cpu.cpp	(nonexistent)
+++ branches/2015Q4/multimedia/openh264/files/patch-codec_common_src_cpu.cpp	(revision 400714)
@@ -0,0 +1,23 @@
+--- codec/common/src/cpu.cpp.orig	2015-03-25 07:43:00 UTC
++++ codec/common/src/cpu.cpp
+@@ -276,9 +276,17 @@ uint32_t WelsCPUFeatureDetect (int32_t* 
+  * that NEON and all associated features are available. */
+ 
+ uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) {
+-  return WELS_CPU_ARMv7 |
+-         WELS_CPU_VFPv3 |
+-         WELS_CPU_NEON;
++  int flags = 0;
++# if __ARM_ARCH == 7
++  flags |= WELS_CPU_ARMv7;
++# endif
++# ifdef __ARM_VFPV3__
++  flags |= WELS_CPU_VFPv3;
++# endif
++# ifdef __ARM_NEON
++  flags |= WELS_CPU_NEON;
++# endif
++  return flags;
+ }
+ #endif
+ #elif defined(HAVE_NEON_AARCH64)

Property changes on: branches/2015Q4/multimedia/openh264/files/patch-codec_common_src_cpu.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 400713)
+++ branches/2015Q4	(revision 400714)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r400578,400697