Skip to content

RDKEMW-6898: gdialserver not compatible with Libsoup3 library #200

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

Closed
balav08 wants to merge 2 commits into from
Closed

RDKEMW-6898: gdialserver not compatible with Libsoup3 library #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
074e1fe
RDKEMW-6898: gdialserver not compatible with Libsoup3 library
balaji-86 May 15, 2026
d76acc9
Update gdialservice.cpp
balav08 May 15, 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
51 changes: 37 additions & 14 deletions server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,24 @@ set (GDIAL_VERSION_MINOR 0)
find_package (PkgConfig REQUIRED)
pkg_search_module (GLIB REQUIRED glib-2.0)
pkg_search_module (GIO REQUIRED gio-2.0)
pkg_search_module (GSSDP12 gssdp-1.2)
pkg_search_module (LIBSOUP3 libsoup-3.0)
if (GSSDP12_FOUND)
pkg_search_module (GSSDP REQUIRED gssdp-1.2)
add_definitions(-DHAVE_GSSDP_VERSION_1_2_OR_NEWER)
message("Using gssdp-1.2")
if (LIBSOUP3_FOUND)
add_definitions(-DHAVE_LIBSOUP_VERSION_3)
pkg_search_module (GSSDP16 gssdp-1.6)
if (GSSDP16_FOUND)
pkg_search_module (GSSDP REQUIRED gssdp-1.6)
add_definitions(-DHAVE_GSSDP_VERSION_1_6_OR_NEWER)
message("Using gssdp-1.6")
endif()
else()
pkg_search_module (GSSDP REQUIRED gssdp-1.0)
pkg_search_module (GSSDP12 gssdp-1.2)
if (GSSDP12_FOUND)
pkg_search_module (GSSDP REQUIRED gssdp-1.2)
add_definitions(-DHAVE_GSSDP_VERSION_1_2_OR_NEWER)
message("Using gssdp-1.2")
else()
pkg_search_module (GSSDP REQUIRED gssdp-1.0)
endif()
endif()
Comment on lines 29 to 47
if (LIBSOUP3_FOUND)
pkg_search_module (SOUP REQUIRED libsoup-3.0)
Expand Down Expand Up @@ -73,14 +83,27 @@ include_directories (
${PROJECT_GLIB_INCLUDE_DIRS}
)

set (GDIAL_EXEC_SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/gdial-util.c
${CMAKE_CURRENT_SOURCE_DIR}/gdial-app.c
${CMAKE_CURRENT_SOURCE_DIR}/gdial-rest.c
${CMAKE_CURRENT_SOURCE_DIR}/gdial-ssdp.c
${CMAKE_CURRENT_SOURCE_DIR}/gdial-shield.c
${CMAKE_CURRENT_SOURCE_DIR}/gdialservice.cpp
)
if (LIBSOUP3_FOUND)
set (GDIAL_EXEC_SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/gdial-util.c
${CMAKE_CURRENT_SOURCE_DIR}/gdial-app.c
${CMAKE_CURRENT_SOURCE_DIR}/libsoup/3.0/gdial-rest.c
${CMAKE_CURRENT_SOURCE_DIR}/libsoup/3.0/gdial-ssdp.c
${CMAKE_CURRENT_SOURCE_DIR}/libsoup/3.0/gdial-shield.c
${CMAKE_CURRENT_SOURCE_DIR}/gdialservice.cpp
)
message("Using libsoup-3.0 compatible source files (gdial1p6-*.c)")
else()
set (GDIAL_EXEC_SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/gdial-util.c
${CMAKE_CURRENT_SOURCE_DIR}/gdial-app.c
${CMAKE_CURRENT_SOURCE_DIR}/libsoup/2.4/gdial-rest.c
${CMAKE_CURRENT_SOURCE_DIR}/libsoup/2.4/gdial-ssdp.c
${CMAKE_CURRENT_SOURCE_DIR}/libsoup/2.4/gdial-shield.c
${CMAKE_CURRENT_SOURCE_DIR}/gdialservice.cpp
)
message("Using libsoup-2.4 compatible source files (gdial-*.c)")
endif()

link_directories (
${GLIB_LIBRARY_DIRS}
Expand Down
134 changes: 83 additions & 51 deletions server/gdialservice.cpp
View file
Open in desktop

Large diffs are not rendered by default.

0 server/gdial-rest.c → server/libsoup/2.4/gdial-rest.c
View file
Open in desktop
File renamed without changes.
0 server/gdial-shield.c → server/libsoup/2.4/gdial-shield.c
View file
Open in desktop
File renamed without changes.
0 server/gdial-ssdp.c → server/libsoup/2.4/gdial-ssdp.c
View file
Open in desktop
File renamed without changes.
Loading
Loading