1 |
commit: 4cb54f5017dd253fabf1661d854e22b738b77b2d |
2 |
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Feb 10 00:26:05 2020 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 11 07:39:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb54f50 |
7 |
|
8 |
games-fps/prboom-plus: Bump to version 2.5.1.5.4540.1 |
9 |
|
10 |
The non-free USE flag is removed because non-free assets are no longer |
11 |
provided in the source tarball. The png USE flag is removed since |
12 |
sdl2-image provides that functionality now. The sdl-image and sdl-mixer |
13 |
USE flags are renamed to sdl2-image and sdl2-mixer respectively to match |
14 |
the use of the matching SDL2 libraries now. |
15 |
|
16 |
Closes: https://bugs.gentoo.org/703610 |
17 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
18 |
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com> |
19 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
20 |
|
21 |
games-fps/prboom-plus/Manifest | 2 +- |
22 |
games-fps/prboom-plus/metadata.xml | 18 ++++-- |
23 |
games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild | 68 ---------------------- |
24 |
.../prboom-plus/prboom-plus-2.5.1.5.4540.1.ebuild | 64 ++++++++++++++++++++ |
25 |
4 files changed, 77 insertions(+), 75 deletions(-) |
26 |
|
27 |
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest |
28 |
index 74314aab3b5..c1490c8fbdb 100644 |
29 |
--- a/games-fps/prboom-plus/Manifest |
30 |
+++ b/games-fps/prboom-plus/Manifest |
31 |
@@ -1 +1 @@ |
32 |
-DIST prboom-plus-2.5.1.4.tar.gz 3007237 BLAKE2B 3dce8aad6fb521d13cf3e6b48a261f010b545bafa853860b284be0d0772f65b4fa0bfa965f7cb1869cc0d0eb21a4237e1873d08ff56d439cb3eed00f82bf12fb SHA512 625b75c5fe663bb3ba54bcd90f914ad7461c0860448f6f179180de26bea0a4d766739c50f96a8245687bc213742ec53bf6ffa26cde09772b3ae0bba91662213e |
33 |
+DIST prboom-plus-2.5.1.5.4540.1.tar.xz 1023228 BLAKE2B 5b1c6aa80516cef4ced73701b640a261188c6eed818a204ef19f183061c0456f4af70dc8b466c240f5c8985903fe4daf0fed42cd32b47849c02b6c890fa807f0 SHA512 9fe207a395d92305dd3b89a38bc1376de6bd2a7bb29d454da42aea03a4ded82b49033d482d97c76377cbd1ecb7d8a65c9e0948af81ecd4e10bd49b0bad791bbc |
34 |
|
35 |
diff --git a/games-fps/prboom-plus/metadata.xml b/games-fps/prboom-plus/metadata.xml |
36 |
index 9ea5253b83d..55581848150 100644 |
37 |
--- a/games-fps/prboom-plus/metadata.xml |
38 |
+++ b/games-fps/prboom-plus/metadata.xml |
39 |
@@ -2,7 +2,15 @@ |
40 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
41 |
<pkgmetadata> |
42 |
<longdescription lang="en"> |
43 |
- PrBoom+ is a Doom source port developed from the original PrBoom project. |
44 |
+ PrBoom+ is an enhanced source port of the classic 3D first-person |
45 |
+ shooter game Doom, first released by id Software in 1993. It uses the |
46 |
+ Simple Direct Media layer (SDL) library and features an optional OpenGL |
47 |
+ renderer. It is based on PrBoom, MBF and LxDoom, which in turn are based |
48 |
+ on TeamTNT's Boom, a freely available port of Doom for DOS. |
49 |
+ |
50 |
+ In addition to PrBoom's features, PrBoom+ offers uncapped framerate, |
51 |
+ variable gamespeed, re-record, walkcam, chasecam, full mouselook, FOV, |
52 |
+ and other features without loss of compatibility with the original Doom. |
53 |
</longdescription> |
54 |
<maintainer type="person"> |
55 |
<email>vilhelm.gray@×××××.com</email> |
56 |
@@ -20,14 +28,12 @@ |
57 |
<flag name="dumb">Enable support for various tracker-style music formats via <pkg>media-libs/dumb</pkg></flag> |
58 |
<flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag> |
59 |
<flag name="net">Enable support for network play</flag> |
60 |
- <flag name="non-free">Enable non-free components</flag> |
61 |
<flag name="portmidi">Enable support for MIDI via <pkg>media-libs/portmidi</pkg></flag> |
62 |
- <flag name="sdl-image">Enable support for high-resolution texture support via <pkg>media-libs/sdl-image</pkg></flag> |
63 |
- <flag name="sdl-mixer">Enable support for MIDI via <pkg>media-libs/sdl-mixer</pkg></flag> |
64 |
+ <flag name="sdl2-image">Enable support for high-resolution texture support via <pkg>media-libs/sdl2-image</pkg></flag> |
65 |
+ <flag name="sdl2-mixer">Enable support for MIDI via <pkg>media-libs/sdl2-mixer</pkg></flag> |
66 |
</use> |
67 |
<upstream> |
68 |
- <bugs-to>https://sourceforge.net/p/prboom-plus/bugs</bugs-to> |
69 |
+ <bugs-to>https://bugs.debian.org/prboom-plus</bugs-to> |
70 |
<doc lang="en">https://prboom-plus.sourceforge.net</doc> |
71 |
- <remote-id type="sourceforge">prboom-plus</remote-id> |
72 |
</upstream> |
73 |
</pkgmetadata> |
74 |
|
75 |
diff --git a/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild b/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild |
76 |
deleted file mode 100644 |
77 |
index aab17006b4b..00000000000 |
78 |
--- a/games-fps/prboom-plus/prboom-plus-2.5.1.4.ebuild |
79 |
+++ /dev/null |
80 |
@@ -1,68 +0,0 @@ |
81 |
-# Copyright 2019-2020 Gentoo Authors |
82 |
-# Distributed under the terms of the GNU General Public License v2 |
83 |
- |
84 |
-EAPI=7 |
85 |
- |
86 |
-inherit autotools desktop xdg |
87 |
- |
88 |
-DESCRIPTION="A Doom source port developed from the original PrBoom project" |
89 |
-HOMEPAGE="https://prboom-plus.sourceforge.net" |
90 |
-# We are using a github mirror here because the upstream tarball is missing the |
91 |
-# free dog assets; we should update SRC_URI to point to the upstream tarball |
92 |
-# once the free assets are present as expected |
93 |
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
94 |
-SRC_URI="https://github.com/coelckers/prboom-plus/archive/f96f891d068dcc5ec52ed91056b46d27e9a8462d.tar.gz -> ${P}.tar.gz" |
95 |
- |
96 |
-LICENSE="GPL-2+ |
97 |
- non-free? ( freedist ) |
98 |
- !non-free? ( BSD )" |
99 |
-SLOT="0" |
100 |
-KEYWORDS="~amd64 ~x86" |
101 |
-IUSE="dumb fluidsynth mad net non-free +opengl pcre +png portmidi sdl-image +sdl-mixer vorbis" |
102 |
-REQUIRED_USE="sdl-image? ( opengl )" |
103 |
- |
104 |
-DEPEND=" |
105 |
- media-libs/libsdl[opengl?,joystick,sound,video] |
106 |
- dumb? ( media-libs/dumb ) |
107 |
- fluidsynth? ( media-sound/fluidsynth:= ) |
108 |
- mad? ( media-libs/libmad ) |
109 |
- net? ( media-libs/sdl-net ) |
110 |
- sdl-image? ( media-libs/sdl-image ) |
111 |
- pcre? ( dev-libs/libpcre:3 ) |
112 |
- png? ( media-libs/libpng:0= ) |
113 |
- portmidi? ( media-libs/portmidi ) |
114 |
- sdl-mixer? ( media-libs/sdl-mixer[midi] ) |
115 |
- vorbis? ( media-libs/libvorbis )" |
116 |
-RDEPEND="${DEPEND}" |
117 |
- |
118 |
-S="${WORKDIR}/prboom-plus-f96f891d068dcc5ec52ed91056b46d27e9a8462d/prboom2" |
119 |
-PATCHES="${FILESDIR}/${P}-Remove-nonstandard-gamesdir-variable.patch" |
120 |
- |
121 |
-src_prepare() { |
122 |
- xdg_src_prepare |
123 |
- eautoreconf |
124 |
-} |
125 |
- |
126 |
-src_configure() { |
127 |
- econf \ |
128 |
- --disable-cpu-opt \ |
129 |
- $(use_enable non-free nonfree-graphics) \ |
130 |
- $(use_enable opengl gl) \ |
131 |
- $(use_with dumb) \ |
132 |
- $(use_with fluidsynth) \ |
133 |
- $(use_with mad) \ |
134 |
- $(use_with net) \ |
135 |
- $(use_with pcre) \ |
136 |
- $(use_with png) \ |
137 |
- $(use_with portmidi) \ |
138 |
- $(use_with sdl-image image) \ |
139 |
- $(use_with sdl-mixer mixer) \ |
140 |
- $(use_with vorbis vorbisfile) \ |
141 |
- --with-waddir="${EPREFIX}/usr/share/doom" |
142 |
-} |
143 |
- |
144 |
-src_install() { |
145 |
- default |
146 |
- newicon ICONS/prboom-plus.svg ${PN}.svg |
147 |
- make_desktop_entry "${PN}" "PrBoom+" |
148 |
-} |
149 |
|
150 |
diff --git a/games-fps/prboom-plus/prboom-plus-2.5.1.5.4540.1.ebuild b/games-fps/prboom-plus/prboom-plus-2.5.1.5.4540.1.ebuild |
151 |
new file mode 100644 |
152 |
index 00000000000..3e0833b7215 |
153 |
--- /dev/null |
154 |
+++ b/games-fps/prboom-plus/prboom-plus-2.5.1.5.4540.1.ebuild |
155 |
@@ -0,0 +1,64 @@ |
156 |
+# Copyright 2019-2020 Gentoo Authors |
157 |
+# Distributed under the terms of the GNU General Public License v2 |
158 |
+ |
159 |
+EAPI=7 |
160 |
+ |
161 |
+inherit autotools desktop xdg |
162 |
+ |
163 |
+MY_PV=$(ver_rs 4 "+svn" 5 "+dfsg") |
164 |
+MY_P=${PN}-${MY_PV} |
165 |
+DESCRIPTION="An enhanced clone of the classic first-person shooter Doom" |
166 |
+HOMEPAGE="https://prboom-plus.sourceforge.net" |
167 |
+SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${MY_PV}.orig.tar.xz -> ${P}.tar.xz" |
168 |
+ |
169 |
+LICENSE="GPL-2+ BSD BSD-with-disclosure LGPL-2.1+ MIT public-domain" |
170 |
+SLOT="0" |
171 |
+KEYWORDS="~amd64 ~x86" |
172 |
+IUSE="dumb fluidsynth mad net +opengl +pcre portmidi sdl2-image +sdl2-mixer vorbis" |
173 |
+REQUIRED_USE="sdl2-image? ( opengl )" |
174 |
+ |
175 |
+DEPEND=" |
176 |
+ media-libs/libsdl2[opengl?,joystick,sound,video] |
177 |
+ dumb? ( media-libs/dumb ) |
178 |
+ fluidsynth? ( media-sound/fluidsynth:= ) |
179 |
+ mad? ( media-libs/libmad ) |
180 |
+ net? ( media-libs/sdl2-net ) |
181 |
+ pcre? ( dev-libs/libpcre:3 ) |
182 |
+ portmidi? ( media-libs/portmidi ) |
183 |
+ sdl2-image? ( media-libs/sdl2-image ) |
184 |
+ sdl2-mixer? ( media-libs/sdl2-mixer[midi] ) |
185 |
+ vorbis? ( media-libs/libvorbis )" |
186 |
+RDEPEND="${DEPEND}" |
187 |
+ |
188 |
+S=${WORKDIR}/${MY_P} |
189 |
+PATCHES=( |
190 |
+ "${FILESDIR}/${PN}-2.5.1.4-Remove-nonstandard-gamesdir-variable.patch" |
191 |
+) |
192 |
+ |
193 |
+src_prepare() { |
194 |
+ xdg_src_prepare |
195 |
+ eautoreconf |
196 |
+} |
197 |
+ |
198 |
+src_configure() { |
199 |
+ econf \ |
200 |
+ --disable-cpu-opt \ |
201 |
+ --disable-nonfree-graphics \ |
202 |
+ $(use_enable opengl gl) \ |
203 |
+ $(use_with dumb) \ |
204 |
+ $(use_with fluidsynth) \ |
205 |
+ $(use_with mad) \ |
206 |
+ $(use_with net) \ |
207 |
+ $(use_with pcre) \ |
208 |
+ $(use_with portmidi) \ |
209 |
+ $(use_with sdl2-image image) \ |
210 |
+ $(use_with sdl2-mixer mixer) \ |
211 |
+ $(use_with vorbis vorbisfile) \ |
212 |
+ --with-waddir="${EPREFIX}/usr/share/doom" |
213 |
+} |
214 |
+ |
215 |
+src_install() { |
216 |
+ default |
217 |
+ doicon ICONS/${PN}.svg |
218 |
+ domenu ICONS/${PN}.desktop |
219 |
+} |