Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Syncup with ThunderLibraries components move to Thunder extension changes #14

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Syncup with ThunderLibraries components move to Thunder extension changes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package/thunder-opensource/thunder-clientlibraries/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion package/thunder-opensource/thunder-clientlibraries/thunder-clientlibraries.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 4 additions & 13 deletions package/thunder-opensource/thunder-libraries/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
25 changes: 0 additions & 25 deletions package/thunder-opensource/thunder-libraries/thunder-libraries.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
10 changes: 3 additions & 7 deletions package/thunder-opensource/thunder-plugins/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions package/thunder-opensource/thunder-plugins/thunder-plugins.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 17 additions & 5 deletions package/thunder-opensource/thunder/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
21 changes: 21 additions & 0 deletions package/thunder-opensource/thunder/thunder.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down