Skip to content

Commit 226cd98

Browse files
HaseenaSainulHaseenaSainul
authored
Thunder: moved bluetooth and broadcast modules from thunder to thunderlibraries and bumpups (#381)
1 parent bd13e05 commit 226cd98

File tree

9 files changed

+50
-17
lines changed

9 files changed

+50
-17
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-clientlibraries
44
#
55
################################################################################
6-
WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = 320301725af195d538363cd8eed59a98daf910b2
6+
WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = 79ba921fa40066a22f8299c3ea1408ab292f73b5
77
WPEFRAMEWORK_CLIENTLIBRARIES_SITE = $(call github,rdkcentral,ThunderClientLibraries,$(WPEFRAMEWORK_CLIENTLIBRARIES_VERSION))
88
WPEFRAMEWORK_CLIENTLIBRARIES_INSTALL_STAGING = YES
99
WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES = wpeframework wpeframework-interfaces

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-interfaces
44
#
55
################################################################################
6-
WPEFRAMEWORK_INTERFACES_VERSION = ea1517d4e6a1ec4cc9ce149657360c4dd8bc2d65
6+
WPEFRAMEWORK_INTERFACES_VERSION = 36901d2714451da51a71854620e47fcd7f34761c
77
WPEFRAMEWORK_INTERFACES_SITE = $(call github,rdkcentral,ThunderInterfaces,$(WPEFRAMEWORK_INTERFACES_VERSION))
88
WPEFRAMEWORK_INTERFACES_INSTALL_STAGING = YES
99
WPEFRAMEWORK_INTERFACES_DEPENDENCIES = wpeframework

‎package/wpe/wpeframework-libraries/Config.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
config BR2_PACKAGE_WPEFRAMEWORK_LIBRARIES
2+
bool

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
################################################################################
2+
#
3+
# wpeframework-libraries
4+
#
5+
################################################################################
6+
WPEFRAMEWORK_LIBRARIES_VERSION = b0859b8f4453c44a25765347e831edde0f88d9aa
7+
WPEFRAMEWORK_LIBRARIES_SITE_METHOD = git
8+
WPEFRAMEWORK_LIBRARIES_SITE = [email protected]:WebPlatformForEmbedded/ThunderLibraries.git
9+
WPEFRAMEWORK_LIBRARIES_INSTALL_STAGING = YES
10+
WPEFRAMEWORK_LIBRARIES_DEPENDENCIES = wpeframework
11+
12+
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BROADCAST),y)
13+
WPEFRAMEWORK_LIBRARIES_CONF_OPTS += -DBROADCAST=ON
14+
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BROADCAST_SI_PARSING),y)
15+
WPEFRAMEWORK_LIBRARIES_CONF_OPTS += -DBROADCAST_SI_PARSING=ON
16+
endif
17+
endif
18+
19+
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH),y)
20+
WPEFRAMEWORK_LIBRARIES_CONF_OPTS += -DBLUETOOTH=ON
21+
WPEFRAMEWORK_LIBRARIES_DEPENDENCIES += bluez5_utils
22+
endif
23+
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+
36+
$(eval $(cmake-package))

‎package/wpe/wpeframework-plugins/Config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ config BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
33

44
menuconfig BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH
55
bool "BluetoothControl"
6+
select BR2_PACKAGE_WPEFRAMEWORK_LIBRARIES
67
select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
78
select BR2_PACKAGE_BLUEZ5_UTILS
89
default n

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-plugins
44
#
55
################################################################################
6-
WPEFRAMEWORK_PLUGINS_VERSION = d426ad0b36cd5b6b51fda55caf37013d2726f454
6+
WPEFRAMEWORK_PLUGINS_VERSION = f5c84b67ed5386ed2ae74275c3407165f2a4b7ba
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
@@ -202,6 +202,7 @@ endif
202202

203203
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH),y)
204204
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH=ON
205+
WPEFRAMEWORK_PLUGINS_DEPENDENCIES += wpeframework-libraries
205206
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH_AUTOSTART),y)
206207
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH_AUTOSTART=true
207208
endif
@@ -383,6 +384,7 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_STREAMER),y)
383384
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_STREAMER=ON
384385
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_STREAMER_DECODERS=$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_STREAMER_DECODERS))
385386
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_STREAMER_BROADCAST),y)
387+
WPEFRAMEWORK_PLUGINS_DEPENDENCIES += wpeframework-libraries
386388
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_STREAMER_BROADCAST_CABLE),y)
387389
PLUGIN_STREAMER_IMPLEMENTATIONS += QAM
388390
WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_STREAMER_BROADCAST_CABLE=ON

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-rdkservices
44
#
55
################################################################################
6-
WPEFRAMEWORK_RDKSERVICES_VERSION = 307c59c69daaf862d26f72afd04921f12577e491
6+
WPEFRAMEWORK_RDKSERVICES_VERSION = 8acdb5d4c8e85e5b04c2a519dd4f4eefcc546fe3
77
WPEFRAMEWORK_RDKSERVICES_SITE_METHOD = git
88
WPEFRAMEWORK_RDKSERVICES_SITE = [email protected]:WebPlatformForEmbedded/ThunderNanoServicesRDK.git
99
WPEFRAMEWORK_RDKSERVICES_INSTALL_STAGING = YES

‎package/wpe/wpeframework/Config.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ endmenu
111111
menu "Extensions"
112112

113113
menuconfig BR2_PACKAGE_WPEFRAMEWORK_BROADCAST
114+
select BR2_PACKAGE_WPEFRAMEWORK_LIBRARIES
114115
bool "Broadcast"
115116
default n
116117
help
@@ -291,6 +292,7 @@ endmenu
291292

292293
source "package/wpe/wpeframework-interfaces/Config.in"
293294
source "package/wpe/wpeframework-clientlibraries/Config.in"
295+
source "package/wpe/wpeframework-libraries/Config.in"
294296
source "package/wpe/wpeframework-rdkservices/Config.in"
295297

296298
endif

‎package/wpe/wpeframework/wpeframework.mk‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework
44
#
55
################################################################################
6-
WPEFRAMEWORK_VERSION = 14c858dda094aa76abfe2204ba4e85dc73150b4d
6+
WPEFRAMEWORK_VERSION = 86b189699b30220465cffd44dc147400450e916c
77
WPEFRAMEWORK_SITE = $(call github,rdkcentral,Thunder,$(WPEFRAMEWORK_VERSION))
88
WPEFRAMEWORK_INSTALL_STAGING = YES
99
WPEFRAMEWORK_DEPENDENCIES = zlib $(call qstrip,$(BR2_PACKAGE_SDK_INSTALL)) host-wpeframework-tools
@@ -71,12 +71,9 @@ ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PREFIX),"")
7171
WPEFRAMEWORK_CONF_OPTS += -DSYSTEM_PREFIX="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PREFIX))"
7272
endif
7373

74-
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
75-
WPEFRAMEWORK_CONF_OPTS += -DBLUETOOTH_SUPPORT=ON -DBLUETOOTH=ON
76-
WPEFRAMEWORK_DEPENDENCIES += bluez5_utils
77-
endif
78-
7974
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BLUETOOTH),y)
75+
WPEFRAMEWORK_CONF_OPTS += -DBLUETOOTH_SUPPORT=ON
76+
WPEFRAMEWORK_DEPENDENCIES += bluez5_utils
8077
WPEFRAMEWORK_EXTERN_EVENTS += Bluetooth
8178
endif
8279

@@ -85,13 +82,6 @@ WPEFRAMEWORK_DEPENDENCIES += openssl
8582
WPEFRAMEWORK_CONF_OPTS += -DSECURE_SOCKET=ON
8683
endif
8784

88-
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BROADCAST),y)
89-
WPEFRAMEWORK_CONF_OPTS += -DBROADCAST=ON
90-
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_BROADCAST_SI_PARSING),y)
91-
WPEFRAMEWORK_CONF_OPTS += -DBROADCAST_SI_PARSING=ON
92-
endif
93-
endif
94-
9585
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_PROCESSCONTAINERS),y)
9686
WPEFRAMEWORK_CONF_OPTS += -DPROCESSCONTAINERS=ON
9787
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_PROCESSCONTAINERS_BE_LXC),y)

0 commit comments

Comments
 (0)