Re: git: f0f115af84c3 - main - multimedia/aom: update to 3.7.0.r1
- Reply: Nuno Teixeira : "Re: git: f0f115af84c3 - main - multimedia/aom: update to 3.7.0.r1"
- Reply: Jan Beich : "Re: git: f0f115af84c3 - main - multimedia/aom: update to 3.7.0.r1"
- In reply to: Jan Beich : "git: f0f115af84c3 - main - multimedia/aom: update to 3.7.0.r1"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 18 Aug 2023 10:57:00 UTC
Hello Jan,
aom is failing on configure, 14-ALPHA1/aarch64:
#######################
-- The C compiler identification is Clang 16.0.6
-- The CXX compiler identification is Clang 16.0.6
<snip>
--- aom_configure: Detected CPU: arm64
-- The ASM compiler identification is unknown
-- Found assembler: as
CMake Error at build/cmake/aom_configure.cmake:212 (enable_language):
The CMAKE_ASM_COMPILER:
as
is not a full path and was not found in the PATH.
Tell CMake where to find the compiler by setting either the environment
variable "ASM" or the CMake cache entry CMAKE_ASM_COMPILER to the full
path
to the compiler, or to the compiler name if it is in the PATH.
Call Stack (most recent call first):
CMakeLists.txt:73 (include)
-- Warning: Did not find file Compiler/-ASM
-- Configuring incomplete, errors occurred!
*** Error code 1
#######################
Any clues?
Thanks,
Jan Beich <jbeich@freebsd.org> escreveu no dia quinta, 17/08/2023 à(s)
01:58:
> The branch main has been updated by jbeich:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=f0f115af84c322c272f76bf279e1713494f2dc5b
>
> commit f0f115af84c322c272f76bf279e1713494f2dc5b
> Author: Jan Beich <jbeich@FreeBSD.org>
> AuthorDate: 2023-08-14 21:22:47 +0000
> Commit: Jan Beich <jbeich@FreeBSD.org>
> CommitDate: 2023-08-17 00:57:39 +0000
>
> multimedia/aom: update to 3.7.0.r1
>
> Changes:
> https://aomedia.googlesource.com/aom/+log/v3.6.1..v3.7.0-rc1
> Reported by: Repology, portscout
> ---
> multimedia/aom/Makefile | 2 +-
> multimedia/aom/distinfo | 6 +++---
> multimedia/aom/files/patch-CMakeLists.txt | 19 +++++++++++++-----
> .../files/patch-build_cmake_aom__configure.cmake | 23
> ++--------------------
> multimedia/aom/files/patch-build_cmake_cpu.cmake | 8 ++++----
> multimedia/aom/pkg-plist | 4 ++--
> 6 files changed, 26 insertions(+), 36 deletions(-)
>
> diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
> index 45c2082af512..93209b9d28c7 100644
> --- a/multimedia/aom/Makefile
> +++ b/multimedia/aom/Makefile
> @@ -1,6 +1,6 @@
> PORTNAME= aom
> DISTVERSIONPREFIX= v
> -DISTVERSION= 3.6.1
> +DISTVERSION= 3.7.0-rc1
> CATEGORIES= multimedia
>
> MAINTAINER= jbeich@FreeBSD.org
> diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
> index 4511c2537d6b..949e2bf663d4 100644
> --- a/multimedia/aom/distinfo
> +++ b/multimedia/aom/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1683569872
> -SHA256 (jbeich-aom-v3.6.1_GH0.tar.gz) =
> 679c41b41a50b9c5a8faa1ba919e0c239aae7fe857525e223ff20c56997f119f
> -SIZE (jbeich-aom-v3.6.1_GH0.tar.gz) = 5269397
> +TIMESTAMP = 1692048167
> +SHA256 (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) =
> 99fad4d57a763f105b080c6ea483be2287a62929777319e293610618c3369063
> +SIZE (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) = 5355997
> diff --git a/multimedia/aom/files/patch-CMakeLists.txt
> b/multimedia/aom/files/patch-CMakeLists.txt
> index 91b299b29a9d..bddd24159c96 100644
> --- a/multimedia/aom/files/patch-CMakeLists.txt
> +++ b/multimedia/aom/files/patch-CMakeLists.txt
> @@ -1,18 +1,27 @@
> +- Add missing dependency for aom_static used by ENABLE_EXAMPLES
> - Drop unused static libhwy dependency when using shared libjxl
>
> ---- CMakeLists.txt.orig 2022-06-16 19:13:50 UTC
> +--- CMakeLists.txt.orig 2023-08-14 21:22:47 UTC
> +++ CMakeLists.txt
> -@@ -565,13 +565,6 @@ if(CONFIG_AV1_ENCODER)
> +@@ -568,17 +568,14 @@ if(CONFIG_AV1_ENCODER)
> + target_include_directories(aom_dsp_encoder PRIVATE
> ${LIBJXL_INCLUDE_DIRS})
> + else()
> + pkg_check_modules(LIBJXL REQUIRED libjxl)
> ++ if(BUILD_SHARED_LIBS)
> ++ target_link_libraries(aom_static
> ++ PRIVATE ${LIBJXL_LDFLAGS}
> ${LIBJXL_LIBRARIES})
> ++ endif()
> + target_link_libraries(aom PRIVATE ${LIBJXL_LDFLAGS}
> ${LIBJXL_LIBRARIES})
> + target_include_directories(aom_dsp_encoder PRIVATE
> ${LIBJXL_INCLUDE_DIRS})
> if(LIBJXL_CFLAGS)
> append_compiler_flag("${LIBJXL_CFLAGS}")
> - endif()
> +- endif()
> - pkg_check_modules(LIBHWY REQUIRED libhwy)
> - target_link_libraries(aom PRIVATE ${LIBHWY_LDFLAGS}
> ${LIBHWY_LIBRARIES})
> - target_include_directories(aom_dsp_encoder
> - PRIVATE ${LIBLIBHWY_INCLUDE_DIRS})
> - if(LIBHWY_CFLAGS)
> - append_compiler_flag("${LIBHWY_CFLAGS}")
> -- endif()
> + endif()
> endif()
>
> - set_target_properties(aom PROPERTIES LINKER_LANGUAGE CXX)
> diff --git a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake
> b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake
> index 5b2650ea5d63..20add2621400 100644
> --- a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake
> +++ b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake
> @@ -1,9 +1,8 @@
> - FreeBSD and NetBSD powerpc* targets don't abbreviate to ppc*
> -- ARM uses compiler intrinsics, so don't require GNU as
>
> ---- build/cmake/aom_configure.cmake.orig 2021-02-23 19:51:03 UTC
> +--- build/cmake/aom_configure.cmake.orig 2023-08-14 21:22:47 UTC
> +++ build/cmake/aom_configure.cmake
> -@@ -71,7 +71,7 @@ if(NOT AOM_TARGET_CPU)
> +@@ -75,7 +75,7 @@ if(NOT AOM_TARGET_CPU)
> set(AOM_TARGET_CPU "${cpu_lowercase}")
> elseif(cpu_lowercase MATCHES "aarch64")
> set(AOM_TARGET_CPU "arm64")
> @@ -12,21 +11,3 @@
> set(AOM_TARGET_CPU "ppc")
> else()
> message(WARNING "The architecture ${CMAKE_SYSTEM_PROCESSOR} is not "
> -@@ -159,17 +159,6 @@ elseif(AOM_TARGET_CPU MATCHES "arm")
> - if(NOT AS_EXECUTABLE)
> - set(AS_EXECUTABLE as)
> - endif()
> -- endif()
> -- find_program(as_executable_found ${AS_EXECUTABLE})
> -- if(NOT as_executable_found)
> -- message(
> -- FATAL_ERROR
> -- "Unable to find assembler and optimizations are enabled."
> -- "Searched for ${AS_EXECUTABLE}. Install it, add it to your path,
> or "
> -- "set the assembler directly by adding -DAS_EXECUTABLE=<assembler
> path> "
> -- "to your CMake command line."
> -- "To build without optimizations, add -DAOM_TARGET_CPU=generic to
> your "
> -- "cmake command line.")
> - endif()
> - string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS)
> - endif()
> diff --git a/multimedia/aom/files/patch-build_cmake_cpu.cmake
> b/multimedia/aom/files/patch-build_cmake_cpu.cmake
> index 26fe6890c69c..462c1f1e0aab 100644
> --- a/multimedia/aom/files/patch-build_cmake_cpu.cmake
> +++ b/multimedia/aom/files/patch-build_cmake_cpu.cmake
> @@ -1,6 +1,6 @@
> - 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.orig 2023-08-14 21:22:47 UTC
> +++ build/cmake/cpu.cmake
> @@ -9,7 +9,7 @@
> # can obtain it at www.aomedia.org/license/patent.
> @@ -8,6 +8,6 @@
>
> -if("${AOM_TARGET_CPU}" MATCHES "^arm")
> +if("${AOM_TARGET_CPU}" MATCHES "^arm" AND NOT "${AOM_TARGET_CPU}"
> MATCHES "^armv6")
> - set(ARCH_ARM 1)
> - set(RTCD_ARCH_ARM "yes")
> -
> + set(AOM_ARCH_ARM 1)
> + if("${AOM_TARGET_CPU}" STREQUAL "arm64")
> + set(AOM_ARCH_AARCH64 1)
> diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist
> index c5e9b4947997..4ade64aa8fb4 100644
> --- a/multimedia/aom/pkg-plist
> +++ b/multimedia/aom/pkg-plist
> @@ -10,8 +10,8 @@ include/aom/aom_image.h
> include/aom/aom_integer.h
> include/aom/aomcx.h
> include/aom/aomdx.h
> -lib/libaom.a
> lib/libaom.so
> lib/libaom.so.3
> -lib/libaom.so.3.6.1
> +lib/libaom.so.3.7.0
> +lib/libaom_static.a
> libdata/pkgconfig/aom.pc
>
--
Nuno Teixeira
FreeBSD Committer (ports)