Index: head/multimedia/openh264/Makefile =================================================================== --- head/multimedia/openh264/Makefile (revision 473443) +++ head/multimedia/openh264/Makefile (revision 473444) @@ -1,73 +1,69 @@ # $FreeBSD$ PORTNAME= openh264 -PORTVERSION= 1.7.0 +PORTVERSION= 1.8.0 DISTVERSIONPREFIX=v PORTEPOCH= 2 CATEGORIES= multimedia MAINTAINER= gecko@FreeBSD.org COMMENT= Cisco implementation of H.264 codec LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= cisco 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= PREFIX="${PREFIX}" \ OS=bsd ARCH="${ARCH:S/amd64/x86_64/}" \ CCASFLAGS='$$(CFLAGS) ${ASFLAGS}' \ CFLAGS_OPT="" CFLAGS_DEBUG="" ALL_TARGET= all PLIST_SUB= PORTVERSION="${PORTVERSION}" OPTIONS_DEFINE= DEBUG PLUGINS TEST OPTIONS_DEFAULT=PLUGINS OPTIONS_SUB= yes DEBUG_BUILD_DEPENDS_OFF= ${DEBUG_BUILD_DEPENDS_OFF_${ARCH}} -DEBUG_BUILD_DEPENDS_OFF_aarch64=as:devel/binutils DEBUG_BUILD_DEPENDS_OFF_amd64= nasm:devel/nasm DEBUG_BUILD_DEPENDS_OFF_i386= nasm:devel/nasm DEBUG_MAKE_ARGS=BUILDTYPE=Debug PLUGINS_BUILD_DEPENDS=gmp-api>=34.0:multimedia/gmp-api # gmp-api<36.0: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: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/$$(LIBDIR_NAME)/libdata/' \ ${WRKSRC}/Makefile pre-build: ${LN} -sf ${LOCALBASE}/lib/libgtest.so ${WRKSRC}/libgtest.a post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.* 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 Index: head/multimedia/openh264/distinfo =================================================================== --- head/multimedia/openh264/distinfo (revision 473443) +++ head/multimedia/openh264/distinfo (revision 473444) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497586814 -SHA256 (cisco-openh264-v1.7.0_GH0.tar.gz) = 9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f6895738653f -SIZE (cisco-openh264-v1.7.0_GH0.tar.gz) = 38681895 +TIMESTAMP = 1530063403 +SHA256 (cisco-openh264-v1.8.0_GH0.tar.gz) = 08670017fd0bb36594f14197f60bebea27b895511251c7c64df6cd33fc667d34 +SIZE (cisco-openh264-v1.8.0_GH0.tar.gz) = 38695675 Index: head/multimedia/openh264/files/patch-clang =================================================================== --- head/multimedia/openh264/files/patch-clang (nonexistent) +++ head/multimedia/openh264/files/patch-clang (revision 473444) @@ -0,0 +1,22 @@ +Based on https://github.com/cisco/openh264/pull/2877 + +--- codec/common/arm64/arm_arch64_common_macro.S.orig 2018-06-27 01:36:43 UTC ++++ codec/common/arm64/arm_arch64_common_macro.S +@@ -52,13 +52,17 @@ ret + .align 2 + .global \funcName + .type \funcName, %function ++#ifndef __clang__ + .func \funcName ++#endif + \funcName: + .endm + + .macro WELS_ASM_AARCH64_FUNC_END + ret ++#ifndef __clang__ + .endfunc ++#endif + .endm + + #endif Property changes on: head/multimedia/openh264/files/patch-clang ___________________________________________________________________ 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