Index: head/multimedia/aom/Makefile =================================================================== --- head/multimedia/aom/Makefile (revision 502496) +++ head/multimedia/aom/Makefile (revision 502497) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-1812 -DISTVERSIONSUFFIX= -g6f981afe8 +DISTVERSION= 1.0.0-1827 +DISTVERSIONSUFFIX= -gd523648d1 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 502496) +++ head/multimedia/aom/distinfo (revision 502497) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558560451 -SHA256 (jbeich-aom-v1.0.0-1812-g6f981afe8_GH0.tar.gz) = be74fdeeb1de91404691294c6cd10011041c208b484f5b3048a8540cc62cd565 -SIZE (jbeich-aom-v1.0.0-1812-g6f981afe8_GH0.tar.gz) = 3279223 +TIMESTAMP = 1558740819 +SHA256 (jbeich-aom-v1.0.0-1827-gd523648d1_GH0.tar.gz) = 8e5776e32163ed8784c07dadc7631a9e7550bd21344a36aced8f00bb6b81b595 +SIZE (jbeich-aom-v1.0.0-1827-gd523648d1_GH0.tar.gz) = 3282279 Index: head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake =================================================================== --- head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake (revision 502496) +++ head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake (revision 502497) @@ -1,38 +1,39 @@ - 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 2018-11-16 20:24:20 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_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") -@@ -136,20 +137,15 @@ elseif("${AOM_TARGET_CPU}" MATCHES "arm") +@@ -137,21 +138,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}") +- message( +- FATAL_ERROR +- "Unknown assembler for: ${AOM_TARGET_CPU}-${AOM_TARGET_SYSTEM}") - endif() - string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS) endif() Index: head/multimedia/aom/files/patch-build_cmake_aom__optimization.cmake =================================================================== --- head/multimedia/aom/files/patch-build_cmake_aom__optimization.cmake (revision 502496) +++ head/multimedia/aom/files/patch-build_cmake_aom__optimization.cmake (revision 502497) @@ -1,61 +1,61 @@ ELF is also used on Solaris, BSDs, Haiku, Fuchsia, etc. ---- build/cmake/aom_optimization.cmake.orig 2018-06-25 14:54:59 UTC +--- build/cmake/aom_optimization.cmake.orig 2019-05-24 23:33:39 UTC +++ build/cmake/aom_optimization.cmake @@ -83,24 +83,20 @@ function(get_asm_obj_format out_format) if("${AOM_TARGET_CPU}" STREQUAL "x86_64") if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin") set(objformat "macho64") - elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux") - set(objformat "elf64") - elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}" - STREQUAL "Windows") + elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" + OR "${AOM_TARGET_SYSTEM}" STREQUAL "Windows") set(objformat "win64") else() - message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}") + set(objformat "elf64") endif() elseif("${AOM_TARGET_CPU}" STREQUAL "x86") if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin") set(objformat "macho32") - elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux") - set(objformat "elf32") - elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}" - STREQUAL "Windows") + elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" + OR "${AOM_TARGET_SYSTEM}" STREQUAL "Windows") set(objformat "win32") else() - message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}") + set(objformat "elf32") endif() else() - message(FATAL_ERROR -@@ -171,7 +167,13 @@ function(test_nasm) - message(FATAL_ERROR - "Unsupported nasm: macho32 object format not supported.") + message( +@@ -172,7 +168,13 @@ function(test_nasm) + message( + FATAL_ERROR "Unsupported nasm: macho32 object format not supported.") endif() - elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux") + elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}" + STREQUAL "Windows") + if(NOT "${nasm_helptext}" MATCHES "win32") + message(FATAL_ERROR + "Unsupported nasm: win32 object format not supported.") + endif() + else() if(NOT "${nasm_helptext}" MATCHES "elf32") - message(FATAL_ERROR - "Unsupported nasm: elf32 object format not supported.") -@@ -183,7 +185,13 @@ function(test_nasm) - message(FATAL_ERROR - "Unsupported nasm: macho64 object format not supported.") + message( + FATAL_ERROR "Unsupported nasm: elf32 object format not supported.") +@@ -184,7 +186,13 @@ function(test_nasm) + message( + FATAL_ERROR "Unsupported nasm: macho64 object format not supported.") endif() - elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux") + elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}" + STREQUAL "Windows") + if(NOT "${nasm_helptext}" MATCHES "win64") + message(FATAL_ERROR + "Unsupported nasm: win64 object format not supported.") + endif() + else() if(NOT "${nasm_helptext}" MATCHES "elf64") - message(FATAL_ERROR - "Unsupported nasm: elf64 object format not supported.") + message( + FATAL_ERROR "Unsupported nasm: elf64 object format not supported.")