aboutsummaryrefslogtreecommitdiff
path: root/lib/libUPnP
diff options
context:
space:
mode:
authoryol <yol@casix.org>2020-03-10 18:11:17 +0100
committerGitHub <noreply@github.com>2020-03-10 18:11:17 +0100
commit94250dc1fa5839693a8a0a62dee560905ffdf333 (patch)
treeb078b5699a84a75d46d4429bafd223d4cc30fb06 /lib/libUPnP
parentdfbbb41574ee77cfbcc830181235bce37ff0981b (diff)
parent4f8bc734ab5cb0316d770fc373e1c652b5628e02 (diff)
Merge pull request #15831 from olafhering/Platinum.Extras
[libUPnP] Remove unused headers from Platinum/Source/Extras
Diffstat (limited to 'lib/libUPnP')
-rw-r--r--lib/libUPnP/CMakeLists.txt1
-rw-r--r--lib/libUPnP/Platinum/Source/Platinum/Platinum.h7
-rw-r--r--lib/libUPnP/patches/0048-libUPnP-Remove-unused-headers-from-Platinum-Source-E.patch29
3 files changed, 29 insertions, 8 deletions
diff --git a/lib/libUPnP/CMakeLists.txt b/lib/libUPnP/CMakeLists.txt
index d2df9527c2..6ef73e1bbf 100644
--- a/lib/libUPnP/CMakeLists.txt
+++ b/lib/libUPnP/CMakeLists.txt
@@ -115,7 +115,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
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/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
new file mode 100644
index 0000000000..c1cdb8f950
--- /dev/null
+++ b/lib/libUPnP/patches/0048-libUPnP-Remove-unused-headers-from-Platinum-Source-E.patch
@@ -0,0 +1,29 @@
+From: Olaf Hering <olaf@aepfle.de>
+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 <olaf@aepfle.de>
+---
+ 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_ */