Skip to content

Commit cfbb470

Browse files
VeithMetroCopilot
VeithMetro
and
Copilot
authored
[Actions][Linux] Add more plugins to be built, fix all compile warnings and errors (#371)
* Fix some compile warnings and errors in some plugins * Enable additional plugins in Linux build template * Update ThunderNanoServicesRDK workflow to use development branch * Add libdrm-dev package to build dependencies * Update ThunderNanoServicesRDK workflow to use master * Update RustBridge/RustBridge.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 5a19df4 commit cfbb470

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

‎.github/workflows/Linux build template.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
export DEBIAN_FRONTEND=noninteractive
4444
PKGS="python3-venv python3-pip build-essential cmake ninja-build libusb-1.0-0-dev autoconf automake libtool libtool-bin pkg-config"
4545
if [ "${{ matrix.architecture }}" = "32" ]; then
46-
PKGS="$PKGS zlib1g-dev:i386 libssl-dev:i386 libsbc-dev:i386 gcc-13-multilib g++-13-multilib libarchive-dev:i386 libcurl4-openssl-dev:i386 libgpgme-dev:i386 libgpg-error-dev:i386 libgstreamer1.0-dev:i386"
46+
PKGS="$PKGS zlib1g-dev:i386 libssl-dev:i386 libsbc-dev:i386 gcc-13-multilib g++-13-multilib libarchive-dev:i386 libcurl4-openssl-dev:i386 libgpgme-dev:i386 libgpg-error-dev:i386 libgstreamer1.0-dev:i386 libdrm-dev:i386"
4747
else
48-
PKGS="$PKGS zlib1g-dev libssl-dev libsbc-dev libarchive-dev libcurl4-openssl-dev libgpgme-dev libgpg-error-dev libgstreamer1.0-dev"
48+
PKGS="$PKGS zlib1g-dev libssl-dev libsbc-dev libarchive-dev libcurl4-openssl-dev libgpgme-dev libgpg-error-dev libgstreamer1.0-dev libdrm-dev"
4949
fi
5050
for attempt in {1..4}; do
5151
if sudo apt-get install -y --no-install-recommends $PKGS; then
@@ -120,16 +120,20 @@ jobs:
120120
-DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
121121
-DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
122122
-DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
123+
-DPLUGIN_BRIDGELINK=ON \
123124
-DPLUGIN_DEVICEIDENTIFICATION=ON \
124125
-DPLUGIN_DEVICEINFO=ON \
126+
-DPLUGIN_DISPLAYINFO=ON \
125127
-DPLUGIN_LOCATIONSYNC=ON \
126128
-DPLUGIN_MESSAGECONTROL=ON \
127129
-DPLUGIN_MESSENGER=ON \
128130
-DPLUGIN_MONITOR=ON \
129131
-DPLUGIN_OPENCDMI=ON \
132+
-DPLUGIN_PACKAGER=ON \
130133
-DPLUGIN_PERFORMANCEMETRICS=ON \
131134
-DPLUGIN_PLAYERINFO=ON \
132-
-DPLUGIN_PACKAGER=ON \
135+
-DPLUGIN_RUSTBRIDGE=ON \
136+
-DPLUGIN_SECURITYAGENT=ON \
133137
${{steps.plugins.outputs.first_match}}
134138
cmake --build ${{matrix.build_type}}/build/ThunderNanoServicesRDK --target install
135139

‎BridgeLink/BridgeLink.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ namespace Plugin {
721721
}
722722
return (result);
723723
}
724-
Core::hresult Subscribe(ICallback* callback, const string& event, const string& designator) override {
724+
Core::hresult Subscribe(ICallback* callback, const string& event, const string& designator, const string& index) override {
725725
uint32_t result = Core::ERROR_UNAVAILABLE;
726726

727727
_adminLock.Lock();
@@ -732,12 +732,12 @@ namespace Plugin {
732732
_adminLock.Unlock();
733733

734734
if (link != nullptr) {
735-
result = link->Subscribe(callback, event, designator);
735+
result = link->Subscribe(callback, event, designator, index);
736736
link->Release();
737737
}
738738
return (result);
739739
}
740-
Core::hresult Unsubscribe(ICallback* callback, const string& event, const string& designator) override {
740+
Core::hresult Unsubscribe(ICallback* callback, const string& event, const string& designator, const string& index) override {
741741
uint32_t result = Core::ERROR_UNAVAILABLE;
742742

743743
_adminLock.Lock();
@@ -748,7 +748,7 @@ namespace Plugin {
748748
_adminLock.Unlock();
749749

750750
if (link != nullptr) {
751-
result = link->Unsubscribe(callback, event, designator);
751+
result = link->Unsubscribe(callback, event, designator, index);
752752
link->Release();
753753
}
754754
return (result);
@@ -910,7 +910,7 @@ namespace Plugin {
910910

911911
_job.Submit();
912912
}
913-
void Destroy(const string& callsign, PluginHost::IShell* plugin) {
913+
void Destroy(const string& callsign, PluginHost::IShell* plugin VARIABLE_IS_NOT_USED) {
914914

915915
_adminLock.Lock();
916916

@@ -947,7 +947,7 @@ namespace Plugin {
947947

948948
_job.Submit();
949949
}
950-
void Activated(const string& callsign, PluginHost::IShell* plugin) {
950+
void Activated(const string& callsign, PluginHost::IShell* plugin VARIABLE_IS_NOT_USED) {
951951
bool change = false;
952952

953953
_adminLock.Lock();
@@ -966,7 +966,7 @@ namespace Plugin {
966966
_job.Submit();
967967
}
968968
}
969-
void Deactivated(const string& callsign, PluginHost::IShell* plugin) {
969+
void Deactivated(const string& callsign, PluginHost::IShell* plugin VARIABLE_IS_NOT_USED) {
970970
bool change = false;
971971

972972
_adminLock.Lock();
@@ -985,7 +985,7 @@ namespace Plugin {
985985
_job.Submit();
986986
}
987987
}
988-
void Unavailable(const string& callsign, PluginHost::IShell* plugin) {
988+
void Unavailable(const string& callsign, PluginHost::IShell* plugin VARIABLE_IS_NOT_USED) {
989989
bool change = false;
990990

991991
_adminLock.Lock();

‎RustBridge/RustBridge.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ namespace Thunder {
100100
return (message);
101101
}
102102

103-
void RustBridge::Deinitialize(PluginHost::IShell* service) /* override */
103+
void RustBridge::Deinitialize(PluginHost::IShell* service VARIABLE_IS_NOT_USED) /* override */
104104
{
105105
if (_service != nullptr) {
106106
ASSERT(_service == _service);
@@ -156,8 +156,8 @@ namespace Thunder {
156156
return(assigned);
157157
}
158158

159-
void RustBridge::Detach(PluginHost::Channel& channel) /* override */ {
160-
// Hopefull this does not happen as than we are loosing the actual service :-) We could do proper error handling
159+
void RustBridge::Detach(PluginHost::Channel& /* channel */) /* override */ {
160+
// Hopefully this does not happen as then we are losing the actual service :-) We could do proper error handling
161161
// if this happens :-)
162162
_javascriptService = 0;
163163
}
@@ -279,7 +279,7 @@ namespace Thunder {
279279
}
280280
}
281281

282-
void RustBridge::RustInvoke(const string& context, const string& method, const string& parmeters, string& response, uint32_t& result) {
282+
void RustBridge::RustInvoke(const string& /* context */, const string& /* method */, const string& /* parameters */, string& /* response */, uint32_t& /* result */) {
283283

284284
}
285285

‎RustBridge/RustBridge.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ namespace Thunder {
167167
RustBridge(const RustBridge&) = delete;
168168
RustBridge& operator=(const RustBridge&) = delete;
169169

170-
PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST);
170+
PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
171171
RustBridge()
172172
: _adminLock()
173173
, _skipURL(0)
@@ -184,7 +184,7 @@ namespace Thunder {
184184
, _cleaner(*this)
185185
{
186186
}
187-
POP_WARNING();
187+
POP_WARNING()
188188
~RustBridge() override = default;
189189

190190
BEGIN_INTERFACE_MAP(RustBridge)

0 commit comments

Comments
 (0)