diff options
| author |   William Breathitt Gray <vilhelm.gray@gmail.com> | 2019-09-04 23:03:50 +0900 |
|---|---|---|
| committer |   James Le Cuirot <chewi@gentoo.org> | 2019-09-07 15:30:06 +0100 |
| commit | d2547e042d7236d9309057f03b1ca5a744f9e8e9 (patch) | |
| tree | 1e0a4b9bf7ee3a88a8d48cac4bb7d62a6d208f98 /games-engines/odamex/files | |
| parent | Revert "sys-libs/musl: back out of b94c385" (diff) | |
| download | gentoo-d2547e042d7236d9309057f03b1ca5a744f9e8e9.tar.gz gentoo-d2547e042d7236d9309057f03b1ca5a744f9e8e9.tar.bz2 gentoo-d2547e042d7236d9309057f03b1ca5a744f9e8e9.zip | |
games-engines/odamex: Bump to version 0.8.1
Closes: https://bugs.gentoo.org/680758
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12863
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'games-engines/odamex/files')
| -rw-r--r-- | games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch b/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch new file mode 100644 index 000000000000..5fca5815162b --- /dev/null +++ b/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch @@ -0,0 +1,48 @@ +From 656306d3e68f7f1f1441f03e1765530f34ea2611 Mon Sep 17 00:00:00 2001 +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu, 27 Mar 2014 21:16:02 +0000 +Subject: [PATCH] unbundle miniupnpc + +--- + CMakeLists.txt | 1 - + server/CMakeLists.txt | 5 ++--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0cafdbd5..00e033a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -124,7 +124,6 @@ if (USE_MINIUPNP) + set(UPNPC_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
+ set(UPNPC_INSTALL OFF CACHE INTERNAL "" FORCE)
+ mark_as_advanced(FORCE UPNPC_INSTALL)
+- add_subdirectory(libraries/libminiupnpc)
+ endif()
+
+ # Subdirectories for Odamex projects
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt +index d8e57257..5badceef 100644 +--- a/server/CMakeLists.txt ++++ b/server/CMakeLists.txt +@@ -35,8 +35,7 @@ set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp) + + # MiniUPnPc + if (USE_MINIUPNP) +- set(MINIUPNPC_DIR ../libraries/libminiupnpc) +- set(MINIUPNPC_STATIC_LIBRARIES upnpc-static) ++ set(MINIUPNPC_DIR /usr/include/miniupnpc) + endif() + + # git describe +@@ -74,7 +73,7 @@ add_executable(odasrv + ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES}) + + if (USE_MINIUPNP) +- target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES}) ++ target_link_libraries(odasrv -lminiupnpc) + endif() + + if(WIN32) +-- +2.23.0 + |