Skip to content

RDKEMW-11485: Fix the entservices-casting to support R5.3 #165

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

Open
tabbas651 wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

RDKEMW-11485: Fix the entservices-casting to support R5.3 #165

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdfbe5a
RDKEMW-11485: Fix the entservices-casting to support R5.3
tabbas651 Feb 4, 2026
6d936bc
Added core.h to avoid Trave_L1 error and removed the unneccessary
tabbas651 Feb 4, 2026
c66d32a
Addressed the karuna review comments
tabbas651 Feb 9, 2026
d85bd1f
Added find_package names as Thunder
tabbas651 Feb 10, 2026
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

cmake_minimum_required(VERSION 3.3)

find_package(WPEFramework)
find_package(WPEFramework NAMES WPEFramework Thunder)

# All packages that did not deliver a CMake Find script (and some deprecated scripts that need to be removed)
# are located in the cmake directory. Include it in the search.
Expand Down
12 changes: 2 additions & 10 deletions Miracast/MiracastPlayer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ find_package(GStreamer REQUIRED)

find_library(GLIB_LIBRARY NAMES glib-2.0 )

if (USE_THUNDER_R4)
find_package(${NAMESPACE}COM REQUIRED)
else ()
find_package(${NAMESPACE}Protocols REQUIRED)
endif (USE_THUNDER_R4)
find_package(${NAMESPACE}COM REQUIRED)

add_library(${MODULE_NAME} SHARED MiracastPlayer.cpp Module.cpp)

Expand All @@ -72,11 +68,7 @@ set_target_properties(${PLUGIN_IMPLEMENTATION} PROPERTIES
CXX_STANDARD_REQUIRED YES)
set_source_files_properties(MiracastPlayer.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")

if (USE_THUNDER_R4)
target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}COM::${NAMESPACE}COM)
else ()
target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}Protocols::${NAMESPACE}Protocols)
endif (USE_THUNDER_R4)

if (RDK_SERVICES_L1_TEST)
target_sources(${PLUGIN_IMPLEMENTATION}
Expand Down Expand Up @@ -116,4 +108,4 @@ endif()
install(TARGETS ${PLUGIN_IMPLEMENTATION}
DESTINATION lib/${STORAGE_DIRECTORY}/plugins)

write_config(${PLUGIN_NAME})
write_config(${PLUGIN_NAME})
6 changes: 1 addition & 5 deletions Miracast/MiracastPlayer/MiracastPlayerImplementation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,7 @@ namespace WPEFramework
public:
static Core::ProxyType<Core::IDispatch> Create(MiracastPlayerImplementation *miracastPlayerImplementation, Event event, ParamsType params)
{
#ifndef USE_THUNDER_R4
return (Core::proxy_cast<Core::IDispatch>(Core::ProxyType<Job>::Create(miracastPlayerImplementation, event, params)));
#else
return (Core::ProxyType<Core::IDispatch>(Core::ProxyType<Job>::Create(miracastPlayerImplementation, event, params)));
#endif
}
virtual void Dispatch()
{
Expand Down Expand Up @@ -150,4 +146,4 @@ namespace WPEFramework
friend class Job;
};
} // namespace Plugin
} // namespace WPEFramework
} // namespace WPEFramework
2 changes: 1 addition & 1 deletion Miracast/MiracastPlayer/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#define MODULE_NAME MiracastPlayer
#endif

#include <core/core.h>
#include <plugins/plugins.h>
#include <tracing/tracing.h>

#undef EXTERNAL
#define EXTERNAL
12 changes: 2 additions & 10 deletions Miracast/MiracastService/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@ find_package(WPEFrameworkSecurityUtil)

find_library(GLIB_LIBRARY NAMES glib-2.0 )

if (USE_THUNDER_R4)
find_package(${NAMESPACE}COM REQUIRED)
else ()
find_package(${NAMESPACE}Protocols REQUIRED)
endif (USE_THUNDER_R4)
find_package(${NAMESPACE}COM REQUIRED)

add_library(${MODULE_NAME} SHARED MiracastService.cpp Module.cpp)

Expand All @@ -70,11 +66,7 @@ set_target_properties(${PLUGIN_IMPLEMENTATION} PROPERTIES
CXX_STANDARD_REQUIRED YES)
set_source_files_properties(MiracastService.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")

if (USE_THUNDER_R4)
target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}COM::${NAMESPACE}COM)
else ()
target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}Protocols::${NAMESPACE}Protocols)
endif (USE_THUNDER_R4)

target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ./)
target_include_directories(${PLUGIN_IMPLEMENTATION} PRIVATE ../common)
Expand All @@ -95,4 +87,4 @@ endif()
install(TARGETS ${PLUGIN_IMPLEMENTATION}
DESTINATION lib/${STORAGE_DIRECTORY}/plugins)

write_config(${PLUGIN_NAME})
write_config(${PLUGIN_NAME})
6 changes: 1 addition & 5 deletions Miracast/MiracastService/MiracastServiceImplementation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,7 @@ namespace WPEFramework
public:
static Core::ProxyType<Core::IDispatch> Create(MiracastServiceImplementation *miracastServiceImplementation, Event event, JsonObject params)
{
#ifndef USE_THUNDER_R4
return (Core::proxy_cast<Core::IDispatch>(Core::ProxyType<Job>::Create(miracastServiceImplementation, event, params)));
#else
return (Core::ProxyType<Core::IDispatch>(Core::ProxyType<Job>::Create(miracastServiceImplementation, event, params)));
#endif
}

virtual void Dispatch()
Expand Down Expand Up @@ -240,4 +236,4 @@ namespace WPEFramework
friend class Job;
}; // class MiracastServiceImplementation
} // namespace Plugin
} // namespace WPEFramework
} // namespace WPEFramework
2 changes: 1 addition & 1 deletion Miracast/MiracastService/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#define MODULE_NAME MiracastService
#endif

#include <core/core.h>
#include <plugins/plugins.h>
#include <tracing/tracing.h>

#undef EXTERNAL
#define EXTERNAL
16 changes: 2 additions & 14 deletions XCast/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,13 @@ set(PLUGIN_XCAST_MODE "Local" CACHE STRING "Controls if the plugin should run in
find_package(${NAMESPACE}Plugins REQUIRED)
find_package(RFC)
find_package(GLIB REQUIRED)
find_package(WPEFrameworkSecurityUtil)
find_package(${NAMESPACE}Definitions REQUIRED)
if(NOT WPEFRAMEWORK_SECURITYUTIL_FOUND)
add_definitions(-DSECURITY_TOKEN_ENABLED=0)
endif()

find_library(GLIB_LIBRARY NAMES glib-2.0)

find_library(XDIAL_LIBRARIES NAMES gdial-server)

if (USE_THUNDER_R4)
find_package(${NAMESPACE}COM REQUIRED)
else ()
find_package(${NAMESPACE}Protocols REQUIRED)
endif (USE_THUNDER_R4)
find_package(${NAMESPACE}COM REQUIRED)

add_library(${MODULE_NAME} SHARED
XCast.cpp
Expand Down Expand Up @@ -74,16 +66,12 @@ set_target_properties(${PLUGIN_IMPLEMENTATION} PROPERTIES
CXX_STANDARD_REQUIRED YES)


if (USE_THUNDER_R4)
target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}COM::${NAMESPACE}COM)
else ()
target_link_libraries(${PLUGIN_IMPLEMENTATION} PRIVATE ${NAMESPACE}Protocols::${NAMESPACE}Protocols)
endif (USE_THUNDER_R4)


find_package(IARMBus)
find_package(CEC)
find_library(NMPROXY_LIB NAMES ${NAMESPACE}NetworkManagerProxy PATHS ${CMAKE_SYSROOT}/usr/lib/wpeframework/proxystubs)
find_library(NMPROXY_LIB NAMES ${NAMESPACE}NetworkManagerProxy PATHS ${CMAKE_SYSROOT}/usr/lib/${STORAGE_DIRECTORY}/proxystubs)

if (RDK_SERVICE_L2_TEST)
message ("L2 test Enabled")
Expand Down
2 changes: 1 addition & 1 deletion XCast/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#define MODULE_NAME Plugin_XCast
#endif

#include <core/core.h>
#include <plugins/plugins.h>
#include <tracing/tracing.h>

#undef EXTERNAL
#define EXTERNAL
6 changes: 1 addition & 5 deletions XCast/XCastImplementation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,7 @@ namespace WPEFramework

public:
static Core::ProxyType<Core::IDispatch> Create(XCastImplementation *tts, Event event,string callsign,JsonObject params) {
#ifndef USE_THUNDER_R4
return (Core::proxy_cast<Core::IDispatch>(Core::ProxyType<Job>::Create(tts, event, callsign, params)));
#else
return (Core::ProxyType<Core::IDispatch>(Core::ProxyType<Job>::Create(tts, event, callsign, params)));
#endif
}

virtual void Dispatch() {
Expand Down Expand Up @@ -332,4 +328,4 @@ namespace WPEFramework
friend class Job;
};
} // namespace Plugin
} // namespace WPEFramework
} // namespace WPEFramework
4 changes: 0 additions & 4 deletions helpers/UtilsController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,7 @@ namespace Utils
return thunderClient;
}

#ifndef USE_THUNDER_R4
class Job : public Core::IDispatchType<void>
#else
class Job : public Core::IDispatch
#endif /* USE_THUNDER_R4 */
{
public:
Job(std::function<void()> work)
Expand Down
Loading