1 |
commit: a6836bac5fd81a343561ecc525b1fc6a82fcd332 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 5 01:23:38 2022 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 5 01:34:55 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6836bac |
7 |
|
8 |
games-fps/quakeforge: minor live ebuild updates |
9 |
|
10 |
Current HEAD has working tests with glibc-2.34 wrt bug #807319 |
11 |
(but the failure had no real consequence, runtime not affected). |
12 |
|
13 |
Not adding a new snapshot yet given there's been major refactoring |
14 |
of the input system and in-game key rebinding seem not re-implemented |
15 |
yet (this is fine if using .cfg directly, but is unintuitive). |
16 |
|
17 |
Removed dated postinst messages, vulkan backend seem to have |
18 |
improved a fair deal. |
19 |
|
20 |
Bug: https://bugs.gentoo.org/807319 |
21 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
22 |
|
23 |
games-fps/quakeforge/quakeforge-9999.ebuild | 31 ++++++++++------------------- |
24 |
1 file changed, 10 insertions(+), 21 deletions(-) |
25 |
|
26 |
diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild |
27 |
index 6013dac54d34..5a6d465477c4 100644 |
28 |
--- a/games-fps/quakeforge/quakeforge-9999.ebuild |
29 |
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild |
30 |
@@ -1,4 +1,4 @@ |
31 |
-# Copyright 1999-2021 Gentoo Authors |
32 |
+# Copyright 1999-2022 Gentoo Authors |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
|
35 |
EAPI=8 |
36 |
@@ -9,9 +9,9 @@ if [[ ${PV} == 9999 ]]; then |
37 |
inherit git-r3 |
38 |
EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git" |
39 |
else |
40 |
- MY_COMMIT="" |
41 |
- SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" |
42 |
- S="${WORKDIR}/${PN}-${MY_COMMIT}" |
43 |
+ QUAKEFORGE_COMMIT="" |
44 |
+ SRC_URI="https://github.com/quakeforge/quakeforge/archive/${QUAKEFORGE_COMMIT}.tar.gz -> ${P}.tar.gz" |
45 |
+ S="${WORKDIR}/${PN}-${QUAKEFORGE_COMMIT}" |
46 |
KEYWORDS="~amd64 ~x86" |
47 |
fi |
48 |
|
49 |
@@ -29,6 +29,8 @@ RDEPEND=" |
50 |
virtual/opengl |
51 |
x11-libs/libX11 |
52 |
x11-libs/libXext |
53 |
+ x11-libs/libXfixes |
54 |
+ x11-libs/libXi |
55 |
x11-libs/libXxf86vm |
56 |
alsa? ( media-libs/alsa-lib ) |
57 |
flac? ( media-libs/flac ) |
58 |
@@ -69,7 +71,7 @@ src_prepare() { |
59 |
|
60 |
src_configure() { |
61 |
qf_client() { |
62 |
- echo $(usex client $(use_enable ${1}) --disable-${1}) |
63 |
+ usex client $(use_enable ${1}) --disable-${1} |
64 |
} |
65 |
|
66 |
local econfargs=( |
67 |
@@ -116,9 +118,9 @@ src_install() { |
68 |
|
69 |
find "${ED}" -name '*.la' -delete || die |
70 |
|
71 |
- local DISABLE_AUTOFORMATTING="yes" |
72 |
- local DOC_CONTENTS=\ |
73 |
-"Before you can play (using nq-x11 or qw-client-x11), you must ensure |
74 |
+ local DISABLE_AUTOFORMATTING=yes |
75 |
+ local DOC_CONTENTS="\ |
76 |
+Before you can play (using nq-x11 or qw-client-x11), you must ensure |
77 |
that ${PN} can find your Quake pak0.pak (and optionally pak1.pak) |
78 |
at one of these locations with lowercase filenames: |
79 |
- '~/.local/share/${PN}/id1/pak0.pak' |
80 |
@@ -148,17 +150,4 @@ Audio/Video notes: |
81 |
|
82 |
pkg_postinst() { |
83 |
readme.gentoo_print_elog |
84 |
- |
85 |
- if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then |
86 |
- elog "Migration may be needed for ${PN}'s home paths, now using:" |
87 |
- elog " ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf" |
88 |
- elog " ~/.${PN}/ -> ~/.local/share/${PN}/" |
89 |
- elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)." |
90 |
- fi |
91 |
- |
92 |
- if use vulkan; then |
93 |
- ewarn "You've enabled the new vulkan support that is still experimental and yet" |
94 |
- ewarn "used by default. If have issues, can use '+setrom vid_render gl' command" |
95 |
- ewarn "line option to revert to GL." |
96 |
- fi |
97 |
} |