Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/, games-fps/quakeforge/files/
Date: Sun, 25 Jul 2021 01:36:36
Message-Id: 1627176909.51bace7b8f0ee05bebb0c854d85fcf6857320aad.ionen@gentoo
1 commit: 51bace7b8f0ee05bebb0c854d85fcf6857320aad
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 25 00:48:10 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 25 01:35:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51bace7b
7
8 games-fps/quakeforge: drop 0.7.2_p20210601
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 games-fps/quakeforge/Manifest | 1 -
13 .../quakeforge-0.7.2_p20210601-png-stub.patch | 9 --
14 .../quakeforge-0.7.2_p20210601-skipped-tests.patch | 15 --
15 .../quakeforge/quakeforge-0.7.2_p20210601.ebuild | 173 ---------------------
16 4 files changed, 198 deletions(-)
17
18 diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
19 index c2890dce25b..8b9eb11acfb 100644
20 --- a/games-fps/quakeforge/Manifest
21 +++ b/games-fps/quakeforge/Manifest
22 @@ -1,2 +1 @@
23 -DIST quakeforge-0.7.2_p20210601.tar.gz 3140318 BLAKE2B 4359c2e92a52bc314bca82dcf6f90aebe2fb7260e9c2e1444d3ca239c53adf1ca912093c5c0ccacb4cf9375e199c244f1b8787196c2f8f3bbc7eb00962b0d8da SHA512 a27e4317b3c01f129f1f32209c02b86abf7148c3e0b2e39306324d6b4758d9165883c169ebfde03fc7350b499088cd685991483911b5ae57ccb9b80baaefa733
24 DIST quakeforge-0.7.2_p20210722.tar.gz 3157720 BLAKE2B 9757ed10a5f78d9b5f09029c149c3fc121daf4bef2cc5a1687d00d2d85c36065663407318478c801a4ae62dee03713e35009c91f590d1686678756da1aab7824 SHA512 1c3778ff73cffbb5cadc33e0b544935f822a0f983ed67945dbbd7f6624752b68e3da46f1836f38f22cbae9a9ac191eeacc256ca5da540c5448dfc1fb56b68aa4
25
26 diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
27 deleted file mode 100644
28 index d32fab57b7e..00000000000
29 --- a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
30 +++ /dev/null
31 @@ -1,9 +0,0 @@
32 -Fix stub definition for USE=-png
33 -https://github.com/quakeforge/quakeforge/issues/14
34 ---- a/libs/image/png.c
35 -+++ b/libs/image/png.c
36 -@@ -320,3 +320,3 @@
37 - VISIBLE tex_t *
38 --LoadPNG (QFile *infile)
39 -+LoadPNG (QFile *infile, int load)
40 - {
41
42 diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
43 deleted file mode 100644
44 index 5b25af47ac2..00000000000
45 --- a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
46 +++ /dev/null
47 @@ -1,15 +0,0 @@
48 -These are only failing at high precision and
49 -should not affect normal usage.
50 - quat/simd: fails with -mavx
51 - sebvf: random failure, sometimes pass
52 ---- a/libs/util/test/Makemodule.am
53 -+++ b/libs/util/test/Makemodule.am
54 -@@ -15,8 +15,5 @@
55 - libs/util/test/test-qfs \
56 -- libs/util/test/test-quat \
57 - libs/util/test/test-seb \
58 -- libs/util/test/test-sebvf \
59 - libs/util/test/test-seg \
60 - libs/util/test/test-set \
61 -- libs/util/test/test-simd \
62 - libs/util/test/test-txtbuffer \
63
64 diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
65 deleted file mode 100644
66 index 504324b8b2b..00000000000
67 --- a/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
68 +++ /dev/null
69 @@ -1,173 +0,0 @@
70 -# Copyright 1999-2021 Gentoo Authors
71 -# Distributed under the terms of the GNU General Public License v2
72 -
73 -EAPI=7
74 -
75 -inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
76 -
77 -MY_COMMIT="53b553e89234306dc0111b107308fb42998e522b"
78 -
79 -DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
80 -HOMEPAGE="http://www.quakeforge.net/"
81 -SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
82 -S="${WORKDIR}/${PN}-${MY_COMMIT}"
83 -
84 -LICENSE="GPL-2"
85 -SLOT="0"
86 -KEYWORDS="~amd64 ~x86"
87 -IUSE="alsa +client custom-cflags debug doc flac ipv6 jack ncurses oss png sdl vorbis wildmidi zlib"
88 -
89 -RDEPEND="
90 - client? (
91 - media-libs/libsamplerate
92 - net-misc/curl
93 - x11-libs/libX11
94 - x11-libs/libXext
95 - x11-libs/libXxf86vm
96 - alsa? ( media-libs/alsa-lib )
97 - flac? ( media-libs/flac )
98 - jack? ( virtual/jack )
99 - sdl? ( media-libs/libsdl[sound] )
100 - vorbis? ( media-libs/libvorbis )
101 - wildmidi? ( media-sound/wildmidi )
102 - )
103 - ncurses? ( sys-libs/ncurses:= )
104 - png? ( media-libs/libpng:= )
105 - zlib? ( sys-libs/zlib:= )"
106 -DEPEND="
107 - ${RDEPEND}
108 - client? (
109 - virtual/opengl
110 - x11-base/xorg-proto
111 - )"
112 -BDEPEND="
113 - sys-devel/bison
114 - sys-devel/flex
115 - virtual/pkgconfig
116 - doc? (
117 - app-doc/doxygen[dot]
118 - media-gfx/transfig
119 - )"
120 -
121 -PATCHES=(
122 - "${FILESDIR}"/${P}-png-stub.patch
123 - "${FILESDIR}"/${P}-skipped-tests.patch
124 -)
125 -
126 -src_prepare() {
127 - default
128 -
129 - echo ${PV} > .tarball-version || die
130 -
131 - eautoreconf
132 -}
133 -
134 -src_configure() {
135 - if ! use custom-cflags; then
136 - # package does a lot of fragile micro-optimizations
137 - strip-flags
138 -
139 - # nq-x11 segfaults starting a new game with -O2+ and gcc11
140 - # https://github.com/quakeforge/quakeforge/issues/12
141 - tc-is-gcc && [[ $(gcc-major-version) -ge 11 ]] && replace-flags '-O[2-9]*' -Os
142 - fi
143 -
144 - append-ldflags -Wl,-z,noexecstack
145 -
146 - qf_client() {
147 - echo $(usex client $(use_enable ${1}) --disable-${1})
148 - }
149 -
150 - local econfargs=(
151 - $(qf_client alsa)
152 - $(qf_client flac)
153 - $(qf_client jack)
154 - $(qf_client oss)
155 - $(qf_client sdl)
156 - $(qf_client vorbis)
157 - # vulkan is work-in-progress and currently needs <=vulkan-headers-1.2.169
158 - # https://github.com/quakeforge/quakeforge/issues/13
159 - --disable-vulkan # $(qf_client vulkan)
160 - $(qf_client wildmidi)
161 - $(use_enable client sound)
162 - $(use_enable client vidmode)
163 - $(use_enable debug)
164 - $(use_enable ncurses curses)
165 - $(use_enable png)
166 - $(use_enable zlib)
167 - $(use_with client x)
168 - $(use_with ipv6)
169 - --disable-Werror
170 - --disable-dga
171 - --disable-static
172 - --enable-xdg
173 - # non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
174 - --with-clients=$(usex client x11 '')
175 - --with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4
176 - --with-global-cfg="${EPREFIX}"/etc/quakeforge.conf
177 - --with-sharepath="${EPREFIX}"/usr/share/quake1
178 - )
179 -
180 - # Jack audio is special (need a different method to enable), and an
181 - # issue prevents it from being usable without another audio output.
182 - # https://github.com/quakeforge/quakeforge/issues/16
183 - # Given hopefully temporary, not relying on REQUIRED_USE.
184 - use alsa || use oss || use sdl || econfargs+=( --enable-oss )
185 -
186 - econf "${econfargs[@]}"
187 -}
188 -
189 -src_compile() {
190 - default
191 -
192 - use doc && emake doc
193 -}
194 -
195 -src_install() {
196 - use doc && local HTML_DOCS=( doxygen/html/. )
197 -
198 - emake -j1 DESTDIR="${D}" install
199 -
200 - find "${ED}" -name '*.la' -delete || die
201 -
202 - local DISABLE_AUTOFORMATTING="yes"
203 - local DOC_CONTENTS=\
204 -"Before you can play (using nq-x11 or qw-client-x11), you must ensure
205 -that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
206 -at one of these locations with lowercase filenames:
207 - - '~/.local/share/${PN}/id1/pak0.pak'
208 - - '${EPREFIX}/usr/share/quake1/id1/pak0.pak'
209 -
210 -You can add them yourself or use either of:
211 - - games-fps/quake1-data: install from a Quake CD-ROM
212 - - games-fps/quake1-demodata: pak0.pak only (limited demo)
213 -
214 -Key binds notes:
215 - Defaults ('imt_mod' table) expect you to set key binds manually in:
216 - - '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1')
217 - For the in-game bind menu to be usable ('imt_0' table), bring up the
218 - console with backtick \`, and run 'imt imt_0' (only needed once).
219 - A mouse-grab bind ('toggle in_grab') and using freelook is recommended.
220 -
221 -Audio/Video notes:
222 - Can add settings in:
223 - - '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf')
224 - Examples:
225 - - set vid_width 800
226 - - set vid_height 600
227 - - set snd_output sdl (or alsa, oss)
228 - - setrom vid_render gl (or sw for software rendering)
229 - - setrom snd_render default (specially set jack here for JACK audio)"
230 - readme.gentoo_create_doc
231 -}
232 -
233 -pkg_postinst() {
234 - readme.gentoo_print_elog
235 -
236 - if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
237 - elog "Migration may be needed for ${PN}'s home paths, now using:"
238 - elog " ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
239 - elog " ~/.${PN}/ -> ~/.local/share/${PN}/"
240 - elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
241 - fi
242 -}