[libUPnP] Remove unused headers from Platinum/Source/Extras

No code from the Extras directory is compiled, so it is unlikely that any of the interfaces will be used. Remove the headers and remove Platinum/Source/Extras from the list of include directories. Signed-off-by: Olaf Hering <[email protected]>
ronie · Mar 28, 2019 · 4f8bc73 · 4f8bc73
1 parent 52e07cf
commit 4f8bc73
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/lib/libUPnP/CMakeLists.txt b/lib/libUPnP/CMakeLists.txt
@@ -114,7 +114,6 @@ target_include_directories(upnp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
                                        Platinum/Source/Devices/MediaConnect
                                        Platinum/Source/Devices/MediaRenderer
                                        Platinum/Source/Devices/MediaServer
-                                       Platinum/Source/Extras
                                        Neptune/Source/Core
                                        Neptune/Source/System/Posix)
 if(CORE_SYSTEM_NAME STREQUAL windows OR CORE_SYSTEM_NAME STREQUAL windowsstore)

diff --git a/lib/libUPnP/Platinum/Source/Platinum/Platinum.h b/lib/libUPnP/Platinum/Source/Platinum/Platinum.h
@@ -108,11 +108,4 @@ cross-platform logging system.
 #include "PltXbox360.h"
 #include "PltMediaConnect.h"
 
-#include "PltDownloader.h"
-#include "PltStreamPump.h"
-#include "PltFrameBuffer.h"
-#include "PltFrameServer.h"
-#include "PltFrameStream.h"
-#include "PltRingBufferStream.h"
-
 #endif /* _PLATINUM_H_ */
diff --git a/lib/libUPnP/patches/0048-libUPnP-Remove-unused-headers-from-Platinum-Source-E.patch b/lib/libUPnP/patches/0048-libUPnP-Remove-unused-headers-from-Platinum-Source-E.patch
@@ -0,0 +1,29 @@
+From: Olaf Hering <[email protected]>
+Date: Thu, 28 Mar 2019 18:07:31 +0100
+Subject: [libUPnP] Remove unused headers from Platinum/Source/Extras
+
+No code from the Extras directory is compiled, so it is unlikely that
+any of the interfaces will be used. Remove the headers and remove
+Platinum/Source/Extras from the list of include directories.
+
+Signed-off-by: Olaf Hering <[email protected]>
+---
+ lib/libUPnP/Platinum/Source/Platinum/Platinum.h | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/lib/libUPnP/Platinum/Source/Platinum/Platinum.h b/lib/libUPnP/Platinum/Source/Platinum/Platinum.h
+index a7f47a6241..970cb8bd95 100644
+--- a/lib/libUPnP/Platinum/Source/Platinum/Platinum.h
++++ b/lib/libUPnP/Platinum/Source/Platinum/Platinum.h
+@@ -108,11 +108,4 @@ cross-platform logging system.
+ #include "PltXbox360.h"
+ #include "PltMediaConnect.h"
+
+-#include "PltDownloader.h"
+-#include "PltStreamPump.h"
+-#include "PltFrameBuffer.h"
+-#include "PltFrameServer.h"
+-#include "PltFrameStream.h"
+-#include "PltRingBufferStream.h"
+-
+ #endif /* _PLATINUM_H_ */
diff --git a/xbmc/network/CMakeLists.txt b/xbmc/network/CMakeLists.txt
@@ -62,7 +62,6 @@ if(ENABLE_UPNP)
                                                      ${CMAKE_SOURCE_DIR}/lib/libUPnP/Platinum/Source/Devices/MediaConnect
                                                      ${CMAKE_SOURCE_DIR}/lib/libUPnP/Platinum/Source/Devices/MediaRenderer
                                                      ${CMAKE_SOURCE_DIR}/lib/libUPnP/Platinum/Source/Devices/MediaServer
-                                                     ${CMAKE_SOURCE_DIR}/lib/libUPnP/Platinum/Source/Extras
                                                      ${CMAKE_SOURCE_DIR}/lib/libUPnP/Neptune/Source/System/Posix
                                                      ${CMAKE_SOURCE_DIR}/lib/libUPnP/Neptune/Source/Core)
 endif()