From 95f4ecedd41206e678e2ddec24f8382ba2287dd1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 Mar 2024 02:13:53 +0100 Subject: gentoo auto-resync : 31:03:2024 - 02:13:53 --- games-engines/Manifest.gz | Bin 3888 -> 3886 bytes games-engines/odamex/Manifest | 2 +- games-engines/odamex/odamex-10.4.0-r2.ebuild | 94 --------------------------- games-engines/odamex/odamex-10.4.0-r3.ebuild | 93 ++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 95 deletions(-) delete mode 100644 games-engines/odamex/odamex-10.4.0-r2.ebuild create mode 100644 games-engines/odamex/odamex-10.4.0-r3.ebuild (limited to 'games-engines') diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz index e9b6272a3ce4..ad59437a9519 100644 Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest index b5f1cbdf2603..5c00df34e8d5 100644 --- a/games-engines/odamex/Manifest +++ b/games-engines/odamex/Manifest @@ -3,5 +3,5 @@ AUX odamex-10.4.0-backport-pr928.patch 2485 BLAKE2B 50219598fd899548148642b97af7 AUX odamex-lto.patch 1570 BLAKE2B 9284ff378e543b26a9871a21017ee93c5b0b426c1b3eb813fcc23b990ea1712993cf932a6c0beedbe2a6eddc9c908533470b7334c7167a265ef3170df6f5d995 SHA512 865b136f47f07ecebb94771435d9fba2b8768ad989713492242f71720a023863e71c23561afd101ff19075d8d5df0c6e4d30851a6a6366d77620b8ea30d4785c AUX odamex-odalaunch-prefix.patch 1890 BLAKE2B 948054a8b66aacc68b000635a15c17544cf745ba87c71a89b230e76e5b316d41c929fbe792904c76ca2d474d810ac6880a99ba28bed07b04b039b0496af0d7e7 SHA512 8de4a39999af6a1e1f040d26d2c0ed4f1bc100b6c5c407fd6b75408e21cdea3b94a7052432f3e1229816ed7094ce95a7b2f2b8467a2aa8df5a1cf4ccb8c0e7f4 DIST odamex-src-10.4.0.tar.gz 24233204 BLAKE2B 377f14db15a367db3e84267a1483d5e138291fcefe53c2d522d2767ddd4a804df7ab31726d8818497c1eed93e6f0658fa4f855b6f4b0610f378a4ef3aab180b6 SHA512 12c114181aaf50e8c1f8c04d6e252f422fe887b5dc0be21974f5c1ac6645e1988091af638eb68fb9667ec4c7c2bdd5bb49981546644c33e90c80a9baefe2c930 -EBUILD odamex-10.4.0-r2.ebuild 2469 BLAKE2B 41f8d1b03d1d6ddf61c582b2ff070b6d4048de1e39cf0579887836ec7d0582803ad6efdd7421a56abfc700356840789ac0265423d4a76fad2c03dc3b1724acfb SHA512 aefe0c08b32ee8d31b32c4dbf3f20df922fe4403a0276678537ceecbca09fa2baf2d4fe7bd5d7216bc7a3afbea2854c2f1b0c8c27dd51d75639ab995815b68b2 +EBUILD odamex-10.4.0-r3.ebuild 2383 BLAKE2B e3c30d7afe7f06b7ed9d3400f94e5b8c10f22e4e0b49c17579604294255bdfa1cdbf9e6cafcf9d857cf93ed609b4370e5b1d051fc49c9183b0de274112503282 SHA512 a4cceee1d8bc395129f38ed169bd23e1e94f9e1a6fedd14d928c26d17fd4fc346117a412c559eb9f541cb5dc9e3d6284345b364d2409304339124f6efd3b875c MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af diff --git a/games-engines/odamex/odamex-10.4.0-r2.ebuild b/games-engines/odamex/odamex-10.4.0-r2.ebuild deleted file mode 100644 index 97ddf96efce4..000000000000 --- a/games-engines/odamex/odamex-10.4.0-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" -HOMEPAGE="https://odamex.net/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.gz" - -LICENSE="GPL-2+ MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+client hidpi master +odalaunch portmidi server upnp X" -REQUIRED_USE="|| ( client master server )" - -# protobuf is still bundled. Unfortunately an old version is required for C++98 -# compatibility. We could use C++11, but upstream is concerned about using a -# completely different protobuf version on a multiplayer-focused engine. - -RDEPEND=" - client? ( - media-libs/libpng:0= - media-libs/libsdl2[joystick,sound,video] - media-libs/sdl2-mixer - net-misc/curl - !hidpi? ( x11-libs/fltk:1 ) - portmidi? ( media-libs/portmidi ) - X? ( x11-libs/libX11 ) - ) - odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - server? ( - dev-libs/jsoncpp:= - upnp? ( net-libs/miniupnpc:= ) - )" -DEPEND="${RDEPEND}" -BDEPEND="games-util/deutex" - -S="${WORKDIR}/${PN}-src-${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch - "${FILESDIR}"/${PN}-10.4.0-backport-pr928.patch - "${FILESDIR}"/${PN}-odalaunch-prefix.patch - "${FILESDIR}"/${PN}-lto.patch -) - -src_prepare() { - rm -r libraries/miniupnp || die - hprefixify common/d_main.cpp - - use odalaunch && setup-wxwidgets - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DUSE_INTERNAL_FLTK=$(usex hidpi) - -DUSE_INTERNAL_JSONCPP=0 - -DUSE_INTERNAL_LIBS=0 - -DUSE_INTERNAL_MINIUPNP=0 - -DBUILD_CLIENT=$(usex client) - -DBUILD_LAUNCHER=$(usex odalaunch) - -DBUILD_MASTER=$(usex master) - -DBUILD_SERVER=$(usex server) - -DBUILD_OR_FAIL=1 - -DENABLE_PORTMIDI=$(usex portmidi) - -DUSE_MINIUPNP=$(usex upnp) - ) - use client && mycmakeargs+=(-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)) - - cmake_src_configure -} - -src_install() { - if use client ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" - done - make_desktop_entry "${PN}" "Odamex" - - if use odalaunch ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" - done - make_desktop_entry odalaunch "Odamex Launcher" odalaunch - fi - fi - - cmake_src_install -} diff --git a/games-engines/odamex/odamex-10.4.0-r3.ebuild b/games-engines/odamex/odamex-10.4.0-r3.ebuild new file mode 100644 index 000000000000..de72a4d61655 --- /dev/null +++ b/games-engines/odamex/odamex-10.4.0-r3.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +HOMEPAGE="https://odamex.net/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.gz" + +LICENSE="GPL-2+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+client hidpi master +odalaunch portmidi server upnp" +REQUIRED_USE="|| ( client master server )" + +# protobuf is still bundled. Unfortunately an old version is required for C++98 +# compatibility. We could use C++11, but upstream is concerned about using a +# completely different protobuf version on a multiplayer-focused engine. + +RDEPEND=" + client? ( + media-libs/libpng:0= + media-libs/libsdl2[joystick,sound,video] + media-libs/sdl2-mixer + net-misc/curl + x11-libs/libX11 + !hidpi? ( x11-libs/fltk:1 ) + portmidi? ( media-libs/portmidi ) + ) + odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) + server? ( + dev-libs/jsoncpp:= + upnp? ( net-libs/miniupnpc:= ) + )" +DEPEND="${RDEPEND}" +BDEPEND="games-util/deutex" + +S="${WORKDIR}/${PN}-src-${PV}" + +PATCHES=( + "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch + "${FILESDIR}"/${PN}-10.4.0-backport-pr928.patch + "${FILESDIR}"/${PN}-odalaunch-prefix.patch + "${FILESDIR}"/${PN}-lto.patch +) + +src_prepare() { + rm -r libraries/miniupnp || die + hprefixify common/d_main.cpp + + use odalaunch && setup-wxwidgets + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_INTERNAL_FLTK=$(usex hidpi) + -DUSE_INTERNAL_JSONCPP=0 + -DUSE_INTERNAL_LIBS=0 + -DUSE_INTERNAL_MINIUPNP=0 + -DBUILD_CLIENT=$(usex client) + -DBUILD_LAUNCHER=$(usex odalaunch) + -DBUILD_MASTER=$(usex master) + -DBUILD_SERVER=$(usex server) + -DBUILD_OR_FAIL=1 + -DENABLE_PORTMIDI=$(usex portmidi) + -DUSE_MINIUPNP=$(usex upnp) + ) + + cmake_src_configure +} + +src_install() { + if use client ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" + done + make_desktop_entry "${PN}" "Odamex" + + if use odalaunch ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" + done + make_desktop_entry odalaunch "Odamex Launcher" odalaunch + fi + fi + + cmake_src_install +} -- cgit v1.2.3