Merge branch 'main' into R4

Author: Divya-563

package/wpe/wpeframework-cdmi/wpeframework-cdmi-nagra/wpeframework-cdmi-nagra.mk

@@ -5,8 +5,7 @@
 ################################################################################
 
 WPEFRAMEWORK_CDMI_NAGRA_VERSION = R1
-WPEFRAMEWORK_CDMI_NAGRA_SITE_METHOD = git
-WPEFRAMEWORK_CDMI_NAGRA_SITE = [email protected]:rdkcentral/OCDM-Nagra.git
+WPEFRAMEWORK_CDMI_NAGRA_SITE = $(call github,rdkcentral,OCDM-Nagra,$(WPEFRAMEWORK_CDMI_NAGRA_VERSION))
 WPEFRAMEWORK_CDMI_NAGRA_INSTALL_STAGING = NO
 WPEFRAMEWORK_CDMI_NAGRA_DEPENDENCIES = wpeframework
 

package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk

@@ -10,8 +10,7 @@ else
 WPEFRAMEWORK_CDMI_PLAYREADY_VERSION = 59b3deba0710b9f372fd333fcc7aca2ebed483a6
 endif
 
-WPEFRAMEWORK_CDMI_PLAYREADY_SITE_METHOD = git
-WPEFRAMEWORK_CDMI_PLAYREADY_SITE = [email protected]:rdkcentral/OCDM-Playready.git
+WPEFRAMEWORK_CDMI_PLAYREADY_SITE = $(call github,rdkcentral,OCDM-Playready,$(WPEFRAMEWORK_CDMI_PLAYREADY_VERSION))
 WPEFRAMEWORK_CDMI_PLAYREADY_INSTALL_STAGING = YES
 WPEFRAMEWORK_CDMI_PLAYREADY_DEPENDENCIES = wpeframework-clientlibraries
 WPEFRAMEWORK_CDMI_PLAYREADY_CONF_OPTS = -DPERSISTENT_PATH=${BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH}

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

@@ -54,18 +54,6 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR),y)
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCOMPOSITORSERVERPLUGIN=ON
 endif
 
-ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_GSTREAMERCLIENT),y)
-WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES += gstreamer1 gst1-plugins-base
-WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DGSTREAMERCLIENT=ON
-ifeq ($(BR2_PACKAGE_HAS_NEXUS),y)
-WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DGSTREAMER_CLIENT_IMPLEMENTATION=Nexus
-else ifeq  ($(BR2_PACKAGE_RPI_FIRMWARE),y)
-WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DGSTREAMER_CLIENT_IMPLEMENTATION=RPI
-else
-$(error Missing a gstreamer client implementation, please provide one)
-endif
-endif
-
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK),y)
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DBLUETOOTHAUDIOSINK=ON
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_EXAMPLEPLAYER),y)

package/wpe/wpeframework/Config.in

@@ -214,14 +214,6 @@ config BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTHAUDIOSINK_EXAMPLEPLAYER
     default y
 endif
 
-config BR2_PACKAGE_WPEFRAMEWORK_GSTREAMERCLIENT
-        select BR2_PACKAGE_WPEFRAMEWORK_CLIENTLIBRARIES
-        bool "GstreamerClient"
-        default n
-        help
-          Gstreamer client provides custom APIs to manipulate underneath stream sinks which will be linked with created pipeline.
-          This implementation will vary based on custom platforms and sink backends.
-
 config BR2_PACKAGE_WPEFRAMEWORK_DISPLAYINFO
     select BR2_PACKAGE_WPEFRAMEWORK_CLIENTLIBRARIES
     bool "DisplayInfo"