* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2017-07-23 13:12 Michael Palimaka
0 siblings, 0 replies; 14+ messages in thread
From: Michael Palimaka @ 2017-07-23 13:12 UTC (permalink / raw
To: gentoo-commits
commit: 2a95b6d1aba510faebfb15b41ab516b6f768b222
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Jul 23 05:51:48 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 13:12:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a95b6d1
games-engines/odamex: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610566
Package-Manager: Portage-2.3.6, Repoman-2.3.2
games-engines/odamex/files/odamex-0.7.0-gcc6.patch | 39 ++++++++++++++++++++++
games-engines/odamex/odamex-0.7.0.ebuild | 5 +--
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/games-engines/odamex/files/odamex-0.7.0-gcc6.patch b/games-engines/odamex/files/odamex-0.7.0-gcc6.patch
new file mode 100644
index 00000000000..9e341b881cc
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.7.0-gcc6.patch
@@ -0,0 +1,39 @@
+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/odamex-0.7.0.ebuild b/games-engines/odamex/odamex-0.7.0.ebuild
index 95f8739cb7a..552df25f75a 100644
--- a/games-engines/odamex/odamex-0.7.0.ebuild
+++ b/games-engines/odamex/odamex-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -40,7 +40,8 @@ src_prepare() {
"${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}-miniupnpc.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
rm -r libraries/libminiupnpc || die
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2018-10-14 18:35 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2018-10-14 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 542e520bfe8cfc266b8899f50502fdb527ac4508
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 18:27:19 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 18:35:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542e520b
games-engines/odamex: EAPI-6 bump, sort stuff
Drop superfluous pkg_pretend, pkg_preinst.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../odamex/files/odamex-0.7.0-miniupnpc20.patch | 4 +-
games-engines/odamex/odamex-0.7.0-r1.ebuild | 51 ++++++++++------------
2 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
index 716a07fe628..377286220b1 100644
--- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
+++ b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
@@ -1,7 +1,7 @@
Index: common/i_net.cpp
===================================================================
---- common/i_net.cpp (revision 5459)
-+++ common/i_net.cpp (working copy)
+--- a/common/i_net.cpp (revision 5459)
++++ b/common/i_net.cpp (working copy)
@@ -151,7 +151,11 @@
Printf(PRINT_HIGH, "UPnP: Discovering router (max 1 unit supported)\n");
diff --git a/games-engines/odamex/odamex-0.7.0-r1.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild
index 0d2e515d29d..78af4a724d7 100644
--- a/games-engines/odamex/odamex-0.7.0-r1.ebuild
+++ b/games-engines/odamex/odamex-0.7.0-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
+
WX_GTK_VER="3.0"
-inherit cmake-utils eutils gnome2-utils readme.gentoo-r1 wxwidgets
+inherit cmake-utils desktop 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/"
+DESCRIPTION="Online multiplayer, free software engine for Doom and Doom II"
+HOMEPAGE="https://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"
+IUSE="dedicated master +odalaunch portmidi server"
RDEPEND="
dedicated? ( >=net-libs/miniupnpc-1.8:0= )
@@ -35,23 +36,19 @@ DOC_CONTENTS="
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
-}
+PATCHES=(
+ "${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
+)
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
+ rm -r libraries/libminiupnpc || die
}
src_configure() {
@@ -59,22 +56,22 @@ src_configure() {
-DUSE_INTREE_PORTMIDI=OFF
-DCMAKE_INSTALL_BINDIR="/usr/bin"
-DCMAKE_INSTALL_DATADIR="/usr/share"
- $(cmake-utils_use_build master MASTER)
+ -DBUILD_MASTER=$(usex master)
)
if use dedicated ; then
mycmakeargs+=(
-DBUILD_CLIENT=OFF
-DBUILD_ODALAUNCH=OFF
- -DBUILD_SERVER=ON
-DENABLE_PORTMIDI=OFF
+ -DBUILD_SERVER=ON
)
else
mycmakeargs+=(
-DBUILD_CLIENT=ON
- $(cmake-utils_use_build odalaunch ODALAUNCH)
- $(cmake-utils_use_build server SERVER)
- $(cmake-utils_use_enable portmidi PORTMIDI)
+ -DBUILD_ODALAUNCH=$(usex odalaunch)
+ -DENABLE_PORTMIDI=$(usex portmidi)
+ -DBUILD_SERVER=$(usex server)
)
fi
@@ -102,10 +99,6 @@ src_install() {
fi
}
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
pkg_postinst() {
gnome2_icon_cache_update
readme.gentoo_print_elog
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2019-09-07 14:33 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2019-09-07 14:33 UTC (permalink / raw
To: gentoo-commits
commit: aa71ca8eced04dcc312153689650ac8a7318ee78
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Wed Sep 4 15:22:46 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 14:30:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa71ca8e
games-engines/odamex: Drop old
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 1 -
.../files/1-odamex-0.7.0-install-rules.patch | 89 -----------------
.../files/2-odamex-0.7.0-cmake-options.patch | 110 ---------------------
.../files/3-odamex-0.7.0-wad-search-path.patch | 67 -------------
.../4-odamex-0.7.0-odalauncher-bin-path.patch | 58 -----------
games-engines/odamex/files/odamex-0.7.0-gcc6.patch | 39 --------
.../odamex/files/odamex-0.7.0-miniupnpc.patch | 35 -------
.../odamex/files/odamex-0.7.0-miniupnpc20.patch | 28 ------
games-engines/odamex/odamex-0.7.0-r1.ebuild | 109 --------------------
9 files changed, 536 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 722a82bbe72..26a10f206ce 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,2 +1 @@
-DIST odamex-src-0.7.0.tar.bz2 8435860 BLAKE2B 9720efdf262047074fed593360b0c38864d5d0f9c076a45d6df9aaf362cba35f41eeafab968338be0911681726872c33e3625934176f75068ca4933655876f7b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b
DIST odamex-src-0.8.1.tar.bz2 8520197 BLAKE2B 9744460f2a2bff375cbf80416a38212e7576a4ef6874d2647c1371dc66b464666d67dd69ac61c918c51bee6da0150cbb70799eb81fc2fd7ff62edaec332241a5 SHA512 5cdd05df9683c9b26cac5e2947f5365405b0c6239890d89ab962f4ac088788148bb1eabc15e80b0f13fca0dea69bffcd9e80e8aa80c6ac0a5d7e63b0bd983642
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 618f9fd87c2..00000000000
--- 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 1de50271140..00000000000
--- 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 77fb4e48996..00000000000
--- 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 acb2692e75f..00000000000
--- 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 9e341b881cc..00000000000
--- 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 34896e2a4e8..00000000000
--- 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 377286220b1..00000000000
--- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: common/i_net.cpp
-===================================================================
---- a/common/i_net.cpp (revision 5459)
-+++ b/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
deleted file mode 100644
index 78af4a724d7..00000000000
--- a/games-engines/odamex/odamex-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-inherit cmake-utils desktop gnome2-utils readme.gentoo-r1 wxwidgets
-
-MY_P=${PN}-src-${PV}
-DESCRIPTION="Online multiplayer, free software engine for Doom and Doom II"
-HOMEPAGE="https://odamex.net/"
-SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated master +odalaunch 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}"
-
-PATCHES=(
- "${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
-)
-
-src_prepare() {
- cmake-utils_src_prepare
- rm -r libraries/libminiupnpc || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_INTREE_PORTMIDI=OFF
- -DCMAKE_INSTALL_BINDIR="/usr/bin"
- -DCMAKE_INSTALL_DATADIR="/usr/share"
- -DBUILD_MASTER=$(usex master)
- )
-
- if use dedicated ; then
- mycmakeargs+=(
- -DBUILD_CLIENT=OFF
- -DBUILD_ODALAUNCH=OFF
- -DENABLE_PORTMIDI=OFF
- -DBUILD_SERVER=ON
- )
- else
- mycmakeargs+=(
- -DBUILD_CLIENT=ON
- -DBUILD_ODALAUNCH=$(usex odalaunch)
- -DENABLE_PORTMIDI=$(usex portmidi)
- -DBUILD_SERVER=$(usex server)
- )
- 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_postinst() {
- gnome2_icon_cache_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2019-09-07 14:33 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2019-09-07 14:33 UTC (permalink / raw
To: gentoo-commits
commit: d2547e042d7236d9309057f03b1ca5a744f9e8e9
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Wed Sep 4 14:03:50 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 14:30:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2547e04
games-engines/odamex: Bump to version 0.8.1
Closes: https://bugs.gentoo.org/680758
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12863
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 1 +
.../odamex/files/odamex-0.8.1-miniupnpc.patch | 48 +++++++++++++
games-engines/odamex/metadata.xml | 11 +--
games-engines/odamex/odamex-0.8.1.ebuild | 78 ++++++++++++++++++++++
4 files changed, 133 insertions(+), 5 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 471256adcaf..722a82bbe72 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1 +1,2 @@
DIST odamex-src-0.7.0.tar.bz2 8435860 BLAKE2B 9720efdf262047074fed593360b0c38864d5d0f9c076a45d6df9aaf362cba35f41eeafab968338be0911681726872c33e3625934176f75068ca4933655876f7b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b
+DIST odamex-src-0.8.1.tar.bz2 8520197 BLAKE2B 9744460f2a2bff375cbf80416a38212e7576a4ef6874d2647c1371dc66b464666d67dd69ac61c918c51bee6da0150cbb70799eb81fc2fd7ff62edaec332241a5 SHA512 5cdd05df9683c9b26cac5e2947f5365405b0c6239890d89ab962f4ac088788148bb1eabc15e80b0f13fca0dea69bffcd9e80e8aa80c6ac0a5d7e63b0bd983642
diff --git a/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch b/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
new file mode 100644
index 00000000000..5fca5815162
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
@@ -0,0 +1,48 @@
+From 656306d3e68f7f1f1441f03e1765530f34ea2611 Mon Sep 17 00:00:00 2001
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu, 27 Mar 2014 21:16:02 +0000
+Subject: [PATCH] unbundle miniupnpc
+
+---
+ CMakeLists.txt | 1 -
+ server/CMakeLists.txt | 5 ++---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0cafdbd5..00e033a9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -124,7 +124,6 @@ if (USE_MINIUPNP)
+ set(UPNPC_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
+ set(UPNPC_INSTALL OFF CACHE INTERNAL "" FORCE)
+ mark_as_advanced(FORCE UPNPC_INSTALL)
+- add_subdirectory(libraries/libminiupnpc)
+ endif()
+
+ # Subdirectories for Odamex projects
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index d8e57257..5badceef 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -35,8 +35,7 @@ set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp)
+
+ # MiniUPnPc
+ if (USE_MINIUPNP)
+- set(MINIUPNPC_DIR ../libraries/libminiupnpc)
+- set(MINIUPNPC_STATIC_LIBRARIES upnpc-static)
++ set(MINIUPNPC_DIR /usr/include/miniupnpc)
+ endif()
+
+ # git describe
+@@ -74,7 +73,7 @@ add_executable(odasrv
+ ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES})
+
+ if (USE_MINIUPNP)
+- target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES})
++ target_link_libraries(odasrv -lminiupnpc)
+ endif()
+
+ if(WIN32)
+--
+2.23.0
+
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index 39562f87b32..608f36b8bc4 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -6,18 +6,19 @@
<name>Proxy Maintainers</name>
</maintainer>
<maintainer type="person">
- <email>mwoodj@knology.net</email>
- <name>Mike Wood</name>
+ <email>vilhelm.gray@gmail.com</email>
+ <name>William Breathitt Gray</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="client">Build client target</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>
+ <flag name="odalaunch">Build the wxWidgets based launcher</flag>
+ <flag name="portmidi">Enable PortMidi support</flag>
+ <flag name="server">Build server target</flag>
</use>
<upstream>
<changelog>http://odamex.net/changelog.php</changelog>
diff --git a/games-engines/odamex/odamex-0.8.1.ebuild b/games-engines/odamex/odamex-0.8.1.ebuild
new file mode 100644
index 00000000000..687e1349aab
--- /dev/null
+++ b/games-engines/odamex/odamex-0.8.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0"
+inherit cmake-utils desktop 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"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~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? (
+ upnp? ( net-libs/miniupnpc:= )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-miniupnpc.patch
+)
+
+src_prepare() {
+ rm -r libraries/libminiupnpc odamex.wad || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_CLIENT=$(usex client)
+ -DBUILD_MASTER=$(usex master)
+ -DBUILD_ODALAUNCH=$(usex odalaunch)
+ -DBUILD_SERVER=$(usex server)
+ -DENABLE_PORTMIDI=$(usex portmidi)
+ -DUSE_MINIUPNP=$(usex upnp)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ # Build odamex.wad
+ cd wad || die "cd failed"
+ deutex -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ../odamex.wad || die
+}
+
+src_install() {
+ if use client ; then
+ newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
+ make_desktop_entry "${PN} -waddir /usr/share/doom" "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-utils_src_install
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2020-04-08 22:46 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2020-04-08 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 5adac9c46b9fd6af6b2c816dd1dca43453f57855
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sun Apr 5 00:34:08 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 8 22:43:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5adac9c4
games-engines/odamex: Version bump to 0.8.2
Closes: https://bugs.gentoo.org/716238
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15268
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 1 +
.../odamex-0.8.2-Fix-odamex.wad-build-flow.patch | 71 ++++++++++++++++++++
...emove-duplicate-build-rule-for-odamex.wad.patch | 26 ++++++++
games-engines/odamex/metadata.xml | 8 +--
games-engines/odamex/odamex-0.8.2.ebuild | 77 ++++++++++++++++++++++
5 files changed, 179 insertions(+), 4 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 26a10f206ce..f7cb0fefbc6 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1 +1,2 @@
+DIST odamex-src-0.8.2.tar.bz2 8502115 BLAKE2B bf4acaea1c9ce81966886bdfef35d361f84dab02e32ec4fd11fe8d250b76c6ca86c0b2870f38382961949713059a2944eea50c6f4d05a41411799386ab3acc64 SHA512 bb3e2427ede7267afce8bb2b852eed3f8d2ed9cf17c5b15a264d6821d170c49dccea06ea0742d9dc7cfe42518701342572689b57ec6712f4b818bd0e25b436c8
DIST odamex-src-0.8.1.tar.bz2 8520197 BLAKE2B 9744460f2a2bff375cbf80416a38212e7576a4ef6874d2647c1371dc66b464666d67dd69ac61c918c51bee6da0150cbb70799eb81fc2fd7ff62edaec332241a5 SHA512 5cdd05df9683c9b26cac5e2947f5365405b0c6239890d89ab962f4ac088788148bb1eabc15e80b0f13fca0dea69bffcd9e80e8aa80c6ac0a5d7e63b0bd983642
diff --git a/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch b/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
new file mode 100644
index 00000000000..e90617c38ea
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
@@ -0,0 +1,71 @@
+From 03581f45a3563d3d79075fe0e85e6fb52e864b76 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Sat, 4 Apr 2020 22:38:26 -0400
+Subject: [PATCH] Fix odamex.wad build flow
+
+The odamex.wad file should be built in the proper build directory;
+building in the source tree confuses CMake and causes it to attempt to
+rebuild a second time. This patch also removes odawad dependency for the
+Odamex client and server executables.
+---
+ wad/CMakeLists.txt | 40 ++++++++++++++++++++++------------------
+ 1 file changed, 22 insertions(+), 18 deletions(-)
+
+diff --git a/wad/CMakeLists.txt b/wad/CMakeLists.txt
+index c09b0d1a..349ce0df 100644
+--- a/wad/CMakeLists.txt
++++ b/wad/CMakeLists.txt
+@@ -4,28 +4,32 @@ find_program(DEUTEX deutex)
+ if(DEUTEX)
+ message("Found DeuTex: ${DEUTEX}")
+
+- file(REMOVE odamex.wad)
+- add_custom_command(OUTPUT odamex.wad
+- COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt odamex.wad
++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
++ COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++ BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
+ VERBATIM)
+
+- add_custom_target(odawad DEPENDS odamex.wad)
++ add_custom_target(odawad ALL
++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad)
+
+- if(BUILD_CLIENT)
+- add_dependencies(odamex odawad)
++ if(WIN32)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
++ DESTINATION .
++ COMPONENT common)
++ else()
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
++ DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
++ COMPONENT common)
+ endif()
+- if(BUILD_SERVER)
+- add_dependencies(odasrv odawad)
+- endif()
+-endif()
+-
+-if(WIN32)
+- install(FILES odamex.wad
+- DESTINATION .
+- COMPONENT common)
+ else()
+- install(FILES odamex.wad
+- DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
+- COMPONENT common)
++ if(WIN32)
++ install(FILES odamex.wad
++ DESTINATION .
++ COMPONENT common)
++ else()
++ install(FILES odamex.wad
++ DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
++ COMPONENT common)
++ endif()
+ endif()
+--
+2.26.0
+
diff --git a/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch b/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
new file mode 100644
index 00000000000..1b1bcf55d9e
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
@@ -0,0 +1,26 @@
+From 2d80f79770f43d19e1af2c7b04a41078b860a46a Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Wed, 8 Apr 2020 11:47:45 -0400
+Subject: [PATCH] Remove duplicate build rule for odamex.wad
+
+The odamex.wad file shouldn't be listed in BYPRODUCTS because it's
+already listed as the OUTPUT of the add_custom_command.
+---
+ wad/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/wad/CMakeLists.txt b/wad/CMakeLists.txt
+index 349ce0df..7b948ea3 100644
+--- a/wad/CMakeLists.txt
++++ b/wad/CMakeLists.txt
+@@ -7,7 +7,6 @@ if(DEUTEX)
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
+ COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+- BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
+ VERBATIM)
+
+ add_custom_target(odawad ALL
+--
+2.26.0
+
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index 608f36b8bc4..29a83742d57 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -1,10 +1,6 @@
<?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>vilhelm.gray@gmail.com</email>
<name>William Breathitt Gray</name>
@@ -13,6 +9,10 @@
<email>games@gentoo.org</email>
<name>Gentoo Games Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="client">Build client target</flag>
<flag name="master">Build master server target (advertises odamex server list)</flag>
diff --git a/games-engines/odamex/odamex-0.8.2.ebuild b/games-engines/odamex/odamex-0.8.2.ebuild
new file mode 100644
index 00000000000..572889edd82
--- /dev/null
+++ b/games-engines/odamex/odamex-0.8.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 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"
+
+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? (
+ upnp? ( net-libs/miniupnpc:= )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+ "${FILESDIR}"/odamex-0.8.1-miniupnpc.patch
+ "${FILESDIR}"/odamex-0.8.1-SearchDir.patch
+ "${FILESDIR}"/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
+ "${FILESDIR}"/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
+)
+
+src_prepare() {
+ rm -r libraries/libminiupnpc wad/odamex.wad || die
+ hprefixify common/d_main.cpp
+
+ use odalaunch && setup-wxwidgets
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_CLIENT=$(usex client)
+ -DBUILD_MASTER=$(usex master)
+ -DBUILD_ODALAUNCH=$(usex odalaunch)
+ -DBUILD_SERVER=$(usex server)
+ -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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2020-08-25 21:57 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2020-08-25 21:57 UTC (permalink / raw
To: gentoo-commits
commit: f72fe819a1fddbed90353ec2d95658b1bc98a17b
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Tue Aug 25 19:16:52 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 21:54:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72fe819
game-engines/odamex: Version bump to 0.8.3
Closes: https://bugs.gentoo.org/722494
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17258
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 1 +
...1-on-odalaunch-target-for-wx-3.0.4-and-up.patch | 29 +++++++++
games-engines/odamex/odamex-0.8.3.ebuild | 76 ++++++++++++++++++++++
3 files changed, 106 insertions(+)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 0f071ac593c..cd2dcf02a55 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-src-0.8.2.tar.bz2 8502115 BLAKE2B bf4acaea1c9ce81966886bdfef35d361f84dab02e32ec4fd11fe8d250b76c6ca86c0b2870f38382961949713059a2944eea50c6f4d05a41411799386ab3acc64 SHA512 bb3e2427ede7267afce8bb2b852eed3f8d2ed9cf17c5b15a264d6821d170c49dccea06ea0742d9dc7cfe42518701342572689b57ec6712f4b818bd0e25b436c8
diff --git a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
new file mode 100644
index 00000000000..95cdfce5183
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
@@ -0,0 +1,29 @@
+From 8b82b887fd1fb17162ad831bbe7a83076187499d Mon Sep 17 00:00:00 2001
+From: Michael Wood <mwoodj@huntsvegas.org>
+Date: Tue, 25 Aug 2020 02:34:37 -0500
+Subject: [PATCH] Use C++11 on odalaunch target for wx 3.0.4 and up
+
+This addresses bug #1311. wxWidgets 3.0.4 requires C++11 support.
+---
+ odalaunch/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
+index f68a4d4d..4abbe0d8 100644
+--- a/odalaunch/CMakeLists.txt
++++ b/odalaunch/CMakeLists.txt
+@@ -32,6 +32,11 @@ endif()
+
+ # Odalaunch target
+ if(wxWidgets_FOUND)
++ # wxWidgets 3.0.4 requires C++11
++ if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3)
++ set(CMAKE_CXX_STANDARD 11)
++ endif()
++
+ add_custom_command(
+ OUTPUT ${XRCRES_HEADER}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res
+--
+2.28.0
+
diff --git a/games-engines/odamex/odamex-0.8.3.ebuild b/games-engines/odamex/odamex-0.8.3.ebuild
new file mode 100644
index 00000000000..ff1b1912857
--- /dev/null
+++ b/games-engines/odamex/odamex-0.8.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 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? (
+ upnp? ( net-libs/miniupnpc:= )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.8.1-miniupnpc.patch"
+ "${FILESDIR}/${P}-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch"
+)
+
+src_prepare() {
+ rm -r libraries/libminiupnpc wad/odamex.wad || die
+ hprefixify common/d_main.cpp
+
+ use odalaunch && setup-wxwidgets
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+ -DBUILD_CLIENT=$(usex client)
+ -DBUILD_MASTER=$(usex master)
+ -DBUILD_ODALAUNCH=$(usex odalaunch)
+ -DBUILD_SERVER=$(usex server)
+ -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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2020-08-25 21:57 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2020-08-25 21:57 UTC (permalink / raw
To: gentoo-commits
commit: b0e272bd41913305438317b7f2ae3e72a5c9fba4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 21:56:53 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 21:56:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e272bd
games-engines/odamex: Drop old 0.8.2
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 1 -
.../odamex/files/odamex-0.8.1-SearchDir.patch | 11 ----
.../odamex-0.8.2-Fix-odamex.wad-build-flow.patch | 71 --------------------
...emove-duplicate-build-rule-for-odamex.wad.patch | 26 --------
games-engines/odamex/odamex-0.8.2.ebuild | 77 ----------------------
5 files changed, 186 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index cd2dcf02a55..70aeb43694a 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,2 +1 @@
DIST odamex-0.8.3.tar.bz2 8532510 BLAKE2B 751d65dfe07a4c4c0cb5ff360e76a1291cf4ba289c459f15a0c277aca4d15b1e0989e1606cdc4e0f0bec56d6ae437027046302f5c55efb3b835a42df512fb18f SHA512 01a875973d43c87dde7953464e0e3c37fa088b00b6cc0ecbef1a8b3b9a87257ab24ef4e3c224ebcbc0e38cd3139c7adc56b12a03ae2528b66d6498bb8d84d720
-DIST odamex-src-0.8.2.tar.bz2 8502115 BLAKE2B bf4acaea1c9ce81966886bdfef35d361f84dab02e32ec4fd11fe8d250b76c6ca86c0b2870f38382961949713059a2944eea50c6f4d05a41411799386ab3acc64 SHA512 bb3e2427ede7267afce8bb2b852eed3f8d2ed9cf17c5b15a264d6821d170c49dccea06ea0742d9dc7cfe42518701342572689b57ec6712f4b818bd0e25b436c8
diff --git a/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch
deleted file mode 100644
index 70bd476eb3f..00000000000
--- a/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch b/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
deleted file mode 100644
index e90617c38ea..00000000000
--- a/games-engines/odamex/files/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 03581f45a3563d3d79075fe0e85e6fb52e864b76 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Sat, 4 Apr 2020 22:38:26 -0400
-Subject: [PATCH] Fix odamex.wad build flow
-
-The odamex.wad file should be built in the proper build directory;
-building in the source tree confuses CMake and causes it to attempt to
-rebuild a second time. This patch also removes odawad dependency for the
-Odamex client and server executables.
----
- wad/CMakeLists.txt | 40 ++++++++++++++++++++++------------------
- 1 file changed, 22 insertions(+), 18 deletions(-)
-
-diff --git a/wad/CMakeLists.txt b/wad/CMakeLists.txt
-index c09b0d1a..349ce0df 100644
---- a/wad/CMakeLists.txt
-+++ b/wad/CMakeLists.txt
-@@ -4,28 +4,32 @@ find_program(DEUTEX deutex)
- if(DEUTEX)
- message("Found DeuTex: ${DEUTEX}")
-
-- file(REMOVE odamex.wad)
-- add_custom_command(OUTPUT odamex.wad
-- COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt odamex.wad
-+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
-+ COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-+ BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- VERBATIM)
-
-- add_custom_target(odawad DEPENDS odamex.wad)
-+ add_custom_target(odawad ALL
-+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad)
-
-- if(BUILD_CLIENT)
-- add_dependencies(odamex odawad)
-+ if(WIN32)
-+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
-+ DESTINATION .
-+ COMPONENT common)
-+ else()
-+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
-+ COMPONENT common)
- endif()
-- if(BUILD_SERVER)
-- add_dependencies(odasrv odawad)
-- endif()
--endif()
--
--if(WIN32)
-- install(FILES odamex.wad
-- DESTINATION .
-- COMPONENT common)
- else()
-- install(FILES odamex.wad
-- DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
-- COMPONENT common)
-+ if(WIN32)
-+ install(FILES odamex.wad
-+ DESTINATION .
-+ COMPONENT common)
-+ else()
-+ install(FILES odamex.wad
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex
-+ COMPONENT common)
-+ endif()
- endif()
---
-2.26.0
-
diff --git a/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch b/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
deleted file mode 100644
index 1b1bcf55d9e..00000000000
--- a/games-engines/odamex/files/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2d80f79770f43d19e1af2c7b04a41078b860a46a Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-Date: Wed, 8 Apr 2020 11:47:45 -0400
-Subject: [PATCH] Remove duplicate build rule for odamex.wad
-
-The odamex.wad file shouldn't be listed in BYPRODUCTS because it's
-already listed as the OUTPUT of the add_custom_command.
----
- wad/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/wad/CMakeLists.txt b/wad/CMakeLists.txt
-index 349ce0df..7b948ea3 100644
---- a/wad/CMakeLists.txt
-+++ b/wad/CMakeLists.txt
-@@ -7,7 +7,6 @@ if(DEUTEX)
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- COMMAND ${DEUTEX} -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-- BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/odamex.wad
- VERBATIM)
-
- add_custom_target(odawad ALL
---
-2.26.0
-
diff --git a/games-engines/odamex/odamex-0.8.2.ebuild b/games-engines/odamex/odamex-0.8.2.ebuild
deleted file mode 100644
index 572889edd82..00000000000
--- a/games-engines/odamex/odamex-0.8.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 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"
-
-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? (
- upnp? ( net-libs/miniupnpc:= )
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="games-util/deutex"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/odamex-0.8.1-miniupnpc.patch
- "${FILESDIR}"/odamex-0.8.1-SearchDir.patch
- "${FILESDIR}"/odamex-0.8.2-Fix-odamex.wad-build-flow.patch
- "${FILESDIR}"/odamex-0.8.2-Remove-duplicate-build-rule-for-odamex.wad.patch
-)
-
-src_prepare() {
- rm -r libraries/libminiupnpc wad/odamex.wad || die
- hprefixify common/d_main.cpp
-
- use odalaunch && setup-wxwidgets
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CLIENT=$(usex client)
- -DBUILD_MASTER=$(usex master)
- -DBUILD_ODALAUNCH=$(usex odalaunch)
- -DBUILD_SERVER=$(usex server)
- -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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2021-05-29 14:54 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2021-05-29 14:54 UTC (permalink / raw
To: gentoo-commits
commit: da21ab625d36f9b941853ed243a8327be3986703
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 14:53:53 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 29 14:53:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da21ab62
games-engines/odamex: Drop old 0.8.3
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 1 -
.../odamex/files/odamex-0.8.1-miniupnpc.patch | 48 --------------
...1-on-odalaunch-target-for-wx-3.0.4-and-up.patch | 29 ---------
games-engines/odamex/odamex-0.8.3.ebuild | 76 ----------------------
4 files changed, 154 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 41281f1f859..e1f1a52559b 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,3 +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
DIST odamex-0.9.2.tar.bz2 6657974 BLAKE2B 60bf542806fe9d66711b45211f646607875621b014175fa3c4b9948c1c02d45af36d4a324349f22f4a7a4e11c13f48f2b96c731a9bb5f18c9d43111c56676f18 SHA512 69fb2ecc1d642c9c90da7503712aba628c753534ee56003945e4d267dc38bca0136d155a75695e483b0b4ec739aa331fca8c7493263b39a2521e8abcb378b5e4
diff --git a/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch b/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
deleted file mode 100644
index 5fca5815162..00000000000
--- a/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 656306d3e68f7f1f1441f03e1765530f34ea2611 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:16:02 +0000
-Subject: [PATCH] unbundle miniupnpc
-
----
- CMakeLists.txt | 1 -
- server/CMakeLists.txt | 5 ++---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cafdbd5..00e033a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -124,7 +124,6 @@ if (USE_MINIUPNP)
- set(UPNPC_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
- set(UPNPC_INSTALL OFF CACHE INTERNAL "" FORCE)
- mark_as_advanced(FORCE UPNPC_INSTALL)
-- add_subdirectory(libraries/libminiupnpc)
- endif()
-
- # Subdirectories for Odamex projects
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index d8e57257..5badceef 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -35,8 +35,7 @@ set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp)
-
- # MiniUPnPc
- if (USE_MINIUPNP)
-- set(MINIUPNPC_DIR ../libraries/libminiupnpc)
-- set(MINIUPNPC_STATIC_LIBRARIES upnpc-static)
-+ set(MINIUPNPC_DIR /usr/include/miniupnpc)
- endif()
-
- # git describe
-@@ -74,7 +73,7 @@ add_executable(odasrv
- ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES})
-
- if (USE_MINIUPNP)
-- target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES})
-+ target_link_libraries(odasrv -lminiupnpc)
- endif()
-
- if(WIN32)
---
-2.23.0
-
diff --git a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
deleted file mode 100644
index 935d43466c4..00000000000
--- a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9e3ae8538475e6f15757ce51e214f5cd29f223e7 Mon Sep 17 00:00:00 2001
-From: Michael Wood <mwoodj@huntsvegas.org>
-Date: Tue, 25 Aug 2020 02:34:37 -0500
-Subject: [PATCH] Use C++11 on odalaunch target for wx 3.0.4 and up
-
-This addresses bug #1311. wxWidgets 3.0.4 requires C++11 support.
----
- odalaunch/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
-index f68a4d4d..4abbe0d8 100644
---- a/odalaunch/CMakeLists.txt
-+++ b/odalaunch/CMakeLists.txt
-@@ -32,6 +32,11 @@ endif()
-
- # Odalaunch target
- if(wxWidgets_FOUND)
-+ # wxWidgets 3.0.4 requires C++11
-+ if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3)
-+ set(CMAKE_CXX_STANDARD 11)
-+ endif()
-+
- add_custom_command(
- OUTPUT ${XRCRES_HEADER}
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res
---
-2.28.0
-
diff --git a/games-engines/odamex/odamex-0.8.3.ebuild b/games-engines/odamex/odamex-0.8.3.ebuild
deleted file mode 100644
index ff1b1912857..00000000000
--- a/games-engines/odamex/odamex-0.8.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 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? (
- upnp? ( net-libs/miniupnpc:= )
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="games-util/deutex"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.8.1-miniupnpc.patch"
- "${FILESDIR}/${P}-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch"
-)
-
-src_prepare() {
- rm -r libraries/libminiupnpc wad/odamex.wad || die
- hprefixify common/d_main.cpp
-
- use odalaunch && setup-wxwidgets
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
- -DBUILD_CLIENT=$(usex client)
- -DBUILD_MASTER=$(usex master)
- -DBUILD_ODALAUNCH=$(usex odalaunch)
- -DBUILD_SERVER=$(usex server)
- -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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2022-03-04 22:49 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2022-03-04 22:49 UTC (permalink / raw
To: gentoo-commits
commit: c15ae9c2d0bcb0f0277b878f82e9b64ed186e67b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 22:48:21 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 22:48:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15ae9c2
games-engines/odamex: Patch to fix musl issue
Closes: https://bugs.gentoo.org/831788
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../odamex/files/odamex-10.0.0-musl.patch | 60 ++++++++++++++++++++++
games-engines/odamex/odamex-0.9.5.ebuild | 1 +
2 files changed, 61 insertions(+)
diff --git a/games-engines/odamex/files/odamex-10.0.0-musl.patch b/games-engines/odamex/files/odamex-10.0.0-musl.patch
new file mode 100644
index 000000000000..92af6ad305bd
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.0.0-musl.patch
@@ -0,0 +1,60 @@
+From b87798fe9fed746e98871aaa10978324e4b9378f Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Tue, 1 Mar 2022 21:29:32 +0000
+Subject: [PATCH] Fix musl build by checking whether execinfo.h's backtrace is
+ present
+
+Closes: https://github.com/odamex/odamex/issues/533
+(cherry picked from commit df3f5976416d342198879db80e4bf35f69eb2ed7)
+---
+ common/CMakeLists.txt | 9 +++++++++
+ common/i_crash_noop.cpp | 2 +-
+ common/i_crash_posix.cpp | 2 +-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
+index 2850607e5..8d02b3212 100644
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -6,3 +6,12 @@ configure_file(git_describe.h.in "${CMAKE_CURRENT_BINARY_DIR}/git_describe.h")
+ add_library(odamex-common INTERFACE)
+ target_sources(odamex-common INTERFACE ${COMMON_SOURCES} ${COMMON_HEADERS})
+ target_include_directories(odamex-common INTERFACE . ${CMAKE_CURRENT_BINARY_DIR})
++
++if(UNIX)
++ include(CheckSymbolExists)
++ check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
++
++ if(HAVE_BACKTRACE)
++ target_compile_definitions(odamex-common INTERFACE HAVE_BACKTRACE)
++ endif()
++endif()
+diff --git a/common/i_crash_noop.cpp b/common/i_crash_noop.cpp
+index 4eb8e70f4..84a406fb3 100644
+--- a/common/i_crash_noop.cpp
++++ b/common/i_crash_noop.cpp
+@@ -23,7 +23,7 @@
+
+
+ #if defined _WIN32 && !defined _XBOX && defined _MSC_VER && !defined _DEBUG
+-#elif defined UNIX && !defined GEKKO
++#elif defined UNIX && defined HAVE_BACKTRACE && !defined GEKKO
+ #else
+
+ #include "odamex.h"
+diff --git a/common/i_crash_posix.cpp b/common/i_crash_posix.cpp
+index 8e6270872..4bf8727f6 100644
+--- a/common/i_crash_posix.cpp
++++ b/common/i_crash_posix.cpp
+@@ -22,7 +22,7 @@
+ //-----------------------------------------------------------------------------
+
+
+-#if defined UNIX && !defined GCONSOLE
++#if defined UNIX && defined HAVE_BACKTRACE && !defined GCONSOLE
+
+ #include "odamex.h"
+
+--
+2.34.1
+
diff --git a/games-engines/odamex/odamex-0.9.5.ebuild b/games-engines/odamex/odamex-0.9.5.ebuild
index 56b4b013e2cf..eb8519c9e40f 100644
--- a/games-engines/odamex/odamex-0.9.5.ebuild
+++ b/games-engines/odamex/odamex-0.9.5.ebuild
@@ -36,6 +36,7 @@ S="${WORKDIR}/${PN}-src-${PV}"
PATCHES=(
"${FILESDIR}/${PN}-0.9.0-Unbundle-miniupnpc.patch"
+ "${FILESDIR}/${PN}-10.0.0-musl.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2022-03-20 13:32 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2022-03-20 13:32 UTC (permalink / raw
To: gentoo-commits
commit: c4f11054b952425eaa64895a0e728b8d1925c84d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 13:32:04 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 13:32:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f11054
games-engines/odamex: Drop old 0.9.5
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 1 -
.../files/odamex-0.9.0-Unbundle-miniupnpc.patch | 80 ----------------------
games-engines/odamex/odamex-0.9.5.ebuild | 79 ---------------------
3 files changed, 160 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index b2e65dadb436..cf41cb20eab0 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,2 +1 @@
-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-0.9.0-Unbundle-miniupnpc.patch b/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch
deleted file mode 100644
index 77b6220041da..000000000000
--- a/games-engines/odamex/files/odamex-0.9.0-Unbundle-miniupnpc.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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.5.ebuild b/games-engines/odamex/odamex-0.9.5.ebuild
deleted file mode 100644
index eb8519c9e40f..000000000000
--- a/games-engines/odamex/odamex-0.9.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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="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
- net-misc/curl
- portmidi? ( media-libs/portmidi )
- X? ( x11-libs/libX11 )
- )
- odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
- server? (
- upnp? ( net-libs/miniupnpc:= )
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="games-util/deutex"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.9.0-Unbundle-miniupnpc.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_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)
- )
- 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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2023-05-14 14:26 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2023-05-14 14:26 UTC (permalink / raw
To: gentoo-commits
commit: b86bdf2c2d16d11c6a6ba3465aec11cb656d6386
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 14:24:42 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 14 14:26:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86bdf2c
games-engines/odamex: Bump to 10.3.0, drop old 10.0.0
Thanks to Mike Wood for the ebuild. Upstream merged most of our patches. I have
bumped wxGTK to 3.2.
Closes: https://bugs.gentoo.org/906221
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/Manifest | 2 +-
.../odamex/files/odamex-10.0.0-gcc12.patch | 21 -----
.../odamex/files/odamex-10.0.0-master-std.patch | 28 -------
.../odamex/files/odamex-10.0.0-musl.patch | 60 --------------
.../files/odamex-10.0.0-unbundle-jsoncpp.patch | 85 -------------------
.../files/odamex-10.0.0-unbundle-miniupnpc.patch | 96 ----------------------
...ltk.patch => odamex-10.3.0-unbundle-fltk.patch} | 54 ++++--------
games-engines/odamex/metadata.xml | 1 +
.../{odamex-10.0.0.ebuild => odamex-10.3.0.ebuild} | 15 ++--
9 files changed, 25 insertions(+), 337 deletions(-)
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index cf41cb20eab0..c2381d9c7a73 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1 +1 @@
-DIST odamex-src-10.0.0.tar.xz 17680868 BLAKE2B 95df336ccc24c2658174bdd051cb9b98ca906d653d84a120330d8fe6f11ad91ba70ba7edfc960f8815d02795f7392761a0174171de30ea78b37389a61deacae7 SHA512 b825953a446a4eb46d2d004b20df876bceec823cb5f0bf661ecac03eff2f07c11fe47c6861f3c3ee417ce9ca869474ff422d78bba1b742485315ba5ba86bd702
+DIST odamex-src-10.3.0.tar.gz 24281159 BLAKE2B f38eacf700f21caa1300e46d926f6e07b97944326cd0ef9d22c3e14af82e91f39e88ae055d90442b81237888b90b8a1c478a54fd599b9648790260863916fb1f SHA512 902f4d20b9246ea94b50099e0ab2c6cd17faad68df344114e9963e100c35a4ac141f3d109b7affb8860a4e082a39ffcfdfcea45d9e6ada6efe09f01c3546f92b
diff --git a/games-engines/odamex/files/odamex-10.0.0-gcc12.patch b/games-engines/odamex/files/odamex-10.0.0-gcc12.patch
deleted file mode 100644
index 8e1a080e1f90..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-gcc12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/files/odamex-10.0.0-master-std.patch b/games-engines/odamex/files/odamex-10.0.0-master-std.patch
deleted file mode 100644
index 2fe299fd12df..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-master-std.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/files/odamex-10.0.0-musl.patch b/games-engines/odamex/files/odamex-10.0.0-musl.patch
deleted file mode 100644
index 92af6ad305bd..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-musl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b87798fe9fed746e98871aaa10978324e4b9378f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 1 Mar 2022 21:29:32 +0000
-Subject: [PATCH] Fix musl build by checking whether execinfo.h's backtrace is
- present
-
-Closes: https://github.com/odamex/odamex/issues/533
-(cherry picked from commit df3f5976416d342198879db80e4bf35f69eb2ed7)
----
- common/CMakeLists.txt | 9 +++++++++
- common/i_crash_noop.cpp | 2 +-
- common/i_crash_posix.cpp | 2 +-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
-index 2850607e5..8d02b3212 100644
---- a/common/CMakeLists.txt
-+++ b/common/CMakeLists.txt
-@@ -6,3 +6,12 @@ configure_file(git_describe.h.in "${CMAKE_CURRENT_BINARY_DIR}/git_describe.h")
- add_library(odamex-common INTERFACE)
- target_sources(odamex-common INTERFACE ${COMMON_SOURCES} ${COMMON_HEADERS})
- target_include_directories(odamex-common INTERFACE . ${CMAKE_CURRENT_BINARY_DIR})
-+
-+if(UNIX)
-+ include(CheckSymbolExists)
-+ check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
-+
-+ if(HAVE_BACKTRACE)
-+ target_compile_definitions(odamex-common INTERFACE HAVE_BACKTRACE)
-+ endif()
-+endif()
-diff --git a/common/i_crash_noop.cpp b/common/i_crash_noop.cpp
-index 4eb8e70f4..84a406fb3 100644
---- a/common/i_crash_noop.cpp
-+++ b/common/i_crash_noop.cpp
-@@ -23,7 +23,7 @@
-
-
- #if defined _WIN32 && !defined _XBOX && defined _MSC_VER && !defined _DEBUG
--#elif defined UNIX && !defined GEKKO
-+#elif defined UNIX && defined HAVE_BACKTRACE && !defined GEKKO
- #else
-
- #include "odamex.h"
-diff --git a/common/i_crash_posix.cpp b/common/i_crash_posix.cpp
-index 8e6270872..4bf8727f6 100644
---- a/common/i_crash_posix.cpp
-+++ b/common/i_crash_posix.cpp
-@@ -22,7 +22,7 @@
- //-----------------------------------------------------------------------------
-
-
--#if defined UNIX && !defined GCONSOLE
-+#if defined UNIX && defined HAVE_BACKTRACE && !defined GCONSOLE
-
- #include "odamex.h"
-
---
-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
deleted file mode 100644
index 9b0d3284dc48..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-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
deleted file mode 100644
index 80b0806e0c11..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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/files/odamex-10.0.0-unbundle-fltk.patch b/games-engines/odamex/files/odamex-10.3.0-unbundle-fltk.patch
similarity index 69%
rename from games-engines/odamex/files/odamex-10.0.0-unbundle-fltk.patch
rename to games-engines/odamex/files/odamex-10.3.0-unbundle-fltk.patch
index 1c9a8753b44a..6cc6a1d18241 100644
--- a/games-engines/odamex/files/odamex-10.0.0-unbundle-fltk.patch
+++ b/games-engines/odamex/files/odamex-10.3.0-unbundle-fltk.patch
@@ -14,19 +14,9 @@ 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})
+--- a/CMakeLists.txt 2022-11-24 21:02:08.000000000 -0600
++++ b/CMakeLists.txt 2023-05-12 14:08:26.838832213 -0500
+@@ -43,6 +43,7 @@
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 )
@@ -34,16 +24,14 @@ index 9353d0c6b..599b6e85b 100644
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)
+--- a/client/CMakeLists.txt 2022-11-24 21:02:08.000000000 -0600
++++ b/client/CMakeLists.txt 2023-05-12 14:10:01.895750073 -0500
+@@ -206,8 +206,28 @@
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)
-+
+- endif()
+ if(USE_INTERNAL_FLTK)
+ set(FLTK_LIBRARIES fltk fltk_images)
+ set(HAVE_FLTK_SCREEN_SCALE TRUE)
@@ -65,16 +53,15 @@ index bd071a7a5..ff1e72ba3 100644
+ endif()
+
+ target_link_libraries(odamex ${FLTK_LIBRARIES})
- endif()
++ 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()
+ target_link_libraries(odamex ${PORTMIDI_LIBRARY})
+--- a/client/gui/gui_boot.cpp 2022-11-24 21:02:08.000000000 -0600
++++ b/client/gui/gui_boot.cpp 2023-05-12 14:11:19.362517260 -0500
+@@ -537,12 +537,14 @@
*/
- std::string GUI_BootWindow()
+ scannedWADs_t GUI_BootWindow()
{
+#ifdef HAVE_FLTK_SCREEN_SCALE
// Scale according to 1600x900.
@@ -87,19 +74,14 @@ index f0a0035d1..834038209 100644
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()
+--- a/libraries/CMakeLists.txt 2022-11-24 21:02:08.000000000 -0600
++++ b/libraries/CMakeLists.txt 2023-05-12 14:11:46.463789831 -0500
+@@ -264,7 +264,7 @@
### FLTK (dep: libpng) ###
-if(BUILD_CLIENT)
+if(BUILD_CLIENT AND USE_INTERNAL_FLTK)
- message(STATUS "Compiling FLTK...")
-
set(_FLTK_BUILDGEN_PARAMS
---
-2.34.1
-
+ "-DOPTION_USE_SYSTEM_LIBJPEG=OFF"
+ "-DOPTION_PRINT_SUPPORT=OFF"
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index 1548d4273e2e..6bc351136c9c 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -17,6 +17,7 @@
<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="github">odamex/odamex</remote-id>
<remote-id type="sourceforge">odamex</remote-id>
</upstream>
<longdescription lang="en">
diff --git a/games-engines/odamex/odamex-10.0.0.ebuild b/games-engines/odamex/odamex-10.3.0.ebuild
similarity index 83%
rename from games-engines/odamex/odamex-10.0.0.ebuild
rename to games-engines/odamex/odamex-10.3.0.ebuild
index 96a4e1334332..2cb036706235 100644
--- a/games-engines/odamex/odamex-10.0.0.ebuild
+++ b/games-engines/odamex/odamex-10.3.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-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"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.gz"
LICENSE="GPL-2+ MIT"
SLOT="0"
@@ -41,16 +41,11 @@ 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
- "${FILESDIR}"/${PN}-10.0.0-master-std.patch
- "${FILESDIR}"/${PN}-10.0.0-gcc12.patch
+ "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
)
src_prepare() {
- rm -r libraries/libminiupnpc || die
+ rm -r libraries/miniupnp || die
hprefixify common/d_main.cpp
use odalaunch && setup-wxwidgets
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2023-07-02 20:49 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2023-07-02 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 0e81bdf479705e3665ad94da434891adc38b6787
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 2 20:34:09 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 2 20:48:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e81bdf4
games-engines/odamex: Fix USE=master with upstream patch
Closes: https://bugs.gentoo.org/907745
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../odamex/files/odamex-10.3.0-master-fix.patch | 31 ++++++++++++++++++++++
games-engines/odamex/odamex-10.3.0-r1.ebuild | 1 +
2 files changed, 32 insertions(+)
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
new file mode 100644
index 000000000000..1a20d8f6523c
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.3.0-master-fix.patch
@@ -0,0 +1,31 @@
+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.3.0-r1.ebuild
index 594869339e54..0c99afc1d885 100644
--- a/games-engines/odamex/odamex-10.3.0-r1.ebuild
+++ b/games-engines/odamex/odamex-10.3.0-r1.ebuild
@@ -42,6 +42,7 @@ 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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2023-12-18 21:57 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2023-12-18 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 1e57cc70a7184fbf1d5be6a0df47bab5c59fa6d6
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Mon Dec 18 21:39:15 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 21:53:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e57cc70
games-engines/odamex: add patch to fix ppc64 build
And tunes i386 SIMD options.
See: https://github.com/odamex/odamex/pull/928
Bug: https://bugs.gentoo.org/849866
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34350
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../files/odamex-10.4.0-backport-pr928.patch | 66 ++++++++++++++++++++++
games-engines/odamex/odamex-10.4.0-r1.ebuild | 1 +
2 files changed, 67 insertions(+)
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
new file mode 100644
index 000000000000..7d6871847814
--- /dev/null
+++ b/games-engines/odamex/files/odamex-10.4.0-backport-pr928.patch
@@ -0,0 +1,66 @@
+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/odamex-10.4.0-r1.ebuild b/games-engines/odamex/odamex-10.4.0-r1.ebuild
index cf946901e853..5a5077b6ca54 100644
--- a/games-engines/odamex/odamex-10.4.0-r1.ebuild
+++ b/games-engines/odamex/odamex-10.4.0-r1.ebuild
@@ -42,6 +42,7 @@ S="${WORKDIR}/${PN}-src-${PV}"
PATCHES=(
"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
+ "${FILESDIR}"/${PN}-10.4.0-backport-pr928.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/
@ 2024-03-19 23:04 James Le Cuirot
0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2024-03-19 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 9f8fd17d55d0fe0cbca82eda3464338508b6bf25
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 23:03:42 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 23:03:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8fd17d
games-engines/odamex: Fix launcher path issue, fix LTO, fix wxGTK crash
We've already seen that odalaunch crashes with wxGTK 3.2 so keep it at 3.0. I
have looked into this, and it relates to the server list sorting, but I cannot
figure it out.
Closes: https://bugs.gentoo.org/858722
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-engines/odamex/files/odamex-lto.patch | 41 ++++++++++++++
.../odamex/files/odamex-odalaunch-prefix.patch | 64 ++++++++++++++++++++++
...ex-10.4.0-r1.ebuild => odamex-10.4.0-r2.ebuild} | 6 +-
3 files changed, 109 insertions(+), 2 deletions(-)
diff --git a/games-engines/odamex/files/odamex-lto.patch b/games-engines/odamex/files/odamex-lto.patch
new file mode 100644
index 000000000000..20d9d88c002b
--- /dev/null
+++ b/games-engines/odamex/files/odamex-lto.patch
@@ -0,0 +1,41 @@
+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-odalaunch-prefix.patch b/games-engines/odamex/files/odamex-odalaunch-prefix.patch
new file mode 100644
index 000000000000..cf293e60f9e1
--- /dev/null
+++ b/games-engines/odamex/files/odamex-odalaunch-prefix.patch
@@ -0,0 +1,64 @@
+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-r1.ebuild b/games-engines/odamex/odamex-10.4.0-r2.ebuild
similarity index 92%
rename from games-engines/odamex/odamex-10.4.0-r1.ebuild
rename to games-engines/odamex/odamex-10.4.0-r2.ebuild
index db3f6bd5532a..97ddf96efce4 100644
--- a/games-engines/odamex/odamex-10.4.0-r1.ebuild
+++ b/games-engines/odamex/odamex-10.4.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-WX_GTK_VER="3.2-gtk3"
+WX_GTK_VER="3.0-gtk3" # odalaunch crashes with 3.2. Check it before updating!
inherit cmake desktop prefix wxwidgets xdg
DESCRIPTION="Online multiplayer free software engine for DOOM"
@@ -43,6 +43,8 @@ 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
)
src_prepare() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-03-19 23:04 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-14 18:35 [gentoo-commits] repo/gentoo:master commit in: games-engines/odamex/, games-engines/odamex/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-03-19 23:04 James Le Cuirot
2023-12-18 21:57 James Le Cuirot
2023-07-02 20:49 James Le Cuirot
2023-05-14 14:26 James Le Cuirot
2022-03-20 13:32 James Le Cuirot
2022-03-04 22:49 James Le Cuirot
2021-05-29 14:54 James Le Cuirot
2020-08-25 21:57 James Le Cuirot
2020-08-25 21:57 James Le Cuirot
2020-04-08 22:46 James Le Cuirot
2019-09-07 14:33 James Le Cuirot
2019-09-07 14:33 James Le Cuirot
2017-07-23 13:12 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox