Re: git: 2080c2eddaca - main - graphics/mesa: Update to 23.3.4

25.01.2024 12:17, Emmanuel Vadot пишет:
> The branch main has been updated by manu:
>
> URL:https://cgit.FreeBSD.org/ports/commit/?id=2080c2eddaca4fa188668ae9fe8d76e0461378c3
>
> commit 2080c2eddaca4fa188668ae9fe8d76e0461378c3
> Author:     Emmanuel Vadot<manu@FreeBSD.org>
> AuthorDate: 2024-01-25 08:37:34 +0000
> Commit:     Emmanuel Vadot<manu@FreeBSD.org>
> CommitDate: 2024-01-25 09:17:00 +0000
>
>      graphics/mesa: Update to 23.3.4
>      
>      Also add a patch to use kcmp(2) if available.
>      
>      Release notes:https://lists.freedesktop.org/archives/mesa-dev/2024-January/226125.html
>      
>      Sponsored by:   Beckhoff Automation GmbH & Co. KG
> ---
>   graphics/mesa-dri/Makefile.common | 3 ++-
>   graphics/mesa-dri/distinfo        | 8 +++++---
>   2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
> index 573345a3552a..19231e2c2156 100644
> --- a/graphics/mesa-dri/Makefile.common
> +++ b/graphics/mesa-dri/Makefile.common
> @@ -12,7 +12,7 @@
>   MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
>   MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
>   
> -MESABASEVERSION=	23.3.3
> +MESABASEVERSION=	23.3.4
>   # if there is a subversion, don't include the '-' between 7.11-rc2.
>   MESASUBVERSION=
>   
> @@ -25,6 +25,7 @@ DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
>   
>   PATCH_SITES=	https://gitlab.freedesktop.org/mesa/mesa/-/commit/
>   PATCHFILES+=	4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch:-p1 #https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26284
> +PATCHFILES+=	7c565db35d39bdbf4e4f867ea19f78b97c8c126f.patch:-p1 #https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27184

Hello!

Did you tested this patch on 13.2?

FAILED: src/util/libmesa_util.a.p/os_file.c.o cc 
-Isrc/util/libmesa_util.a.p -Isrc/util -I../src/util -Iinclude 
-I../include -Isrc -I../src -Isrc/util/format -I../src/util/format 
-I/usr/local/include -fvisibility=hidden -fdiagnostics-color=never 
-DNDEBUG -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c11 
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS 
'-DPACKAGE_VERSION="23.3.4"' 
'-DPACKAGE_BUGREPORT="https://gitlab.freedesktop.org/mesa/mesa/-/issues"' 
-DHAVE_OPENGL=1 -DHAVE_OPENGL_ES_1=1 -DHAVE_OPENGL_ES_2=1 -DHAVE_R300 
-DVIDEO_CODEC_VC1DEC=0 -DVIDEO_CODEC_H264DEC=0 -DVIDEO_CODEC_H264ENC=0 
-DVIDEO_CODEC_H265DEC=0 -DVIDEO_CODEC_H265ENC=0 -DHAVE_X11_PLATFORM 
-DHAVE_WAYLAND_PLATFORM -DHAVE_SURFACELESS_PLATFORM -DHAVE_DRM_PLATFORM 
-DHAVE_XCB_PLATFORM -DENABLE_ST_OMX_BELLAGIO=0 -DENABLE_ST_OMX_TIZONIA=0 
-DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_DRM 
-DGLAPI_EXPORT_PROTO_ENTRY_POINTS=0 -DALLOW_KCMP -DETIME=ETIMEDOUT 
-DENABLE_SHADER_CACHE -DHAVE___BUILTIN_BSWAP32 -DHAVE___BUILTIN_BSWAP64 
-DHAVE___BUILTIN_CLZ -DHAVE___BUILTIN_CLZLL -DHAVE___BUILTIN_CTZ 
-DHAVE___BUILTIN_EXPECT -DHAVE___BUILTIN_FFS -DHAVE___BUILTIN_FFSLL 
-DHAVE___BUILTIN_POPCOUNT -DHAVE___BUILTIN_POPCOUNTLL 
-DHAVE___BUILTIN_UNREACHABLE -DHAVE___BUILTIN_TYPES_COMPATIBLE_P 
-DHAVE_FUNC_ATTRIBUTE_CONST -DHAVE_FUNC_ATTRIBUTE_FLATTEN 
-DHAVE_FUNC_ATTRIBUTE_MALLOC -DHAVE_FUNC_ATTRIBUTE_PURE 
-DHAVE_FUNC_ATTRIBUTE_UNUSED -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT 
-DHAVE_FUNC_ATTRIBUTE_WEAK -DHAVE_FUNC_ATTRIBUTE_FORMAT 
-DHAVE_FUNC_ATTRIBUTE_PACKED -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL 
-DHAVE_FUNC_ATTRIBUTE_ALIAS -DHAVE_FUNC_ATTRIBUTE_NORETURN 
-DHAVE_FUNC_ATTRIBUTE_VISIBILITY -DHAVE_UINT128 -DHAVE_REALLOCARRAY 
-DHAVE_FMEMOPEN -D_GNU_SOURCE -DUSE_SSE41 
-DHAVE___BUILTIN_IA32_CLFLUSHOPT -DUSE_GCC_ATOMIC_BUILTINS 
-DUSE_X86_64_ASM -DHAS_SCHED_H -DHAS_SCHED_GETAFFINITY 
-DHAVE_SYS_SYSCTL_H -DHAVE_XLOCALE_H -DHAVE_ENDIAN_H -DHAVE_DLFCN_H 
-DHAVE_SYS_SHM_H -DHAVE_CET_H -DHAVE_PTHREAD_NP_H -DHAVE_STRTOF 
-DHAVE_MKOSTEMP -DHAVE_MEMFD_CREATE -DHAVE_FLOCK -DHAVE_STRTOK_R 
-DHAVE_GETRANDOM -DHAVE_QSORT_S -DHAVE_POSIX_FALLOCATE 
-DHAVE_BSD_QSORT_R -DHAVE_STRUCT_TIMESPEC -DHAVE_POSIX_MEMALIGN 
-DHAVE_DIRENT_D_TYPE -DHAVE_STRTOD_L -DHAVE_DLADDR 
-DHAVE_DL_ITERATE_PHDR -DHAVE_ZLIB -DHAVE_ZSTD -DHAVE_COMPRESSION 
-DHAVE_PTHREAD -DHAVE_LIBDRM -DHAVE_LIBUDEV -DLLVM_AVAILABLE 
'-DMESA_LLVM_VERSION_STRING="15.0.7"' -DLLVM_IS_SHARED=1 
-DDRAW_LLVM_AVAILABLE -DUSE_LIBELF -DUSE_LIBGLVND=1 -DWL_HIDE_DEPRECATED 
-DXCB_KEYSYMS_AVAILABLE -DHAVE_DRI -DHAVE_DRI2 -DHAVE_DRI3 
-DHAVE_DRI3_MODIFIERS -DHAVE_DRISW_KMS 
-Werror=implicit-function-declaration -Werror=missing-prototypes 
-Werror=return-type -Werror=empty-body 
-Werror=incompatible-pointer-types -Werror=int-conversion 
-Wimplicit-fallthrough -Wmisleading-indentation 
-Wno-missing-field-initializers -fno-math-errno -fno-trapping-math 
-Qunused-arguments -fno-common -Wno-microsoft-enum-value 
-Wno-unused-function -Werror=format -Wformat-security 
-ffunction-sections -fdata-sections -Wno-unused-variable 
-Wno-unused-but-set-variable -O2 -pipe -march=core2 
-fstack-protector-strong -fno-strict-aliasing -fPIC -pthread 
-Werror=pointer-arith -Werror=vla -Werror=gnu-empty-initializer -MD -MQ 
src/util/libmesa_util.a.p/os_file.c.o -MF 
src/util/libmesa_util.a.p/os_file.c.o.d -o 
src/util/libmesa_util.a.p/os_file.c.o -c ../src/util/os_file.c 
../src/util/os_file.c:216:19: error: use of undeclared identifier 
'SYS_kcmp' return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); ^ 
../src/util/os_file.c:216:39: error: use of undeclared identifier 
'KCMP_FILE' return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); ^ 2 
errors generated.


After remove this patch port build without this error.


-- 
Best regards,
Vladimir Druzenko