commit: f628eecd507ec310771db2c0e25dffb4c8124034 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Nov 13 07:33:19 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 13 07:33:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f628eecd
games-fps/quakeforge: migrate to fig2dev Closes: https://bugs.gentoo.org/917250 Signed-off-by: Sam James <sam <AT> gentoo.org> ...ebuild => quakeforge-0.7.2_p20210722-r2.ebuild} | 40 ++++++++++++++-------- games-fps/quakeforge/quakeforge-9999.ebuild | 2 +- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild similarity index 77% copy from games-fps/quakeforge/quakeforge-9999.ebuild copy to games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild index 9c6f72e80f93..e904e35f9cd1 100644 --- a/games-fps/quakeforge/quakeforge-9999.ebuild +++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild @@ -9,9 +9,9 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git"; else - QUAKEFORGE_COMMIT="" - SRC_URI="https://github.com/quakeforge/quakeforge/archive/${QUAKEFORGE_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${QUAKEFORGE_COMMIT}" + MY_COMMIT="e799a7ae45b0ab2ad7b642953277db8ccf256cf8" + SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_COMMIT}" KEYWORDS="~amd64 ~x86" fi @@ -29,8 +29,6 @@ RDEPEND=" virtual/opengl x11-libs/libX11 x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi x11-libs/libXxf86vm alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac:= ) @@ -55,16 +53,16 @@ BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen[dot] - media-gfx/transfig + >=media-gfx/fig2dev-3.2.9-r1 )" +PATCHES=( + "${FILESDIR}"/${P}-skipped-tests.patch +) + src_prepare() { default - # These seem to fail at high precision and shouldn't affect normal use. - # quat/simd: may fail with -mavx, sebvf: random? (likely hardware related) - sed -i '/test-\(quat\|simd\|sebvf\)/d' libs/util/test/Makemodule.am || die - echo ${PV} > .tarball-version || die eautoreconf } @@ -74,7 +72,7 @@ src_configure() { unset LEX YACC #902997,884287 qf_client() { - usex client $(use_enable ${1}) --disable-${1} + echo $(usex client $(use_enable ${1}) --disable-${1}) } local econfargs=( @@ -95,7 +93,6 @@ src_configure() { $(use_with client x) --disable-Werror --disable-dga - --disable-simd # all this does is append -mavx2 and similar --enable-xdg # non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio) --with-clients=$(usev client x11) @@ -121,9 +118,9 @@ src_install() { find "${ED}" -name '*.la' -delete || die - local DISABLE_AUTOFORMATTING=yes - local DOC_CONTENTS="\ -Before you can play (using nq-x11 or qw-client-x11), you must ensure + local DISABLE_AUTOFORMATTING="yes" + local DOC_CONTENTS=\ +"Before you can play (using nq-x11 or qw-client-x11), you must ensure that ${PN} can find your Quake pak0.pak (and optionally pak1.pak) at one of these locations with lowercase filenames: - '~/.local/share/${PN}/id1/pak0.pak' @@ -153,4 +150,17 @@ Audio/Video notes: pkg_postinst() { readme.gentoo_print_elog + + if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then + elog "Migration may be needed for ${PN}'s home paths, now using:" + elog " ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf" + elog " ~/.${PN}/ -> ~/.local/share/${PN}/" + elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)." + fi + + if use vulkan; then + ewarn "You've enabled the new vulkan support that is still experimental and yet" + ewarn "used by default. If have issues, can use '+setrom vid_render gl' command" + ewarn "line option to revert to GL." + fi } diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild index 9c6f72e80f93..df728f289149 100644 --- a/games-fps/quakeforge/quakeforge-9999.ebuild +++ b/games-fps/quakeforge/quakeforge-9999.ebuild @@ -55,7 +55,7 @@ BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen[dot] - media-gfx/transfig + >=media-gfx/fig2dev-3.2.9-r1 )" src_prepare() {
