From nobody Fri Aug 18 10:57:00 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRzNC1Ttlz4qLtJ; Fri, 18 Aug 2023 10:57:15 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRzNB519Dz4Fr5; Fri, 18 Aug 2023 10:57:14 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692356234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=C9TOOFIzE27Fm2f9xYeA56LwB6xl3ph96h/ibtkSNSg=; b=xoa/2bGxo1igTj9gdxUrgM3eRXSeDIGnhB0pSMREzXv7KkTqBLTb0zsmM/aKqy38YzIVJa TEzv5aCeW6aqVFTYlCkWuVz1lXCme4Lj+ov4EkS32JI2tvL4LNGXSDRvxYz921sE2ec5gk obHLyM3tAfYuDx4SpXS/qIEInwlG453nBBQYnf5Fe6pj+cgpZw/ZDFtzE/2j8JCIM+KGg5 x5ryznMwHDqbBmpwWpxM7t93oOLgNTRToxyy13kdKcir/4xEfP67EkxOKfSawxtmKtsOuF 7f3EG9bEz1ZhYb/gcwMsnOB2dzQXzkLWszasCf9P+GUxPOBm3GRDJVlCqBn+/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692356234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=C9TOOFIzE27Fm2f9xYeA56LwB6xl3ph96h/ibtkSNSg=; b=jQdBklBBXGRlT3JWefVc/yBChUIyhdKUbM3+FG4VvHU/MJ4bQXivktUdM2wDvHX8wZclUH KMK3t+yTmJM61hz2R0LfWSbHFyw5KPxFijBUH1CpIJcYZ7QOhZe5GL+KpAanbHNhMJJ3C0 u4zjhj7aklFE/mEGCKygXzSKug34MD9Ru8ZazCaEnXo5bucnWPJpLS5ER6C6FhvnZYs07e fblwe3SVXdtOmbX0v2yEHrHcdbg/aRj1qhOzusTIvo4Zz880LAW1++ga/7zSDf5L+7zl7I ePFNkiX7SRlIXWinPWU9PI+TTubU29vZ+V1giUjDHXcMeMg6aVDo9K9lYBX38g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692356234; a=rsa-sha256; cv=none; b=PAay2AHi2r7Xz4hmeT5MiXFq5+APRQHflWMsu3sDEyT1n8GOUsJxiyOQMOrBjtqwsSw0ER uqSxNGeNlQeD3M17W53AajpqoNJcPKljOq43Enl6ljrXdCuhvGNpsAAmHrgFffT4o0rVrY 9OrNktQZIB4HrZz49QEaPwp7S8HBsiJxPLePJOKtDgSpU+KdsxPu6/EIO8+0X0pzjV9Cun RkIGiRbndoabM6Wgvz8PyQBhYdktpi9ECUSeOzKxqWRDxaEt8U1o6PifBa5ib5IuufRSNy JJeR4+l8zaNNpy16EsqTBZADYGMKfccnH37AuaBvPe6FG3BykCZy4qNit++3LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RRzNB3yHDz187f; Fri, 18 Aug 2023 10:57:14 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-40ff82320a7so5216141cf.3; Fri, 18 Aug 2023 03:57:14 -0700 (PDT) X-Gm-Message-State: AOJu0Yz73ahZaFyLmKw8jkp1KtbDY70LdixHCTUAOq/T00lxMyVAIPPW AJfDOth/o92hASiXpmyHfJ2O/Jyp4D/bDUDgVTo= X-Google-Smtp-Source: AGHT+IGjR1lCPIN0xbDtzxBXf+UEPbVCXJv2NrRhdE2bY1gMTMLh0ecQ9HW0l4bfBvWEWS+QAL4LHLF7WRIMM8PSf60= X-Received: by 2002:a05:622a:1349:b0:403:adf1:8352 with SMTP id w9-20020a05622a134900b00403adf18352mr2833155qtk.24.1692356233677; Fri, 18 Aug 2023 03:57:13 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202308170058.37H0w4d8078202@gitrepo.freebsd.org> In-Reply-To: <202308170058.37H0w4d8078202@gitrepo.freebsd.org> From: Nuno Teixeira Date: Fri, 18 Aug 2023 11:57:00 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: f0f115af84c3 - main - multimedia/aom: update to 3.7.0.r1 To: Jan Beich Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000245ca4060330648b" --000000000000245ca4060330648b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 --- 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 escreveu no dia quinta, 17/08/2023 =C3=A0(s) 01:58: > The branch main has been updated by jbeich: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3Df0f115af84c322c272f76bf279e17= 13494f2dc5b > > commit f0f115af84c322c272f76bf279e1713494f2dc5b > Author: Jan Beich > AuthorDate: 2023-08-14 21:22:47 +0000 > Commit: Jan Beich > 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=3D aom > DISTVERSIONPREFIX=3D v > -DISTVERSION=3D 3.6.1 > +DISTVERSION=3D 3.7.0-rc1 > CATEGORIES=3D multimedia > > MAINTAINER=3D 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 =3D 1683569872 > -SHA256 (jbeich-aom-v3.6.1_GH0.tar.gz) =3D > 679c41b41a50b9c5a8faa1ba919e0c239aae7fe857525e223ff20c56997f119f > -SIZE (jbeich-aom-v3.6.1_GH0.tar.gz) =3D 5269397 > +TIMESTAMP =3D 1692048167 > +SHA256 (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) =3D > 99fad4d57a763f105b080c6ea483be2287a62929777319e293610618c3369063 > +SIZE (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) =3D 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=3D path> " > -- "to your CMake command line." > -- "To build without optimizations, add -DAOM_TARGET_CPU=3Dgeneric= 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 > --=20 Nuno Teixeira FreeBSD Committer (ports) --000000000000245ca4060330648b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Jan,

aom is failing on= configure, 14-ALPHA1/aarch64:
#######################
<= div>-- The C compiler identification is Clang 16.0.6
-- The CXX compiler= identification is Clang 16.0.6
<snip>
--- aom_configure: Detec= ted CPU: arm64
-- The ASM compiler identification is unknown
-- Found= assembler: as
CMake Error at build/cmake/aom_configure.cmake:212 (enabl= e_language):
=C2=A0 The CMAKE_ASM_COMPILER:

=C2=A0 =C2=A0 as
<= br>=C2=A0 is not a full path and was not found in the PATH.

=C2=A0 T= ell CMake where to find the compiler by setting either the environment
= =C2=A0 variable "ASM" or the CMake cache entry CMAKE_ASM_COMPILER= to the full path
=C2=A0 to the compiler, or to the compiler name if it = is in the PATH.
Call Stack (most recent call first):
=C2=A0 CMakeList= s.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 =C3=A0= (s) 01:58:
The b= ranch main has been updated by jbeich:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3Df0f115af84c322c272f76bf279e1713494f2dc5b

commit f0f115af84c322c272f76bf279e1713494f2dc5b
Author:=C2=A0 =C2=A0 =C2=A0Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-08-14 21:22:47 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-08-17 00:57:39 +0000

=C2=A0 =C2=A0 multimedia/aom: update to 3.7.0.r1

=C2=A0 =C2=A0 Changes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 https://aomedia.googlesource.com/aom/+log/v3.6.1..v3.7.0-rc1
=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 Repology, portscout
---
=C2=A0multimedia/aom/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-
=C2=A0multimedia/aom/distinfo=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 6 +++---
=C2=A0multimedia/aom/files/patch-CMakeLists.txt=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 | 19 +++++++++++++-----
=C2=A0.../files/patch-build_cmake_aom__configure.cmake=C2=A0 =C2=A0| 23 ++-= -------------------
=C2=A0multimedia/aom/files/patch-build_cmake_cpu.cmake=C2=A0 =C2=A0|=C2=A0 = 8 ++++----
=C2=A0multimedia/aom/pkg-plist=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 4 ++--
=C2=A06 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 @@
=C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 aom
=C2=A0DISTVERSIONPREFIX=3D=C2=A0 =C2=A0 =C2=A0v
-DISTVERSION=3D=C2=A0 =C2=A03.6.1
+DISTVERSION=3D=C2=A0 =C2=A03.7.0-rc1
=C2=A0CATEGORIES=3D=C2=A0 =C2=A0 multimedia

=C2=A0MAINTAINER=3D=C2=A0 =C2=A0 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 =3D 1683569872
-SHA256 (jbeich-aom-v3.6.1_GH0.tar.gz) =3D 679c41b41a50b9c5a8faa1ba919e0c23= 9aae7fe857525e223ff20c56997f119f
-SIZE (jbeich-aom-v3.6.1_GH0.tar.gz) =3D 5269397
+TIMESTAMP =3D 1692048167
+SHA256 (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) =3D 99fad4d57a763f105b080c6ea483= be2287a62929777319e293610618c3369063
+SIZE (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) =3D 5355997
diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/fil= es/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
=C2=A0- Drop unused static libhwy dependency when using shared libjxl

---- CMakeLists.txt.orig=C2=A0 =C2=A0 =C2=A0 =C2=A0 2022-06-16 19:13:50 UTC=
+--- CMakeLists.txt.orig=C2=A0 =C2=A0 =C2=A0 =C2=A0 2023-08-14 21:22:47 UTC=
=C2=A0+++ CMakeLists.txt
-@@ -565,13 +565,6 @@ if(CONFIG_AV1_ENCODER)
+@@ -568,17 +568,14 @@ if(CONFIG_AV1_ENCODER)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0target_include_directories(aom_dsp_encoder PRIV= ATE ${LIBJXL_INCLUDE_DIRS})
+=C2=A0 =C2=A0 =C2=A0else()
+=C2=A0 =C2=A0 =C2=A0 =C2=A0pkg_check_modules(LIBJXL REQUIRED libjxl)
++=C2=A0 =C2=A0 =C2=A0 if(BUILD_SHARED_LIBS)
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 target_link_libraries(aom_static
++=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 PRIVATE ${LIBJXL_LDFLAGS} ${LIBJXL_LIBRARIE= S})
++=C2=A0 =C2=A0 =C2=A0 endif()
+=C2=A0 =C2=A0 =C2=A0 =C2=A0target_link_libraries(aom PRIVATE ${LIBJXL_LDFL= AGS} ${LIBJXL_LIBRARIES})
+=C2=A0 =C2=A0 =C2=A0 =C2=A0target_include_directories(aom_dsp_encoder PRIV= ATE ${LIBJXL_INCLUDE_DIRS})
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if(LIBJXL_CFLAGS)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 append_compiler_flag("${LIBJXL_CFLA= GS}")
-=C2=A0 =C2=A0 =C2=A0 =C2=A0endif()
+-=C2=A0 =C2=A0 =C2=A0 endif()
=C2=A0-=C2=A0 =C2=A0 =C2=A0 pkg_check_modules(LIBHWY REQUIRED libhwy)
=C2=A0-=C2=A0 =C2=A0 =C2=A0 target_link_libraries(aom PRIVATE ${LIBHWY_LDFL= AGS} ${LIBHWY_LIBRARIES})
=C2=A0-=C2=A0 =C2=A0 =C2=A0 target_include_directories(aom_dsp_encoder
=C2=A0-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0PRIVATE ${LIBLIBHWY_INC= LUDE_DIRS})
=C2=A0-=C2=A0 =C2=A0 =C2=A0 if(LIBHWY_CFLAGS)
=C2=A0-=C2=A0 =C2=A0 =C2=A0 =C2=A0 append_compiler_flag("${LIBHWY_CFLA= GS}")
--=C2=A0 =C2=A0 =C2=A0 endif()
+=C2=A0 =C2=A0 =C2=A0 =C2=A0endif()
=C2=A0 =C2=A0 =C2=A0 endif()

-=C2=A0 =C2=A0 =C2=A0set_target_properties(aom PROPERTIES LINKER_LANGUAGE C= XX)
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 @@
=C2=A0- 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=C2=A0 =C2=A0 =C2=A0 =C2=A02021-02= -23 19:51:03 UTC
+--- build/cmake/aom_configure.cmake.orig=C2=A0 =C2=A0 =C2=A0 =C2=A02023-08= -14 21:22:47 UTC
=C2=A0+++ build/cmake/aom_configure.cmake
-@@ -71,7 +71,7 @@ if(NOT AOM_TARGET_CPU)
+@@ -75,7 +75,7 @@ if(NOT AOM_TARGET_CPU)
=C2=A0 =C2=A0 =C2=A0 set(AOM_TARGET_CPU "${cpu_lowercase}")
=C2=A0 =C2=A0 elseif(cpu_lowercase MATCHES "aarch64")
=C2=A0 =C2=A0 =C2=A0 set(AOM_TARGET_CPU "arm64")
@@ -12,21 +11,3 @@
=C2=A0 =C2=A0 =C2=A0 set(AOM_TARGET_CPU "ppc")
=C2=A0 =C2=A0 else()
=C2=A0 =C2=A0 =C2=A0 message(WARNING "The architecture ${CMAKE_SYSTEM_= PROCESSOR} is not "
-@@ -159,17 +159,6 @@ elseif(AOM_TARGET_CPU MATCHES "arm")
-=C2=A0 =C2=A0 =C2=A0if(NOT AS_EXECUTABLE)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0set(AS_EXECUTABLE as)
-=C2=A0 =C2=A0 =C2=A0endif()
--=C2=A0 endif()
--=C2=A0 find_program(as_executable_found ${AS_EXECUTABLE})
--=C2=A0 if(NOT as_executable_found)
--=C2=A0 =C2=A0 message(
--=C2=A0 =C2=A0 =C2=A0 FATAL_ERROR
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 "Unable to find assembler and optimizati= ons are enabled."
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 "Searched for ${AS_EXECUTABLE}. Install = it, add it to your path, or "
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 "set the assembler directly by adding -D= AS_EXECUTABLE=3D<assembler path> "
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 "to your CMake command line."
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 "To build without optimizations, add -DA= OM_TARGET_CPU=3Dgeneric to your "
--=C2=A0 =C2=A0 =C2=A0 =C2=A0 "cmake command line.")
-=C2=A0 =C2=A0endif()
-=C2=A0 =C2=A0string(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 @@
=C2=A0- 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
=C2=A0+++ build/cmake/cpu.cmake
=C2=A0@@ -9,7 +9,7 @@
=C2=A0 # can obtain it at www.aomedia.org/license/patent. @@ -8,6 +8,6 @@

=C2=A0-if("${AOM_TARGET_CPU}" MATCHES "^arm")
=C2=A0+if("${AOM_TARGET_CPU}" MATCHES "^arm" AND NOT &q= uot;${AOM_TARGET_CPU}" MATCHES "^armv6")
-=C2=A0 =C2=A0set(ARCH_ARM 1)
-=C2=A0 =C2=A0set(RTCD_ARCH_ARM "yes")
-
+=C2=A0 =C2=A0set(AOM_ARCH_ARM 1)
+=C2=A0 =C2=A0if("${AOM_TARGET_CPU}" STREQUAL "arm64")<= br> +=C2=A0 =C2=A0 =C2=A0set(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
=C2=A0include/aom/aom_integer.h
=C2=A0include/aom/aomcx.h
=C2=A0include/aom/aomdx.h
-lib/libaom.a
=C2=A0lib/libaom.so
=C2=A0lib/libaom.so.3
-lib/libaom.so.3.6.1
+lib/libaom.so.3.7.0
+lib/libaom_static.a
=C2=A0libdata/pkgconfig/aom.pc


--
Nuno Teixeira
FreeBSD Committ= er (ports)
--000000000000245ca4060330648b--