From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/files/, games-fps/prboom-plus/
Date: Thu, 11 Aug 2022 07:37:50 +0000 (UTC) [thread overview]
Message-ID: <1660203428.ed1ee35ae6b03c883af7995d636c287c0c0050d5.ionen@gentoo> (raw)
commit: ed1ee35ae6b03c883af7995d636c287c0c0050d5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 06:08:32 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 07:37:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1ee35a
games-fps/prboom-plus: drop 2.6.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-fps/prboom-plus/Manifest | 1 -
...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, 95 deletions(-)
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 5fe0fab49db5..100d5304041c 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1,2 +1 @@
-DIST prboom-plus-2.6.1.tar.gz 1555792 BLAKE2B accb919039b966952340a18b3a37b9c2401a20c1f9562829ba531bf4dafc5e876d7d1212e9ba58886c7469a86b3170c48973cbd8af8ab03d1f2d685813c39607 SHA512 6ae628a453930d4fe3901d186a7c450276d023db6b38e678463f52d463a697819cea1022510030f7405bee8244c3dec04d00741fee8de839775e6e0965f0df39
DIST prboom-plus-2.6.2.tar.gz 1557494 BLAKE2B 1ce63a893ffa6cb0e04fa3bcb34a06fdef47e2d6886f88bb7df9407f9342c81ddee6a245c15b614c15535fbfd889633f63f4532196b7ae46fd3ce32d20dda559 SHA512 7005fa55bdbfffa1b6b24ff470f5e1962e89367eaa28b23e95ebde0d1385dbe14e1c0f2d67d8ebefb1adfeeca8d551ec2b7b04a23a6af3a0f708b36da09613b3
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
deleted file mode 100644
index 78a0285703f4..000000000000
--- a/games-fps/prboom-plus/files/prboom-plus-2.6.1-Guard-OpenGL-call-in-D_Display-with-GL_DOOM.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eca393ffd3c05279150a29e104953c0234a59736 Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray <vilhelm.gray@gmail.com>
-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
deleted file mode 100644
index 4dbc0b9a4876..000000000000
--- a/games-fps/prboom-plus/prboom-plus-2.6.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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
-}
next reply other threads:[~2022-08-11 7:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-11 7:37 Ionen Wolkens [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-19 9:46 [gentoo-commits] repo/gentoo:master commit in: games-fps/prboom-plus/files/, games-fps/prboom-plus/ James Le Cuirot
2021-02-24 20:47 James Le Cuirot
2021-02-24 20:47 James Le Cuirot
2020-06-07 11:26 James Le Cuirot
2019-06-24 20:07 James Le Cuirot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1660203428.ed1ee35ae6b03c883af7995d636c287c0c0050d5.ionen@gentoo \
--to=ionen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox