[WIDEVINE] Allow the keybox and the certificate to be configured from the config.

Author: pwielders

package/wpe/wpeframework-cdmi/WidevineConfig.in

@@ -15,10 +15,16 @@ config BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE
 config BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP
         bool
 
-config BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP_DEVICE_CERTIFICATE
-    depends on BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP
+config BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_DEVICE_CERTIFICATE
     string "Device certificate"
     default ""
     help
         Set the path where the device certificate can be
         found on the system. Leave empty to disable.h
+
+config BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_KEYBOX
+    string "Keybox"
+    default ""
+    help
+        Set the path where the keybox can be found on the
+        system. Leave empty to disable.h

package/wpe/wpeframework-plugins/wpeframework-plugins.mk

@@ -204,11 +204,11 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI),y)
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_OPENCDMI=ON
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_OPENCDMI_AUTOSTART=true
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_OPENCDMI_OOP=true
-ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP_DEVICE_CERTIFICATE),"")
-WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_OPENCDMI_WIDEVINE_DEVICE_CERTIFICATE="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP_DEVICE_CERTIFICATE))"
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_DEVICE_CERTIFICATE),)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_OPENCDMI_WIDEVINE_DEVICE_CERTIFICATE="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_DEVICE_CERTIFICATE))"
 endif
-ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_KEYBOX_CERTIFICATE),)
-WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_OPENCDMI_WIDEVINE_KEYBOX_CERTIFICATE=$(BR2_PACKAGE_WPEFRAMEWORK_KEYBOX_CERTIFICATE)
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_KEYBOX),)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_OPENCDMI_WIDEVINE_KEYBOX="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_KEYBOX))"
 endif
 ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER),)
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_OPENCDMI_USER=$(BR2_PACKAGE_WPEFRAMEWORK_CDMI_USER)