Skip to contentSkip to conversation

opencv: Check for commercial_ffmpeg as well to enable ffmpeg

PATCH New Khem Raj 1 participant 1 message Dec 1, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 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

---
 meta-oe/recipes-support/opencv/opencv_4.6.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/opencv/opencv_4.6.0.bb +1 -1
index 158cb63423..4403af1952 100644
@@ -109,7 +109,7 @@ EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1"
 
 PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
-    ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libav", "", d)}"
+    ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}"
 
 # TBB does not build for powerpc so disable that package config
 PACKAGECONFIG:remove:powerpc = "tbb"
Signature · 1 line
2.38.1