From nobody Thu Aug 17 00:58:04 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 4RR67J6X73z4mRyJ; Thu, 17 Aug 2023 00:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR67J5MrNz4WlS; Thu, 17 Aug 2023 00:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692233884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2yWK030YxRMOIix8/U8jTugdwq7pKCaFt2b8Bk7dAo=; b=dQ6XUGuzxJiOKg+bEdpNJlSfcywxfjpm1jqsgbRJjZ8yHak3g99LukzCwo5zHFMp4fF4p4 uJIsJ9GbBXdGQSg96bwTbqDPNnT1NlZS/I3IcPqyLMnTjFkvVtuIRl33fLvOEw+KHFus4D +z6qbztUtx4h6lS41nYJ4/smgmJz3dgTpYaTGQoISdWEf7oUQdw58VfNUB0dZ8vAiYVxzO 6szZcq1JZVqZoUyje7ijylnKoqmIEZasBhqeSodUEf6prgAgi60N8SQUJXV2M8rRVaAgSu Lz2JYKuJEn7cdopsEJ35Mn75VHn5siUZoQOPK6/mEAh5Iwx+THUT4pveykBt1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692233884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2yWK030YxRMOIix8/U8jTugdwq7pKCaFt2b8Bk7dAo=; b=d6G+E6gWISk6iCerm6v+MgRAJ/rGPtNqY1LhBAX47cpElj8Hw/9+IG2SKRnJnK/FkidVrm xvURhEqNUegj7LcuIGusC7Ya6CqtFF+0ejeaYCCI+AqgwQzTWb3j7mUm2P8nXaa83WgXzO 5t1NcB8JX+30YYcatl0vAd5/7gtmTjgjJ8DIVjtXTUt9i7SYkEE4nbGzeuar/4axJyc7Ls ip+fkNLE9pjHqCBRoE1E5Y3kCz+976aVtu04uwkbLgiiIMgL82pxjVbhufFUyCILEjwd3z mQZXDVAdJPZxejsFm0QJmkpFXiEVy2krShPHzQOCtaIE1PcFjzSYBlfwGckQWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692233884; a=rsa-sha256; cv=none; b=whjjpavajiP98cwtupFWjnTfFcqXPA2cTvsFfR7Ym22yk/Zz17Tp4wQeg/sSrH97YgBg8U kGpFq1gTAUZnA7j+22Ff4pEHN+W++9mw0KIGaURPvW+57YELUjC9Js7zmH6qAoSd5RTwwR kSaf3RkArTa7fJZSjXghCITLtFeXebmiQO8ngTdnBtAchxFnbzqleWHQjViwShzXIopq05 RS+iP617QWq36aWfoD8jsmwqsKOw3YV2n+AEHNPKkmIaQ/KGq+NWzU8aYMXW3MztKJSFXz +5XbdATk/0cI6ZLApk/FEUGiAxk9fnRO6ZBfI2UXiVmnEutE1lnTSwdK2AuYMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RR67J4JdZz1Cc3; Thu, 17 Aug 2023 00:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37H0w4fQ078205; Thu, 17 Aug 2023 00:58:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H0w4d8078202; Thu, 17 Aug 2023 00:58:04 GMT (envelope-from git) Date: Thu, 17 Aug 2023 00:58:04 GMT Message-Id: <202308170058.37H0w4d8078202@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f0f115af84c3 - main - multimedia/aom: update to 3.7.0.r1 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0f115af84c322c272f76bf279e1713494f2dc5b Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f0f115af84c322c272f76bf279e1713494f2dc5b 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= 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= " -- "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