diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
commit | 0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch) | |
tree | 07815070629c7c11000a7f51ceb8ccbccb49a809 /games-engines/odamex | |
parent | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-engines/odamex')
-rw-r--r-- | games-engines/odamex/Manifest | 10 | ||||
-rw-r--r-- | games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch | 89 | ||||
-rw-r--r-- | games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch | 110 | ||||
-rw-r--r-- | games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch | 67 | ||||
-rw-r--r-- | games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch | 58 | ||||
-rw-r--r-- | games-engines/odamex/files/odamex-0.7.0-gcc6.patch | 39 | ||||
-rw-r--r-- | games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch | 35 | ||||
-rw-r--r-- | games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch | 28 | ||||
-rw-r--r-- | games-engines/odamex/metadata.xml | 37 | ||||
-rw-r--r-- | games-engines/odamex/odamex-0.7.0-r1.ebuild | 116 |
10 files changed, 0 insertions, 589 deletions
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest deleted file mode 100644 index 1df4b384f4d7..000000000000 --- a/games-engines/odamex/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX 1-odamex-0.7.0-install-rules.patch 2713 BLAKE2B 885f9d88127bae449383b66305ae266bceccd8b9d321ff2a850cf85732e254281ea7222a95d6c1890d16633e0237df9c5f23a3a65aeb111dfcb18221b3e00dea SHA512 8ad2f8eaaf6697275daec6ff3076c3f8359eed46bc89bb8567f25e5c825ef065ae875c7c607a5bb99fd62bf8e616e4c0296af374817e9fe02abcd311b306a453 -AUX 2-odamex-0.7.0-cmake-options.patch 3459 BLAKE2B 3fa5b4f813a3e1fcbab917d7468807335883c78d328fd554c7c85e937023a2674610878449b93359059075133fbf68a38ff60b3dc73dfb50fc74362f5d2ceed2 SHA512 ef5ac9a88b189fb4276989e1de6e2723491777fa0cc12cd5dd38b9c992ed22e6be6892371efa4cf4af28eda85883056c27efa3ed074b878f89325333476dd19d -AUX 3-odamex-0.7.0-wad-search-path.patch 1758 BLAKE2B a202ea34cf7c219b611d48601affd505614454b04a43d5678f70cc400e7100c65cce955bd378f4f51479572f09bcde447da425ac0a794a1a45227533ded9eb1c SHA512 031507d97734e75cddbcde5b09a7e483f1110dd08e692652b71a79e7f90b703090798916b3f25a74e18f29e0091e2f018d93662d82f994fb11317ba0215dfd10 -AUX 4-odamex-0.7.0-odalauncher-bin-path.patch 1671 BLAKE2B 833c95320ce5567fea90b12eedd7e2703540bff8f1a38e99ec80563ac4556ffe748b946948bb46d12064a08ed46a8c42fac92fbc5d6d408478067650718d92b8 SHA512 4ab5c84d5e3e1465fb02c775fad0208bf177264137d82297515c8f2bf188e9f4ce79a5510e28dfc4811392ecef407b89267e2baf45d37c236fb86cfc066c1ed2 -AUX odamex-0.7.0-gcc6.patch 1149 BLAKE2B e97191c08be8f1987c3374c4920b9016beb1e824e5e7781c8d4ec9088d9eb977e2dbb155ab7930914e3bae295098156c05d0726da7ee2df82a80a90d1ee333a7 SHA512 e34fc554016d67e42d95b9f2e964b69282791a9c07c9976c49990778188bfc1dab5784b29a798e10d6fcd8cc36893bd3416b57c8e2c9f1bd67587a3524c0a422 -AUX odamex-0.7.0-miniupnpc.patch 1144 BLAKE2B feb91380a8f1677f6aae2d29a569f3e452e6464c48962fe7f718a83733ce160b6bf2d4d0c84be78fbdb3f9102862571c13c69a9163a822f003743167d52a564d SHA512 0a805aca36687f183aa168972ecc9bfcd04c117787e42967fbf62b08873943b9f6c5118f15089a70ede43335ce571216255f315e08ce08f89ff23f6859507951 -AUX odamex-0.7.0-miniupnpc20.patch 846 BLAKE2B 3c55c9a761e5abe0de591ce6a53efc915eb7c6a0bdbd308ebff7fc9aa19517d647b882eaeec163a673f071a2f7aab505864ef8e7e64ffb2961682fb024cee190 SHA512 a55e2fea8742bed18765824131d87321e72df293c8e10b6682ade542b7f8feda10f89acbea9dc98749b509c117ae94c070b065ec95434118c73845f74e187664 -DIST odamex-src-0.7.0.tar.bz2 8435860 BLAKE2B 9720efdf262047074fed593360b0c38864d5d0f9c076a45d6df9aaf362cba35f41eeafab968338be0911681726872c33e3625934176f75068ca4933655876f7b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b -EBUILD odamex-0.7.0-r1.ebuild 2680 BLAKE2B 7dab16f3b940503a9710ae254921a28b47c9f4afc27c3ce68080fa266ca2e349a8ee5f66d54e99728b0e69469454a17cc771cb9dd07570e40320d34642cd026c SHA512 45a4c37fe091c908e9aada85da92c508f8eacdc6bddca74e5c3ee4044417fb516e2d4b7ad8e2b7b0e687ebf4918592562c0a09a0e71a5b1fd0a630f9109e9c3d -MISC metadata.xml 1467 BLAKE2B 43e3e80b72476360be1f5a345946a96c4ba0b6068209afa8506325a9a8467d56c8f19b62e5713a8d41c6a84cdc24c8218b8dd73453feb7ac621e3338a9421e16 SHA512 386792eba91c781bdb52d0f3d262a516843b3ab17e9522e23506fb7327ca726178ac387d577464faa1608fd396e81b3be813ab2bdac6b92caf10a9133a28332b diff --git a/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch b/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch deleted file mode 100644 index 618f9fd87c2c..000000000000 --- a/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 1352b633388dd9d82b8cb7e3d11932d0b569da4e Mon Sep 17 00:00:00 2001 -From: hasufell <hasufell@gentoo.org> -Date: Thu, 27 Mar 2014 21:07:37 +0100 -Subject: [PATCH 1/4] make install destinations modifiable - ---- - CMakeLists.txt | 5 +++-- - client/CMakeLists.txt | 2 +- - master/CMakeLists.txt | 4 ++++ - odalaunch/CMakeLists.txt | 2 +- - server/CMakeLists.txt | 2 +- - 5 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 11e52d1..262e3db 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,5 @@ - include(CMakeDependentOption)
-+include(GNUInstallDirs)
-
- project(Odamex)
- cmake_minimum_required(VERSION 2.8)
-@@ -113,10 +114,10 @@ if(NOT APPLE) - set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
- else()
- install(FILES odamex.wad LICENSE README
-- DESTINATION share/odamex
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
- COMPONENT common)
- install(FILES ${CONFIG_SAMPLES}
-- DESTINATION share/odamex/config-samples
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex/config-samples
- COMPONENT common)
-
- option(ODAMEX_COMPONENT_PACKAGES "Create several rpm/deb packages for repository maintainers." OFF)
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt -index 510b820..3f73ab5 100644 ---- a/client/CMakeLists.txt -+++ b/client/CMakeLists.txt -@@ -228,7 +228,7 @@ if(SDL_FOUND AND SDLMIXER_FOUND) - COMPONENT client)
- else()
- install(TARGETS odamex
-- RUNTIME DESTINATION bin
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT client)
- endif()
- endif()
-diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt -index 7fc386b..5bdc048 100644 ---- a/master/CMakeLists.txt -+++ b/master/CMakeLists.txt -@@ -14,3 +14,7 @@ if(WIN32) - elseif(SOLARIS)
- target_link_libraries(odamast socket nsl)
- endif()
-+
-+if(UNIX)
-+ install( TARGETS odamast DESTINATION ${CMAKE_INSTALL_BINDIR} )
-+endif()
-diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt -index 4ca5920..0b134ef 100644 ---- a/odalaunch/CMakeLists.txt -+++ b/odalaunch/CMakeLists.txt -@@ -71,7 +71,7 @@ if(wxWidgets_FOUND) - COMPONENT odalaunch)
- else()
- install(TARGETS odalaunch
-- RUNTIME DESTINATION bin
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT odalaunch)
- endif()
-
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt -index b046714..d33b974 100644 ---- a/server/CMakeLists.txt -+++ b/server/CMakeLists.txt -@@ -73,6 +73,6 @@ elseif(WIN32) - COMPONENT server)
- else()
- install(TARGETS odasrv
-- RUNTIME DESTINATION bin
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT server)
- endif()
--- -1.9.1 - diff --git a/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch b/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch deleted file mode 100644 index 1de502711406..000000000000 --- a/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 851bc58a74eadd89838c924167f27df1b9d3be37 Mon Sep 17 00:00:00 2001 -From: hasufell <hasufell@gentoo.org> -Date: Thu, 27 Mar 2014 21:14:20 +0100 -Subject: [PATCH 2/4] add various cmake options - ---- - CMakeLists.txt | 26 ++++++++++++++++++++++---- - client/CMakeLists.txt | 34 ++++++++++++++++++++-------------- - 2 files changed, 42 insertions(+), 18 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 262e3db..91d5c50 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,13 @@ - include(CMakeDependentOption)
- include(GNUInstallDirs)
-
-+# options
-+option(BUILD_CLIENT "Build client target" 1)
-+option(BUILD_SERVER "Build server target" 1)
-+option(BUILD_MASTER "Build master server target" 1)
-+cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 )
-+cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )
-+
- project(Odamex)
- cmake_minimum_required(VERSION 2.8)
-
-@@ -73,10 +80,21 @@ if(USE_INTREE_PORTMIDI) - endif()
-
- # Subdirectories for Odamex projects
--add_subdirectory(client)
--add_subdirectory(server)
--add_subdirectory(master)
--add_subdirectory(odalaunch)
-+if(BUILD_CLIENT)
-+ add_subdirectory(client)
-+endif()
-+if(BUILD_SERVER)
-+ add_subdirectory(server)
-+endif()
-+if(BUILD_MASTER)
-+ add_subdirectory(master)
-+endif()
-+if(BUILD_ODALAUNCH)
-+ add_subdirectory(odalaunch)
-+endif()
-+if(NOT BUILD_CLIENT AND NOT BUILD_SERVER AND NOT BUILD_MASTER)
-+ message(FATAL_ERROR "No target chosen, doing nothing.")
-+endif()
-
- # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET
- # This is only really useful when setting up a universal build.
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt -index 3f73ab5..7363c5a 100644 ---- a/client/CMakeLists.txt -+++ b/client/CMakeLists.txt -@@ -107,17 +107,21 @@ include_directories(${PNG_INCLUDE_DIRS}) - add_definitions(-DUSE_PNG)
-
- # PortMidi configuration
--if(USE_INTREE_PORTMIDI)
-- include_directories(../libraries/portmidi/pm_common/ ../libraries/portmidi/porttime/)
-- add_definitions(-DPORTMIDI)
-+if(ENABLE_PORTMIDI)
-+ if(USE_INTREE_PORTMIDI)
-+ include_directories(../libraries/portmidi/pm_common/ ../libraries/portmidi/porttime/)
-+ add_definitions(-DPORTMIDI)
-+ else()
-+ find_package(PortMidi QUIET)
-+ if(PORTMIDI_FOUND)
-+ include_directories(${PORTMIDI_INCLUDE_DIR})
-+ add_definitions(-DPORTMIDI)
-+ else()
-+ message(WARNING "PortMidi not found, client will be built without PortMidi support.")
-+ endif()
-+ endif()
- else()
-- find_package(PortMidi QUIET)
-- if(PORTMIDI_FOUND)
-- include_directories(${PORTMIDI_INCLUDE_DIR})
-- add_definitions(-DPORTMIDI)
-- else()
-- message(WARNING "PortMidi not found, client will be built without PortMidi support.")
-- endif()
-+ message(STATUS "Portmidi disabled.")
- endif()
-
- # Find Mac frameworks
-@@ -147,10 +151,12 @@ if(SDL_FOUND AND SDLMIXER_FOUND) - target_link_libraries(odamex ${ZLIB_LIBRARY})
- target_link_libraries(odamex ${PNG_LIBRARY} ${ZLIB_LIBRARY})
-
-- if(USE_INTREE_PORTMIDI)
-- target_link_libraries(odamex portmidi-static)
-- elseif(PORTMIDI_FOUND)
-- target_link_libraries(odamex ${PORTMIDI_LIBRARIES})
-+ if(ENABLE_PORTMIDI)
-+ if(USE_INTREE_PORTMIDI)
-+ target_link_libraries(odamex portmidi-static)
-+ elseif(PORTMIDI_FOUND)
-+ target_link_libraries(odamex ${PORTMIDI_LIBRARIES})
-+ endif()
- endif()
-
- if(WIN32)
--- -1.9.1 - diff --git a/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch b/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch deleted file mode 100644 index 77fb4e48996e..000000000000 --- a/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 9af4e992ff9fa10816beba36478c711ac2c8542a Mon Sep 17 00:00:00 2001 -From: hasufell <hasufell@gentoo.org> -Date: Thu, 27 Mar 2014 21:17:21 +0100 -Subject: [PATCH 3/4] add odamex.wad install destination to wad search path - ---- - CMakeLists.txt | 9 +++++++++ - common/d_main.cpp | 2 ++ - config.h.in | 6 ++++++ - 3 files changed, 17 insertions(+) - create mode 100644 config.h.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 91d5c50..a06613e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,6 +13,15 @@ -
- set(PROJECT_VERSION 0.7.0)
- set(PROJECT_COPYRIGHT "2006-2014")
-+
-+configure_file (
-+ "${PROJECT_SOURCE_DIR}/config.h.in"
-+ "${PROJECT_BINARY_DIR}/config.h"
-+ )
-+
-+include_directories(
-+ ${PROJECT_BINARY_DIR}
-+)
-
- # Default build type
- if(NOT MSVC)
-diff --git a/common/d_main.cpp b/common/d_main.cpp -index 31d4f59..be0ffd2 100644 ---- a/common/d_main.cpp -+++ b/common/d_main.cpp -@@ -23,6 +23,7 @@ - //-----------------------------------------------------------------------------
-
- #include "version.h"
-+#include "config.h"
-
- #include <sstream>
- #include <string>
-@@ -506,6 +507,7 @@ static std::string BaseFileSearch(std::string file, std::string ext = "", std::s - D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
- D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
- D_AddSearchDir(dirs, getenv("HOME"), separator);
-+ D_AddSearchDir(dirs, CMAKE_WADDIR, separator);
-
- // [AM] Search additional paths based on platform
- D_AddPlatformSearchDirs(dirs);
-diff --git a/config.h.in b/config.h.in -new file mode 100644 -index 0000000..e91b3a6 ---- /dev/null -+++ b/config.h.in -@@ -0,0 +1,6 @@ -+#ifndef CONFIG_H -+#define CONFIG_H -+ -+#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@" -+ -+#endif --- -1.9.1 - diff --git a/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch b/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch deleted file mode 100644 index acb2692e75fb..000000000000 --- a/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 672b2e61f3c0347c29746a4a22fe3ab912e88d62 Mon Sep 17 00:00:00 2001 -From: hasufell <hasufell@gentoo.org> -Date: Thu, 27 Mar 2014 21:19:48 +0100 -Subject: [PATCH 4/4] use CMAKE_BINDIR as default bin patch in odalauncher - ---- - config.h.in | 1 + - odalaunch/src/dlg_main.cpp | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/config.h.in b/config.h.in -index e91b3a6..7019a02 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -2,5 +2,6 @@ - #define CONFIG_H - - #define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@" -+#define CMAKE_BINDIR "@CMAKE_INSTALL_BINDIR@" - - #endif -diff --git a/odalaunch/src/dlg_main.cpp b/odalaunch/src/dlg_main.cpp -index a95a5f6..abbfc0a 100644 ---- a/odalaunch/src/dlg_main.cpp -+++ b/odalaunch/src/dlg_main.cpp -@@ -27,6 +27,7 @@ - #include "str_utils.h" - - #include "md5.h" -+#include "config.h" - - #include <wx/settings.h> - #include <wx/menu.h> -@@ -42,6 +43,7 @@ - #include <wx/process.h> - #include <wx/toolbar.h> - #include <wx/xrc/xmlres.h> -+#include <wx/string.h> - #include <wx/cmdline.h> - - #ifdef __WXMSW__ -@@ -205,10 +207,12 @@ dlgMain::dlgMain(wxWindow* parent, wxWindowID id) - } - #endif - -+ const char *cmake_bindir_str = CMAKE_BINDIR; -+ wxString cmake_bindir = wxString::FromAscii(cmake_bindir_str); - launchercfg_s.get_list_on_start = 1; - launchercfg_s.show_blocked_servers = 0; - launchercfg_s.wad_paths = wxGetCwd(); -- launchercfg_s.odamex_directory = wxGetCwd(); -+ launchercfg_s.odamex_directory = cmake_bindir; - - m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList); - m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList); --- -1.9.1 - diff --git a/games-engines/odamex/files/odamex-0.7.0-gcc6.patch b/games-engines/odamex/files/odamex-0.7.0-gcc6.patch deleted file mode 100644 index 9e341b881ccd..000000000000 --- a/games-engines/odamex/files/odamex-0.7.0-gcc6.patch +++ /dev/null @@ -1,39 +0,0 @@ -Bug: https://bugs.gentoo.org/610566 -Commit: https://github.com/odamex/odamex/commit/1d8121c78fe2db9befb05dd40ceb9b86062024e4 - -From 1d8121c78fe2db9befb05dd40ceb9b86062024e4 Mon Sep 17 00:00:00 2001 -From: rice <russell@odamex.net> -Date: Tue, 30 Aug 2016 08:37:15 +0000 -Subject: [PATCH] - Apply patch from bug 1177, thanks RjY! - -SVN r5444 (trunk) ---- - common/m_vectors.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/common/m_vectors.cpp b/common/m_vectors.cpp -index b51e4e40..2eb48a04 100644 ---- a/common/m_vectors.cpp -+++ b/common/m_vectors.cpp -@@ -541,16 +541,16 @@ void M_PerpendicularVec3(v3double_t *dest, const v3double_t *src) - { - // find the smallest component of the vector src - v3double_t tempvec; -- double minelem = src->x; -+ double minelem = fabs(src->x); - double *mincomponent = &(tempvec.x); -- if (abs(src->y) < minelem) -+ if (fabs(src->y) < minelem) - { -- minelem = abs(src->y); -+ minelem = fabs(src->y); - mincomponent = &(tempvec.y); - } -- if (abs(src->z) < minelem) -+ if (fabs(src->z) < minelem) - { -- minelem = abs(src->z); -+ minelem = fabs(src->z); - mincomponent = &(tempvec.z); - } - diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch deleted file mode 100644 index 34896e2a4e8b..000000000000 --- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Thu Mar 27 21:16:02 UTC 2014 -Subject: unbundle miniupnpc - ---- a/server/CMakeLists.txt -+++ b/server/CMakeLists.txt -@@ -29,8 +29,7 @@ - set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp)
-
- # MiniUPnPc
--set(MINIUPNPC_DIR ../libraries/libminiupnpc)
--set(MINIUPNPC_STATIC_LIBRARIES upnpc-static)
-+set(MINIUPNPC_DIR /usr/include/miniupnpc)
-
- # Platform definitions
- define_platform()
-@@ -54,7 +53,7 @@ - ${COMMON_SOURCES} ${COMMON_HEADERS}
- ${SERVER_SOURCES} ${SERVER_HEADERS}
- ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES})
--target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES})
-+target_link_libraries(odasrv -lminiupnpc)
-
- if(WIN32)
- target_link_libraries(odasrv winmm wsock32)
---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -71,7 +71,6 @@ - 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)
-
- # PortMidi
- cmake_dependent_option(USE_INTREE_PORTMIDI "Compile with the version of PortMidi included in the source tree." ON "WIN32" OFF)
diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch deleted file mode 100644 index 716a07fe628a..000000000000 --- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: common/i_net.cpp -=================================================================== ---- common/i_net.cpp (revision 5459) -+++ common/i_net.cpp (working copy) -@@ -151,7 +151,11 @@ - - Printf(PRINT_HIGH, "UPnP: Discovering router (max 1 unit supported)\n"); - -+#if MINIUPNPC_API_VERSION < 14 - devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, &res); -+#else -+ devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, 2, &res); -+#endif - - if (!devlist || res != UPNPDISCOVER_SUCCESS) - { -@@ -179,7 +183,11 @@ - // " desc: %s\n st: %s\n", - // dev->descURL, dev->st); - -+#if MINIUPNPC_API_VERSION < 16 - descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0); -+#else -+ descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0, &res); -+#endif - - if (descXML) - { diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml deleted file mode 100644 index 39562f87b323..000000000000 --- a/games-engines/odamex/metadata.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <maintainer type="person"> - <email>mwoodj@knology.net</email> - <name>Mike Wood</name> - </maintainer> - <maintainer type="project"> - <email>games@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <use> - <flag name="odalaunch">Build the wxwidgets based launcher.</flag> - <flag name="master">Build master server target (advertises odamex server list)</flag> - <flag name="portmidi">Enable portmidi support.</flag> - <flag name="server">Build server target.</flag> - </use> - <upstream> - <changelog>http://odamex.net/changelog.php</changelog> - <doc lang="en">http://odamex.net/wiki/Odamex</doc> - <bugs-to>http://odamex.net/bugs/</bugs-to> - <remote-id type="sourceforge">odamex</remote-id> - </upstream> - <longdescription lang="en"> - Odamex is a free and open source port for the classic - first-person-shooter Doom. Odamex's goal is to emulate the feel of and - retain many aspects of the original Doom executables while offering a - broader expanse of security features, personal configuration, gameplay - options, and editing features. Odamex can run on a wide range of - operating systems and hardware, so players should be able to play - on almost any platform. - </longdescription> -</pkgmetadata> diff --git a/games-engines/odamex/odamex-0.7.0-r1.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild deleted file mode 100644 index 0d2e515d29dc..000000000000 --- a/games-engines/odamex/odamex-0.7.0-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -WX_GTK_VER="3.0" -inherit cmake-utils eutils gnome2-utils readme.gentoo-r1 wxwidgets - -MY_P=${PN}-src-${PV} -DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II" -HOMEPAGE="http://odamex.net/" -SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dedicated +odalaunch master portmidi server" - -RDEPEND=" - dedicated? ( >=net-libs/miniupnpc-1.8:0= ) - !dedicated? ( - media-libs/libpng:0= - >=media-libs/libsdl-1.2.9[X,sound,joystick,video] - >=media-libs/sdl-mixer-1.2.6 - odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - portmidi? ( media-libs/portmidi ) - server? ( >=net-libs/miniupnpc-1.8:0= ) - ) -" -DEPEND="${RDEPEND}" - -DOC_CONTENTS=" - This is just the engine, you will need doom resource files in order to play. - Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F -" - -S="${WORKDIR}/src-${PV:2:3}" - -pkg_pretend() { - if ! test-flag-CXX -std=c++11; then - die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/1-${P}-install-rules.patch \ - "${FILESDIR}"/2-${P}-cmake-options.patch \ - "${FILESDIR}"/3-${P}-wad-search-path.patch \ - "${FILESDIR}"/4-${P}-odalauncher-bin-path.patch \ - "${FILESDIR}"/${P}-miniupnpc.patch \ - "${FILESDIR}"/${P}-miniupnpc20.patch \ - "${FILESDIR}"/${P}-gcc6.patch - - rm -r libraries/libminiupnpc || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DUSE_INTREE_PORTMIDI=OFF - -DCMAKE_INSTALL_BINDIR="/usr/bin" - -DCMAKE_INSTALL_DATADIR="/usr/share" - $(cmake-utils_use_build master MASTER) - ) - - if use dedicated ; then - mycmakeargs+=( - -DBUILD_CLIENT=OFF - -DBUILD_ODALAUNCH=OFF - -DBUILD_SERVER=ON - -DENABLE_PORTMIDI=OFF - ) - else - mycmakeargs+=( - -DBUILD_CLIENT=ON - $(cmake-utils_use_build odalaunch ODALAUNCH) - $(cmake-utils_use_build server SERVER) - $(cmake-utils_use_enable portmidi PORTMIDI) - ) - fi - - append-cxxflags -std=c++11 - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - readme.gentoo_create_doc - - if ! use dedicated ; then - newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png" - make_desktop_entry ${PN} - - if use odalaunch ; then - newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png" - make_desktop_entry odalaunch "Odamex Launcher" odalaunch - fi - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - readme.gentoo_print_elog -} - -pkg_postrm() { - gnome2_icon_cache_update -} |