| Message ID | 20220526023226.3728-1-haihao.xiang@intel.com |
|---|---|
| State | Accepted |
| Commit | f912cefb8343efc511aa72963b9f66e327ec0b88 |
| Headers | show |
| Series | [FFmpeg-devel] qsv: check for libmfx.pc instead of mfx.pc | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
On Thu, 2022-05-26 at 10:32 +0800, Haihao Xiang wrote: > This fixed the regression caused by commit 478e1a98a > > Reported-by: Timo Rothenpieler <timo@rothenpieler.org> > Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> > --- > configure | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure b/configure > index 6cf7d89674..5a167613a4 100755 > --- a/configure > +++ b/configure > @@ -6565,7 +6565,7 @@ enabled liblensfun && require_pkg_config > liblensfun lensfun lensfun.h lf_ > # Media SDK or Intel Media Server Studio, these don't come with > # pkg-config support. Instead, users should make sure that the build > # can find the libraries and headers through other means. > -enabled libmfx && { check_pkg_config libmfx "mfx >= 1.28" > "mfx/mfxvideo.h" MFXInit || > +enabled libmfx && { check_pkg_config libmfx "libmfx >= 1.28" > "mfx/mfxvideo.h" MFXInit || > { require libmfx "mfx/mfxvideo.h > mfx/mfxdefs.h" MFXInit "-llibmfx $advapi32_extralibs" && > { test_cpp_condition mfx/mfxdefs.h > "MFX_VERSION >= 1028" || die "ERROR: libmfx version must be >= 1.28"; } && > warn "using libmfx without pkg-config"; } } Will apply, -Haihao
diff --git a/configure b/configure index 6cf7d89674..5a167613a4 100755 --- a/configure +++ b/configure @@ -6565,7 +6565,7 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_ # Media SDK or Intel Media Server Studio, these don't come with # pkg-config support. Instead, users should make sure that the build # can find the libraries and headers through other means. -enabled libmfx && { check_pkg_config libmfx "mfx >= 1.28" "mfx/mfxvideo.h" MFXInit || +enabled libmfx && { check_pkg_config libmfx "libmfx >= 1.28" "mfx/mfxvideo.h" MFXInit || { require libmfx "mfx/mfxvideo.h mfx/mfxdefs.h" MFXInit "-llibmfx $advapi32_extralibs" && { test_cpp_condition mfx/mfxdefs.h "MFX_VERSION >= 1028" || die "ERROR: libmfx version must be >= 1.28"; } && warn "using libmfx without pkg-config"; } }
This fixed the regression caused by commit 478e1a98a Reported-by: Timo Rothenpieler <timo@rothenpieler.org> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)