webos: packagegroup-webos-camera=r3 g-camera-pipeline=gav.52-r17

:Release Notes: Add g-camera-pipeline to all MACHINEs :Detailed Notes: g-camera-pipeline: submissions/gav.49..submissions/gav.52 6424413 Block webos-pro gcp build error f62e557 Change negative PACKAGECONFIG bf06de4 Add null check in feedData c06b625 Fix QA Issue in 32bit build be7c787 Expand to webos-pro a5a28bc Define DISABLE_DISPLAY_RESOURCE c3fcbd4 Remove dto_types.h dependence a1678df Add DISABLE_CAMSRC feature packagegroup-webos-camera: r3 Add g-camera-pipeline to all MACHINEs. :Testing Performed: Local Build & Test : OK :QA Notes: N/A :Issues Addressed: [WRQ-14690] CCC: packagegroup-webos-camera=r3 g-camera-pipeline=gav.52-r17 [WRQ-14547] Add g-camera-pipeline to all MACHINEs Cherry-picked-from-commit: 87a6bfa Cherry-picked-from-branch:
webosose · Jun 5, 2024 · 9011b8f · 9011b8f
1 parent aa2b1c9
commit 9011b8f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/meta-webos/recipes-core/packagegroups/packagegroup-webos-camera.bb b/meta-webos/recipes-core/packagegroups/packagegroup-webos-camera.bb
@@ -4,23 +4,14 @@ DESCRIPTION = "Components for camera added to webOS"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-PR = "r2"
+PR = "r3"
 
 inherit packagegroup
 inherit features_check
 
 REQUIRED_DISTRO_FEATURES = "webos-camera"
 
-VIRTUAL-RUNTIME_g-camera-pipeline ?= ""
-VIRTUAL-RUNTIME_g-camera-pipeline:rpi = "g-camera-pipeline"
-VIRTUAL-RUNTIME_g-camera-pipeline:qemux86 = "g-camera-pipeline"
-VIRTUAL-RUNTIME_g-camera-pipeline:qemux86-64 = "g-camera-pipeline"
-
 RDEPENDS:${PN} = " \
+    g-camera-pipeline \
     packagegroup-webos-media \
 "
-
-# Add to webos distro only
-RDEPENDS:${PN}:append:webos = " \
-    ${VIRTUAL-RUNTIME_g-camera-pipeline} \
-"
diff --git a/meta-webos/recipes-webos/g-camera-pipeline/g-camera-pipeline.bb b/meta-webos/recipes-webos/g-camera-pipeline/g-camera-pipeline.bb
@@ -18,12 +18,12 @@ inherit webos_public_repo
 inherit webos_machine_impl_dep
 inherit webos_pkgconfig
 
-PR = "r16"
+PR = "r17"
 
 DEPENDS = "boost gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad umediaserver media-resource-calculator com.webos.service.camera webos-wayland-extensions"
 DEPENDS:append:rpi = " userland"
 
-WEBOS_VERSION = "1.0.0-gav.49_84c1ac89a789287f34a9b0f5ce0cd40c712365d7"
+WEBOS_VERSION = "1.0.0-gav.52_c77d83e1bfcaa805ada7ec4f3e2a1c477e55a589"
 
 SRC_URI = "${WEBOSOSE_GIT_REPO_COMPLETE}"
 
@@ -37,3 +37,14 @@ FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
 PACKAGECONFIG[use-rpi] = "-DUSE_RPI:BOOL=True,-DUSE_RPI:BOOL=False,"
 PACKAGECONFIG[use-emulator] = "-DUSE_EMULATOR:BOOL=True,-DUSE_EMULATOR:BOOL=False,"
 PACKAGECONFIG:append:emulator = " use-emulator"
+
+# Calculate display plane resource
+PACKAGECONFIG[use-display-resource] = "-DUSE_DISPLAY_RESOURCE:BOOL=True,-DUSE_DISPLAY_RESOURCE:BOOL=False,"
+
+# Use camsrc
+PACKAGECONFIG[use-camsrc] = "-DUSE_CAMSRC:BOOL=True,-DUSE_CAMSRC:BOOL=False,"
+
+# Pro UMS
+PACKAGECONFIG[pro-ums] = "-DPRO_UMS:BOOL=True,-DPRO_UMS:BOOL=False,"
+
+PACKAGECONFIG:webos = "use-display-resource use-camsrc"