miniupnpc: Update to 2.1.20190408

Switched to CMake. This allows getting rid of several patches and hacks.

Added PKG_LICENSE information

Rearranged some stuff for consistency between packages.

Added some linked flags for smaller size. Saves around 500 bytes on MIPS.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-04-13 15:32:08 -07:00
parent daa50e3168
commit 6e68dcdb97
4 changed files with 49 additions and 24 deletions
+15
View File
@@ -0,0 +1,15 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,12 +38,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
target_compile_definitions(miniupnpc-private INTERFACE _DARWIN_C_SOURCE)
endif ()
-# Set compiler specific build flags
-if (CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_SYSTEM_NAME STREQUAL "AmigaOS")
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- target_compile_options(miniupnpc-private INTERFACE -Wall)
-endif ()
-
# Suppress noise warnings
if (MSVC)
target_compile_definitions(miniupnpc-private INTERFACE _CRT_SECURE_NO_WARNINGS)
@@ -1,13 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -186,8 +186,8 @@ installpythonmodule3: pythonmodule3
MAKE=$(MAKE) python3 setup.py install
validateminixml: minixmlvalid
- @echo "minixml validation test"
- ./minixmlvalid
+ @echo "(skipping) minixml validation test"
+# ./minixmlvalid
touch $@
validateminiwget: testminiwget minihttptestserver testminiwget.sh
@@ -0,0 +1,21 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,7 @@ set (MINIUPNPC_SOURCES
connecthostport.c
portlistingparse.c
receivedata.c
+ listdevices.c
connecthostport.h
igd_desc_parse.h
minisoap.h
@@ -142,6 +143,10 @@ if (UPNPC_BUILD_SHARED)
add_executable (upnpc-shared upnpc.c)
target_link_libraries (upnpc-shared PRIVATE libminiupnpc-shared)
target_include_directories(upnpc-shared PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
+ add_executable (listdevices listdevices.c)
+ target_link_libraries (listdevices PRIVATE libminiupnpc-shared)
+ target_include_directories(listdevices PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
endif ()
endif ()