Skip to content

Fix ffmpeg-vaapi.patch for updated meson-7.1 branch #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
graemeg wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −5
Open

Fix ffmpeg-vaapi.patch for updated meson-7.1 branch #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions subprojects/packagefiles/ffmpeg-vaapi.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,40 @@
diff --git a/meson.build b/meson.build
index f2c90c3..f8dd187 100644
index 6d83266..f13e376 100644
--- a/meson.build
+++ b/meson.build
@@ -1257,6 +1257,7 @@ check_types = [
@@ -1280,6 +1280,7 @@ check_types = [
['VAProcPipelineParameterBuffer', ['va/va.h', 'va/va_vpp.h']],
['VAEncPictureParameterBufferH264', ['va/va.h', 'va/va_enc_h264.h']],
['VAEncPictureParameterBufferHEVC', ['va/va.h', 'va/va_enc_hevc.h']],
+ ['VAEncPictureParameterBufferAV1', ['va/va.h', 'va/va_enc_av1.h']],
['VAEncPictureParameterBufferJPEG', ['va/va.h', 'va/va_enc_mpeg2.h']],
['VAEncPictureParameterBufferMPEG2', ['va/va.h', 'va/va_enc_mpeg2.h']],
['VAEncPictureParameterBufferVP8', ['va/va.h', 'va/va_enc_vp8.h']],
@@ -3242,8 +3243,10 @@ endif
@@ -2148,7 +2149,7 @@ foreach check : all_checks
found = found and conf.get(precondition, 0) == 1
endif
else
- found = found and conf.get(precondition) == 1
+ found = found and conf.get(precondition, 0) == 1
endif
endforeach

@@ -3378,11 +3379,13 @@ endforeach

add_project_arguments(project_c_args, language: 'c')

+libdrm_dep = dependency('libdrm')
+
libavcodec_optional_deps = [iconv_extra_deps + android_extra_deps]
libavcodec_optional_deps = [
get_variable('iconv_extra_deps', [])
+ android_extra_deps
]
-libavutil_optional_deps = [vaapi_drm_extra_deps + vaapi_x11_extra_deps + vdpau_x11_extra_deps]
+libavutil_optional_deps = [vaapi_drm_extra_deps + vaapi_x11_extra_deps + vdpau_x11_extra_deps + libdrm_dep]
libswresample_optional_deps = [libsoxr_extra_deps]

common_deps += libm_extra_deps
@@ -3362,6 +3365,8 @@ if conf.get('aarch64', 0) == 1
@@ -3512,6 +3515,8 @@ if conf.get('aarch64', 0) == 1
final_conf.set('AS_ARCH_LEVEL', as_arch_level)
endif

Expand Down