summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2023-06-15 15:04:37 +0200
committerAnuj Mittal <anuj.mittal@intel.com>2023-06-16 15:29:25 +0800
commita1ae00c7ac5eb47204c0631334bea6fc9f4e9835 (patch)
tree2d25d6c5a7c7aae47a6211275eeb1fe28bb1de63 /recipes-multimedia
parent046a0f4862253f43518a7d228b160607783f0baf (diff)
downloadmeta-intel-a1ae00c7ac5eb47204c0631334bea6fc9f4e9835.tar.gz
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 <f_l_k@t-online.de> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r--recipes-multimedia/onevpl/files/0006-vpl.pc.in-dont-pass-pcfiledir.patch28
-rw-r--r--recipes-multimedia/onevpl/onevpl_2023.1.3.bb1
2 files changed, 29 insertions, 0 deletions
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 @@
1From 5055b72e87e2dfbb8ac2fbb0e9d8cb4be2e11add Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Thu, 15 Jun 2023 13:43:32 +0200
4Subject: [PATCH] vpl.pc.in: dont pass pcfiledir to cflags
5
6Signed-off-by: Markus Volk <f_l_k@t-online.de>
7
8Upstream-Status: Inappropriate [oe specific]
9---
10 dispatcher/pkgconfig/vpl.pc.in | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/dispatcher/pkgconfig/vpl.pc.in b/dispatcher/pkgconfig/vpl.pc.in
14index ab468a9..05c020e 100644
15--- a/dispatcher/pkgconfig/vpl.pc.in
16+++ b/dispatcher/pkgconfig/vpl.pc.in
17@@ -8,6 +8,6 @@ Description: oneAPI Video Processing Library
18 Version: @API_VERSION_MAJOR@.@API_VERSION_MINOR@
19 URL: https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onevpl.html
20
21-Libs: -L${libdir} -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@
22+Libs: -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@
23 Libs.private: @VPL_PKGCONFIG_PRIVATE_LIBS@
24-Cflags: -I${includedir} -I${includedir}/vpl
25+Cflags: -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/vpl
26--
272.34.1
28
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 \
14 file://0003-Fix-X11-rendering-corruption-issue.patch \ 14 file://0003-Fix-X11-rendering-corruption-issue.patch \
15 file://0004-Adjust-MPEG-1920x1088-alignment.patch \ 15 file://0004-Adjust-MPEG-1920x1088-alignment.patch \
16 file://0005-Fix-sample_multi_transcode-intermittent-segfault.patch \ 16 file://0005-Fix-sample_multi_transcode-intermittent-segfault.patch \
17 file://0006-vpl.pc.in-dont-pass-pcfiledir.patch \
17 " 18 "
18SRCREV = "4cdf44ccaa605460499c52f39eff5517da2fc3c8" 19SRCREV = "4cdf44ccaa605460499c52f39eff5517da2fc3c8"
19S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"