Skip to content

Commit e4bdebf

Browse files
HaseenaSainulHaseenaSainul
authored
Merge pull request #390 from WebPlatformForEmbedded/development/version-bumpups
Thunder: CMAKE BUILD_TYPE flag alignment based on the changes in the thunder source and version bump ups
2 parents 4605f2a + 8af6a76 commit e4bdebf

File tree

13 files changed

+20
-90
lines changed

13 files changed

+20
-90
lines changed

‎package/amazon-backend/amazon-backend.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
AMAZON_BACKEND_VERSION = 23ddafb2838a48daaa2865060663da2e6a9c3268
7+
AMAZON_BACKEND_VERSION = 950b97f47e0f02af2c72366bb153ea8ea1577fd0
88
AMAZON_BACKEND_SITE = [email protected]:Metrological/amazon-backend.git
99
AMAZON_BACKEND_SITE_METHOD = git
1010
AMAZON_BACKEND_DEPENDENCIES = wpeframework wpeframework-clientlibraries

‎package/netflix52/0002-add-nox11-flag.patch‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎package/netflix52/netflix52.mk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
NETFLIX52_VERSION = d8d0b804c89c2af4bfa2a17f675ad2937479f06d
7+
NETFLIX52_VERSION = 59b1d0ac86ac629bcd7c1b29c736561d9e743fb7
88
NETFLIX52_SITE = [email protected]:Metrological/netflix.git
99
NETFLIX52_SITE_METHOD = git
1010
NETFLIX52_LICENSE = PROPRIETARY
@@ -236,6 +236,8 @@ define NETFLIX52_INSTALL_TO_STAGING
236236

237237
$(INSTALL) -d $(1)/usr/lib/pkgconfig
238238
$(INSTALL) -D package/netflix52/netflix.pc $(1)/usr/lib/pkgconfig/netflix.pc
239+
$(INSTALL) -d $(1)/usr/lib/cmake/netflix/
240+
$(INSTALL) -D $(NETFLIX52_BUILD_DIR)/src/platform/gibbon/netflix-config.cmake $(1)/usr/lib/cmake/netflix/netflix-config.cmake
239241

240242
$(INSTALL) -d $(1)/usr/include/netflix
241243
rsync -arL $(NETFLIX52_BUILD_DIR)/include/* $(1)/usr/include/netflix

‎package/wpe/wpeframework-amazon/wpeframework-amazon.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
################################################################################
77

8-
WPEFRAMEWORK_AMAZON_VERSION = baa7c8b11bd757f6b32efff8c7896befc0f5ea5d
8+
WPEFRAMEWORK_AMAZON_VERSION = 57c3e29840f3e29f44f81191c9f634b86f081754
99
WPEFRAMEWORK_AMAZON_SITE_METHOD = git
1010
WPEFRAMEWORK_AMAZON_SITE = [email protected]:Metrological/WPEPluginAmazon.git
1111
WPEFRAMEWORK_AMAZON_INSTALL_STAGING = YES

‎package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine/wpeframework-cdmi-widevine.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-cdmi-widevine
44
#
55
################################################################################
6-
WPEFRAMEWORK_CDMI_WIDEVINE_VERSION = 90befe56289c3192739c84257a05e70fe53c94d8
6+
WPEFRAMEWORK_CDMI_WIDEVINE_VERSION = 65841b1036a77c49a1447a5300b68e80e5d5305d
77
WPEFRAMEWORK_CDMI_WIDEVINE_SITE_METHOD = git
88
WPEFRAMEWORK_CDMI_WIDEVINE_SITE = [email protected]:rdkcentral/OCDM-Widevine.git
99
WPEFRAMEWORK_CDMI_WIDEVINE_INSTALL_STAGING = NO

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-clientlibraries
44
#
55
################################################################################
6-
WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = 79ba921fa40066a22f8299c3ea1408ab292f73b5
6+
WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = c95095057f2c45b382c13f77b2a25e50c868284c
77
WPEFRAMEWORK_CLIENTLIBRARIES_SITE = $(call github,rdkcentral,ThunderClientLibraries,$(WPEFRAMEWORK_CLIENTLIBRARIES_VERSION))
88
WPEFRAMEWORK_CLIENTLIBRARIES_INSTALL_STAGING = YES
99
WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES = wpeframework wpeframework-interfaces
@@ -21,18 +21,6 @@ WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += \
2121
-DCMAKE_MODULE_PATH=$(HOST_DIR)/share/cmake/Modules
2222
endif
2323

24-
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_DEBUG),y)
25-
WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DBUILD_TYPE=Debug
26-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_DEBUG_OPTIMIZED),y)
27-
WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DBUILD_TYPE=DebugOptimized
28-
else ifeq ($( BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_RELEASE_WITH_SYMBOLS),y)
29-
WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DBUILD_TYPE=ReleaseSymbols
30-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_RELEASE),y)
31-
WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DBUILD_TYPE=Release
32-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_PRODUCTION),y)
33-
WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DBUILD_TYPE=Production
34-
endif
35-
3624
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_COMPOSITORCLIENT),y)
3725
WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCOMPOSITORCLIENT=ON
3826
WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES += libegl

‎package/wpe/wpeframework-interfaces/wpeframework-interfaces.mk‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-interfaces
44
#
55
################################################################################
6-
WPEFRAMEWORK_INTERFACES_VERSION = 36901d2714451da51a71854620e47fcd7f34761c
6+
WPEFRAMEWORK_INTERFACES_VERSION = 0cf9ec2fb8aa289037e213b10e7dd0a6950486cd
77
WPEFRAMEWORK_INTERFACES_SITE = $(call github,rdkcentral,ThunderInterfaces,$(WPEFRAMEWORK_INTERFACES_VERSION))
88
WPEFRAMEWORK_INTERFACES_INSTALL_STAGING = YES
99
WPEFRAMEWORK_INTERFACES_DEPENDENCIES = wpeframework
@@ -21,18 +21,6 @@ WPEFRAMEWORK_INTERFACES_CONF_OPTS += \
2121
-DCMAKE_MODULE_PATH=$(HOST_DIR)/share/cmake/Modules
2222
endif
2323

24-
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_DEBUG),y)
25-
WPEFRAMEWORK_INTERFACES_CONF_OPTS += -DBUILD_TYPE=Debug
26-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_DEBUG_OPTIMIZED),y)
27-
WPEFRAMEWORK_INTERFACES_CONF_OPTS += -DBUILD_TYPE=DebugOptimized
28-
else ifeq ($( BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_RELEASE_WITH_SYMBOLS),y)
29-
WPEFRAMEWORK_INTERFACES_CONF_OPTS += -DBUILD_TYPE=ReleaseSymbols
30-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_RELEASE),y)
31-
WPEFRAMEWORK_INTERFACES_CONF_OPTS += -DBUILD_TYPE=Release
32-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_PRODUCTION),y)
33-
WPEFRAMEWORK_INTERFACES_CONF_OPTS += -DBUILD_TYPE=Production
34-
endif
35-
3624
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDM),y)
3725
WPEFRAMEWORK_INTERFACES_CONF_OPTS += -DCDMI=ON
3826
endif

‎package/wpe/wpeframework-libraries/wpeframework-libraries.mk‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-libraries
44
#
55
################################################################################
6-
WPEFRAMEWORK_LIBRARIES_VERSION = b0859b8f4453c44a25765347e831edde0f88d9aa
6+
WPEFRAMEWORK_LIBRARIES_VERSION = 82497384c740a63b6fda3a448a0c209cee9a5f69
77
WPEFRAMEWORK_LIBRARIES_SITE_METHOD = git
88
WPEFRAMEWORK_LIBRARIES_SITE = [email protected]:WebPlatformForEmbedded/ThunderLibraries.git
99
WPEFRAMEWORK_LIBRARIES_INSTALL_STAGING = YES
@@ -21,16 +21,4 @@ WPEFRAMEWORK_LIBRARIES_CONF_OPTS += -DBLUETOOTH=ON
2121
WPEFRAMEWORK_LIBRARIES_DEPENDENCIES += bluez5_utils
2222
endif
2323

24-
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_DEBUG),y)
25-
WPEFRAMEWORK_LIBRARIES_CONF_OPTS += -DBUILD_TYPE=Debug
26-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_DEBUG_OPTIMIZED),y)
27-
WPEFRAMEWORK_LIBRARIES_CONF_OPTS += -DBUILD_TYPE=DebugOptimized
28-
else ifeq ($( BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_RELEASE_WITH_SYMBOLS),y)
29-
WPEFRAMEWORK_LIBRARIES_CONF_OPTS += -DBUILD_TYPE=ReleaseSymbols
30-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_RELEASE),y)
31-
WPEFRAMEWORK_LIBRARIES_CONF_OPTS += -DBUILD_TYPE=Release
32-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_PRODUCTION),y)
33-
WPEFRAMEWORK_LIBRARIES_CONF_OPTS += -DBUILD_TYPE=Production
34-
endif
35-
3624
$(eval $(cmake-package))

‎package/wpe/wpeframework-netflix/wpeframework-netflix.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
WPEFRAMEWORK_NETFLIX_VERSION = 7b7cf7db7ee9fb2cfdb07ad5f3640eeb8cb6b102
7+
WPEFRAMEWORK_NETFLIX_VERSION = 4743ee1461d887d260f4b9bbbaaba8c572451b83
88
ifeq ($(BR2_PACKAGE_NETFLIX50),y)
99
WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DNETFLIX_VERSION_5=true
1010
WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DNETFLIX_VERSION_5_0=true

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-plugins
44
#
55
################################################################################
6-
WPEFRAMEWORK_PLUGINS_VERSION = f5c84b67ed5386ed2ae74275c3407165f2a4b7ba
6+
WPEFRAMEWORK_PLUGINS_VERSION = 41b6fb6b8291605831175e4720dc85a93fdccdd6
77
WPEFRAMEWORK_PLUGINS_SITE = $(call github,rdkcentral,ThunderNanoServices,$(WPEFRAMEWORK_PLUGINS_VERSION))
88
WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
99
WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework wpeframework-interfaces wpeframework-clientlibraries libpng
@@ -17,19 +17,6 @@ WPEFRAMEWORK_PLUGINS_OPKG_DESCRIPTION = "WPEFramework plugins"
1717

1818
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DBUILD_REFERENCE=${WPEFRAMEWORK_PLUGINS_VERSION}
1919

20-
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_DEBUG),y)
21-
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DBUILD_TYPE=Debug
22-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_DEBUG_OPTIMIZED),y)
23-
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DBUILD_TYPE=DebugOptimized
24-
else ifeq ($( BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_RELEASE_WITH_SYMBOLS),y)
25-
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DBUILD_TYPE=ReleaseSymbols
26-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_RELEASE),y)
27-
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DBUILD_TYPE=Release
28-
else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BUILD_TYPE_PRODUCTION),y)
29-
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DBUILD_TYPE=Production
30-
endif
31-
# libprovision
32-
3320
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_COBALT),y)
3421
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_COBALT=ON
3522
WPEFRAMEWORK_PLUGINS_DEPENDENCIES += cobalt

0 commit comments

Comments
 (0)