diff --git a/package/thunder-opensource/thunder-clientlibraries/Config.in b/package/thunder-opensource/thunder-clientlibraries/Config.in index 17c7c92..cc33549 100644 --- a/package/thunder-opensource/thunder-clientlibraries/Config.in +++ b/package/thunder-opensource/thunder-clientlibraries/Config.in @@ -1,3 +1,2 @@ config BR2_PACKAGE_THUNDER_CLIENTLIBRARIES - select BR2_PACKAGE_THUNDER_LIBRARIES if BR2_PACKAGE_THUNDER_COMPOSITOR_EXPERIMENTAL && BR2_PACKAGE_THUNDER_CLIENTLIBRARY_COMPOSITORCLIENT bool diff --git a/package/thunder-opensource/thunder-clientlibraries/thunder-clientlibraries.mk b/package/thunder-opensource/thunder-clientlibraries/thunder-clientlibraries.mk index 9f17b00..54a7619 100644 --- a/package/thunder-opensource/thunder-clientlibraries/thunder-clientlibraries.mk +++ b/package/thunder-opensource/thunder-clientlibraries/thunder-clientlibraries.mk @@ -26,7 +26,7 @@ THUNDER_CLIENTLIBRARIES_CONF_OPTS += -DCOMPOSITORCLIENT=ON THUNDER_CLIENTLIBRARIES_DEPENDENCIES += libegl ifeq ($(BR2_PACKAGE_THUNDER_COMPOSITOR_EXPERIMENTAL),y) THUNDER_CLIENTLIBRARIES_CONF_OPTS += -DPLUGIN_COMPOSITOR_IMPLEMENTATION=Mesa -THUNDER_CLIENTLIBRARIES_DEPENDENCIES += libdrm mesa3d thunder-libraries +THUNDER_CLIENTLIBRARIES_DEPENDENCIES += libdrm mesa3d else ifeq ($(BR2_PACKAGE_WESTEROS),y) THUNDER_CLIENTLIBRARIES_CONF_OPTS += -DPLUGIN_COMPOSITOR_IMPLEMENTATION=Wayland THUNDER_CLIENTLIBRARIES_CONF_OPTS += -DPLUGIN_COMPOSITOR_SUB_IMPLEMENTATION=Westeros diff --git a/package/thunder-opensource/thunder-libraries/Config.in b/package/thunder-opensource/thunder-libraries/Config.in index 5dddb33..0ca1139 100644 --- a/package/thunder-opensource/thunder-libraries/Config.in +++ b/package/thunder-opensource/thunder-libraries/Config.in @@ -1,15 +1,6 @@ config BR2_PACKAGE_THUNDER_LIBRARIES - select BR2_PACKAGE_BLUEZ5_UTILS_HEADERS if BR2_PACKAGE_THUNDER_BLUETOOTH - bool + bool "thunderlibraries" + default n -config BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH - bool - -config BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH_GATT - select BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH - bool - -config BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH_AUDIO - select BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH - select BR2_PACKAGE_SBC - bool + help + Thunder Libraries diff --git a/package/thunder-opensource/thunder-libraries/thunder-libraries.mk b/package/thunder-opensource/thunder-libraries/thunder-libraries.mk index b0cc8a3..5defada 100644 --- a/package/thunder-opensource/thunder-libraries/thunder-libraries.mk +++ b/package/thunder-opensource/thunder-libraries/thunder-libraries.mk @@ -13,29 +13,4 @@ THUNDER_LIBRARIES_CONF_OPTS += \ -DCMAKE_MODULE_PATH=$(HOST_DIR)/share/cmake/Modules endif -ifeq ($(BR2_PACKAGE_THUNDER_LIBRARIES_BROADCAST),y) -THUNDER_LIBRARIES_CONF_OPTS += -DBROADCAST=ON -ifeq ($(BR2_PACKAGE_THUNDER_BROADCAST_SI_PARSING),y) -THUNDER_LIBRARIES_CONF_OPTS += -DBROADCAST_SI_PARSING=ON -endif -endif - -ifeq ($(BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH),y) -THUNDER_LIBRARIES_CONF_OPTS += -DBLUETOOTH=ON -THUNDER_LIBRARIES_DEPENDENCIES += bluez5_utils-headers - -ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT)$(BR2_PACKAGE_THUNDER_BLUETOOTH_CHIP_CONTROL_USERSPACE),yy) -THUNDER_LIBRARIES_CONF_OPTS += -DBCM43XX=ON -endif - -ifeq ($(BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH_GATT),y) -THUNDER_LIBRARIES_CONF_OPTS += -DBLUETOOTH_GATT_SUPPORT=ON -endif - -ifeq ($(BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH_AUDIO),y) -THUNDER_LIBRARIES_CONF_OPTS += -DBLUETOOTH_AUDIO_SUPPORT=ON -THUNDER_LIBRARIES_DEPENDENCIES += sbc -endif -endif - $(eval $(cmake-package)) diff --git a/package/thunder-opensource/thunder-plugins/Config.in b/package/thunder-opensource/thunder-plugins/Config.in index 75120f7..8eed648 100644 --- a/package/thunder-opensource/thunder-plugins/Config.in +++ b/package/thunder-opensource/thunder-plugins/Config.in @@ -184,8 +184,6 @@ menuconfig BR2_PACKAGE_THUNDER_BACKOFFICE menuconfig BR2_PACKAGE_THUNDER_BLUETOOTH bool "BluetoothControl" - select BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH - select BR2_PACKAGE_THUNDER_LIBRARIES select BR2_PACKAGE_BLUEZ5_UTILS_HEADERS default n help @@ -252,8 +250,7 @@ menuconfig BR2_PACKAGE_THUNDER_BLUETOOTH config BR2_PACKAGE_THUNDER_BLUETOOTHREMOTECONTROL bool "BluetoothRemoteControl" select BR2_PACKAGE_THUNDER_BLUETOOTH - select BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH - select BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH_GATT + select BR2_PACKAGE_THUNDER_BLUETOOTH_GATT default n help A Bluetooth Low Energy HID over GATT remote control @@ -273,8 +270,7 @@ menuconfig BR2_PACKAGE_THUNDER_BLUETOOTHSDPSERVER menuconfig BR2_PACKAGE_THUNDER_BLUETOOTHAUDIO bool "BluetoothAudio" select BR2_PACKAGE_THUNDER_BLUETOOTH - select BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH - select BR2_PACKAGE_THUNDER_LIBRARY_BLUETOOTH_AUDIO + select BR2_PACKAGE_THUNDER_BLUETOOTH_AUDIO default n help Bluetooth audio plugin @@ -1105,7 +1101,7 @@ config BR2_PACKAGE_THUNDER_SICONTROL menuconfig BR2_PACKAGE_THUNDER_STREAMER select BR2_PACKAGE_THUNDER_PLUGINS - select BR2_PACKAGE_THUNDER_LIBRARIES_BROADCAST + select BR2_PACKAGE_THUNDER_BROADCAST bool "Streamer" default n help diff --git a/package/thunder-opensource/thunder-plugins/thunder-plugins.mk b/package/thunder-opensource/thunder-plugins/thunder-plugins.mk index cf23200..3540bb8 100644 --- a/package/thunder-opensource/thunder-plugins/thunder-plugins.mk +++ b/package/thunder-opensource/thunder-plugins/thunder-plugins.mk @@ -345,7 +345,6 @@ THUNDER_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH_BAUDRATE=921600 else THUNDER_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH_BAUDRATE=115200 endif -THUNDER_PLUGINS_DEPENDENCIES += thunder-libraries ifeq ($(BR2_PACKAGE_THUNDER_BLUETOOTH_AUTOSTART),y) THUNDER_PLUGINS_CONF_OPTS += -DPLUGIN_BLUETOOTH_AUTOSTART=true endif @@ -627,7 +626,6 @@ ifeq ($(BR2_PACKAGE_THUNDER_STREAMER),y) THUNDER_PLUGINS_CONF_OPTS += -DPLUGIN_STREAMER=ON THUNDER_PLUGINS_CONF_OPTS += -DPLUGIN_STREAMER_DECODERS=$(call qstrip,$(BR2_PACKAGE_THUNDER_STREAMER_DECODERS)) ifeq ($(BR2_PACKAGE_THUNDER_STREAMER_BROADCAST),y) -THUNDER_PLUGINS_DEPENDENCIES += thunder-libraries ifeq ($(BR2_PACKAGE_THUNDER_STREAMER_BROADCAST_CABLE),y) PLUGIN_STREAMER_IMPLEMENTATIONS += QAM THUNDER_PLUGINS_CONF_OPTS += -DPLUGIN_STREAMER_BROADCAST_CABLE=ON @@ -738,7 +736,7 @@ THUNDER_PLUGINS_CONF_OPTS += -DCOMPOSITOR_BUFFER_IMPLEMENTATION=GBM else THUNDER_PLUGINS_CONF_OPTS += -DCOMPOSITOR_BUFFER_IMPLEMENTATION=DRMDumb endif -THUNDER_PLUGINS_DEPENDENCIES += libdrm thunder-libraries +THUNDER_PLUGINS_DEPENDENCIES += libdrm else ifeq ($(BR2_PACKAGE_WESTEROS),y) THUNDER_PLUGINS_DEPENDENCIES += westeros THUNDER_PLUGINS_CONF_OPTS += -DPLUGIN_COMPOSITOR_IMPLEMENTATION=Wayland diff --git a/package/thunder-opensource/thunder/Config.in b/package/thunder-opensource/thunder/Config.in index fd549b9..0114ae9 100644 --- a/package/thunder-opensource/thunder/Config.in +++ b/package/thunder-opensource/thunder/Config.in @@ -222,14 +222,14 @@ endmenu menu "Extensions" -menuconfig BR2_PACKAGE_THUNDER_LIBRARIES_BROADCAST - select BR2_PACKAGE_THUNDER_LIBRARIES +menuconfig BR2_PACKAGE_THUNDER_BROADCAST + select BR2_PACKAGE_THUNDER bool "Broadcast" default n help Abstraction on QAM tuner and PSI/SI parser functionality. -if BR2_PACKAGE_THUNDER_LIBRARIES_BROADCAST +if BR2_PACKAGE_THUNDER_BROADCAST config BR2_PACKAGE_THUNDER_BROADCAST_SI_PARSING bool "SI Parsing" default n @@ -239,13 +239,12 @@ config BR2_PACKAGE_THUNDER_BROADCAST_SI_PARSING endif config BR2_PACKAGE_THUNDER_EXTENSION_PRIVILEDGED_REQUEST - select BR2_PACKAGE_THUNDER_LIBRARIES bool "Priviledged Request" help Library to share file desciptors between processes. config BR2_PACKAGE_THUNDER_COMPOSITOR_BUFFER - select BR2_PACKAGE_THUNDER_LIBRARIES + select BR2_PACKAGE_THUNDER_CLIENTLIBRARIES select BR2_PACKAGE_THUNDER_EXTENSION_PRIVILEDGED_REQUEST bool "Compositor Buffer" help @@ -266,6 +265,19 @@ config BR2_PACKAGE_THUNDER_CLIENTLIBRARY_COMPOSITORCLIENT interaction (Graphics/input). The implementation hides all the compositor specific details. allows for relaying keys to plugins +config BR2_PACKAGE_THUNDER_BLUETOOTH + select BR2_PACKAGE_BLUEZ5_UTILS_HEADERS + bool + +config BR2_PACKAGE_THUNDER_BLUETOOTH_GATT + select BR2_PACKAGE_THUNDER_BLUETOOTH + bool + +config BR2_PACKAGE_THUNDER_BLUETOOTH_AUDIO + select BR2_PACKAGE_THUNDER_BLUETOOTH + select BR2_PACKAGE_SBC + bool + config BR2_PACKAGE_THUNDER_EXTENSION_LOCALTRACER bool "Local Tracer" default n diff --git a/package/thunder-opensource/thunder/thunder.mk b/package/thunder-opensource/thunder/thunder.mk index a978506..9265101 100644 --- a/package/thunder-opensource/thunder/thunder.mk +++ b/package/thunder-opensource/thunder/thunder.mk @@ -175,9 +175,30 @@ ifneq ($(BR2_PACKAGE_THUNDER_GROUP),"") THUNDER_CONF_OPTS += -DGROUP="$(call qstrip,$(BR2_PACKAGE_THUNDER_GROUP))" endif +ifeq ($(BR2_PACKAGE_THUNDER_BROADCAST),y) +THUNDER_CONF_OPTS += -DBROADCAST=ON +ifeq ($(BR2_PACKAGE_THUNDER_BROADCAST_SI_PARSING),y) +THUNDER_CONF_OPTS += -DBROADCAST_SI_PARSING=ON +endif +endif + ifeq ($(BR2_PACKAGE_THUNDER_BLUETOOTH),y) THUNDER_CONF_OPTS += -DBLUETOOTH_SUPPORT=ON +THUNDER_CONF_OPTS += -DBLUETOOTH=ON THUNDER_DEPENDENCIES += bluez5_utils-headers + +ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT)$(BR2_PACKAGE_THUNDER_BLUETOOTH_CHIP_CONTROL_USERSPACE),yy) +THUNDER_CONF_OPTS += -DBCM43XX=ON +endif + +ifeq ($(BR2_PACKAGE_THUNDER_BLUETOOTH_GATT),y) +THUNDER_CONF_OPTS += -DBLUETOOTH_GATT_SUPPORT=ON +endif + +ifeq ($(BR2_PACKAGE_THUNDER_BLUETOOTH_AUDIO),y) +THUNDER_CONF_OPTS += -DBLUETOOTH_AUDIO_SUPPORT=ON +THUNDER_DEPENDENCIES += sbc +endif endif ifeq ($(BR2_PACKAGE_THUNDER_EXTENSION_PRIVILEDGED_REQUEST),y)