Bug 257443 - multimedia/libva-intel-media-driver: 21.3.0 regressed global nox11?
Summary: multimedia/libva-intel-media-driver: 21.3.0 regressed global nox11?
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Jan Beich
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-07-27 05:10 UTC by Evgeniy Khramtsov
Modified: 2021-09-05 21:14 UTC (History)
1 user (show)

See Also:
jbeich: maintainer-feedback+


Attachments
v1 (use "git am") (2.50 KB, patch)
2021-07-27 06:07 UTC, Evgeniy Khramtsov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Evgeniy Khramtsov 2021-07-27 05:10:34 UTC
Note, I was locally fixing fallout from ports not respecting CC, and while it, rebased to 6a3cf86d09cb31d768e072fe0fc7f05126e12c20 which has 21.2.3 (known good) -> 21.3.0 upgrade.

samu: job failed: /usr/local/llvm12/bin/clang++ -DENABLE_KERNELS -DHEVC_FEI_ENABLE_CMRT -DIGFX_GEN10_CNL_SUPPORTED -DIGFX_GEN10_SUPPORTED -DIGFX_GEN11_ICLLP_SUPPORTED -DIGFX_GEN11_JSL_SU
PPORTED -DIGFX_GEN11_SUPPORTED -DIGFX_GEN12_ADLP_SUPPORTED -DIGFX_GEN12_ADLS_SUPPORTED -DIGFX_GEN12_RKL_SUPPORTED -DIGFX_GEN12_SUPPORTED -DIGFX_GEN12_TGLLP_CMFCPATCH_SUPPORTED -DIGFX_GEN12_TGLLP_CMFC_SUPPORTED -DIGFX_GEN12_TGLLP_SUPPORTED -DIGFX_GEN12_TGLLP_SWSB_SUPPORTED -DIGFX_GEN8_BDW_SUPPORTED -DIGFX_GEN8_SUPPORTED -DIGFX_GEN9_BXT_SUPPORTED -DIGFX_GEN9_CFL_SUPPORTED -DIGFX_GEN9_CML_SUPPORTED -DIGFX_GEN9_CMPV_SUPPORTED -DIGFX_GEN9_GLK_SUPPORTED -DIGFX_GEN9_KBL_SUPPORTED -DIGFX_GEN9_SKL_SUPPORTED -DIGFX_GEN9_SUPPORTED -DMEDIA_VERSION=\"21.3.0\" -DMEDIA_VERSION_DETAILS=\"intel-media-21.3.0\" -DVEBOX_AUTO_DENOISE_SUPPORTED=1 -D_AV1_DECODE_SUPPORTED -D_AVC_DECODE_SUPPORTED -D_AVC_ENCODE_VDENC_SUPPORTED -D_AVC_ENCODE_VME_SUPPORTED -D_COMMON_ENCODE_SUPPORTED -D_DECODE_PROCESSING_SUPPORTED -D_HEVC_DECODE_SUPPORTED -D_HEVC_ENCODE_VDENC_SUPPORTED -D_HEVC_ENCODE_VME_SUPPORTED -D_JPEG_DECODE_SUPPORTED -D_JPEG_ENCODE_SUPPORTED -D_MMC_SUPPORTED -D_MPEG2_DECODE_SUPPORTED -D_MPEG2_ENCODE_VME_SUPPORTED -D_RELEASE -D_VC1_DECODE_SUPPORTED -D_VP8_DECODE_SUPPORTED -D_VP8_ENCODE_SUPPORTED -D_VP9_DECODE_SUPPORTED -D_VP9_ENCODE_VDENC_SUPPORTED -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -D__VPHAL_SFC_SUPPORTED=1 -I/wrkdirs/usr/ports/multimedia/libva-intel-media-driver/work/media-driver-intel-media-21.3.0/media_driver/linux/common/os/i915/include -I
[...]
-I/wrkdirs/usr/ports/multimedia/libva-intel-media-driver/work/media-driver-intel-media-21.3.0/../gmmlib/Source/GmmLib/inc -I/wrkdirs/usr/ports/multimedia/libva-intel-media-driver/work/media-driver-intel-media-21.3.0/../huc/inc -I/linux -O2 -pipe -O3 -march=native -mbranches-within-32B-boundaries -fstack-protector-strong -fPIE -fPIC -isystem /usr/local/include -fno-strict-aliasing  -fPIE -fPIC -isystem /usr/local/include -Wreorder -Wsign-promo -Wnon-virtual-dtor -Wno-invalid-offsetof -fvisibility-inlines-hidden -fno-use-cxa-atexit -frtti -fexceptions -fpermissive -fcheck-new -std=c++1y -std=c++11 -O2 -pipe -O3 -march=native -mbranches-within-32B-boundaries -fstack-protector-strong -fPIE -fPIC -isystem /usr/local/include -fno-strict-aliasing  -fPIE -fPIC -isystem /usr/local/include -fPIC -Wall -Winit-self -Wpointer-arith -Wno-unused -Wno-unknown-pragmas -Wno-comments -Wno-sign-compare -Wno-attributes -Wno-narrowing -Wno-overflow -Wno-parentheses -Wno-delete-incomplete -Werror=address -Werror=format-security -Werror=non-virtual-dtor -Werror=return-type -finline-functions -fno-short-enums -Wa,--noexecstack -fno-strict-aliasing -fmessage-length=0 -fvisibility=hidden -fstack-protector -fdata-sections -ffunction-sections -m64 -DLINUX=1 -DLINUX -DNO_RTTI -DNO_EXCEPTION_HANDLING -DINTEL_NOT_PUBLIC -g -D_AMD64_ -D__CT__ -fPIC -Wno-deprecated -Wno-missing-braces -Wno-overloaded-virtual -Wbitfield-constant-conversion -O2 -D_FORTIFY_SOURCE=2 -fno-omit-frame-pointer -MD -MT media_driver/CMakeFiles/iHD_drv_video_OBJ.dir/__/media_softlet/linux/common/ddi/media_libva_interface_next.cpp.o -MF media_driver/CMakeFiles/iHD_drv_video_OBJ.dir/__/media_softlet/linux/common/ddi/media_libva_interface_next.cpp.o.d -o media_driver/CMakeFiles/iHD_drv_video_OBJ.dir/__/media_softlet/linux/common/ddi/media_libva_interface_next.cpp.o -c /wrkdirs/usr/ports/multimedia/libva-intel-media-driver/work/media-driver-intel-media-21.3.0/media_softlet/linux/common/ddi/media_libva_interface_next.cpp
In file included from /wrkdirs/usr/ports/multimedia/libva-intel-media-driver/work/media-driver-intel-media-21.3.0/media_softlet/linux/common/ddi/media_libva_interface_next.cpp:38:
/wrkdirs/usr/ports/multimedia/libva-intel-media-driver/work/media-driver-intel-media-21.3.0/media_driver/linux/common/ddi/media_libva_putsurface_linux.h:31:10: fatal error: 'va/va_dricommon.h' file not found
#include <va/va_dricommon.h>
         ^~~~~~~~~~~~~~~~~~~
1 error generated.
samu: subcommand failed
===> Compilation failed unexpectedly.

foo@:/usr/ports $ rg 'va_dricommon.h' .
./multimedia/libva/pkg-plist
14:%%X11%%include/va/va_dricommon.h

Rebuiling libva with X11=on results in working build.

I plan to bisect this later; this PR is to inform.
Comment 1 Evgeniy Khramtsov 2021-07-27 06:07:13 UTC
Created attachment 226727 [details]
v1 (use "git am")

Attached patch unbreaks it for me. I will test with 130-amd64 vanilla jail/ports/options sometime today, going away from the machine until evening.
Comment 2 Evgeniy Khramtsov 2021-07-27 06:08:01 UTC
(In reply to Evgeniy Khramtsov from comment #1)

Note: https://github.com/intel/media-driver/pull/1223 doesn't help.
Comment 3 commit-hook freebsd_committer 2021-07-27 14:32:00 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d738c49f9754a2e76d9f4fdbb5c157bbc022b888

commit d738c49f9754a2e76d9f4fdbb5c157bbc022b888
Author:     Evgeniy Khramtsov <evgeniy@khramtsov.org>
AuthorDate: 2021-07-27 06:01:59 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-07-27 14:31:05 +0000

    multimedia/libva-intel-media-driver: unbreak X11=off after 7f7a93023ffb

    media_driver/linux/common/ddi/media_libva_putsurface_linux.h:31:10: fatal error: 'va/va_dricommon.h' file not found
     #include <va/va_dricommon.h>
              ^~~~~~~~~~~~~~~~~~~

    PR:             257443
    Approved by:    jbeich (maintainer)

 multimedia/libva-intel-media-driver/Makefile | 1 +
 multimedia/libva-intel-media-driver/distinfo | 2 ++
 2 files changed, 3 insertions(+)
Comment 4 Jan Beich freebsd_committer 2021-07-27 14:33:33 UTC
Thanks.
Comment 5 Jan Beich freebsd_committer 2021-09-05 21:14:55 UTC
FWIW, upstream merged the fix in 21.3.3, landing here as ports 475e308077ae.