From a1ae00c7ac5eb47204c0631334bea6fc9f4e9835 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Thu, 15 Jun 2023 15:04:37 +0200 Subject: onevpl: dont pass pcfiledir to cflags Avoid to pass ${pcfiledir} to CFLAGS and thus fix build for ffmpeg with --enable-libvpl | ERROR: libvpl >= 2.6 not found | | If you think configure made a mistake, make sure you are using the latest | version from Git. If the latest version fails, report the problem to the | ffmpeg-user@ffmpeg.org mailing list or IRC #ffmpeg on irc.libera.chat. | Include the log file "ffbuild/config.log" produced by configure as this will help | solve the problem. | WARNING: exit code 1 from a shell command. Signed-off-by: Markus Volk Signed-off-by: Anuj Mittal --- .../files/0006-vpl.pc.in-dont-pass-pcfiledir.patch | 28 ++++++++++++++++++++++ recipes-multimedia/onevpl/onevpl_2023.1.3.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 recipes-multimedia/onevpl/files/0006-vpl.pc.in-dont-pass-pcfiledir.patch (limited to 'recipes-multimedia') diff --git a/recipes-multimedia/onevpl/files/0006-vpl.pc.in-dont-pass-pcfiledir.patch b/recipes-multimedia/onevpl/files/0006-vpl.pc.in-dont-pass-pcfiledir.patch new file mode 100644 index 00000000..887b8b1d --- /dev/null +++ b/recipes-multimedia/onevpl/files/0006-vpl.pc.in-dont-pass-pcfiledir.patch @@ -0,0 +1,28 @@ +From 5055b72e87e2dfbb8ac2fbb0e9d8cb4be2e11add Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Thu, 15 Jun 2023 13:43:32 +0200 +Subject: [PATCH] vpl.pc.in: dont pass pcfiledir to cflags + +Signed-off-by: Markus Volk + +Upstream-Status: Inappropriate [oe specific] +--- + dispatcher/pkgconfig/vpl.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dispatcher/pkgconfig/vpl.pc.in b/dispatcher/pkgconfig/vpl.pc.in +index ab468a9..05c020e 100644 +--- a/dispatcher/pkgconfig/vpl.pc.in ++++ b/dispatcher/pkgconfig/vpl.pc.in +@@ -8,6 +8,6 @@ Description: oneAPI Video Processing Library + Version: @API_VERSION_MAJOR@.@API_VERSION_MINOR@ + URL: https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onevpl.html + +-Libs: -L${libdir} -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@ ++Libs: -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@ + Libs.private: @VPL_PKGCONFIG_PRIVATE_LIBS@ +-Cflags: -I${includedir} -I${includedir}/vpl ++Cflags: -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/vpl +-- +2.34.1 + diff --git a/recipes-multimedia/onevpl/onevpl_2023.1.3.bb b/recipes-multimedia/onevpl/onevpl_2023.1.3.bb index 5b8b6260..400f7a9a 100644 --- a/recipes-multimedia/onevpl/onevpl_2023.1.3.bb +++ b/recipes-multimedia/onevpl/onevpl_2023.1.3.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/oneapi-src/oneVPL.git;protocol=https;branch=master \ file://0003-Fix-X11-rendering-corruption-issue.patch \ file://0004-Adjust-MPEG-1920x1088-alignment.patch \ file://0005-Fix-sample_multi_transcode-intermittent-segfault.patch \ + file://0006-vpl.pc.in-dont-pass-pcfiledir.patch \ " SRCREV = "4cdf44ccaa605460499c52f39eff5517da2fc3c8" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf