From 2f8db31405fac68eea6f7257d58529243815033b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 30 Apr 2018 21:33:31 +0100 Subject: gentoo resync : 30.04.2018 --- games-engines/odamex/Manifest | 3 +- .../odamex/files/odamex-0.7.0-miniupnpc20.patch | 28 +++++ games-engines/odamex/odamex-0.7.0-r1.ebuild | 116 +++++++++++++++++++++ games-engines/odamex/odamex-0.7.0.ebuild | 116 --------------------- 4 files changed, 146 insertions(+), 117 deletions(-) create mode 100644 games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch create mode 100644 games-engines/odamex/odamex-0.7.0-r1.ebuild delete mode 100644 games-engines/odamex/odamex-0.7.0.ebuild (limited to 'games-engines/odamex') diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest index f27594958328..1df4b384f4d7 100644 --- a/games-engines/odamex/Manifest +++ b/games-engines/odamex/Manifest @@ -4,6 +4,7 @@ AUX 3-odamex-0.7.0-wad-search-path.patch 1758 BLAKE2B a202ea34cf7c219b611d48601a AUX 4-odamex-0.7.0-odalauncher-bin-path.patch 1671 BLAKE2B 833c95320ce5567fea90b12eedd7e2703540bff8f1a38e99ec80563ac4556ffe748b946948bb46d12064a08ed46a8c42fac92fbc5d6d408478067650718d92b8 SHA512 4ab5c84d5e3e1465fb02c775fad0208bf177264137d82297515c8f2bf188e9f4ce79a5510e28dfc4811392ecef407b89267e2baf45d37c236fb86cfc066c1ed2 AUX odamex-0.7.0-gcc6.patch 1149 BLAKE2B e97191c08be8f1987c3374c4920b9016beb1e824e5e7781c8d4ec9088d9eb977e2dbb155ab7930914e3bae295098156c05d0726da7ee2df82a80a90d1ee333a7 SHA512 e34fc554016d67e42d95b9f2e964b69282791a9c07c9976c49990778188bfc1dab5784b29a798e10d6fcd8cc36893bd3416b57c8e2c9f1bd67587a3524c0a422 AUX odamex-0.7.0-miniupnpc.patch 1144 BLAKE2B feb91380a8f1677f6aae2d29a569f3e452e6464c48962fe7f718a83733ce160b6bf2d4d0c84be78fbdb3f9102862571c13c69a9163a822f003743167d52a564d SHA512 0a805aca36687f183aa168972ecc9bfcd04c117787e42967fbf62b08873943b9f6c5118f15089a70ede43335ce571216255f315e08ce08f89ff23f6859507951 +AUX odamex-0.7.0-miniupnpc20.patch 846 BLAKE2B 3c55c9a761e5abe0de591ce6a53efc915eb7c6a0bdbd308ebff7fc9aa19517d647b882eaeec163a673f071a2f7aab505864ef8e7e64ffb2961682fb024cee190 SHA512 a55e2fea8742bed18765824131d87321e72df293c8e10b6682ade542b7f8feda10f89acbea9dc98749b509c117ae94c070b065ec95434118c73845f74e187664 DIST odamex-src-0.7.0.tar.bz2 8435860 BLAKE2B 9720efdf262047074fed593360b0c38864d5d0f9c076a45d6df9aaf362cba35f41eeafab968338be0911681726872c33e3625934176f75068ca4933655876f7b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b -EBUILD odamex-0.7.0.ebuild 2633 BLAKE2B 9ed602563c7ed2c8eaf5d0ab138410a2b3a9f68367fbf28006e9ed39cc05da1de43e6b82b16d5629d3997fdf2045ec5dfdc183f44a6a4085fbd515e900cb762c SHA512 9c7af68d6e4629e2f0f8ac261e919b0d0ae797aef702f3c0fd4a2b7a1c88d46f24849822b55db7d759d8f11954202147a0d67bee23da76e33995bcab186fea87 +EBUILD odamex-0.7.0-r1.ebuild 2680 BLAKE2B 7dab16f3b940503a9710ae254921a28b47c9f4afc27c3ce68080fa266ca2e349a8ee5f66d54e99728b0e69469454a17cc771cb9dd07570e40320d34642cd026c SHA512 45a4c37fe091c908e9aada85da92c508f8eacdc6bddca74e5c3ee4044417fb516e2d4b7ad8e2b7b0e687ebf4918592562c0a09a0e71a5b1fd0a630f9109e9c3d MISC metadata.xml 1467 BLAKE2B 43e3e80b72476360be1f5a345946a96c4ba0b6068209afa8506325a9a8467d56c8f19b62e5713a8d41c6a84cdc24c8218b8dd73453feb7ac621e3338a9421e16 SHA512 386792eba91c781bdb52d0f3d262a516843b3ab17e9522e23506fb7327ca726178ac387d577464faa1608fd396e81b3be813ab2bdac6b92caf10a9133a28332b diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch new file mode 100644 index 000000000000..716a07fe628a --- /dev/null +++ b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch @@ -0,0 +1,28 @@ +Index: common/i_net.cpp +=================================================================== +--- common/i_net.cpp (revision 5459) ++++ common/i_net.cpp (working copy) +@@ -151,7 +151,11 @@ + + Printf(PRINT_HIGH, "UPnP: Discovering router (max 1 unit supported)\n"); + ++#if MINIUPNPC_API_VERSION < 14 + devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, &res); ++#else ++ devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, 2, &res); ++#endif + + if (!devlist || res != UPNPDISCOVER_SUCCESS) + { +@@ -179,7 +183,11 @@ + // " desc: %s\n st: %s\n", + // dev->descURL, dev->st); + ++#if MINIUPNPC_API_VERSION < 16 + descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0); ++#else ++ descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0, &res); ++#endif + + if (descXML) + { diff --git a/games-engines/odamex/odamex-0.7.0-r1.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild new file mode 100644 index 000000000000..0d2e515d29dc --- /dev/null +++ b/games-engines/odamex/odamex-0.7.0-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +WX_GTK_VER="3.0" +inherit cmake-utils eutils gnome2-utils readme.gentoo-r1 wxwidgets + +MY_P=${PN}-src-${PV} +DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II" +HOMEPAGE="http://odamex.net/" +SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dedicated +odalaunch master portmidi server" + +RDEPEND=" + dedicated? ( >=net-libs/miniupnpc-1.8:0= ) + !dedicated? ( + media-libs/libpng:0= + >=media-libs/libsdl-1.2.9[X,sound,joystick,video] + >=media-libs/sdl-mixer-1.2.6 + odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) + portmidi? ( media-libs/portmidi ) + server? ( >=net-libs/miniupnpc-1.8:0= ) + ) +" +DEPEND="${RDEPEND}" + +DOC_CONTENTS=" + This is just the engine, you will need doom resource files in order to play. + Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F +" + +S="${WORKDIR}/src-${PV:2:3}" + +pkg_pretend() { + if ! test-flag-CXX -std=c++11; then + die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags" + fi +} + +src_prepare() { + epatch "${FILESDIR}"/1-${P}-install-rules.patch \ + "${FILESDIR}"/2-${P}-cmake-options.patch \ + "${FILESDIR}"/3-${P}-wad-search-path.patch \ + "${FILESDIR}"/4-${P}-odalauncher-bin-path.patch \ + "${FILESDIR}"/${P}-miniupnpc.patch \ + "${FILESDIR}"/${P}-miniupnpc20.patch \ + "${FILESDIR}"/${P}-gcc6.patch + + rm -r libraries/libminiupnpc || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_INTREE_PORTMIDI=OFF + -DCMAKE_INSTALL_BINDIR="/usr/bin" + -DCMAKE_INSTALL_DATADIR="/usr/share" + $(cmake-utils_use_build master MASTER) + ) + + if use dedicated ; then + mycmakeargs+=( + -DBUILD_CLIENT=OFF + -DBUILD_ODALAUNCH=OFF + -DBUILD_SERVER=ON + -DENABLE_PORTMIDI=OFF + ) + else + mycmakeargs+=( + -DBUILD_CLIENT=ON + $(cmake-utils_use_build odalaunch ODALAUNCH) + $(cmake-utils_use_build server SERVER) + $(cmake-utils_use_enable portmidi PORTMIDI) + ) + fi + + append-cxxflags -std=c++11 + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + readme.gentoo_create_doc + + if ! use dedicated ; then + newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png" + make_desktop_entry ${PN} + + if use odalaunch ; then + newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png" + make_desktop_entry odalaunch "Odamex Launcher" odalaunch + fi + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + readme.gentoo_print_elog +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-engines/odamex/odamex-0.7.0.ebuild b/games-engines/odamex/odamex-0.7.0.ebuild deleted file mode 100644 index 9dbda85d5fc4..000000000000 --- a/games-engines/odamex/odamex-0.7.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -WX_GTK_VER="3.0" -inherit cmake-utils eutils gnome2-utils wxwidgets games - -MY_P=${PN}-src-${PV} -DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II" -HOMEPAGE="http://odamex.net/" -SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dedicated +odalaunch master portmidi server" - -RDEPEND=" - dedicated? ( >=net-libs/miniupnpc-1.8 ) - !dedicated? ( - media-libs/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 ) - )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/src-${PV:2:3} - -pkg_pretend() { - if ! test-flag-CXX -std=c++11; then - die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/1-${P}-install-rules.patch \ - "${FILESDIR}"/2-${P}-cmake-options.patch \ - "${FILESDIR}"/3-${P}-wad-search-path.patch \ - "${FILESDIR}"/4-${P}-odalauncher-bin-path.patch \ - "${FILESDIR}"/${P}-miniupnpc.patch \ - "${FILESDIR}"/${P}-gcc6.patch - - rm -r libraries/libminiupnpc || die - - epatch_user -} - -src_configure() { - local mycmakeargs=( - -DUSE_INTREE_PORTMIDI=OFF - -DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}" - -DCMAKE_INSTALL_DATADIR="${GAMES_DATADIR}" - $(cmake-utils_use_build master MASTER) - ) - - if use dedicated ; then - mycmakeargs+=( - -DBUILD_CLIENT=OFF - -DBUILD_ODALAUNCH=OFF - -DBUILD_SERVER=ON - -DENABLE_PORTMIDI=OFF - ) - else - mycmakeargs+=( - -DBUILD_CLIENT=ON - $(cmake-utils_use_build odalaunch ODALAUNCH) - $(cmake-utils_use_build server SERVER) - $(cmake-utils_use_enable portmidi PORTMIDI) - ) - fi - - append-cxxflags -std=c++11 - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - if ! use dedicated ; then - newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png" - make_desktop_entry ${PN} - - if use odalaunch ; then - newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png" - make_desktop_entry odalaunch "Odamex Launcher" odalaunch - fi - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - einfo - elog "This is just the engine, you will need doom resource files in order to play." - elog "Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F" - einfo - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- cgit v1.2.3