Merge branch 'main' into R3

Author: Divya-563

package/wpe/wpeframework-clientlibraries/wpeframework-clientlibraries.mk

@@ -112,14 +112,16 @@ endif
 
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDM),y)
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCDMI=ON
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_SOFTWARE_OVERRIDE),y)
+WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCDMI_ADAPTER_IMPLEMENTATION="gstreamer"
+WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES += gstreamer1
+else
 ifeq ($(BR2_PACKAGE_HAS_NEXUS_SAGE),y)
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCDMI_BCM_NEXUS_SVP=ON
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCDMI_ADAPTER_IMPLEMENTATION="broadcom-svp"
 WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES += gst1-bcm
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += [email protected]:WebPlatformForEmbedded/OCDMAdapter-brcm.git
-else
-WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCDMI_ADAPTER_IMPLEMENTATION="gstreamer"
-WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES += gstreamer1
+endif
 endif
 endif