Date: Sat, 25 May 2019 00:58:02 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502497 - in head/multimedia/aom: . files Message-ID: <201905250058.x4P0w27h045404@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat May 25 00:58:01 2019 New Revision: 502497 URL: https://svnweb.freebsd.org/changeset/ports/502497 Log: multimedia/aom: update to 1.0.0.1827 Changes: https://aomedia.googlesource.com/aom/+log/6f981afe8..d523648d1 Modified: head/multimedia/aom/Makefile (contents, props changed) head/multimedia/aom/distinfo (contents, props changed) head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake (contents, props changed) head/multimedia/aom/files/patch-build_cmake_aom__optimization.cmake (contents, props changed) Modified: head/multimedia/aom/Makefile ============================================================================== --- head/multimedia/aom/Makefile Sat May 25 00:57:53 2019 (r502496) +++ head/multimedia/aom/Makefile Sat May 25 00:58:01 2019 (r502497) @@ -2,8 +2,8 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-1812 -DISTVERSIONSUFFIX= -g6f981afe8 +DISTVERSION= 1.0.0-1827 +DISTVERSIONSUFFIX= -gd523648d1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org Modified: head/multimedia/aom/distinfo ============================================================================== --- head/multimedia/aom/distinfo Sat May 25 00:57:53 2019 (r502496) +++ head/multimedia/aom/distinfo Sat May 25 00:58:01 2019 (r502497) @@ -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 Modified: head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake ============================================================================== --- head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake Sat May 25 00:57:53 2019 (r502496) +++ head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake Sat May 25 00:58:01 2019 (r502497) @@ -6,12 +6,12 @@ @@ -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}) @@ -29,8 +29,9 @@ + 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) Modified: head/multimedia/aom/files/patch-build_cmake_aom__optimization.cmake ============================================================================== --- head/multimedia/aom/files/patch-build_cmake_aom__optimization.cmake Sat May 25 00:57:53 2019 (r502496) +++ head/multimedia/aom/files/patch-build_cmake_aom__optimization.cmake Sat May 25 00:58:01 2019 (r502497) @@ -1,6 +1,6 @@ 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") @@ -8,8 +8,8 @@ ELF is also used on Solaris, BSDs, Haiku, Fuchsia, etc 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}") @@ -20,18 +20,18 @@ ELF is also used on Solaris, BSDs, Haiku, Fuchsia, etc 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}" @@ -42,11 +42,11 @@ ELF is also used on Solaris, BSDs, Haiku, Fuchsia, etc + 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}" @@ -57,5 +57,5 @@ ELF is also used on Solaris, BSDs, Haiku, Fuchsia, etc + 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.")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905250058.x4P0w27h045404>