Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 18 Jun 2025 21:08:20 +0200
From:      Jan Beich <jbeich@FreeBSD.org>
To:        Dima Panov <fluffy@FreeBSD.org>
Cc:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   Re: git: 69ade557bb45 - main - www/qt6-webengine: unbreak build on aarch64 (+)
Message-ID:  <sejw-eul7-wny@FreeBSD.org>
In-Reply-To: <202506181805.55II5NBc012127@gitrepo.freebsd.org> (Dima Panov's message of "Wed, 18 Jun 2025 18:05:23 GMT")
References:  <202506181805.55II5NBc012127@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail 

Dima Panov <fluffy@FreeBSD.org> writes:

> +--- src/3rdparty/chromium/third_party/dav1d/libdav1d/src/arm/cpu.c.orig	2025-05-29 01:27:28 UTC
> ++++ src/3rdparty/chromium/third_party/dav1d/libdav1d/src/arm/cpu.c
> +@@ -35,6 +35,20 @@
> + #if defined(HAVE_GETAUXVAL) || defined(HAVE_ELF_AUX_INFO)
> + #include <sys/auxv.h>

The bundled version already has https://code.videolan.org/videolan/dav1d/-/commit/b10771e9d6ab
www/chromium isn't affected due to using multimedia/dav1d via system_dav1d.
In www/qt6-webengine that would probably be CMAKE_ON+=QT_FEATURE_webengine_system_dav1d.

> ++#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

so the patch can be simplified to

--8<---------------cut here---------------start------------->8---
--- src/3rdparty/chromium/third_party/dav1d/libdav1d/src/arm/cpu.c.orig	2025-05-29 01:27:28 UTC
+++ src/3rdparty/chromium/third_party/dav1d/libdav1d/src/arm/cpu.c
@@ -32,6 +32,10 @@
 #include "src/cpu.h"
 #include "src/arm/cpu.h"
 
+#if defined(__FreeBSD__)
+#define HAVE_ELF_AUX_INFO
+#endif
+
 #if defined(HAVE_GETAUXVAL) || defined(HAVE_ELF_AUX_INFO)
 #include <sys/auxv.h>
 
--8<---------------cut here---------------end--------------->8---

or

--8<---------------cut here---------------start------------->8---
--- src/3rdparty/chromium/third_party/dav1d/config/linux/arm64/config.h.orig	2025-05-29 01:27:28 UTC
+++ src/3rdparty/chromium/third_party/dav1d/config/linux/arm64/config.h
@@ -63,7 +63,11 @@
 
 #define HAVE_DOTPROD 1
 
+#if defined(__FreeBSD__)
+#define HAVE_ELF_AUX_INFO 1
+#else
 #define HAVE_GETAUXVAL 1
+#endif
 
 #define HAVE_I8MM 1
 
--- src/3rdparty/chromium/third_party/dav1d/config/linux/arm/config.h.orig	2025-05-29 01:27:28 UTC
+++ src/3rdparty/chromium/third_party/dav1d/config/linux/arm/config.h
@@ -49,7 +49,11 @@
 
 #define HAVE_DLSYM 1
 
+#if defined(__FreeBSD__)
+#define HAVE_ELF_AUX_INFO 1
+#else
 #define HAVE_GETAUXVAL 1
+#endif
 
 #define HAVE_POSIX_MEMALIGN 1
 
--8<---------------cut here---------------end--------------->8---

or maybe even

--8<---------------cut here---------------start------------->8---
--- src/3rdparty/chromium/third_party/dav1d/BUILD.gn.orig	2025-05-29 01:27:28 UTC
+++ src/3rdparty/chromium/third_party/dav1d/BUILD.gn
@@ -97,6 +97,9 @@ if (is_win) {
   if (is_mac || is_ios) {
     dav1d_copts += [ "-D_DARWIN_C_SOURCE" ]
   }
+  if (is_freebsd) {
+    dav1d_copts += [ "-DHAVE_ELF_AUX_INFO" ]
+  }
   if (is_linux || is_chromeos || is_android || current_os == "aix") {
     if (!is_clang) {
       dav1d_copts += [ "-D_GNU_SOURCE" ]
--8<---------------cut here---------------end--------------->8---
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?sejw-eul7-wny>