Date: Sat, 17 Nov 2018 00:58:28 +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: r485107 - in head/multimedia/aom: . files Message-ID: <201811170058.wAH0wSot055746@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Nov 17 00:58:27 2018 New Revision: 485107 URL: https://svnweb.freebsd.org/changeset/ports/485107 Log: multimedia/aom: update to 1.0.0.941 Changes: https://aomedia.googlesource.com/aom/+log/e5eec6c5e..d2a592e1c Added: head/multimedia/aom/files/patch-build_cmake_cpu.cmake (contents, props changed) Modified: head/multimedia/aom/Makefile (contents, props changed) head/multimedia/aom/distinfo (contents, props changed) head/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c (contents, props changed) head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake (contents, props changed) Modified: head/multimedia/aom/Makefile ============================================================================== --- head/multimedia/aom/Makefile Sat Nov 17 00:57:35 2018 (r485106) +++ head/multimedia/aom/Makefile Sat Nov 17 00:58:27 2018 (r485107) @@ -2,8 +2,8 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-923 -DISTVERSIONSUFFIX= -ge5eec6c5e +DISTVERSION= 1.0.0-941 +DISTVERSIONSUFFIX= -gd2a592e1c CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org Modified: head/multimedia/aom/distinfo ============================================================================== --- head/multimedia/aom/distinfo Sat Nov 17 00:57:35 2018 (r485106) +++ head/multimedia/aom/distinfo Sat Nov 17 00:58:27 2018 (r485107) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542043646 -SHA256 (jbeich-aom-v1.0.0-923-ge5eec6c5e_GH0.tar.gz) = 74296674960dcfec3d58e2bebd7b81c54321d1f563740f6ddaadf6e6263b5d4b -SIZE (jbeich-aom-v1.0.0-923-ge5eec6c5e_GH0.tar.gz) = 3050131 +TIMESTAMP = 1542399860 +SHA256 (jbeich-aom-v1.0.0-941-gd2a592e1c_GH0.tar.gz) = f0727a7bcd3121cb74f61166244265548a5f5ddb691d512f9ee42669d1e7239c +SIZE (jbeich-aom-v1.0.0-941-gd2a592e1c_GH0.tar.gz) = 3058963 Modified: head/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c ============================================================================== --- head/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c Sat Nov 17 00:57:35 2018 (r485106) +++ head/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c Sat Nov 17 00:58:27 2018 (r485107) @@ -1,7 +1,7 @@ - Assume NEON is enabled on aarch64 - Implement NEON runtime detection on FreeBSD ---- aom_ports/arm_cpudetect.c.orig 2018-06-25 14:54:59 UTC +--- aom_ports/arm_cpudetect.c.orig 2018-11-16 20:24:20 UTC +++ aom_ports/arm_cpudetect.c @@ -38,7 +38,7 @@ static int arm_cpu_env_mask(void) { return env && *env ? (int)strtol(env, NULL, 0) : ~0; @@ -10,9 +10,9 @@ -#if !CONFIG_RUNTIME_CPU_DETECT +#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON) - int arm_cpu_caps(void) { + int aom_arm_cpu_caps(void) { /* This function should actually be a no-op. There is no way to adjust any of -@@ -143,7 +143,61 @@ int arm_cpu_caps(void) { +@@ -143,7 +143,61 @@ int aom_arm_cpu_caps(void) { } return flags & mask; } @@ -57,7 +57,7 @@ +#define HWCAP_NEON (1 << 12) +#endif + -+int arm_cpu_caps(void) { ++int aom_arm_cpu_caps(void) { + int flags; + int mask; + unsigned long hwcaps; Modified: head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake ============================================================================== --- head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake Sat Nov 17 00:57:35 2018 (r485106) +++ head/multimedia/aom/files/patch-build_cmake_aom__configure.cmake Sat Nov 17 00:58:27 2018 (r485107) @@ -1,10 +1,9 @@ - uname -p returns amd64 on FreeBSD/OpenBSD but x86_64 on DragonFly/NetBSD -- Automatically fall back to generic without forcing downstream to maintain whitelist - More ELF platforms can use GNU assembler on non-x86 ---- build/cmake/aom_configure.cmake.orig 2018-06-25 14:54:59 UTC +--- build/cmake/aom_configure.cmake.orig 2018-11-16 20:24:20 UTC +++ build/cmake/aom_configure.cmake -@@ -51,6 +51,7 @@ endforeach() +@@ -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 @@ -12,20 +11,7 @@ "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") if(${CMAKE_SIZEOF_VOID_P} EQUAL 4) set(AOM_TARGET_CPU "x86") -@@ -122,10 +123,8 @@ else() - endif() - - if(NOT "${AOM_SUPPORTED_CPU_TARGETS}" MATCHES "${AOM_TARGET_CPU}") -- message(FATAL_ERROR -- "No RTCD support for ${AOM_TARGET_CPU}. Create it, or " -- "add -DAOM_TARGET_CPU=generic to your cmake command line for a " -- "generic build of libaom and tools.") -+ message(WARNING "No RTCD support for ${AOM_TARGET_CPU}. Assuming generic.") -+ set(AOM_TARGET_CPU generic) - endif() - - if("${AOM_TARGET_CPU}" STREQUAL "x86" OR "${AOM_TARGET_CPU}" STREQUAL "x86_64") -@@ -151,20 +150,15 @@ elseif("${AOM_TARGET_CPU}" MATCHES "arm") +@@ -136,20 +137,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}) Added: head/multimedia/aom/files/patch-build_cmake_cpu.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/aom/files/patch-build_cmake_cpu.cmake Sat Nov 17 00:58:27 2018 (r485107) @@ -0,0 +1,13 @@ +- Don't enable NEON on armv6 similar to build/cmake/rtcd.pl + +--- build/cmake/cpu.cmake.orig 2018-11-16 20:24:20 UTC ++++ build/cmake/cpu.cmake +@@ -9,7 +9,7 @@ + # can obtain it at www.aomedia.org/license/patent. + # + +-if("${AOM_TARGET_CPU}" MATCHES "^arm") ++if("${AOM_TARGET_CPU}" MATCHES "^armv[78]") + set(ARCH_ARM 1) + set(RTCD_ARCH_ARM "yes") +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811170058.wAH0wSot055746>