* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2015-11-03 15:46 Michael Sterrett
0 siblings, 0 replies; 11+ messages in thread
From: Michael Sterrett @ 2015-11-03 15:46 UTC (permalink / raw
To: gentoo-commits
commit: 64f57dffcf5590da78ebb1f4b31c2fb17cddde09
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 3 15:46:08 2015 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Nov 3 15:46:08 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f57dff
old
Package-Manager: portage-2.2.20.1
games-engines/odamex/Manifest | 1 -
.../files/1-odamex-0.6.4-install-rules.patch | 79 ----------------
.../files/2-odamex-0.6.4-cmake-options.patch | 77 ---------------
.../files/3-odamex-0.6.4-wad-search-path.patch | 59 ------------
.../4-odamex-0.6.4-odalauncher-bin-path.patch | 51 ----------
games-engines/odamex/odamex-0.6.4.ebuild | 103 ---------------------
6 files changed, 370 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 4bca179..f7868f1 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,2 +1 @@
-DIST odamex-src-0.6.4.tar.bz2 8449818 SHA256 7832fed1e0cca992c746fd0f7e876b090c0f244f2d1d5230ffa3df8b33ce0f6a SHA512 0a917568cfc4bd4d9921cb82185cbbc318bce493bc66e489093e45401ec4c7596148778648e5078f13c50824470a040a995aa50c7956e2446c90920254c8129f WHIRLPOOL 9d95a9422ab382ccd5f4fc7d89f0558e30c604e18a33eec3bb074ae446258f030ec67d4738e1c517d89c9a4e09aea6e3a84651d7c8b1df9a88a26077c1b319b4
DIST odamex-src-0.7.0.tar.bz2 8435860 SHA256 d0306ddca3d5534672e6f0c547092d8f3f6f815686e4f6b21d6521afae1fd73b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b WHIRLPOOL 91ca8f658435f4503df8a2d5f52b1ef1cf34229373c4e1c3918b7eb919ae54e3a416618ce184d54c6ebc25bdfe6fea96f8933f98d859562b4972f89bd5c320ff
diff --git a/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch b/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch
deleted file mode 100644
index 4820503..0000000
--- a/games-engines/odamex/files/1-odamex-0.6.4-install-rules.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-commit 04fff802ee72c08d2e1730c6c5506fc2e708d5fe
-Author: hasufell <hasufell@gentoo.org>
-Date: Wed Jul 31 03:34:29 2013 +0200
-
- BUILD: add unix install rules
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b77096a..f49a1e8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,8 @@
- project(Odamex)
- cmake_minimum_required(VERSION 2.8)
-
-+# cmake modules
-+include( GNUInstallDirs )
- set(PROJECT_VERSION 0.6.4)
- set(PROJECT_COPYRIGHT "2006-2013")
-
-@@ -64,3 +66,8 @@ add_subdirectory(odalaunch)
- if(NOT NO_AG-ODALAUNCH_TARGET)
- add_subdirectory(ag-odalaunch)
- endif()
-+
-+# global install rules
-+if(UNIX)
-+ install(FILES odamex.wad DESTINATION ${CMAKE_INSTALL_DATADIR})
-+endif()
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 5dd5d43..1fde0ff 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -168,5 +168,8 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
- " )
- endif()
-
-+ # UNIX install rules
-+ elseif(UNIX)
-+ install( TARGETS odamex DESTINATION ${CMAKE_INSTALL_BINDIR} )
- endif()
- endif()
-diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
-index c1c3853..3e94b34 100644
---- a/master/CMakeLists.txt
-+++ b/master/CMakeLists.txt
-@@ -12,3 +12,8 @@ if(WIN32)
- elseif(SOLARIS)
- target_link_libraries(odamast socket nsl)
- endif()
-+
-+# install rules
-+if(UNIX)
-+ install( TARGETS odamast DESTINATION ${CMAKE_INSTALL_BINDIR} )
-+endif()
-diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
-index ff9b6e3..d2d2171 100644
---- a/odalaunch/CMakeLists.txt
-+++ b/odalaunch/CMakeLists.txt
-@@ -61,3 +61,8 @@ if(wxWidgets_FOUND)
- )
- endif()
- endif()
-+
-+# install rules
-+if(UNIX)
-+ install( TARGETS odalaunch DESTINATION ${CMAKE_INSTALL_BINDIR} )
-+endif()
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index 2284a8a..a079434 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -61,3 +61,7 @@ if(UNIX AND NOT APPLE)
- target_link_libraries(odasrv rt)
- endif()
-
-+# install rules
-+if(UNIX)
-+ install( TARGETS odasrv DESTINATION ${CMAKE_INSTALL_BINDIR} )
-+endif()
diff --git a/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch b/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch
deleted file mode 100644
index de0f078..0000000
--- a/games-engines/odamex/files/2-odamex-0.6.4-cmake-options.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-commit 7abf37ed186701f0170bded26df8cbb8a99a21e1
-Author: hasufell <hasufell@gentoo.org>
-Date: Wed Jul 31 03:35:46 2013 +0200
-
- BUILD: add various cmake options
-
- to control building client/server/odalaunch
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f49a1e8..ca01bba 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,7 +3,15 @@ project(Odamex)
- cmake_minimum_required(VERSION 2.8)
-
- # cmake modules
-+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 )
- set(PROJECT_VERSION 0.6.4)
- set(PROJECT_COPYRIGHT "2006-2013")
-
-@@ -56,10 +64,22 @@ endmacro(define_platform)
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
-
- # Subdirectories for individual 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 1fde0ff..9f06fa6 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -48,7 +48,7 @@ endif()
-
- # PortMidi configuration
- find_package(PortMidi)
--if(PORTMIDI_FOUND)
-+if(PORTMIDI_FOUND AND ENABLE_PORTMIDI)
- include_directories(${PORTMIDI_INCLUDE_DIR})
- add_definitions(-DPORTMIDI)
- else()
-@@ -95,7 +95,7 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
- target_link_libraries(odamex ${SDL_LIBRARY})
- target_link_libraries(odamex ${SDLMIXER_LIBRARY})
-
-- if(PORTMIDI_FOUND)
-+ if(PORTMIDI_FOUND AND ENABLE_PORTMIDI)
- target_link_libraries(odamex ${PORTMIDI_LIBRARIES})
- endif()
-
diff --git a/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch b/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch
deleted file mode 100644
index 3eb6953..0000000
--- a/games-engines/odamex/files/3-odamex-0.6.4-wad-search-path.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-commit 3a5209e2595e459a31c111f6040dbac347df1967
-Author: hasufell <hasufell@gentoo.org>
-Date: Wed Jul 31 03:38:10 2013 +0200
-
- add odamex.wad install destination to wad search path
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ca01bba..83a0e30 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,16 @@ 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 )
-+
-+configure_file (
-+ "${PROJECT_SOURCE_DIR}/config.h.in"
-+ "${PROJECT_BINARY_DIR}/config.h"
-+ )
-+
-+include_directories(
-+ ${PROJECT_BINARY_DIR}
-+)
-+
- set(PROJECT_VERSION 0.6.4)
- set(PROJECT_COPYRIGHT "2006-2013")
-
-diff --git a/common/d_main.cpp b/common/d_main.cpp
-index 010bdcb..6dc2e5f 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>
-@@ -493,6 +494,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
diff --git a/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch b/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch
deleted file mode 100644
index 2224498..0000000
--- a/games-engines/odamex/files/4-odamex-0.6.4-odalauncher-bin-path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit a6c55c51dc251924be7eccf6637fc719a2b7ace0
-Author: hasufell <hasufell@gentoo.org>
-Date: Wed Jul 31 03:38:24 2013 +0200
-
- use CMAKE_BINDIR as default bin patch in odalauncher
-
-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 915b527..f01224a 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__
-@@ -200,10 +202,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);
diff --git a/games-engines/odamex/odamex-0.6.4.ebuild b/games-engines/odamex/odamex-0.6.4.ebuild
deleted file mode 100644
index f2e15ed..0000000
--- a/games-engines/odamex/odamex-0.6.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WX_GTK_VER="2.8"
-inherit cmake-utils eutils gnome2-utils wxwidgets games
-
-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 )
- !dedicated? (
- >=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 )
- )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-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
-
- epatch_user
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}"
- -DCMAKE_INSTALL_DATADIR="${GAMES_DATADIR}"/${PN}
- $(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
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- 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
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- einfo
- elog "This is just the engine, you will need doom resource files in order to play."
- elog "Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F"
- einfo
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2018-04-29 13:06 Pacho Ramos
0 siblings, 0 replies; 11+ messages in thread
From: Pacho Ramos @ 2018-04-29 13:06 UTC (permalink / raw
To: gentoo-commits
commit: b029eb6c402e6c3b489bc1e2aff7e7424711f4f6
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 12:55:06 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 13:06:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b029eb6c
games-engines/odamex: Drop games.eclass, fix bugs #575762 and #649226
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../odamex/files/odamex-0.7.0-miniupnpc20.patch | 28 +++++
games-engines/odamex/odamex-0.7.0-r1.ebuild | 116 +++++++++++++++++++++
2 files changed, 144 insertions(+)
diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
new file mode 100644
index 00000000000..716a07fe628
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
@@ -0,0 +1,28 @@
+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/odamex-0.7.0-r1.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild
new file mode 100644
index 00000000000..0d2e515d29d
--- /dev/null
+++ b/games-engines/odamex/odamex-0.7.0-r1.ebuild
@@ -0,0 +1,116 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2019-09-09 22:08 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2019-09-09 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 2c5f5b7682e49e3f140632b6f8b03d3226ed3dc1
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 9 22:05:48 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 9 22:05:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5f5b76
games-engines/odamex: Search our usual data directory and prefix paths
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/files/odamex-0.8.1-SearchDir.patch | 11 +++++++++++
.../odamex/{odamex-0.8.1.ebuild => odamex-0.8.1-r1.ebuild} | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch
new file mode 100644
index 00000000000..70bd476eb3f
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch
@@ -0,0 +1,11 @@
+diff -Naur a/common/d_main.cpp b/common/d_main.cpp
+--- a/common/d_main.cpp 2019-07-22 19:11:28.000000000 +0100
++++ b/common/d_main.cpp 2019-09-09 22:57:47.624246017 +0100
+@@ -459,6 +459,7 @@
+ D_AddSearchDir(dirs, INSTALL_PREFIX "/" INSTALL_DATADIR "/games/odamex", separator);
+ #endif
+
++ D_AddSearchDir(dirs, "/usr/share/doom", separator);
+ D_AddSearchDir(dirs, "/usr/share/games/doom", separator);
+ D_AddSearchDir(dirs, "/usr/local/share/games/doom", separator);
+ D_AddSearchDir(dirs, "/usr/local/share/doom", separator);
diff --git a/games-engines/odamex/odamex-0.8.1.ebuild b/games-engines/odamex/odamex-0.8.1-r1.ebuild
similarity index 93%
rename from games-engines/odamex/odamex-0.8.1.ebuild
rename to games-engines/odamex/odamex-0.8.1-r1.ebuild
index dbf54b31f41..a4aa73ce963 100644
--- a/games-engines/odamex/odamex-0.8.1.ebuild
+++ b/games-engines/odamex/odamex-0.8.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
WX_GTK_VER="3.0-gtk3"
-inherit cmake-utils desktop wxwidgets xdg
+inherit cmake-utils desktop prefix wxwidgets xdg
DESCRIPTION="Online multiplayer free software engine for DOOM"
HOMEPAGE="https://odamex.net/"
@@ -35,10 +35,12 @@ S="${WORKDIR}/${PN}-src-${PV}"
PATCHES=(
"${FILESDIR}"/${P}-miniupnpc.patch
+ "${FILESDIR}"/${P}-SearchDir.patch
)
src_prepare() {
rm -r libraries/libminiupnpc odamex.wad || die
+ hprefixify common/d_main.cpp
use odalaunch && setup-wxwidgets
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2021-03-31 7:40 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2021-03-31 7:40 UTC (permalink / raw
To: gentoo-commits
commit: ab6e3ef325e41f1992546d0da5db8fca7c12b0a4
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Mon Mar 22 09:49:29 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 07:40:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6e3ef3
games-engines/odamex: Version bump to 0.9.0
Closes: https://bugs.gentoo.org/777651
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20058
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
games-engines/odamex/Manifest | 1 +
...x-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch | 24 +++++++
.../files/odamex-0.9.0-Unbundle-miniupnpc.patch | 80 ++++++++++++++++++++++
games-engines/odamex/odamex-0.9.0.ebuild | 79 +++++++++++++++++++++
4 files changed, 184 insertions(+)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 70aeb43694a..44fab4decbb 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1 +1,2 @@
DIST odamex-0.8.3.tar.bz2 8532510 BLAKE2B 751d65dfe07a4c4c0cb5ff360e76a1291cf4ba289c459f15a0c277aca4d15b1e0989e1606cdc4e0f0bec56d6ae437027046302f5c55efb3b835a42df512fb18f SHA512 01a875973d43c87dde7953464e0e3c37fa088b00b6cc0ecbef1a8b3b9a87257ab24ef4e3c224ebcbc0e38cd3139c7adc56b12a03ae2528b66d6498bb8d84d720
+DIST odamex-0.9.0.tar.bz2 6644055 BLAKE2B 656a469665783e0a5aa1a39792454a7ec34843b7fa11539f5504463701b5485eed0b5fabcd4f9f39eef3bdad9062f657c0b1d6147bcd41defa4142b51b4096a4 SHA512 f86e61afd5fdd9be6db03554e07fa140fdcc61747ce9312706af2cada8ec88705647abdfff4f221d8cfbd4a53b991e08edf4cbf0025cf6e5a74d2213fc662855
diff --git a/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch b/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch
new file mode 100644
index 00000000000..654085d1d25
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch
@@ -0,0 +1,24 @@
+From 3707d8ebad7a4a0664ca4d5a5a5bef4a276af6a2 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Mon, 29 Mar 2021 20:30:10 +0900
+Subject: [PATCH] Set IMPORTED_LOCATION for jsoncpp
+
+---
+ libraries/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index 2ffe95a5..a7dcb83b 100644
+--- a/libraries/CMakeLists.txt
++++ b/libraries/CMakeLists.txt
+@@ -172,6 +172,7 @@ if(BUILD_SERVER)
+ INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/local/include"
+ IMPORTED_LOCATION_DEBUG ${JSONCPP_LIBRARY_DEBUG}
+ IMPORTED_LOCATION_RELEASE ${JSONCPP_LIBRARY_RELEASE}
++ IMPORTED_LOCATION ${JSONCPP_LIBRARY_RELEASE}
+ MAP_IMPORTED_CONFIG_MINSIZEREL Release
+ MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
+ endif()
+--
+2.31.0
+
diff --git a/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch b/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch
new file mode 100644
index 00000000000..77b6220041d
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch
@@ -0,0 +1,80 @@
+From 4b9a8ca565e5cd388a49cd0fbe693b5332577c57 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Mon, 22 Mar 2021 18:20:15 +0900
+Subject: [PATCH] Unbundle miniupnpc
+
+---
+ libraries/CMakeLists.txt | 42 ----------------------------------------
+ server/CMakeLists.txt | 3 ++-
+ 2 files changed, 2 insertions(+), 43 deletions(-)
+
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index 177a86a2..2ffe95a5 100644
+--- a/libraries/CMakeLists.txt
++++ b/libraries/CMakeLists.txt
+@@ -227,48 +227,6 @@ endif()
+
+ ### MiniUPnPc ###
+
+-if(BUILD_SERVER)
+- message(STATUS "Compiling MiniUPnPc...")
+-
+- # Figure out the correct library path to attach to our imported target
+- set(MINIUPNPC_INCLUDE_DIR
+- "${CMAKE_CURRENT_BINARY_DIR}/local/include/miniupnpc")
+- set(MINIUPNPC_LIBRARY
+- "${CMAKE_CURRENT_BINARY_DIR}/local/lib/${libprefix}miniupnpc${libsuffix}")
+-
+- # This must exist before the target is synthesized.
+- file(MAKE_DIRECTORY ${MINIUPNPC_INCLUDE_DIR})
+-
+- # Generate the build.
+- execute_process(COMMAND "${CMAKE_COMMAND}"
+- -S "${CMAKE_CURRENT_SOURCE_DIR}/libminiupnpc"
+- -B "${CMAKE_CURRENT_BINARY_DIR}/libminiupnpc-build"
+- -G "${CMAKE_GENERATOR}"
+- -A "${CMAKE_GENERATOR_PLATFORM}"
+- -T "${CMAKE_GENERATOR_TOOLSET}"
+- "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
+- "-DCMAKE_LINKER=${CMAKE_LINKER}"
+- "-DCMAKE_RC_COMPILER=${CMAKE_RC_COMPILER}"
+- "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+- "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/local"
+- "-DCMAKE_INSTALL_LIBDIR=lib" # Without this, CentOS installs into lib64
+- "-DUPNPC_BUILD_SHARED=No"
+- "-DUPNPC_BUILD_TESTS=No")
+-
+- # Compile the library.
+- execute_process(COMMAND "${CMAKE_COMMAND}"
+- --build "${CMAKE_CURRENT_BINARY_DIR}/libminiupnpc-build"
+- --config RelWithDebInfo --target install --parallel ${PARALLEL_PROC_COUNT})
+-
+- # Synthesize an imported target that can be linked against.
+- add_library(upnpc-static STATIC IMPORTED GLOBAL)
+- set_target_properties(upnpc-static PROPERTIES
+- INTERFACE_INCLUDE_DIRECTORIES "${MINIUPNPC_INCLUDE_DIR}"
+- IMPORTED_LOCATION ${MINIUPNPC_LIBRARY})
+- if(WIN32)
+- set_target_properties(upnpc-static PROPERTIES INTERFACE_LINK_LIBRARIES "ws2_32;iphlpapi")
+- endif()
+-endif()
+
+ ### SDL libraries ###
+
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index 73a70000..e4b085f2 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -53,7 +53,8 @@ endif()
+ target_link_libraries(odasrv jsoncpp odamex-common)
+
+ if(USE_MINIUPNP)
+- target_link_libraries(odasrv upnpc-static)
++ target_include_directories(odasrv SYSTEM PRIVATE "/usr/include/miniupnpc")
++ target_link_libraries(odasrv -lminiupnpc)
+ endif()
+
+ if(WIN32)
+--
+2.31.0
+
diff --git a/games-engines/odamex/odamex-0.9.0.ebuild b/games-engines/odamex/odamex-0.9.0.ebuild
new file mode 100644
index 00000000000..dc97bd284d1
--- /dev/null
+++ b/games-engines/odamex/odamex-0.9.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake desktop prefix wxwidgets xdg
+
+DESCRIPTION="Online multiplayer free software engine for DOOM"
+HOMEPAGE="https://odamex.net/"
+SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+client master +odalaunch portmidi server upnp X"
+REQUIRED_USE="|| ( client master server )"
+
+RDEPEND="
+ client? (
+ media-libs/libpng:0=
+ media-libs/libsdl2[joystick,sound,video]
+ media-libs/sdl2-mixer
+ odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+ portmidi? ( media-libs/portmidi )
+ X? ( x11-libs/libX11 )
+ )
+ server? (
+ dev-libs/jsoncpp:=
+ upnp? ( net-libs/miniupnpc:= )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-Unbundle-miniupnpc.patch"
+ "${FILESDIR}/${P}-Set-IMPORTED_LOCATION-for-jsoncpp.patch"
+)
+
+src_prepare() {
+ rm -r libraries/libminiupnpc || die
+ hprefixify common/d_main.cpp
+
+ use odalaunch && setup-wxwidgets
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+ -DUSE_INTERNAL_LIBS=0
+ -DBUILD_CLIENT=$(usex client)
+ -DBUILD_LAUNCHER=$(usex odalaunch)
+ -DBUILD_MASTER=$(usex master)
+ -DBUILD_SERVER=$(usex server)
+ -DBUILD_OR_FAIL=1
+ -DENABLE_PORTMIDI=$(usex portmidi)
+ -DUSE_MINIUPNP=$(usex upnp)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ if use client ; then
+ newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
+ make_desktop_entry "${PN}" "Odamex"
+
+ if use odalaunch ; then
+ newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
+ make_desktop_entry odalaunch "Odamex Launcher" odalaunch
+ fi
+ fi
+
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2021-06-18 14:00 Ionen Wolkens
0 siblings, 0 replies; 11+ messages in thread
From: Ionen Wolkens @ 2021-06-18 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 4296144fa2e60ce0bb43b4bfc7ffa63c842b201c
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Fri Jun 18 13:42:22 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 13:57:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4296144f
games-engines/odamex: Drop version 0.9.0
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21301
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-engines/odamex/Manifest | 1 -
...x-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch | 24 -------
games-engines/odamex/odamex-0.9.0.ebuild | 79 ----------------------
3 files changed, 104 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index b41a58384ff..adc0097ca0d 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,3 +1,2 @@
-DIST odamex-0.9.0.tar.bz2 6644055 BLAKE2B 656a469665783e0a5aa1a39792454a7ec34843b7fa11539f5504463701b5485eed0b5fabcd4f9f39eef3bdad9062f657c0b1d6147bcd41defa4142b51b4096a4 SHA512 f86e61afd5fdd9be6db03554e07fa140fdcc61747ce9312706af2cada8ec88705647abdfff4f221d8cfbd4a53b991e08edf4cbf0025cf6e5a74d2213fc662855
DIST odamex-0.9.2.tar.bz2 6657974 BLAKE2B 60bf542806fe9d66711b45211f646607875621b014175fa3c4b9948c1c02d45af36d4a324349f22f4a7a4e11c13f48f2b96c731a9bb5f18c9d43111c56676f18 SHA512 69fb2ecc1d642c9c90da7503712aba628c753534ee56003945e4d267dc38bca0136d155a75695e483b0b4ec739aa331fca8c7493263b39a2521e8abcb378b5e4
DIST odamex-0.9.3.tar.bz2 6658459 BLAKE2B 1afe34400d2875ac196d5c189a35eb402fce0de90ded496aafcc98d2847ac7cdb10f07261c977a69e2442876897c0931813ddaf1954de2a871af6ca9d9317895 SHA512 114afe22f5651c87cedd7677055286ef9d222de790d9578669fdb5a20b471b273bd427c0dd103a64bcf7c285477776b6fa608b4086f78b4cd8271c33c87afcc3
diff --git a/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch b/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch
deleted file mode 100644
index 654085d1d25..00000000000
--- a/games-engines/odamex/files/odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3707d8ebad7a4a0664ca4d5a5a5bef4a276af6a2 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Mon, 29 Mar 2021 20:30:10 +0900
-Subject: [PATCH] Set IMPORTED_LOCATION for jsoncpp
-
----
- libraries/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index 2ffe95a5..a7dcb83b 100644
---- a/libraries/CMakeLists.txt
-+++ b/libraries/CMakeLists.txt
-@@ -172,6 +172,7 @@ if(BUILD_SERVER)
- INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/local/include"
- IMPORTED_LOCATION_DEBUG ${JSONCPP_LIBRARY_DEBUG}
- IMPORTED_LOCATION_RELEASE ${JSONCPP_LIBRARY_RELEASE}
-+ IMPORTED_LOCATION ${JSONCPP_LIBRARY_RELEASE}
- MAP_IMPORTED_CONFIG_MINSIZEREL Release
- MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release)
- endif()
---
-2.31.0
-
diff --git a/games-engines/odamex/odamex-0.9.0.ebuild b/games-engines/odamex/odamex-0.9.0.ebuild
deleted file mode 100644
index dc97bd284d1..00000000000
--- a/games-engines/odamex/odamex-0.9.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake desktop prefix wxwidgets xdg
-
-DESCRIPTION="Online multiplayer free software engine for DOOM"
-HOMEPAGE="https://odamex.net/"
-SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+client master +odalaunch portmidi server upnp X"
-REQUIRED_USE="|| ( client master server )"
-
-RDEPEND="
- client? (
- media-libs/libpng:0=
- media-libs/libsdl2[joystick,sound,video]
- media-libs/sdl2-mixer
- odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
- portmidi? ( media-libs/portmidi )
- X? ( x11-libs/libX11 )
- )
- server? (
- dev-libs/jsoncpp:=
- upnp? ( net-libs/miniupnpc:= )
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="games-util/deutex"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${P}-Unbundle-miniupnpc.patch"
- "${FILESDIR}/${P}-Set-IMPORTED_LOCATION-for-jsoncpp.patch"
-)
-
-src_prepare() {
- rm -r libraries/libminiupnpc || die
- hprefixify common/d_main.cpp
-
- use odalaunch && setup-wxwidgets
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
- -DUSE_INTERNAL_LIBS=0
- -DBUILD_CLIENT=$(usex client)
- -DBUILD_LAUNCHER=$(usex odalaunch)
- -DBUILD_MASTER=$(usex master)
- -DBUILD_SERVER=$(usex server)
- -DBUILD_OR_FAIL=1
- -DENABLE_PORTMIDI=$(usex portmidi)
- -DUSE_MINIUPNP=$(usex upnp)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- if use client ; then
- newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
- make_desktop_entry "${PN}" "Odamex"
-
- if use odalaunch ; then
- newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
- make_desktop_entry odalaunch "Odamex Launcher" odalaunch
- fi
- fi
-
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2022-03-04 22:49 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2022-03-04 22:49 UTC (permalink / raw
To: gentoo-commits
commit: 644f1b4a501fc9d3c8767023e6a2bebcae0f145c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 22:49:27 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 22:49:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644f1b4a
games-engines/odamex: Version bump to 10.0.0, unbundling patches
Closes: https://bugs.gentoo.org/833588
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 1 +
.../odamex/files/odamex-10.0.0-unbundle-fltk.patch | 105 +++++++++++++++++++++
.../files/odamex-10.0.0-unbundle-jsoncpp.patch | 85 +++++++++++++++++
.../files/odamex-10.0.0-unbundle-miniupnpc.patch | 96 +++++++++++++++++++
games-engines/odamex/metadata.xml | 3 +-
games-engines/odamex/odamex-10.0.0.ebuild | 90 ++++++++++++++++++
6 files changed, 379 insertions(+), 1 deletion(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 41eaaf581314..b2e65dadb436 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1 +1,2 @@
DIST odamex-0.9.5.tar.bz2 6659528 BLAKE2B 6f6052aff5a1e0c9a54c417113b67a91044d05ebf13d8ab5fb01132f9bb90b1c97392e881b8bff8baee4621c8e53abbb360fc8c7e6de8ff53d45ee55f73c48ec SHA512 70a0deb5e5b5902620f8fe692dc8507f9f19d7d6afabb4e2efbc25dc6879d469aa250dc55bb165db83a4288af9d5adda72ce3823a3db6dd9ccb83f5c684d3ac8
+DIST odamex-src-10.0.0.tar.xz 17680868 BLAKE2B 95df336ccc24c2658174bdd051cb9b98ca906d653d84a120330d8fe6f11ad91ba70ba7edfc960f8815d02795f7392761a0174171de30ea78b37389a61deacae7 SHA512 b825953a446a4eb46d2d004b20df876bceec823cb5f0bf661ecac03eff2f07c11fe47c6861f3c3ee417ce9ca869474ff422d78bba1b742485315ba5ba86bd702
diff --git a/games-engines/odamex/files/odamex-10.0.0-unbundle-fltk.patch b/games-engines/odamex/files/odamex-10.0.0-unbundle-fltk.patch
new file mode 100644
index 000000000000..1c9a8753b44a
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.0.0-unbundle-fltk.patch
@@ -0,0 +1,105 @@
+From 8a2b7c043fe86916d56044d7489f8dce6ed2d479 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 27 Feb 2022 14:01:33 +0000
+Subject: [PATCH 3/3] Allow building against the system FLTK library
+
+`USE_INTERNAL_FLTK` defaults to true and ignores `USE_INTERNAL_LIBS`
+because users are unlikely to have it installed.
+
+Odamex makes of use screen scaling features in FLTK that have not yet
+been released. This change therefore checks for the Fl::screen_scale
+symbol and skips the associated code if it is absent. In practise, this
+only affects the size of the dialog window on HiDPI screens. The game
+window is unaffected.
+
+Tested against FLTK 1.3.5 on Gentoo Linux.
+
+(cherry picked from commit 656afab54e30598022f4dd2af298cf6a487a1fe1)
+---
+ CMakeLists.txt | 1 +
+ client/CMakeLists.txt | 23 ++++++++++++++++++++++-
+ client/gui/gui_boot.cpp | 2 ++
+ libraries/CMakeLists.txt | 2 +-
+ 4 files changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9353d0c6b..599b6e85b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,6 +42,7 @@ option(USE_INTERNAL_DEUTEX "Use internal DeuTex" ${USE_INTERNAL_LIBS})
+ cmake_dependent_option( USE_INTERNAL_ZLIB "Use internal zlib" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )
+ cmake_dependent_option( USE_INTERNAL_PNG "Use internal libpng" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )
+ cmake_dependent_option( USE_INTERNAL_CURL "Use internal libcurl" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )
++cmake_dependent_option( USE_INTERNAL_FLTK "Use internal FLTK" 1 BUILD_CLIENT 0 )
+ cmake_dependent_option( USE_INTERNAL_JSONCPP "Use internal JsonCpp" 1 BUILD_SERVER 0 )
+ cmake_dependent_option( USE_INTERNAL_WXWIDGETS "Use internal wxWidgets" ${USE_INTERNAL_LIBS} BUILD_LAUNCHER 0 )
+ cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index bd071a7a5..ff1e72ba3 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -206,7 +206,28 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
+ target_link_libraries(odamex ${PNG_LIBRARY} ${ZLIB_LIBRARY} CURL::libcurl)
+ if(NOT GCONSOLE)
+ target_include_directories(odamex PRIVATE gui)
+- target_link_libraries(odamex fltk fltk_images)
++
++ if(USE_INTERNAL_FLTK)
++ set(FLTK_LIBRARIES fltk fltk_images)
++ set(HAVE_FLTK_SCREEN_SCALE TRUE)
++ else()
++ set(FLTK_SKIP_OPENGL 1)
++ set(FLTK_SKIP_FORMS 1)
++ set(FLTK_SKIP_FLUID 1)
++ find_package(FLTK REQUIRED)
++ target_include_directories(odamex SYSTEM PRIVATE ${FLTK_INCLUDE_DIR})
++
++ include(CheckCXXSymbolExists)
++ set(CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR})
++ set(CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES})
++ check_cxx_symbol_exists(Fl::screen_scale "FL/Fl.H" HAVE_FLTK_SCREEN_SCALE)
++ endif()
++
++ if(HAVE_FLTK_SCREEN_SCALE)
++ target_compile_definitions(odamex PRIVATE HAVE_FLTK_SCREEN_SCALE)
++ endif()
++
++ target_link_libraries(odamex ${FLTK_LIBRARIES})
+ endif()
+
+ if(ENABLE_PORTMIDI)
+diff --git a/client/gui/gui_boot.cpp b/client/gui/gui_boot.cpp
+index f0a0035d1..834038209 100644
+--- a/client/gui/gui_boot.cpp
++++ b/client/gui/gui_boot.cpp
+@@ -315,12 +315,14 @@ static BootWindow* MakeBootWindow()
+ */
+ std::string GUI_BootWindow()
+ {
++#ifdef HAVE_FLTK_SCREEN_SCALE
+ // Scale according to 1600x900.
+ Fl::screen_scale(0, MAX(Fl::h() / 900.0f, 1.0f));
+
+ // This feature is too clever by half, and in my experience just
+ // deforms the window.
+ Fl::keyboard_screen_scaling(0);
++#endif
+
+ BootWindow* win = MakeBootWindow();
+ win->initWADDirs();
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index 493d8f12b..a53441d13 100644
+--- a/libraries/CMakeLists.txt
++++ b/libraries/CMakeLists.txt
+@@ -255,7 +255,7 @@ endif()
+
+ ### FLTK (dep: libpng) ###
+
+-if(BUILD_CLIENT)
++if(BUILD_CLIENT AND USE_INTERNAL_FLTK)
+ message(STATUS "Compiling FLTK...")
+
+ set(_FLTK_BUILDGEN_PARAMS
+--
+2.34.1
+
diff --git a/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch b/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch
new file mode 100644
index 000000000000..9b0d3284dc48
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch
@@ -0,0 +1,85 @@
+From c8d1cd6465d8d64a23a111edb5fba67565660fe8 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 27 Feb 2022 22:51:18 +0000
+Subject: [PATCH 2/3] Allow building against the system JsonCpp library
+
+`USE_INTERNAL_JSONCPP` defaults to true and ignores `USE_INTERNAL_LIBS`
+because users are unlikely to have it installed.
+
+More recent versions of JsonCpp require C++11, but Odamex targets C++98
+for compatibility with older platforms. The standard is therefore only
+changed to C++11 when `USE_INTERNAL_JSONCPP` is false, and only for the
+server where JsonCpp is used. Note that C++11 still works when building
+against an older JsonCpp version.
+
+Tested against JsonCpp 1.9.5 on Gentoo Linux.
+
+Closes: https://github.com/odamex/odamex/issues/261
+(cherry picked from commit 5162c6297c7177af907e5e0502eac9d59ffcc22b)
+---
+ CMakeLists.txt | 1 +
+ libraries/CMakeLists.txt | 2 +-
+ server/CMakeLists.txt | 15 ++++++++++++++-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c43c9f111..9353d0c6b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,6 +42,7 @@ option(USE_INTERNAL_DEUTEX "Use internal DeuTex" ${USE_INTERNAL_LIBS})
+ cmake_dependent_option( USE_INTERNAL_ZLIB "Use internal zlib" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )
+ cmake_dependent_option( USE_INTERNAL_PNG "Use internal libpng" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )
+ cmake_dependent_option( USE_INTERNAL_CURL "Use internal libcurl" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )
++cmake_dependent_option( USE_INTERNAL_JSONCPP "Use internal JsonCpp" 1 BUILD_SERVER 0 )
+ cmake_dependent_option( USE_INTERNAL_WXWIDGETS "Use internal wxWidgets" ${USE_INTERNAL_LIBS} BUILD_LAUNCHER 0 )
+ cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )
+ cmake_dependent_option( USE_MINIUPNP "Build with UPnP support" 1 BUILD_SERVER 0 )
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index ae7db4c86..493d8f12b 100644
+--- a/libraries/CMakeLists.txt
++++ b/libraries/CMakeLists.txt
+@@ -295,7 +295,7 @@ endif()
+
+ ### JsonCpp ###
+
+-if(BUILD_SERVER)
++if(BUILD_SERVER AND USE_INTERNAL_JSONCPP)
+ message(STATUS "Compiling JsonCpp...")
+
+ # Figure out the correct library path to attach to our imported target
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index 32297080f..a9bf8c44d 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -45,7 +45,12 @@ endif()
+ add_executable(odasrv
+ ${COMMON_SOURCES} ${SERVER_SOURCES} ${SERVER_WIN32_SOURCES})
+ odamex_target_settings(odasrv)
+-set_property(TARGET odasrv PROPERTY CXX_STANDARD 98)
++
++if(USE_INTERNAL_JSONCPP)
++ set_property(TARGET odasrv PROPERTY CXX_STANDARD 98)
++else()
++ set_property(TARGET odasrv PROPERTY CXX_STANDARD 11)
++endif()
+
+ target_include_directories(odasrv PRIVATE src)
+ if(WIN32)
+@@ -53,6 +58,14 @@ if(WIN32)
+ endif()
+ target_link_libraries(odasrv ZLIB::ZLIB jsoncpp odamex-common odaproto)
+
++if(USE_INTERNAL_JSONCPP)
++ target_link_libraries(odasrv jsoncpp)
++else()
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(JSONCPP jsoncpp REQUIRED IMPORTED_TARGET)
++ target_link_libraries(odasrv PkgConfig::JSONCPP)
++endif()
++
+ if(USE_MINIUPNP)
+ if(USE_INTERNAL_MINIUPNP)
+ target_link_libraries(odasrv upnpc-static)
+--
+2.34.1
+
diff --git a/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch b/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch
new file mode 100644
index 000000000000..80b0806e0c11
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch
@@ -0,0 +1,96 @@
+From 4e9fec4ce56fda2568a3a656e1f7c59cdbc5fb21 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 20 Feb 2022 11:24:24 +0000
+Subject: [PATCH 1/3] Allow building against the system miniupnpc library
+
+`USE_INTERNAL_MINIUPNP` defaults to true and ignores `USE_INTERNAL_LIBS` because
+users are unlikely to have it installed.
+
+Although miniupnpc uses pkg-config, it doesn't add any include paths to the
+flags because it expects your include directives to include the miniupnpc
+directory. We should therefore do the same with the internal build so that
+either can be used.
+
+Bug: https://github.com/odamex/odamex/issues/261
+(cherry picked from commit 1832a4a1c06504de953cdec2413a47ee393101c7)
+---
+ CMakeLists.txt | 1 +
+ common/i_net.cpp | 7 +++----
+ libraries/CMakeLists.txt | 4 ++--
+ server/CMakeLists.txt | 8 +++++++-
+ 4 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fd17dd36b..c43c9f111 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,7 @@ cmake_dependent_option( USE_INTERNAL_CURL "Use internal libcurl" ${USE_INTERNAL_
+ cmake_dependent_option( USE_INTERNAL_WXWIDGETS "Use internal wxWidgets" ${USE_INTERNAL_LIBS} BUILD_LAUNCHER 0 )
+ cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )
+ cmake_dependent_option( USE_MINIUPNP "Build with UPnP support" 1 BUILD_SERVER 0 )
++cmake_dependent_option( USE_INTERNAL_MINIUPNP "Use internal MiniUPnP" 1 USE_MINIUPNP 0 )
+
+ set(PROJECT_COPYRIGHT "2006-2022")
+ set(PROJECT_RC_VERSION "10,0,0,0")
+diff --git a/common/i_net.cpp b/common/i_net.cpp
+index 27b218d0d..dba512346 100644
+--- a/common/i_net.cpp
++++ b/common/i_net.cpp
+@@ -93,10 +93,9 @@ typedef int SOCKET;
+ #include "minilzo.h"
+
+ #ifdef ODA_HAVE_MINIUPNP
+-#define MINIUPNP_STATICLIB
+-#include "miniwget.h"
+-#include "miniupnpc.h"
+-#include "upnpcommands.h"
++#include "miniupnpc/miniwget.h"
++#include "miniupnpc/miniupnpc.h"
++#include "miniupnpc/upnpcommands.h"
+ #endif
+
+ unsigned int inet_socket;
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index 1785ed0d8..ae7db4c86 100644
+--- a/libraries/CMakeLists.txt
++++ b/libraries/CMakeLists.txt
+@@ -350,7 +350,7 @@ endif()
+ ### MiniUPnPc ###
+ if(BUILD_SERVER AND NOT USE_MINIUPNP)
+ message(STATUS "Skipping MiniUPnPc...")
+-elseif(BUILD_SERVER AND USE_MINIUPNP)
++elseif(BUILD_SERVER AND USE_MINIUPNP AND USE_INTERNAL_MINIUPNP)
+ message(STATUS "Compiling MiniUPnPc...")
+
+ # Figure out the correct library path to attach to our imported target
+@@ -386,7 +386,7 @@ elseif(BUILD_SERVER AND USE_MINIUPNP)
+ # Synthesize an imported target that can be linked against.
+ add_library(upnpc-static STATIC IMPORTED GLOBAL)
+ set_target_properties(upnpc-static PROPERTIES
+- INTERFACE_INCLUDE_DIRECTORIES "${MINIUPNPC_INCLUDE_DIR}"
++ INTERFACE_COMPILE_DEFINITIONS MINIUPNP_STATICLIB
+ IMPORTED_LOCATION ${MINIUPNPC_LIBRARY})
+ if(WIN32)
+ set_target_properties(upnpc-static PROPERTIES INTERFACE_LINK_LIBRARIES "ws2_32;iphlpapi")
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index c9fa17b64..32297080f 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -54,7 +54,13 @@ endif()
+ target_link_libraries(odasrv ZLIB::ZLIB jsoncpp odamex-common odaproto)
+
+ if(USE_MINIUPNP)
+- target_link_libraries(odasrv upnpc-static)
++ if(USE_INTERNAL_MINIUPNP)
++ target_link_libraries(odasrv upnpc-static)
++ else()
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(MINIUPNPC miniupnpc REQUIRED IMPORTED_TARGET)
++ target_link_libraries(odasrv PkgConfig::MINIUPNPC)
++ endif()
+ endif()
+
+ if(WIN32)
+--
+2.34.1
+
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index cb169a6f5bc5..1548d4273e2e 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="client">Build client target</flag>
+ <flag name="hidpi">Use bundled FLTK 1.4, which has better support for HiDPI screens</flag>
<flag name="master">Build master server target (advertises odamex server list)</flag>
<flag name="odalaunch">Build the wxWidgets based launcher</flag>
<flag name="portmidi">Enable PortMidi support</flag>
@@ -25,6 +26,6 @@
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.
+ on almost any platform.
</longdescription>
</pkgmetadata>
diff --git a/games-engines/odamex/odamex-10.0.0.ebuild b/games-engines/odamex/odamex-10.0.0.ebuild
new file mode 100644
index 000000000000..36c7c98744f3
--- /dev/null
+++ b/games-engines/odamex/odamex-10.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake desktop prefix wxwidgets xdg
+
+DESCRIPTION="Online multiplayer free software engine for DOOM"
+HOMEPAGE="https://odamex.net/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+client hidpi master +odalaunch portmidi server upnp X"
+REQUIRED_USE="|| ( client master server )"
+
+# protobuf is still bundled. Unfortunately an old version is required for C++98
+# compatibility. We could use C++11, but upstream is concerned about using a
+# completely different protobuf version on a multiplayer-focused engine.
+
+RDEPEND="
+ client? (
+ media-libs/libpng:0=
+ media-libs/libsdl2[joystick,sound,video]
+ media-libs/sdl2-mixer
+ net-misc/curl
+ !hidpi? ( x11-libs/fltk:1 )
+ portmidi? ( media-libs/portmidi )
+ X? ( x11-libs/libX11 )
+ )
+ odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+ server? (
+ dev-libs/jsoncpp:=
+ upnp? ( net-libs/miniupnpc:= )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0.0-unbundle-miniupnpc.patch
+ "${FILESDIR}"/${PN}-10.0.0-unbundle-jsoncpp.patch
+ "${FILESDIR}"/${PN}-10.0.0-unbundle-fltk.patch
+ "${FILESDIR}"/${PN}-10.0.0-musl.patch
+)
+
+src_prepare() {
+ rm -r libraries/libminiupnpc || die
+ hprefixify common/d_main.cpp
+
+ use odalaunch && setup-wxwidgets
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_INTERNAL_FLTK=$(usex hidpi)
+ -DUSE_INTERNAL_JSONCPP=0
+ -DUSE_INTERNAL_LIBS=0
+ -DUSE_INTERNAL_MINIUPNP=0
+ -DBUILD_CLIENT=$(usex client)
+ -DBUILD_LAUNCHER=$(usex odalaunch)
+ -DBUILD_MASTER=$(usex master)
+ -DBUILD_SERVER=$(usex server)
+ -DBUILD_OR_FAIL=1
+ -DENABLE_PORTMIDI=$(usex portmidi)
+ -DUSE_MINIUPNP=$(usex upnp)
+ )
+ use client && mycmakeargs+=(-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X))
+
+ cmake_src_configure
+}
+
+src_install() {
+ if use client ; then
+ newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
+ make_desktop_entry "${PN}" "Odamex"
+
+ if use odalaunch ; then
+ newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
+ make_desktop_entry odalaunch "Odamex Launcher" odalaunch
+ fi
+ fi
+
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2022-03-20 13:32 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2022-03-20 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 0797eb1343330b24b4b9097622b5419d7c518dbc
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 13:30:43 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 13:30:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0797eb13
games-engines/odamex: Patch fix USE=master breakage on newer compilers
Closes: https://bugs.gentoo.org/835638
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../odamex/files/odamex-10.0.0-master-std.patch | 28 ++++++++++++++++++++++
games-engines/odamex/odamex-10.0.0.ebuild | 1 +
2 files changed, 29 insertions(+)
diff --git a/games-engines/odamex/files/odamex-10.0.0-master-std.patch b/games-engines/odamex/files/odamex-10.0.0-master-std.patch
new file mode 100644
index 000000000000..2fe299fd12df
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.0.0-master-std.patch
@@ -0,0 +1,28 @@
+From 08ff1a04abfde739f7b6d273ebfad65e9a09c24a Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 20 Mar 2022 13:19:49 +0000
+Subject: [PATCH] Set odamast C++ standard to 98
+
+Otherwise the use of `byte` is ambiguous with newer compilers, resulting
+in a build error.
+
+(cherry picked from commit 4c06d27e60b1e10c4d661523894430323398b140)
+---
+ master/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
+index cbe6a0311..f216eab9a 100644
+--- a/master/CMakeLists.txt
++++ b/master/CMakeLists.txt
+@@ -6,6 +6,7 @@ file(GLOB MASTER_SOURCES *.cpp *.h)
+ # Master target
+ add_executable(odamast ${MASTER_SOURCES})
+ odamex_target_settings(odamast)
++set_property(TARGET odamast PROPERTY CXX_STANDARD 98)
+
+ if(WIN32)
+ target_link_libraries(odamast wsock32)
+--
+2.34.1
+
diff --git a/games-engines/odamex/odamex-10.0.0.ebuild b/games-engines/odamex/odamex-10.0.0.ebuild
index 36c7c98744f3..3f412be3f47d 100644
--- a/games-engines/odamex/odamex-10.0.0.ebuild
+++ b/games-engines/odamex/odamex-10.0.0.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-10.0.0-unbundle-jsoncpp.patch
"${FILESDIR}"/${PN}-10.0.0-unbundle-fltk.patch
"${FILESDIR}"/${PN}-10.0.0-musl.patch
+ "${FILESDIR}"/${PN}-10.0.0-master-std.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2022-06-17 22:50 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-06-17 22:50 UTC (permalink / raw
To: gentoo-commits
commit: a7a34ec3f155cab724c8106e4375fd2fa08a347a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 21:39:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 22:49:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a34ec3
games-engines/odamex: fix build with GCC 12
Closes: https://bugs.gentoo.org/852566
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../odamex/files/odamex-10.0.0-gcc12.patch | 21 +++++++++++++++++++++
games-engines/odamex/odamex-10.0.0.ebuild | 1 +
2 files changed, 22 insertions(+)
diff --git a/games-engines/odamex/files/odamex-10.0.0-gcc12.patch b/games-engines/odamex/files/odamex-10.0.0-gcc12.patch
new file mode 100644
index 000000000000..8e1a080e1f90
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.0.0-gcc12.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/852566
+--- a/libraries/portmidi/pm_linux/finddefault.c
++++ b/libraries/portmidi/pm_linux/finddefault.c
+@@ -2,6 +2,7 @@
+ Roger Dannenberg, Jan 2009
+ */
+
++#include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+--- a/master/main.cpp
++++ b/master/main.cpp
+@@ -29,6 +29,7 @@
+ #include <iostream>
+ #endif
+
++#include <ctime>
+ #include <string>
+ #include <vector>
+ #include <list>
diff --git a/games-engines/odamex/odamex-10.0.0.ebuild b/games-engines/odamex/odamex-10.0.0.ebuild
index 3f412be3f47d..bcaefbef7099 100644
--- a/games-engines/odamex/odamex-10.0.0.ebuild
+++ b/games-engines/odamex/odamex-10.0.0.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-10.0.0-unbundle-fltk.patch
"${FILESDIR}"/${PN}-10.0.0-musl.patch
"${FILESDIR}"/${PN}-10.0.0-master-std.patch
+ "${FILESDIR}"/${PN}-10.0.0-gcc12.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2023-10-21 8:16 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2023-10-21 8:16 UTC (permalink / raw
To: gentoo-commits
commit: 85f08ecc7d44f5c9b0e8ed474b049e36a70af724
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 08:16:06 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 08:16:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f08ecc
games-engines/odamex: Bump to 10.4.0, drop old 10.3.0-r1
Closes: https://bugs.gentoo.org/915983
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 2 +-
.../odamex/files/odamex-10.3.0-master-fix.patch | 31 ----------------------
...damex-10.3.0-r1.ebuild => odamex-10.4.0.ebuild} | 1 -
3 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index c2381d9c7a73..0bc5ecb71c7d 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1 +1 @@
-DIST odamex-src-10.3.0.tar.gz 24281159 BLAKE2B f38eacf700f21caa1300e46d926f6e07b97944326cd0ef9d22c3e14af82e91f39e88ae055d90442b81237888b90b8a1c478a54fd599b9648790260863916fb1f SHA512 902f4d20b9246ea94b50099e0ab2c6cd17faad68df344114e9963e100c35a4ac141f3d109b7affb8860a4e082a39ffcfdfcea45d9e6ada6efe09f01c3546f92b
+DIST odamex-src-10.4.0.tar.gz 24233204 BLAKE2B 377f14db15a367db3e84267a1483d5e138291fcefe53c2d522d2767ddd4a804df7ab31726d8818497c1eed93e6f0658fa4f855b6f4b0610f378a4ef3aab180b6 SHA512 12c114181aaf50e8c1f8c04d6e252f422fe887b5dc0be21974f5c1ac6645e1988091af638eb68fb9667ec4c7c2bdd5bb49981546644c33e90c80a9baefe2c930
diff --git a/games-engines/odamex/files/odamex-10.3.0-master-fix.patch b/games-engines/odamex/files/odamex-10.3.0-master-fix.patch
deleted file mode 100644
index 1a20d8f6523c..000000000000
--- a/games-engines/odamex/files/odamex-10.3.0-master-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 10beb4212625ee5e6d5b8a55e94d22d70d630217 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Wed, 19 Apr 2023 14:33:33 +0200
-Subject: [PATCH] include time.h on all platforms
-
----
- master/main.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/master/main.cpp b/master/main.cpp
-index a69af8dd0..3226792a7 100644
---- a/master/main.cpp
-+++ b/master/main.cpp
-@@ -38,16 +38,15 @@
- #include <string.h>
-
- #include <stdint.h>
-+#include <time.h>
-
- #ifdef UNIX
- #include <netinet/in.h>
- #include <unistd.h>
--#include <sys/time.h>
- #endif
-
- #ifdef _WIN32
- #include <winsock.h>
--#include <time.h>
- #define usleep(n) Sleep(n/1000)
- #endif
-
diff --git a/games-engines/odamex/odamex-10.3.0-r1.ebuild b/games-engines/odamex/odamex-10.4.0.ebuild
similarity index 98%
rename from games-engines/odamex/odamex-10.3.0-r1.ebuild
rename to games-engines/odamex/odamex-10.4.0.ebuild
index 0c99afc1d885..594869339e54 100644
--- a/games-engines/odamex/odamex-10.3.0-r1.ebuild
+++ b/games-engines/odamex/odamex-10.4.0.ebuild
@@ -42,7 +42,6 @@ S="${WORKDIR}/${PN}-src-${PV}"
PATCHES=(
"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
- "${FILESDIR}"/${P}-master-fix.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2024-05-12 16:23 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2024-05-12 16:23 UTC (permalink / raw
To: gentoo-commits
commit: ba3dacd5312a26126935d0f4e4a7aaffa033f7fd
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 16:21:40 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 12 16:23:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba3dacd5
games-engines/odamex: Fix musl build with patch
This has been merged upstream.
Closes: https://bugs.gentoo.org/923818
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/files/odamex-musl.patch | 119 +++++++++++++++++++++++++++
games-engines/odamex/odamex-10.4.0-r3.ebuild | 5 +-
2 files changed, 121 insertions(+), 3 deletions(-)
diff --git a/games-engines/odamex/files/odamex-musl.patch b/games-engines/odamex/files/odamex-musl.patch
new file mode 100644
index 000000000000..bf6f2999ba49
--- /dev/null
+++ b/games-engines/odamex/files/odamex-musl.patch
@@ -0,0 +1,119 @@
+From deb113e672588879697ae3343c5d3f1616d13503 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 30 Mar 2024 22:39:14 +0000
+Subject: [PATCH] Include <ctime> wherever time_t is used to fix musl
+
+---
+ client/src/m_menu.cpp | 2 ++
+ client/src/v_screenshot.cpp | 2 ++
+ common/c_dispatch.cpp | 1 +
+ common/cmdlib.h | 1 +
+ common/p_user.cpp | 2 ++
+ server/src/c_console.cpp | 2 ++
+ server/src/sv_banlist.cpp | 1 +
+ server/src/sv_banlist.h | 1 +
+ 8 files changed, 12 insertions(+)
+
+diff --git a/client/src/m_menu.cpp b/client/src/m_menu.cpp
+index 6268e1819..f82cbf40d 100644
+--- a/client/src/m_menu.cpp
++++ b/client/src/m_menu.cpp
+@@ -25,6 +25,8 @@
+
+ #include "odamex.h"
+
++#include <ctime>
++
+ #include "gstrings.h"
+ #include "c_console.h"
+ #include "c_dispatch.h"
+diff --git a/client/src/v_screenshot.cpp b/client/src/v_screenshot.cpp
+index 2f24cb184..375de5b9d 100644
+--- a/client/src/v_screenshot.cpp
++++ b/client/src/v_screenshot.cpp
+@@ -24,6 +24,8 @@
+
+ #include "odamex.h"
+
++#include <ctime>
++
+ #include <SDL.h>
+
+ #include <stdlib.h>
+diff --git a/common/c_dispatch.cpp b/common/c_dispatch.cpp
+index 504379aad..d30dd4e24 100644
+--- a/common/c_dispatch.cpp
++++ b/common/c_dispatch.cpp
+@@ -26,6 +26,7 @@
+
+ #include <sstream>
+ #include <algorithm>
++#include <ctime>
+
+ #include "cmdlib.h"
+ #include "c_console.h"
+diff --git a/common/cmdlib.h b/common/cmdlib.h
+index c7041837b..a20be7c4c 100644
+--- a/common/cmdlib.h
++++ b/common/cmdlib.h
+@@ -24,6 +24,7 @@
+ #pragma once
+
+ #include <algorithm>
++#include <ctime>
+
+ #ifdef _MSC_VER
+ #pragma warning(disable : 4244) // MIPS
+diff --git a/common/p_user.cpp b/common/p_user.cpp
+index d9a4bb965..461a3ef03 100644
+--- a/common/p_user.cpp
++++ b/common/p_user.cpp
+@@ -26,6 +26,8 @@
+
+ #include "odamex.h"
+
++#include <ctime>
++
+ #include <limits.h>
+
+ #include "cmdlib.h"
+diff --git a/server/src/c_console.cpp b/server/src/c_console.cpp
+index 34fcd19d9..57d7e71e2 100644
+--- a/server/src/c_console.cpp
++++ b/server/src/c_console.cpp
+@@ -24,6 +24,8 @@
+
+ #include "odamex.h"
+
++#include <ctime>
++
+ #include <stdarg.h>
+
+ #include "m_memio.h"
+diff --git a/server/src/sv_banlist.cpp b/server/src/sv_banlist.cpp
+index c271fe68c..36cdf9b63 100644
+--- a/server/src/sv_banlist.cpp
++++ b/server/src/sv_banlist.cpp
+@@ -24,6 +24,7 @@
+
+ #include "odamex.h"
+
++#include <ctime>
+ #include <sstream>
+
+ #include "win32inc.h"
+diff --git a/server/src/sv_banlist.h b/server/src/sv_banlist.h
+index 6096f73fc..f4d686071 100644
+--- a/server/src/sv_banlist.h
++++ b/server/src/sv_banlist.h
+@@ -23,6 +23,7 @@
+
+ #pragma once
+
++#include <ctime>
+ #include <sstream>
+
+ #include "json/json.h"
+--
+2.44.0
+
diff --git a/games-engines/odamex/odamex-10.4.0-r3.ebuild b/games-engines/odamex/odamex-10.4.0-r3.ebuild
index a1d216e1f011..8b0fd3fd1b7b 100644
--- a/games-engines/odamex/odamex-10.4.0-r3.ebuild
+++ b/games-engines/odamex/odamex-10.4.0-r3.ebuild
@@ -9,7 +9,7 @@ inherit cmake desktop prefix wxwidgets xdg
DESCRIPTION="Online multiplayer free software engine for DOOM"
HOMEPAGE="https://odamex.net/"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz"
-
+S="${WORKDIR}/${PN}-src-${PV}"
LICENSE="GPL-2+ MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -38,13 +38,12 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="games-util/deutex"
-S="${WORKDIR}/${PN}-src-${PV}"
-
PATCHES=(
"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
"${FILESDIR}"/${PN}-10.4.0-backport-pr928.patch
"${FILESDIR}"/${PN}-odalaunch-prefix.patch
"${FILESDIR}"/${PN}-lto.patch
+ "${FILESDIR}"/${PN}-musl.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/
@ 2024-09-16 21:31 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2024-09-16 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 1b2111f7caf865f8a84baa4eab77ad4c76a5be0d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 16 21:10:59 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 16 21:31:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2111f7
games-engines/odamex: Bump to 10.6.0, drop old 10.4.0-r3
Closes: https://bugs.gentoo.org/933746
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 2 +-
.../files/odamex-10.4.0-backport-pr928.patch | 66 ------------
games-engines/odamex/files/odamex-lto.patch | 41 -------
games-engines/odamex/files/odamex-musl.patch | 119 ---------------------
.../odamex/files/odamex-odalaunch-prefix.patch | 64 -----------
...damex-10.4.0-r3.ebuild => odamex-10.6.0.ebuild} | 4 -
6 files changed, 1 insertion(+), 295 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index ec0da44a3f5b..a05e76deb85d 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1 +1 @@
-DIST odamex-src-10.4.0.tar.xz 17255540 BLAKE2B bdfb357424bd1712cf763f5e6109b67910e518703e8a29fa3b071f73302beea2d3e7ed63a4e7195c367a01947ad829a78967cc77acfe3455a6e2094ca33b6590 SHA512 bea6a2e70e6bdab6a1d6b5beccf981b7570142cdabc6e54935601c5fd966e1a0e7935aa6b492185165440b31899fa6240f038a75d4741a92520e6e9be935ef7b
+DIST odamex-src-10.6.0.tar.xz 17560572 BLAKE2B eeb9742b587a7e45fa5d33ae7a96b767a4d6517732ffc82a58c68557edfd43305413667fdcc24f7256613c05421da85a81db2c5d36d7ad09b91e4b2d76fa1693 SHA512 c1269a9047199af16c64aee5d0520070cfa36c7a2488628bb19744024f13e083a6841b65f8dc18b930d3b0ef39cdebddfcf028ea44af98b4418319c364e806c0
diff --git a/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch b/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch
deleted file mode 100644
index 7d6871847814..000000000000
--- a/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/849866
-https://github.com/odamex/odamex/pull/928
-
-From b952137ac487a6558e1796c86d8fd55b8b3c9025 Mon Sep 17 00:00:00 2001
-From: matoro <matoro@users.noreply.github.com>
-Date: Wed, 6 Dec 2023 01:01:29 -0500
-Subject: [PATCH] Fix auto-SIMD for i386+sse2, ppc+altivec
-
-Only Darwin ever used -faltivec, gcc uses -maltivec since at least 2007:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=30254#c1
-
-Similarly, recent versions of gcc define __APPLE_ALTIVEC__ for
-compatibility, so just unconditionally include altivec.h.
-
-Canonical way to enable specific extensions is e.g. -msse2, use that
-instead of optimizing for a specific CPU.
-
-Finally, cmake uses target_compile_options to add arbitrary flags.
-target_compile_definitions assumes you want a preprocessor definition,
-which was adding "-D-faltivec" to the command line which gcc doesn't
-like; this is what originally prompted this change.
----
- client/CMakeLists.txt | 11 +++++++----
- client/src/r_drawt_altivec.cpp | 2 --
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 646164916..56caf04f8 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -169,14 +169,17 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
- message(STATUS "Default SIMD flags not touched for AMD64")
- elseif(ODAMEX_TARGET_ARCH STREQUAL "i386")
- if(NOT MSVC)
-- # Pentium M has SSE2.
-- target_compile_definitions(odamex PRIVATE -march=pentium-m)
-+ target_compile_options(odamex PRIVATE -msse2)
- else()
-- target_compile_definitions(odamex PRIVATE /arch:SSE2)
-+ target_compile_options(odamex PRIVATE /arch:SSE2)
- endif()
- message(STATUS "Default SIMD flags set to SSE2")
- elseif(ODAMEX_TARGET_ARCH MATCHES "ppc")
-- target_compile_definitions(odamex PRIVATE -faltivec)
-+ if(APPLE)
-+ target_compile_options(odamex PRIVATE -faltivec)
-+ else()
-+ target_compile_options(odamex PRIVATE -maltivec)
-+ endif()
- message(STATUS "Default SIMD flags set to AltiVec")
- endif()
- else()
-diff --git a/client/src/r_drawt_altivec.cpp b/client/src/r_drawt_altivec.cpp
-index eea758733..5a0cdf95e 100644
---- a/client/src/r_drawt_altivec.cpp
-+++ b/client/src/r_drawt_altivec.cpp
-@@ -36,9 +36,7 @@
- #include "r_main.h"
- #include "i_video.h"
-
--#if !defined(__APPLE_ALTIVEC__)
- #include <altivec.h>
--#endif
-
- #define ALTIVEC_ALIGNED(x) x __attribute__((aligned(16)))
-
diff --git a/games-engines/odamex/files/odamex-lto.patch b/games-engines/odamex/files/odamex-lto.patch
deleted file mode 100644
index 20d9d88c002b..000000000000
--- a/games-engines/odamex/files/odamex-lto.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/odamex/odamex/pull/942
-
-diff --git a/client/src/cl_parse.cpp b/client/src/cl_parse.cpp
-index cdadbbdf2..e15c45edc 100644
---- a/client/src/cl_parse.cpp
-+++ b/client/src/cl_parse.cpp
-@@ -2354,7 +2354,7 @@ static void CL_SectorProperties(const odaproto::svc::SectorProperties* msg)
- break;
- }
- case SPC_Gravity:
-- *(int*)§or->gravity = msg->sector().gravity();
-+ *§or->gravity = msg->sector().gravity();
- break;
- case SPC_Panning:
- sector->ceiling_xoffs = msg->sector().ceiling_offs().x();
-diff --git a/common/p_spec.cpp b/common/p_spec.cpp
-index df1a42a6a..d0a5af419 100644
---- a/common/p_spec.cpp
-+++ b/common/p_spec.cpp
-@@ -465,7 +465,7 @@ void DPusher::Serialize (FArchive &arc)
- else
- {
- arc >> m_Type;
-- arc.ReadObject((DObject*&)m_Source, DPusher::StaticType());
-+ arc.ReadObject((DObject*&)*m_Source, DPusher::StaticType());
- arc >> m_Xmag >> m_Ymag >> m_Magnitude >> m_Radius >> m_X >> m_Y >> m_Affectee;
- }
- }
-diff --git a/odalpapi/net_io.cpp b/odalpapi/net_io.cpp
-index d6dd666fe..16f136374 100644
---- a/odalpapi/net_io.cpp
-+++ b/odalpapi/net_io.cpp
-@@ -194,7 +194,7 @@ void BufferedSocket::SetRemoteAddress(const string& Address, const uint16_t& Por
-
- m_RemoteAddress.sin_family = PF_INET;
- m_RemoteAddress.sin_port = htons(Port);
-- m_RemoteAddress.sin_addr.s_addr = *((unsigned long*)&(((sockaddr_in*)result->ai_addr)->sin_addr));
-+ m_RemoteAddress.sin_addr = ((sockaddr_in*)result->ai_addr)->sin_addr;
- memset(m_RemoteAddress.sin_zero, '\0', sizeof m_RemoteAddress.sin_zero);
-
- freeaddrinfo(result);
diff --git a/games-engines/odamex/files/odamex-musl.patch b/games-engines/odamex/files/odamex-musl.patch
deleted file mode 100644
index bf6f2999ba49..000000000000
--- a/games-engines/odamex/files/odamex-musl.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From deb113e672588879697ae3343c5d3f1616d13503 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 30 Mar 2024 22:39:14 +0000
-Subject: [PATCH] Include <ctime> wherever time_t is used to fix musl
-
----
- client/src/m_menu.cpp | 2 ++
- client/src/v_screenshot.cpp | 2 ++
- common/c_dispatch.cpp | 1 +
- common/cmdlib.h | 1 +
- common/p_user.cpp | 2 ++
- server/src/c_console.cpp | 2 ++
- server/src/sv_banlist.cpp | 1 +
- server/src/sv_banlist.h | 1 +
- 8 files changed, 12 insertions(+)
-
-diff --git a/client/src/m_menu.cpp b/client/src/m_menu.cpp
-index 6268e1819..f82cbf40d 100644
---- a/client/src/m_menu.cpp
-+++ b/client/src/m_menu.cpp
-@@ -25,6 +25,8 @@
-
- #include "odamex.h"
-
-+#include <ctime>
-+
- #include "gstrings.h"
- #include "c_console.h"
- #include "c_dispatch.h"
-diff --git a/client/src/v_screenshot.cpp b/client/src/v_screenshot.cpp
-index 2f24cb184..375de5b9d 100644
---- a/client/src/v_screenshot.cpp
-+++ b/client/src/v_screenshot.cpp
-@@ -24,6 +24,8 @@
-
- #include "odamex.h"
-
-+#include <ctime>
-+
- #include <SDL.h>
-
- #include <stdlib.h>
-diff --git a/common/c_dispatch.cpp b/common/c_dispatch.cpp
-index 504379aad..d30dd4e24 100644
---- a/common/c_dispatch.cpp
-+++ b/common/c_dispatch.cpp
-@@ -26,6 +26,7 @@
-
- #include <sstream>
- #include <algorithm>
-+#include <ctime>
-
- #include "cmdlib.h"
- #include "c_console.h"
-diff --git a/common/cmdlib.h b/common/cmdlib.h
-index c7041837b..a20be7c4c 100644
---- a/common/cmdlib.h
-+++ b/common/cmdlib.h
-@@ -24,6 +24,7 @@
- #pragma once
-
- #include <algorithm>
-+#include <ctime>
-
- #ifdef _MSC_VER
- #pragma warning(disable : 4244) // MIPS
-diff --git a/common/p_user.cpp b/common/p_user.cpp
-index d9a4bb965..461a3ef03 100644
---- a/common/p_user.cpp
-+++ b/common/p_user.cpp
-@@ -26,6 +26,8 @@
-
- #include "odamex.h"
-
-+#include <ctime>
-+
- #include <limits.h>
-
- #include "cmdlib.h"
-diff --git a/server/src/c_console.cpp b/server/src/c_console.cpp
-index 34fcd19d9..57d7e71e2 100644
---- a/server/src/c_console.cpp
-+++ b/server/src/c_console.cpp
-@@ -24,6 +24,8 @@
-
- #include "odamex.h"
-
-+#include <ctime>
-+
- #include <stdarg.h>
-
- #include "m_memio.h"
-diff --git a/server/src/sv_banlist.cpp b/server/src/sv_banlist.cpp
-index c271fe68c..36cdf9b63 100644
---- a/server/src/sv_banlist.cpp
-+++ b/server/src/sv_banlist.cpp
-@@ -24,6 +24,7 @@
-
- #include "odamex.h"
-
-+#include <ctime>
- #include <sstream>
-
- #include "win32inc.h"
-diff --git a/server/src/sv_banlist.h b/server/src/sv_banlist.h
-index 6096f73fc..f4d686071 100644
---- a/server/src/sv_banlist.h
-+++ b/server/src/sv_banlist.h
-@@ -23,6 +23,7 @@
-
- #pragma once
-
-+#include <ctime>
- #include <sstream>
-
- #include "json/json.h"
---
-2.44.0
-
diff --git a/games-engines/odamex/files/odamex-odalaunch-prefix.patch b/games-engines/odamex/files/odamex-odalaunch-prefix.patch
deleted file mode 100644
index cf293e60f9e1..000000000000
--- a/games-engines/odamex/files/odamex-odalaunch-prefix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 04e38b9fcb8a71a7b0b1b5bc1c1f229f2ff7a0a8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 18 Mar 2024 22:54:16 +0000
-Subject: [PATCH] Always define INSTALL_PREFIX to fix paths for odalaunch
-
-Without INSTALL_PREFIX, it was falling back to the current directory and
-failing to launch the game.
----
- CMakeLists.txt | 5 +++++
- client/CMakeLists.txt | 5 -----
- server/CMakeLists.txt | 5 -----
- 3 files changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 147060cb1..97c447424 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,6 +26,11 @@ include(GNUInstallDirs OPTIONAL)
- add_definitions(-DINSTALL_BINDIR="${CMAKE_INSTALL_BINDIR}")
- add_definitions(-DINSTALL_DATADIR="${CMAKE_INSTALL_DATADIR}")
-
-+# Set up FHS installation path
-+if(NOT APPLE AND NOT WIN32)
-+ add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
-+endif()
-+
- if(WIN32)
- set(USE_INTERNAL_LIBS 1)
- else()
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 56caf04f8..0559564c7 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -128,11 +128,6 @@ if(APPLE)
- ${AUDIOUNIT_LIBRARY})
- endif()
-
--# Set up FHS installation path
--if(NOT APPLE AND NOT WIN32)
-- add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
--endif()
--
- # Client target
- if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
-
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index e5b54d8de..9afc6c2c6 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -37,11 +37,6 @@ if(WIN32 AND NOT MSVC)
- add_definitions(-DWINVER=0x0500)
- endif()
-
--# Set up FHS installation path
--if(NOT APPLE AND NOT WIN32)
-- add_definitions(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
--endif()
--
- add_executable(odasrv
- ${COMMON_SOURCES} ${SERVER_SOURCES} ${SERVER_WIN32_SOURCES})
- odamex_target_settings(odasrv)
---
-2.43.2
-
diff --git a/games-engines/odamex/odamex-10.4.0-r3.ebuild b/games-engines/odamex/odamex-10.6.0.ebuild
similarity index 93%
rename from games-engines/odamex/odamex-10.4.0-r3.ebuild
rename to games-engines/odamex/odamex-10.6.0.ebuild
index 2b88ef70989c..4a70b03acc25 100644
--- a/games-engines/odamex/odamex-10.4.0-r3.ebuild
+++ b/games-engines/odamex/odamex-10.6.0.ebuild
@@ -42,10 +42,6 @@ BDEPEND="games-util/deutex"
PATCHES=(
"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
- "${FILESDIR}"/${PN}-10.4.0-backport-pr928.patch
- "${FILESDIR}"/${PN}-odalaunch-prefix.patch
- "${FILESDIR}"/${PN}-lto.patch
- "${FILESDIR}"/${PN}-musl.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-09-16 21:31 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-16 21:31 [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/files/, games-engines/odamex/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-05-12 16:23 James Le Cuirot
2023-10-21 8:16 James Le Cuirot
2022-06-17 22:50 Sam James
2022-03-20 13:32 James Le Cuirot
2022-03-04 22:49 James Le Cuirot
2021-06-18 14:00 Ionen Wolkens
2021-03-31 7:40 Joonas Niilola
2019-09-09 22:08 James Le Cuirot
2018-04-29 13:06 Pacho Ramos
2015-11-03 15:46 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox