Bug 257382 - graphics/mesa-dri: fails to apply patch cleanly
Summary: graphics/mesa-dri: fails to apply patch cleanly
Status: Closed Not A Bug
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-x11 (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-07-24 14:15 UTC by dougs@dawnsign.com
Modified: 2021-07-24 15:47 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (x11)


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description dougs@dawnsign.com 2021-07-24 14:15:23 UTC
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.
Comment 1 Emmanuel Vadot freebsd_committer 2021-07-24 14:34:03 UTC
There is not such patch anymore : https://cgit.freebsd.org/ports/tree/graphics/mesa-dri/files

How did you update your tree ?
Comment 2 dougs@dawnsign.com 2021-07-24 15:01:00 UTC
(In reply to Emmanuel Vadot from comment #1)
I used gitup. I'll rerun gitup and report back.
Comment 3 dougs@dawnsign.com 2021-07-24 15:08:38 UTC
(In reply to dougs@dawnsign.com from comment #2)
After rerunning gitup, it seems to have gone through cleanly. Gitup was last run on 7/23 at 10:00 GMT. So it has been a bit more and 24 hours since then.

When I reran gitup, it did complain of some files in graphics.mesa-dri. I uninstalled it and gitup didn't complain on the next run.
Comment 4 Emmanuel Vadot freebsd_committer 2021-07-24 15:47:35 UTC
Closing as it's a gitup bug.