1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00

multimedia/aom: update to 1.0.0.941

Changes:	https://aomedia.googlesource.com/aom/+log/e5eec6c5e..d2a592e1c
This commit is contained in:
Jan Beich 2018-11-17 00:58:27 +00:00
parent 3a26e84988
commit c83deecbc6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=485107
5 changed files with 25 additions and 26 deletions

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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})

View File

@ -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")