From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Aug 2021 08:59:54 +0100 Subject: gentoo resync : 31.08.2021 --- games-fps/prboom-plus/Manifest | 3 + ...ard-OpenGL-call-in-D_Display-with-GL_DOOM.patch | 28 +++++++++ games-fps/prboom-plus/prboom-plus-2.6.1.ebuild | 66 ++++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch create mode 100644 games-fps/prboom-plus/prboom-plus-2.6.1.ebuild (limited to 'games-fps/prboom-plus') diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest index 7401e8a5116a..ef95c85f360d 100644 --- a/games-fps/prboom-plus/Manifest +++ b/games-fps/prboom-plus/Manifest @@ -1,4 +1,7 @@ AUX prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch 1141 BLAKE2B 0fbb9af4874c3bcdec3ae822e7b1f213d68ece3381ad80a75ea0fc5f5f8b5b872fa07def7729e38c5a74b32fdf4bc33d748cc6a3f29beea58eff9a08b9508647 SHA512 4da358bca4d8034649842c7b96c22a087e18c5c8263a7e74e5c9d7225102f14dd071223dd0ba8c3f75bf9c57abd9fc475017299a435fae6dfa07b86fdd7ef741 +AUX prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch 739 BLAKE2B 308d840db294e39fe3d0460f2c493a1e3991a5c016c24640592ef97dfe08c1e56283b3b9be1ba5c17a1d11374b95169036f037cb5f8950df13f4a12d64a6b247 SHA512 3e87b824b5f53da9cd0039deaa476980005185a8da71fcec3cce9c95c7fa1a2cf4ea1eac0b12f7aecdd9233522f0fdfe6e1ea03465d9e38db66eca13a30eacc4 +DIST prboom-plus-2.6.1.tar.gz 1555792 BLAKE2B accb919039b966952340a18b3a37b9c2401a20c1f9562829ba531bf4dafc5e876d7d1212e9ba58886c7469a86b3170c48973cbd8af8ab03d1f2d685813c39607 SHA512 6ae628a453930d4fe3901d186a7c450276d023db6b38e678463f52d463a697819cea1022510030f7405bee8244c3dec04d00741fee8de839775e6e0965f0df39 DIST prboom-plus-2.6.tar.gz 1526732 BLAKE2B 00c0eeb0dfb5a99a427c986e557b6616e69be3b98373582c3aa54585136e3a16b67c0176faec59ebc011112bc8764da78b34215ae4c00b490f12820b26704e45 SHA512 c2f8c6895683ee22d729ad2c9dc10bd821e5bdb55d75b88b4c6db25b8f3604370d18285677660c82761912a159b0c1068a6fcf1c8333e20d849fa1087a74800f +EBUILD prboom-plus-2.6.1.ebuild 1961 BLAKE2B f46c0c735669f8e2067ff5a1d64d4e9bb70ca6dfd409aac25ed4d9cbb1fb60cef6066a2331978a6191c4b84d05733178219d1763c3f5222c21458398f9c6fdad SHA512 5b00b4fb2e2dafae7ebb3470ea4e218bda8e617dffe2d16d37fe133fcf899273f54c8c47a978d4c0273117806fd17b7bd7b8de0be567e58bfb80c72fc0f3e00f EBUILD prboom-plus-2.6.ebuild 1845 BLAKE2B eb9a95fbee8274dd371c5dc5e402d3356f4ceeec6c7d1eef997ef5a2ab93c9fbf8191dde475d4a8bc7bb9993f99cd85444d4f03c2e8f8b644fce834b5eca378f SHA512 fd3592ba16a0ee0af7e686f893533e7bbe4900d641c383dc951cf77f25b4d6f22080b824dcad098ae04c22de41878fdc29a54c7f20492bfcb92c0cc43bbb1675 MISC metadata.xml 1927 BLAKE2B 5a33a90f12cc0d874a785cf75d3e58297bb7f6ff659b8b9717f88d298afbfabc78bfadd430a2c0054b7100bd382addf1faf030366839f4cbcb467b790ee7df56 SHA512 519799ce6c90146f96eee844488085f0c2d42a59a88bfcdb024fbe8209fb584f2b89400de4f882c55ea05993d054cf6542649b2b62b595cd91f020157584e28a diff --git a/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch b/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch new file mode 100644 index 000000000000..78a0285703f4 --- /dev/null +++ b/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch @@ -0,0 +1,28 @@ +From eca393ffd3c05279150a29e104953c0234a59736 Mon Sep 17 00:00:00 2001 +From: William Breathitt Gray +Date: Fri, 27 Aug 2021 12:06:45 +0900 +Subject: [PATCH] Guard OpenGL call in D_Display() with GL_DOOM + +Fixes: https://github.com/coelckers/prboom-plus/issues/382 +--- + prboom2/src/d_main.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/prboom2/src/d_main.c b/prboom2/src/d_main.c +index 16a9efc2..4fe97465 100644 +--- a/prboom2/src/d_main.c ++++ b/prboom2/src/d_main.c +@@ -395,8 +395,10 @@ void D_Display (fixed_t frac) + R_DrawViewBorder(); + HU_Drawer(); + ++#ifdef GL_DOOM + if (V_GetMode() == VID_MODEGL) + gld_ProcessExtraAlpha(); ++#endif + } + + isborderstate = isborder; +-- +2.33.0 + diff --git a/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild b/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild new file mode 100644 index 000000000000..4dbc0b9a4876 --- /dev/null +++ b/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop xdg + +DESCRIPTION="An enhanced clone of the classic first-person shooter Doom" +HOMEPAGE="https://github.com/coelckers/prboom-plus/" +SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${PV}um.orig.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+ GPL-3+ BSD BSD-2 BSD-with-disclosure CC-BY-3.0 CC0-1.0 LGPL-2.1+ MIT public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa dumb fluidsynth mad net +opengl +pcre portmidi sdl2-image +sdl2-mixer server vorbis zlib" +REQUIRED_USE="server? ( net )" + +DEPEND=" + media-libs/libsdl2[opengl?,joystick,sound,video] + alsa? ( media-libs/alsa-lib:= ) + dumb? ( media-libs/dumb:= ) + fluidsynth? ( media-sound/fluidsynth:= ) + mad? ( media-libs/libmad ) + net? ( media-libs/sdl2-net ) + pcre? ( dev-libs/libpcre:3 ) + portmidi? ( media-libs/portmidi ) + sdl2-image? ( media-libs/sdl2-image ) + sdl2-mixer? ( media-libs/sdl2-mixer[midi] ) + vorbis? ( media-libs/libvorbis ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P}um/prboom2" + +src_prepare() { + eapply -p2 "${FILESDIR}/${P}-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch" + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_GL="$(usex opengl)" + -DWITH_IMAGE="$(usex sdl2-image)" + -DWITH_MIXER="$(usex sdl2-mixer)" + -DWITH_NET="$(usex net)" + -DWITH_PCRE="$(usex pcre)" + -DWITH_ZLIB="$(usex zlib)" + -DWITH_MAD="$(usex mad)" + -DWITH_FLUIDSYNTH="$(usex fluidsynth)" + -DWITH_DUMB="$(usex dumb)" + -DWITH_VORBISFILE="$(usex vorbis)" + -DWITH_PORTMIDI="$(usex portmidi)" + -DWITH_ALSA="$(usex alsa)" + -DDOOMWADDIR="${EPREFIX}/usr/share/doom" + -DPRBOOMDATADIR="${EPREFIX}/usr/share/${PF}" + -DWAD_DATA_PATH="${EPREFIX}/usr/share/doom" + -DBUILD_SERVER="$(usex server)" + ) + cmake_src_configure +} + +src_install() { + doicon -s scalable ICONS/${PN}.svg + domenu ICONS/${PN}.desktop + cmake_src_install +} -- cgit v1.2.3