diff options
author | Jose Quaresma <quaresma.jose@gmail.com> | 2022-02-07 01:08:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-08 14:20:18 +0000 |
commit | 1197b1c5ed4077b8cc2fc8b24c8c9d2328e7e179 (patch) | |
tree | f427b445ac2089f8e4c744ac058892cdbfdd3d19 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad | |
parent | 7f4bd6e984fa8fec44490a88b104ca1c7334d1ae (diff) | |
download | poky-1197b1c5ed4077b8cc2fc8b24c8c9d2328e7e179.tar.gz |
gstreamer1.0-plugins-bad: upgrade 1.18.5 -> 1.20.0
- Remove meson options
libmms
ofa
- Add new meson options
gpl: Allow build plugins that have GPL-licensed dependencies
faad: Free AAC audio decoder plugin (GPL - only built if gpl option is also enabled!)
resindvd: Resin DVD playback plugin (GPL - only built if gpl option is also enabled!)
x265: HEVC/H.265 video encoder plugin (GPL - only built if gpl option is also enabled!)
- Add new meson options
Feature options for plugins without external deps
codecalpha
aes: AES encryption/decryption plugin
Feature options for plugins that need external deps
asio: Steinberg Audio Streaming Input Output (ASIO) plugin
gs: Google Cloud Storage source and sink plugin
ldac: LDAC bluetooth audio codec plugin
openaptx: Open Source implementation of Audio Processing Technology codec (aptX) plugin
qroverlay: new elements that allow overlaying data on top of video in the form of a QR code
onnx: ONNX neural network plugin
(From OE-Core rev: 76433d3628cbad311b428a57b25b4e2701ee513b)
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad')
5 files changed, 56 insertions, 69 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch index 13a673cd50..4b3451d321 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch | |||
@@ -1,11 +1,12 @@ | |||
1 | From f08ab3ac2ce43ac91d3bf65b26f26436690f499b Mon Sep 17 00:00:00 2001 | 1 | From 6c3eeaf6435608f744303c17d52245f926cd28ac Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Tue, 26 Jan 2016 15:16:01 -0800 | 3 | Date: Tue, 26 Jan 2016 15:16:01 -0800 |
4 | Subject: [PATCH 1/4] fix maybe-uninitialized warnings when compiling with -Os | 4 | Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 8 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
9 | |||
9 | --- | 10 | --- |
10 | gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- | 11 | gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -23,6 +24,3 @@ index 2c60ced..e8226d8 100644 | |||
23 | guint8 structA[8] = { 0, }; | 24 | guint8 structA[8] = { 0, }; |
24 | guint8 structB[12] = { 0, }; | 25 | guint8 structB[12] = { 0, }; |
25 | GstBitReader br; | 26 | GstBitReader br; |
26 | -- | ||
27 | 2.28.0 | ||
28 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch index ead6897f67..e3e5d9fb60 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch | |||
@@ -1,22 +1,23 @@ | |||
1 | From 3b05e91720c10fcf6e0e408595b7217f6fa145c2 Mon Sep 17 00:00:00 2001 | 1 | From 701255c5797f222f0c47ace6437d213607b98d1e Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Wed, 3 Feb 2016 18:05:41 -0800 | 3 | Date: Wed, 3 Feb 2016 18:05:41 -0800 |
4 | Subject: [PATCH 2/4] avoid including <sys/poll.h> directly | 4 | Subject: [PATCH] avoid including <sys/poll.h> directly |
5 | 5 | ||
6 | musl libc generates warnings if <sys/poll.h> is included directly. | 6 | musl libc generates warnings if <sys/poll.h> is included directly. |
7 | 7 | ||
8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
9 | 9 | ||
10 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 10 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
11 | |||
11 | --- | 12 | --- |
12 | sys/dvb/gstdvbsrc.c | 2 +- | 13 | sys/dvb/gstdvbsrc.c | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c | 16 | diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c |
16 | index ca6b92a..b2772db 100644 | 17 | index 92c918c..5e27871 100644 |
17 | --- a/sys/dvb/gstdvbsrc.c | 18 | --- a/sys/dvb/gstdvbsrc.c |
18 | +++ b/sys/dvb/gstdvbsrc.c | 19 | +++ b/sys/dvb/gstdvbsrc.c |
19 | @@ -97,7 +97,7 @@ | 20 | @@ -98,7 +98,7 @@ |
20 | #include <gst/gst.h> | 21 | #include <gst/gst.h> |
21 | #include <gst/glib-compat-private.h> | 22 | #include <gst/glib-compat-private.h> |
22 | #include <sys/ioctl.h> | 23 | #include <sys/ioctl.h> |
@@ -25,6 +26,3 @@ index ca6b92a..b2772db 100644 | |||
25 | #include <fcntl.h> | 26 | #include <fcntl.h> |
26 | #include <errno.h> | 27 | #include <errno.h> |
27 | #include <stdio.h> | 28 | #include <stdio.h> |
28 | -- | ||
29 | 2.28.0 | ||
30 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch index 88fbc40dcd..280cbf984a 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5ed27de9f662fe063b8b3d5d4335aa64cd4718c9 Mon Sep 17 00:00:00 2001 | 1 | From 001fa08542dd5fc79571f7c803b2d3dd59c04a06 Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Tue, 9 Feb 2016 14:00:00 -0800 | 3 | Date: Tue, 9 Feb 2016 14:00:00 -0800 |
4 | Subject: [PATCH 3/4] ensure valid sentinals for gst_structure_get() etc | 4 | Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc |
5 | 5 | ||
6 | For GStreamer functions declared with G_GNUC_NULL_TERMINATED, | 6 | For GStreamer functions declared with G_GNUC_NULL_TERMINATED, |
7 | ie __attribute__((__sentinel__)), gcc will generate a warning if the | 7 | ie __attribute__((__sentinel__)), gcc will generate a warning if the |
@@ -17,6 +17,7 @@ without an explicit cast to a pointer type. | |||
17 | Upstream-Status: Pending | 17 | Upstream-Status: Pending |
18 | 18 | ||
19 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 19 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
20 | |||
20 | --- | 21 | --- |
21 | sys/decklink/gstdecklink.cpp | 10 +++++----- | 22 | sys/decklink/gstdecklink.cpp | 10 +++++----- |
22 | sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- | 23 | sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- |
@@ -24,10 +25,10 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
24 | 3 files changed, 7 insertions(+), 7 deletions(-) | 25 | 3 files changed, 7 insertions(+), 7 deletions(-) |
25 | 26 | ||
26 | diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp | 27 | diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp |
27 | index 4dac7e1..43762ce 100644 | 28 | index 3f79deb..96600c6 100644 |
28 | --- a/sys/decklink/gstdecklink.cpp | 29 | --- a/sys/decklink/gstdecklink.cpp |
29 | +++ b/sys/decklink/gstdecklink.cpp | 30 | +++ b/sys/decklink/gstdecklink.cpp |
30 | @@ -674,7 +674,7 @@ gst_decklink_mode_get_generic_structure (GstDecklinkModeEnum e) | 31 | @@ -680,7 +680,7 @@ gst_decklink_mode_get_generic_structure (GstDecklinkModeEnum e) |
31 | "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, | 32 | "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, |
32 | "interlace-mode", G_TYPE_STRING, | 33 | "interlace-mode", G_TYPE_STRING, |
33 | mode->interlaced ? "interleaved" : "progressive", | 34 | mode->interlaced ? "interleaved" : "progressive", |
@@ -36,7 +37,7 @@ index 4dac7e1..43762ce 100644 | |||
36 | 37 | ||
37 | return s; | 38 | return s; |
38 | } | 39 | } |
39 | @@ -699,16 +699,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f, | 40 | @@ -705,16 +705,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f, |
40 | case bmdFormat8BitYUV: /* '2vuy' */ | 41 | case bmdFormat8BitYUV: /* '2vuy' */ |
41 | gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", | 42 | gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", |
42 | "colorimetry", G_TYPE_STRING, mode->colorimetry, | 43 | "colorimetry", G_TYPE_STRING, mode->colorimetry, |
@@ -58,10 +59,10 @@ index 4dac7e1..43762ce 100644 | |||
58 | case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */ | 59 | case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */ |
59 | case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */ | 60 | case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */ |
60 | diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp | 61 | diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp |
61 | index 2fef934..c47229a 100644 | 62 | index 50ad5cc..d209180 100644 |
62 | --- a/sys/decklink/gstdecklinkaudiosrc.cpp | 63 | --- a/sys/decklink/gstdecklinkaudiosrc.cpp |
63 | +++ b/sys/decklink/gstdecklinkaudiosrc.cpp | 64 | +++ b/sys/decklink/gstdecklinkaudiosrc.cpp |
64 | @@ -379,7 +379,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self) | 65 | @@ -388,7 +388,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self) |
65 | g_mutex_unlock (&self->input->lock); | 66 | g_mutex_unlock (&self->input->lock); |
66 | 67 | ||
67 | if (videosrc) { | 68 | if (videosrc) { |
@@ -71,10 +72,10 @@ index 2fef934..c47229a 100644 | |||
71 | 72 | ||
72 | switch (vconn) { | 73 | switch (vconn) { |
73 | diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp | 74 | diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp |
74 | index e3a6775..f1a5aae 100644 | 75 | index a64c046..07a09e8 100644 |
75 | --- a/sys/decklink/gstdecklinkvideosink.cpp | 76 | --- a/sys/decklink/gstdecklinkvideosink.cpp |
76 | +++ b/sys/decklink/gstdecklinkvideosink.cpp | 77 | +++ b/sys/decklink/gstdecklinkvideosink.cpp |
77 | @@ -286,7 +286,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure, | 78 | @@ -288,7 +288,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure, |
78 | gpointer user_data) | 79 | gpointer user_data) |
79 | { | 80 | { |
80 | gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, | 81 | gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, |
@@ -83,6 +84,3 @@ index e3a6775..f1a5aae 100644 | |||
83 | 84 | ||
84 | return TRUE; | 85 | return TRUE; |
85 | } | 86 | } |
86 | -- | ||
87 | 2.28.0 | ||
88 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch index b816709066..029b80e174 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f19ff66640f2f472c4e9d9055253032d34e125c6 Mon Sep 17 00:00:00 2001 | 1 | From 3bc5d48257032b6bbee532aad15062fbbcc43bfe Mon Sep 17 00:00:00 2001 |
2 | From: Andrey Zhizhikin <andrey.z@gmail.com> | 2 | From: Andrey Zhizhikin <andrey.z@gmail.com> |
3 | Date: Mon, 27 Jan 2020 10:22:35 +0000 | 3 | Date: Mon, 27 Jan 2020 10:22:35 +0000 |
4 | Subject: [PATCH 4/4] opencv: resolve missing opencv data dir in yocto build | 4 | Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build |
5 | 5 | ||
6 | When Yocto build is performed, opencv searches for data dir using simple | 6 | When Yocto build is performed, opencv searches for data dir using simple |
7 | 'test' command, this fails because pkg-config provides an absolute | 7 | 'test' command, this fails because pkg-config provides an absolute |
@@ -11,39 +11,23 @@ in order for the 'test' utility to pick up the absolute path. | |||
11 | Upstream-Status: Inappropriate [OE-specific] | 11 | Upstream-Status: Inappropriate [OE-specific] |
12 | 12 | ||
13 | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> | 13 | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> |
14 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
15 | |||
14 | --- | 16 | --- |
15 | ext/opencv/meson.build | 7 ++++--- | 17 | ext/opencv/meson.build | 3 +++ |
16 | 1 file changed, 4 insertions(+), 3 deletions(-) | 18 | 1 file changed, 3 insertions(+) |
17 | 19 | ||
18 | diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build | 20 | diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build |
19 | index 0b0b3fc..0ed3344 100644 | 21 | index 1d86b90..b5c8b95 100644 |
20 | --- a/ext/opencv/meson.build | 22 | --- a/ext/opencv/meson.build |
21 | +++ b/ext/opencv/meson.build | 23 | +++ b/ext/opencv/meson.build |
22 | @@ -78,20 +78,21 @@ else | 24 | @@ -87,6 +87,9 @@ if opencv_found |
23 | endif | 25 | opencv_prefix = opencv_dep.get_variable('prefix') |
24 | |||
25 | if opencv_found | ||
26 | + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() | ||
27 | opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') | ||
28 | gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] | 26 | gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] |
29 | 27 | ||
28 | + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() | ||
29 | + opencv_prefix = pkgconf_sysroot + opencv_prefix | ||
30 | + | ||
30 | # Check the data dir used by opencv for its xml data files | 31 | # Check the data dir used by opencv for its xml data files |
31 | # Use prefix from pkg-config to be compatible with cross-compilation | 32 | # Use prefix from pkg-config to be compatible with cross-compilation |
32 | - r = run_command('test', '-d', opencv_prefix + '/share/opencv') | 33 | r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false) |
33 | + r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv') | ||
34 | if r.returncode() == 0 | ||
35 | gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv"' | ||
36 | else | ||
37 | - r = run_command('test', '-d', opencv_prefix + '/share/OpenCV') | ||
38 | + r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/OpenCV') | ||
39 | if r.returncode() == 0 | ||
40 | gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' | ||
41 | else | ||
42 | - r = run_command('test', '-d', opencv_prefix + '/share/opencv4') | ||
43 | + r = run_command('test', '-d', pkgconf_sysroot + opencv_prefix + '/share/opencv4') | ||
44 | if r.returncode() == 0 | ||
45 | gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' | ||
46 | else | ||
47 | -- | ||
48 | 2.28.0 | ||
49 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch index cb3bb7d361..273b45bd49 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1f00d5026118ebd48e4ccf83d32d67155c4e7f60 Mon Sep 17 00:00:00 2001 | 1 | From e31f68c46ff0c29fa3c22755f18d5dde87b23bf2 Mon Sep 17 00:00:00 2001 |
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | 2 | From: Naveen Saini <naveen.kumar.saini@intel.com> |
3 | Date: Wed, 30 Dec 2020 16:37:47 +0800 | 3 | Date: Wed, 30 Dec 2020 16:37:47 +0800 |
4 | Subject: [PATCH] msdk: fix includedir path | 4 | Subject: [PATCH] msdk: fix includedir path |
@@ -8,24 +8,33 @@ In cross compilation, need to prepend PKG_CONFIG_SYSROOT_DIR to the dir path. | |||
8 | Upstream-Status: Inappropriate [OE-specific] | 8 | Upstream-Status: Inappropriate [OE-specific] |
9 | 9 | ||
10 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | 10 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
12 | |||
11 | --- | 13 | --- |
12 | sys/msdk/meson.build | 2 ++ | 14 | sys/msdk/meson.build | 4 ++++ |
13 | 1 file changed, 2 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
14 | 16 | ||
15 | diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build | 17 | diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build |
16 | index 6346c9451..068f38548 100644 | 18 | index 24aabc7..6003bb7 100644 |
17 | --- a/sys/msdk/meson.build | 19 | --- a/sys/msdk/meson.build |
18 | +++ b/sys/msdk/meson.build | 20 | +++ b/sys/msdk/meson.build |
19 | @@ -40,7 +40,9 @@ endif | 21 | @@ -46,7 +46,9 @@ if mfx_api != 'oneVPL' |
22 | mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false) | ||
20 | 23 | ||
21 | mfx_dep = dependency('libmfx', required: false) | 24 | if mfx_dep.found() |
22 | if mfx_dep.found() | 25 | + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() |
23 | + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() | 26 | mfx_incdir = mfx_dep.get_variable('includedir') |
24 | mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') | 27 | + mfx_incdir = pkgconf_sysroot + mfx_incdir |
25 | + mfx_incdir = pkgconf_sysroot + mfx_incdir | 28 | mfx_inc = [] |
26 | mfx_inc = [] | 29 | use_msdk = true |
27 | else | 30 | else |
28 | # Old versions of MediaSDK don't provide a pkg-config file | 31 | @@ -75,7 +77,9 @@ if not use_msdk and mfx_api != 'MSDK' |
29 | -- | 32 | mfx_dep = dependency('vpl', version: '>= 2.2', required: false) |
30 | 2.17.1 | 33 | |
31 | 34 | if mfx_dep.found() | |
35 | + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() | ||
36 | mfx_incdir = mfx_dep.get_variable('includedir') | ||
37 | + mfx_incdir = pkgconf_sysroot + mfx_incdir | ||
38 | mfx_inc = [] | ||
39 | use_onevpl = true | ||
40 | endif | ||