Index: head/multimedia/aom/Makefile =================================================================== --- head/multimedia/aom/Makefile (revision 520411) +++ head/multimedia/aom/Makefile (revision 520412) @@ -1,40 +1,40 @@ # $FreeBSD$ PORTNAME= aom DISTVERSIONPREFIX= v # XXX Switch to release after https://bugs.chromium.org/p/aomedia/issues/detail?id=2545 -DISTVERSION= 1.0.0-2827 -DISTVERSIONSUFFIX= -gd53f175e3 +DISTVERSION= 1.0.0-2847 +DISTVERSIONSUFFIX= -g76cd2655a CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= AV1 reference encoder/decoder LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm USES= cmake compiler:c++11-lib perl5 USE_GITHUB= yes USE_PERL5= build USE_LDCONFIG= yes GH_ACCOUNT= jbeich # mirror CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= ENABLE_DOCS ENABLE_TESTS OPTIONS_DEFINE= VMAF VMAF_DESC= Encoding tuning for VMAF VMAF_BUILD_DEPENDS= ${LOCALBASE}/lib/libvmaf.a:multimedia/vmaf VMAF_USES= localbase:ldflags VMAF_CMAKE_ON= -DCONFIG_TUNE_VMAF:STRING=1 post-patch: # Extract (snapshot) version from the port instead of CHANGELOG @${REINPLACE_CMD} 's,$${AOM_ROOT}/CHANGELOG,${DISTVERSIONFULL:S/^v//},' \ ${WRKSRC}/build/cmake/version.cmake .include Index: head/multimedia/aom/distinfo =================================================================== --- head/multimedia/aom/distinfo (revision 520411) +++ head/multimedia/aom/distinfo (revision 520412) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576542250 -SHA256 (jbeich-aom-v1.0.0-2827-gd53f175e3_GH0.tar.gz) = a9045b97239b5f4a53edc4e8096abb77c83c9968c530c1d77b24bda2f05ee651 -SIZE (jbeich-aom-v1.0.0-2827-gd53f175e3_GH0.tar.gz) = 3460835 +TIMESTAMP = 1576715340 +SHA256 (jbeich-aom-v1.0.0-2847-g76cd2655a_GH0.tar.gz) = 0d4ac1d4040990b8d602b731de1431dd04e4db2964d5f19dd6d184be4c93607c +SIZE (jbeich-aom-v1.0.0-2847-g76cd2655a_GH0.tar.gz) = 3463157 Index: head/multimedia/aom/files/patch-CMakeLists.txt =================================================================== --- head/multimedia/aom/files/patch-CMakeLists.txt (revision 520411) +++ head/multimedia/aom/files/patch-CMakeLists.txt (revision 520412) @@ -1,13 +1,15 @@ - Stop linking shared library statically +- Depend on C++ runtime to unbreak consumers --- CMakeLists.txt.orig 2019-12-13 22:21:07 UTC +++ CMakeLists.txt -@@ -389,7 +389,7 @@ if(CONFIG_AV1_ENCODER) +@@ -389,7 +389,8 @@ if(CONFIG_AV1_ENCODER) message(FATAL_ERROR "VMAF library not found.") endif() message("-- Found VMAF library: " ${VMAF}) - target_link_libraries(aom PRIVATE ${VMAF} -static) + target_link_libraries(aom PRIVATE ${VMAF}) ++ set_property(TARGET aom PROPERTY LINKER_LANGUAGE CXX) endif() endif()