diff options
| author | Khem Raj <raj.khem@gmail.com> | 2022-12-01 10:51:42 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-12-03 08:11:30 -0800 |
| commit | 01996cbe10fb3fd3950833269c7aadb9bae6f032 (patch) | |
| tree | 5095100d7f60d2f5e5c57952a640693dd9fa4eaa /meta-oe/recipes-support/opencv | |
| parent | b3fdc71ef3c358bb2f88a66b3a8d4d07f5c8059c (diff) | |
| download | meta-openembedded-01996cbe10fb3fd3950833269c7aadb9bae6f032.tar.gz | |
opencv: Check for commercial_ffmpeg as well to enable ffmpeg
syntax for LICENSE_FLAGS_ACCEPTED can be "type_package" format as well
and some distros may enable commercial license selectively by not using
"commercial" as broadbrush but "commercial_ffmpeg" to just enable libav
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/opencv')
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.6.0.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb index 158cb6342..4403af195 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.6.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.6.0.bb | |||
| @@ -109,7 +109,7 @@ EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" | |||
| 109 | 109 | ||
| 110 | PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ | 110 | PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ |
| 111 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ | 111 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ |
| 112 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libav", "", d)}" | 112 | ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" |
| 113 | 113 | ||
| 114 | # TBB does not build for powerpc so disable that package config | 114 | # TBB does not build for powerpc so disable that package config |
| 115 | PACKAGECONFIG:remove:powerpc = "tbb" | 115 | PACKAGECONFIG:remove:powerpc = "tbb" |