Playready v4 will be selected by default

Santhosh Ramani · Santhosh Ramani · commit f77c71eafde4 · 2021-04-28T12:00:36.000+05:30
When CDMi is selected in WPEframework plugins, Playready v4 will be
selected by default. Provisioning from backend is not supported for
Playready v4. Local vault provisioning is supported. If Playready v2.5
is preferred, select from menuconfig under DRM section.
diff --git a/package/libprovision/libprovision.mk b/package/libprovision/libprovision.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBPROVISION_VERSION = 10322dfe52ca4225289825dfdb4f78ae01345ed6
+LIBPROVISION_VERSION = 1f84847b6996128e1667999546244bedef1d2ac6
 LIBPROVISION_SITE_METHOD = git
 LIBPROVISION_SITE = git@github.com:Metrological/libprovision.git
 LIBPROVISION_LICENSE = PROPRIETARY
diff --git a/package/playready/Config.in b/package/playready/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_PLAYREADY
 	select BR2_PACKAGE_HAS_PLAYREADY
 	depends on BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY
-	bool "playready"
+	bool "Playready v2.5"
 	help
-	  A playready implementation port from Microsoft.
+	  A playready v2.5 implementation port from Microsoft.
 
 config BR2_PACKAGE_HAS_PLAYREADY
 	bool
diff --git a/package/playready4/Config.in b/package/playready4/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_PLAYREADY4
         select BR2_PACKAGE_HAS_PLAYREADY
+        select BR2_PACKAGE_LIBCURL
         depends on BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY
-        bool "playready 4"
+        bool "Playready v4.0"
         help
           A playready v4 implementation port from Microsoft.
 
diff --git a/package/playready4/playready4.mk b/package/playready4/playready4.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-PLAYREADY4_VERSION = 17e0356ef6a357d3c20afbd6e125b86e8609e281
+PLAYREADY4_VERSION = 8440356ff33359a9f5b8e2453f51136df7559c32
 PLAYREADY4_SITE = git@github.com:Metrological/playready.git
 PLAYREADY4_SITE_METHOD = git
 PLAYREADY4_LICENSE = PROPRIETARY
 PLAYREADY4_DEPENDENCIES += libcurl
 PLAYREADY4_INSTALL_STAGING = YES
 PLAYREADY4_INSTALL_TARGET = YES
-PLAYREADY4_SUBDIR = "$(@D)/source/linux"
+PLAYREADY4_SUBDIR = "source/linux"
 PLAYREADY4_MAKE=$(MAKE1)
 PLAYREADY_USE_PROVISION = "OFF"
 
@@ -25,7 +25,7 @@ endif
 # Parallel build issues, Use MAKE1 to disable parallel
 define PLAYREADY4_BUILD_CMDS
         ulimit -n 4096; \
-        export PLAYREADY_DIR=$(PLAYREADY4_SUBDIR);\
+	export PLAYREADY_DIR="$(@D)/$(PLAYREADY4_SUBDIR)";\
 	export PLAYREADY_ROOT="$(@D)";\
 	export PLAYREADY_PROFILE="drmprofilelinux.mk";\
 	export LINUX_BUILD="1";\
diff --git a/package/wpe/wpeframework-cdmi/PlayreadyConfig.in b/package/wpe/wpeframework-cdmi/PlayreadyConfig.in
@@ -10,8 +10,8 @@ config BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_MODULE
 	  PlayReady
 
 config BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY
-	select BR2_PACKAGE_HAS_PLAYREADY
-	bool
+        select BR2_PACKAGE_PLAYREADY4 if !BR2_PACKAGE_PLAYREADY
+        bool
 
 config BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS 
 	bool
@@ -33,6 +33,8 @@ config BR2_PACKAGE_BCM_REFSW_SAGE_PLAYREADY_30
         
 endchoice
 
+
+
 config BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_SECURE_STOP_METERING_CERTIFICATE
     depends on BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SVP
     string "SecureStop metering certificate"
diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk
@@ -12,7 +12,7 @@ endif
 WPEFRAMEWORK_CDMI_PLAYREADY_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_PLAYREADY_SITE = git@github.com:rdkcentral/OCDM-Playready.git
 WPEFRAMEWORK_CDMI_PLAYREADY_INSTALL_STAGING = YES
-WPEFRAMEWORK_CDMI_PLAYREADY_DEPENDENCIES = wpeframework-clientlibraries playready
+WPEFRAMEWORK_CDMI_PLAYREADY_DEPENDENCIES = wpeframework-clientlibraries
 WPEFRAMEWORK_CDMI_PLAYREADY_CONF_OPTS = -DPERSISTENT_PATH=${BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH}
 
 ifeq ($(BR2_PACKAGE_PLAYREADY4),y)
diff --git a/package/wpe/wpeframework-provisioning/wpeframework-provisioning.mk b/package/wpe/wpeframework-provisioning/wpeframework-provisioning.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_PROVISIONING_VERSION = 6b4ae14236986b6762e44a2a116e11879c1cdd08
+WPEFRAMEWORK_PROVISIONING_VERSION = 9971f86e3c18a25e144e249f6dde2aac1f16fb6f
 WPEFRAMEWORK_PROVISIONING_SITE_METHOD = git
 WPEFRAMEWORK_PROVISIONING_SITE = git@github.com:WebPlatformForEmbedded/WPEPluginProvisioning.git
 WPEFRAMEWORK_PROVISIONING_INSTALL_STAGING = YES

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`	`6`
`7`		`-LIBPROVISION_VERSION = 10322dfe52ca4225289825dfdb4f78ae01345ed6`
	`7`	`+LIBPROVISION_VERSION = 1f84847b6996128e1667999546244bedef1d2ac6`
`8`	`8`	`LIBPROVISION_SITE_METHOD = git`
`9`	`9`	`LIBPROVISION_SITE = [email protected]:Metrological/libprovision.git`
`10`	`10`	`LIBPROVISION_LICENSE = PROPRIETARY`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`	`6`
`7`		`-WPEFRAMEWORK_PROVISIONING_VERSION = 6b4ae14236986b6762e44a2a116e11879c1cdd08`
	`7`	`+WPEFRAMEWORK_PROVISIONING_VERSION = 9971f86e3c18a25e144e249f6dde2aac1f16fb6f`
`8`	`8`	`WPEFRAMEWORK_PROVISIONING_SITE_METHOD = git`
`9`	`9`	`WPEFRAMEWORK_PROVISIONING_SITE = [email protected]:WebPlatformForEmbedded/WPEPluginProvisioning.git`
`10`	`10`	`WPEFRAMEWORK_PROVISIONING_INSTALL_STAGING = YES`