[Bug 257382] graphics/mesa-dri: fails to apply patch cleanly

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257382

            Bug ID: 257382
           Summary: graphics/mesa-dri: fails to apply patch cleanly
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: Individual Port(s)
          Assignee: x11@FreeBSD.org
          Reporter: dougs@dawnsign.com
          Assignee: x11@FreeBSD.org
             Flags: maintainer-feedback?(x11@FreeBSD.org)

On a FreeBSD 13.0-RELEASE-p3 system, during a weekly ports update run,
graphics/mesa-dri failed to patch as follows:

===>   mesa-dri-21.1.5 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by mesa-dri-21.1.5 for building
===>  Extracting for mesa-dri-21.1.5
=> SHA256 Checksum OK for mesa-21.1.5.tar.xz.
===>  Patching for mesa-dri-21.1.5
===>  Applying FreeBSD patches for mesa-dri-21.1.5 from
/usr/ports/graphics/mesa-dri/files
1 out of 1 hunks failed--saving rejects to src/intel/vulkan/anv_device.c.rej
===>  FAILED Applying FreeBSD patch-src_intel_vulkan_anv__device.c
===> Cleanly applied FreeBSD patch(es)  patch-meson.build
patch-src_amd_vulkan_radv__device.c
patch-src_gallium_drivers_llvmpipe_lp__rast__tri.c
patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c
patch-src_intel_compiler_brw__nir__lower__shader__calls.c
===> FAILED to apply cleanly FreeBSD patch(es) 
patch-src_intel_vulkan_anv__device.c
*** Error code 1

Stop.
make[1]: stopped in /usr/ports/graphics/mesa-dri
*** Error code 1

Stop.
make: stopped in /usr/ports/graphics/mesa-dri


[root@mailfilter 24.Jul 7:09am /usr/ports/graphics/mesa-dri]# ll
/usr/ports/graphics/mesa-dri/files/
total 68
-rw-r--r--  1 root  wheel   458 Dec 23  2020 01-freebsd.conf
-rw-r--r--  1 root  wheel   528 Oct 12  2020
extra-src_gallium_auxiliary_meson.build
-rw-r--r--  1 root  wheel   431 Oct 12  2020
extra-src_gallium_auxiliary_vl_vl__stubs.c
-rw-r--r--  1 root  wheel  1152 Jul 23 03:24 patch-meson.build
-rw-r--r--  1 root  wheel   441 Oct 12  2020
patch-src_amd_vulkan_radv__device.c
-rw-r--r--  1 root  wheel   357 Jul 23 03:24
patch-src_gallium_drivers_llvmpipe_lp__rast__tri.c
-rw-r--r--  1 root  wheel   340 Jul 23 03:24
patch-src_gallium_drivers_llvmpipe_lp__setup__tri.c
-rw-r--r--  1 root  wheel   538 Jul 23 03:24
patch-src_intel_compiler_brw__nir__lower__shader__calls.c
-rw-r--r--  1 root  wheel   326 Oct 12  2020
patch-src_intel_vulkan_anv__device.c
-rw-r--r--  1 root  wheel   340 Dec  3  2020 patch-src_loader_meson.build
-rw-r--r--  1 root  wheel   313 Jan 17  2019 patch-src_util_build__id.c
-rw-r--r--  1 root  wheel   307 Jul 23 03:24 patch-src_util_os__file.c
-rw-r--r--  1 root  wheel   814 Oct 12  2020 patch-src_util_os__misc.c
-rw-r--r--  1 root  wheel  1147 Jul 23 03:24 patch-src_util_u__process.c
-rw-r--r--  1 root  wheel   170 Oct 12  2020 pkg-message.in


[root@mailfilter 24.Jul 7:10am /usr/ports/graphics/mesa-dri]# make showconfig
===> The following configuration options are available for mesa-dri-21.1.5:
     WAYLAND=off: Enable support for the Wayland platform in Vulkan drivers
     ZSTD=on: Use ZSTD for shader cache
====> Options available for the group PLATFORM
     PLATFORM_X11=off: Enable X11 support for GBM/EGL
     PLATFORM_WAYLAND=off: Enable Wayland support for GBM/EGL
===> Use 'make config' to modify these settings

[root@mailfilter 24.Jul 7:11am /usr/ports/graphics/mesa-dri]# cat
/etc/make.conf
OPTIONS_UNSET= X11 GUI CUPS DOCS EXAMPLES NLS FONTCONFIG 

# Line for custom kernel configuration
KERNCONF=MAILFILTER

# uncomment to enable building ports that contain security vulnerabilities
# such as graphics/tiff
# be sure to comment out after each rebuild!
DISABLE_VULNERABILITIES=yes
MAKE_JOBS_UNSAFE=yes

#DEFAULT_VERSIONS+= perl5=5.32


Please advise.

-- 
You are receiving this mail because:
You are the assignee for the bug.