-
Notifications
You must be signed in to change notification settings - Fork 26
RDKEMW-6898 : Upgrade GSSDP to latest version #194
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.
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
balav08
wants to merge
9
commits into
main
Choose a base branch
from
feature/RDKEMW-6898_mar27
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b30a48e
Update CMakeLists.txt
balav08 ff5a4ea
Update gdialservice.cpp
balav08 05bb19a
Create gdial1p6-rest.c
balav08 fd42dd9
Create gdial1p6-shield.c
balav08 23c602c
Create gdial1p6-ssdp.c
balav08 fdff39d
Update CMakeLists.txt
balav08 e6da76f
Update gdial1p6-rest.c
balav08 d6ce8c6
Update gdial1p6-shield.c
balav08 5a2e747
Update gdial1p6-ssdp.c
balav08 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -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() | ||||||||||
| if (LIBSOUP3_FOUND) | ||||||||||
| pkg_search_module (SOUP REQUIRED libsoup-3.0) | ||||||||||
|
|
@@ -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}/gdial1p6-rest.c | ||||||||||
| ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-ssdp.c | ||||||||||
|
Comment on lines
+90
to
+91
|
||||||||||
| ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-rest.c | |
| ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-ssdp.c | |
| ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-rest.c | |
| ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-ssdp.c |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When
LIBSOUP3_FOUNDis true, GSSDP is only set ifGSSDP16_FOUNDis true; otherwiseGSSDPis never marked REQUIRED and${GSSDP_INCLUDE_DIRS}/${GSSDP_LIBRARIES}may be empty, leading to build/link failures later. If libsoup3 builds require gssdp-1.6, makepkg_search_module(GSSDP REQUIRED gssdp-1.6)unconditional in that branch (or add a clear fallback/error path).