From nobody Thu Dec 7 00:58:28 2023 X-Original-To: dev-commits-ports-all@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 4Slwr51FCGz53HdV; Thu, 7 Dec 2023 00:58:29 +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 4Slwr50Y21z4Qds; Thu, 7 Dec 2023 00:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701910709; 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=lGjhqm02I9F1sPHHBKS54UYEwzqxL+DQ75K01ImlLP4=; b=hHp6eRm4mhGqJB6LKfKjS7tleV/FhtCgM7nNyczvK6tGPTSDQawktWXMnMr3HOG1uiJAC7 ohwCsa3Hh6wbyfcMQXg8YbWR7ZH90AbBuYGwDN/FIgq1DnV8JImHpD4jnadpmdtOc2QgrU KsJV2Fol47HxlLODptQA2UV2dai8IgS3IEbIa929SdpmegSC7IE2cXbsbZCYAyDQUD3MFv VGi/jNCB4KdqjRMaaK1mB8B9mkQEduiQpKgeO2ZAMPGgx7u+8phLHQtS/QoiVStKmJvI9i fTCgX5WavWZsZ0nDFWZEgtj7xckxsc6LMMPstHIASxV9mlxRUu4xWHs2XgQOoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701910709; a=rsa-sha256; cv=none; b=oHEJJ0Ry6gqJ2Z122ACnk2gONq/xZF2oonGtCD8LWVOj0w2/whC9P93q5pUojqSRrjeSye N1/RCAOJMROruzmDXax8QFAiqasOOPSbJrcg4KgUxerRJGNEtg/w6lSReTNrvyk0pP10J7 bESA+F6B4LN7OzvLCWUXJvnOTcM77sEW+V17QmFR+z3iJWpPc7qTenkAIG/KTkBhBDV41x Wz6qjv2OM8C+MjXrw2X1F/pyetIEq6A86MBlwckOysk10t0Mx96x9yfdeevm52BWITjM+Z dzxiWj9F75bjTxD8bLppYcD0WyU8MlbdtMkIBgv6uqI6vFDBP4jg9xxgXKdHMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701910709; 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=lGjhqm02I9F1sPHHBKS54UYEwzqxL+DQ75K01ImlLP4=; b=O5JkySpSYBHJmHXUEpIWWm1tn/sor4h5rx6cFPO1FeV/fDDwcpNK1lPqw0exEJ3IbXWOTu d/heJCgypf3xq7lchZ6A0O4laiW1QpLVRg98UGEV+nAxr8TCsSFmdQ7y1GBQ8veE/YnGQw JQdSxQF5X61G49TZ+sidXX1KK5bYYwMo5I2VfTnAhAEUkvjSti32NtPkMpcscmUn5Iu6M9 o5+9aB6Q59q6Ye8bUzxCm+d9FLXeBdfmI3vr1OKb5z475qfGs9n/2VSgJJRl0JAEgn3NOH Ly4Nsh8v6f4LIuiP0IsjEgoQIHUw+V/R1M1TrMVoTc0YmWBIQzJieB5nL5OIlw== 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 4Slwr46TpNz1CV; Thu, 7 Dec 2023 00:58:28 +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 3B70wSaf073424; Thu, 7 Dec 2023 00:58:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B70wSsQ073421; Thu, 7 Dec 2023 00:58:28 GMT (envelope-from git) Date: Thu, 7 Dec 2023 00:58:28 GMT Message-Id: <202312070058.3B70wSsQ073421@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: 807f3c0e8252 - main - multimedia/aom: update to 3.8.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 807f3c0e8252e93d9338b012eebfd9202f5ece34 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=807f3c0e8252e93d9338b012eebfd9202f5ece34 commit 807f3c0e8252e93d9338b012eebfd9202f5ece34 Author: Jan Beich AuthorDate: 2023-11-30 23:18:12 +0000 Commit: Jan Beich CommitDate: 2023-12-07 00:47:42 +0000 multimedia/aom: update to 3.8.0 Changes: https://aomedia.googlesource.com/aom/+log/v3.7.1..v3.8.0 Reported by: Repology, portscout --- multimedia/aom/Makefile | 2 +- multimedia/aom/distinfo | 6 ++-- .../files/patch-aom__ports_aarch32__cpudetect.c | 39 ++++++++++++++++++++ .../files/patch-aom__ports_aarch64__cpudetect.c | 29 +++++++++++++++ .../aom/files/patch-aom__ports_arm__cpudetect.c | 41 ---------------------- multimedia/aom/files/patch-build_cmake_cpu.cmake | 16 ++++----- multimedia/aom/pkg-plist | 2 +- 7 files changed, 81 insertions(+), 54 deletions(-) diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index 71dee6a97736..80761c6d1f25 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -1,6 +1,6 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 3.7.1 +DISTVERSION= 3.8.0 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo index d4bfb374fe28..6ee7f481e071 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1700269070 -SHA256 (jbeich-aom-v3.7.1_GH0.tar.gz) = ece0d7d5d2a6b83231e51ffba5aa419df0d855e47e86a34a9e2a99c0211a5f8c -SIZE (jbeich-aom-v3.7.1_GH0.tar.gz) = 5357475 +TIMESTAMP = 1701386292 +SHA256 (jbeich-aom-v3.8.0_GH0.tar.gz) = d8e0cb0157410e97ffcf01f4fe24e6447303c46cc4103d6597ba30ef508afe05 +SIZE (jbeich-aom-v3.8.0_GH0.tar.gz) = 5458954 diff --git a/multimedia/aom/files/patch-aom__ports_aarch32__cpudetect.c b/multimedia/aom/files/patch-aom__ports_aarch32__cpudetect.c new file mode 100644 index 000000000000..f73ebb24b13c --- /dev/null +++ b/multimedia/aom/files/patch-aom__ports_aarch32__cpudetect.c @@ -0,0 +1,39 @@ +- Assume NEON is enabled on armv7 +- Implement runtime detection on FreeBSD + +--- aom_ports/aarch32_cpudetect.c.orig 2023-11-30 23:18:12 UTC ++++ aom_ports/aarch32_cpudetect.c +@@ -12,7 +12,7 @@ + + #include "arm_cpudetect.h" + +-#if !CONFIG_RUNTIME_CPU_DETECT ++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON) + + static int arm_get_cpu_caps(void) { + // This function should actually be a no-op. There is no way to adjust any of +@@ -55,9 +55,23 @@ static int arm_get_cpu_caps(void) { + return flags; + } + +-#elif defined(__linux__) // end defined(AOM_USE_ANDROID_CPU_FEATURES) ++#elif defined(__linux__) || defined(__FreeBSD__) // end defined(AOM_USE_ANDROID_CPU_FEATURES) + + #include ++ ++#if defined(__FreeBSD__) ++static unsigned long getauxval(unsigned long type) ++{ ++ /* Only AT_HWCAP* return unsigned long */ ++ if (type != AT_HWCAP && type != AT_HWCAP2) { ++ return 0; ++ } ++ ++ unsigned long ret = 0; ++ elf_aux_info(type, &ret, sizeof(ret)); ++ return ret; ++} ++#endif + + // Define hwcap values ourselves: building with an old auxv header where these + // hwcap values are not defined should not prevent features from being enabled. diff --git a/multimedia/aom/files/patch-aom__ports_aarch64__cpudetect.c b/multimedia/aom/files/patch-aom__ports_aarch64__cpudetect.c new file mode 100644 index 000000000000..41f34b516c23 --- /dev/null +++ b/multimedia/aom/files/patch-aom__ports_aarch64__cpudetect.c @@ -0,0 +1,29 @@ +- Implement runtime detection on FreeBSD + +--- aom_ports/aarch64_cpudetect.c.orig 2023-11-30 23:18:12 UTC ++++ aom_ports/aarch64_cpudetect.c +@@ -95,9 +95,23 @@ static int arm_get_cpu_caps(void) { + return flags; + } + +-#elif defined(__linux__) // end defined(AOM_USE_ANDROID_CPU_FEATURES) ++#elif defined(__linux__) || defined(__FreeBSD__) // end defined(AOM_USE_ANDROID_CPU_FEATURES) + + #include ++ ++#if defined(__FreeBSD__) ++static unsigned long getauxval(unsigned long type) ++{ ++ /* Only AT_HWCAP* return unsigned long */ ++ if (type != AT_HWCAP && type != AT_HWCAP2) { ++ return 0; ++ } ++ ++ unsigned long ret = 0; ++ elf_aux_info(type, &ret, sizeof(ret)); ++ return ret; ++} ++#endif + + // Define hwcap values ourselves: building with an old auxv header where these + // hwcap values are not defined should not prevent features from being enabled. diff --git a/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c b/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c deleted file mode 100644 index c8bce475ce5e..000000000000 --- a/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c +++ /dev/null @@ -1,41 +0,0 @@ -- Assume NEON is enabled on aarch64 -- Implement NEON runtime detection on FreeBSD - ---- aom_ports/arm_cpudetect.c.orig 2021-10-01 00:23:06 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; - } - --#if !CONFIG_RUNTIME_CPU_DETECT || defined(__APPLE__) -+#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON) || defined(__APPLE__) - - 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,25 @@ int aom_arm_cpu_caps(void) { - } - return flags & mask; - } --#else /* end __linux__ */ -+#elif defined(__FreeBSD__) -+ -+#include -+ -+int aom_arm_cpu_caps(void) { -+ int flags; -+ int mask; -+ u_long hwcap = 0; -+ if (!arm_cpu_env_flags(&flags)) { -+ return flags; -+ } -+ mask = arm_cpu_env_mask(); -+ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); -+#if HAVE_NEON -+ if (hwcap & HWCAP_NEON) flags |= HAS_NEON; -+#endif -+ return flags & mask; -+} -+#else /* end __FreeBSD__ */ - #error \ - "Runtime CPU detection selected, but no CPU detection method " \ - "available for your platform. Rerun cmake with -DCONFIG_RUNTIME_CPU_DETECT=0." diff --git a/multimedia/aom/files/patch-build_cmake_cpu.cmake b/multimedia/aom/files/patch-build_cmake_cpu.cmake index 462c1f1e0aab..92353162f0a3 100644 --- a/multimedia/aom/files/patch-build_cmake_cpu.cmake +++ b/multimedia/aom/files/patch-build_cmake_cpu.cmake @@ -1,13 +1,13 @@ - Don't enable NEON on armv6 similar to build/cmake/rtcd.pl ---- build/cmake/cpu.cmake.orig 2023-08-14 21:22:47 UTC +--- build/cmake/cpu.cmake.orig 2023-11-30 23:18:12 UTC +++ build/cmake/cpu.cmake -@@ -9,7 +9,7 @@ - # can obtain it at www.aomedia.org/license/patent. - # +@@ -61,7 +61,7 @@ if("${AOM_TARGET_CPU}" STREQUAL "arm64") + endif() + endforeach() --if("${AOM_TARGET_CPU}" MATCHES "^arm") -+if("${AOM_TARGET_CPU}" MATCHES "^arm" AND NOT "${AOM_TARGET_CPU}" MATCHES "^armv6") +-elseif("${AOM_TARGET_CPU}" MATCHES "^arm") ++elseif("${AOM_TARGET_CPU}" MATCHES "^arm" AND NOT "${AOM_TARGET_CPU}" MATCHES "^armv6") set(AOM_ARCH_ARM 1) - if("${AOM_TARGET_CPU}" STREQUAL "arm64") - set(AOM_ARCH_AARCH64 1) + set(RTCD_ARCH_ARM "yes") + diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist index a80efc1221b1..3042d3eabe09 100644 --- a/multimedia/aom/pkg-plist +++ b/multimedia/aom/pkg-plist @@ -13,5 +13,5 @@ include/aom/aomdx.h lib/libaom.a lib/libaom.so lib/libaom.so.3 -lib/libaom.so.3.7.1 +lib/libaom.so.3.8.0 libdata/pkgconfig/aom.pc