Index: head/multimedia/aom/Makefile =================================================================== --- head/multimedia/aom/Makefile (revision 514012) +++ head/multimedia/aom/Makefile (revision 514013) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-2468 -DISTVERSIONSUFFIX= -gfdd0ab4b3 +DISTVERSION= 1.0.0-2474 +DISTVERSIONSUFFIX= -g60a00de69 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 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 514012) +++ head/multimedia/aom/distinfo (revision 514013) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570225733 -SHA256 (jbeich-aom-v1.0.0-2468-gfdd0ab4b3_GH0.tar.gz) = 834c015e982f2a592959e61b0172dc5cec67b7f65fd1dc03bca7cdb9ad824a25 -SIZE (jbeich-aom-v1.0.0-2468-gfdd0ab4b3_GH0.tar.gz) = 3431810 +TIMESTAMP = 1570491061 +SHA256 (jbeich-aom-v1.0.0-2474-g60a00de69_GH0.tar.gz) = ff71e85f4d55054558e63cf81e4ed3c0a12ef28de250796eda659b8b55c22435 +SIZE (jbeich-aom-v1.0.0-2474-g60a00de69_GH0.tar.gz) = 3432655 Index: head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake =================================================================== --- head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake (revision 514012) +++ head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake (revision 514013) @@ -1,39 +1,30 @@ -- uname -p returns amd64 on FreeBSD/OpenBSD but x86_64 on DragonFly/NetBSD - More ELF platforms can use GNU assembler on non-x86 ---- build/cmake/aom_configure.cmake.orig 2019-05-24 23:33:39 UTC +--- build/cmake/aom_configure.cmake.orig 2019-10-07 23:31:01 UTC +++ build/cmake/aom_configure.cmake -@@ -37,6 +37,7 @@ string(STRIP "${AOM_CMAKE_CONFIG}" AOM_CMAKE_CONFIG) - # Detect target CPU. - if(NOT AOM_TARGET_CPU) - if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" -+ OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64" - OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") - if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) - set(AOM_TARGET_CPU "x86") -@@ -137,21 +138,15 @@ elseif("${AOM_TARGET_CPU}" MATCHES "arm") +@@ -154,21 +154,15 @@ elseif("${AOM_TARGET_CPU}" MATCHES "arm") if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin") set(AS_EXECUTABLE as) set(AOM_AS_FLAGS -arch ${AOM_TARGET_CPU} -isysroot ${CMAKE_OSX_SYSROOT}) - elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux") - if(NOT AS_EXECUTABLE) - set(AS_EXECUTABLE as) - endif() elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Windows") if(NOT AS_EXECUTABLE) set(AS_EXECUTABLE ${CMAKE_C_COMPILER} -c -mimplicit-it=always) endif() + else() + if(NOT AS_EXECUTABLE) + set(AS_EXECUTABLE as) + endif() endif() - if(NOT AS_EXECUTABLE) - message( - FATAL_ERROR - "Unknown assembler for: ${AOM_TARGET_CPU}-${AOM_TARGET_SYSTEM}") - endif() - string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS) endif()