From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 116CA15ACFC for ; Wed, 3 May 2023 01:03:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC1D6E08D3; Wed, 3 May 2023 01:03:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8571E08D3 for ; Wed, 3 May 2023 01:03:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48DB834153C for ; Wed, 3 May 2023 01:03:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7453C8E4 for ; Wed, 3 May 2023 01:03:40 +0000 (UTC) From: "Yuan Liao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuan Liao" Message-ID: <1683072712.47268339043ca47d6ac3f4f1a410637263de0cbd.liaoyuan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/dosbox-x/Manifest games-emulation/dosbox-x/dosbox-x-2022.12.26-r1.ebuild X-VCS-Directories: games-emulation/dosbox-x/ X-VCS-Committer: liaoyuan X-VCS-Committer-Name: Yuan Liao X-VCS-Revision: 47268339043ca47d6ac3f4f1a410637263de0cbd X-VCS-Branch: dev Date: Wed, 3 May 2023 01:03:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ba78d3cd-de4f-4145-a38c-05ccabcd7426 X-Archives-Hash: 8b6a9e26840803dd55ec14041ee005f7 commit: 47268339043ca47d6ac3f4f1a410637263de0cbd Author: Yuan Liao gmail com> AuthorDate: Wed May 3 00:11:52 2023 +0000 Commit: Yuan Liao gmail com> CommitDate: Wed May 3 00:11:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=47268339 games-emulation/dosbox-x: Drop 2022.12.26-r1 Signed-off-by: Yuan Liao gmail.com> games-emulation/dosbox-x/Manifest | 1 - .../dosbox-x/dosbox-x-2022.12.26-r1.ebuild | 197 --------------------- 2 files changed, 198 deletions(-) diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest index eaef75815..906992a36 100644 --- a/games-emulation/dosbox-x/Manifest +++ b/games-emulation/dosbox-x/Manifest @@ -1,2 +1 @@ -DIST dosbox-x-v2022.12.26.tar.gz 67886370 BLAKE2B a748c18bd51833f8532ee76cf30c1bed994458acf56f36be3207c9714678f8e1b4c4fb130aeaa54d5cac39f60484b6aa12a4d59fcd8ce1a7ddbb5d98cede9df7 SHA512 18895a3cd9b46a226490f4eda160b92f80e6a9022d22cc192cbf8ddea93803d72b658e9d88ebc3163b93d214389e74f67193e8aac37bf58f7068a1daf68dd550 DIST dosbox-x-v2023.03.31.tar.gz 67926579 BLAKE2B d5668bfed2fb05f93364cc0b0886716f919666ce3743d6bd371f55ea280848fc880067d6e2c6b327be606a44e5518ffb0e3c140774ed29a169ddaa9e1da8136c SHA512 376901f7795ba3f98af6b4cb8afc52298065c96e58be3db285dce81f5eb82455a7e7dac00d170aa54a7f83183dae71c7e6951494480cb726239bc22313790733 diff --git a/games-emulation/dosbox-x/dosbox-x-2022.12.26-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.12.26-r1.ebuild deleted file mode 100644 index 688fc4f58..000000000 --- a/games-emulation/dosbox-x/dosbox-x-2022.12.26-r1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs xdg - -if [[ "${PV}" == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git" -else - SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${PV}.tar.gz" - S="${WORKDIR}/${PN}-${PN}-v${PV}" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Complete, accurate DOS emulator forked from DOSBox" -HOMEPAGE="https://dosbox-x.com/" - -# Stay consistent with games-emulation/dosbox::gentoo even though source file -# headers specify the GPL version to be "either version 2 of the License, or -# (at your option) any later version." The same header is used in both the -# DOSBox source tree and the DOSBox-X source tree. -LICENSE="GPL-2" -SLOT="0" - -IUSE="X debug ffmpeg fluidsynth freetype opengl png slirp" -# Unit tests are only available in debug builds -RESTRICT="!debug? ( test )" - -BDEPEND=" - dev-lang/nasm - sys-libs/libcap -" - -# Unconditionally pulling in automagically-enabled optional dependencies: -# - media-libs/alsa-lib -# - media-libs/sdl2-net -# - net-libs/libpcap -# -# With media-libs/libsdl2[-X,wayland], this package does work on a Wayland -# desktop, but (at least on GNOME) the program does not launch in a movable -# and resizable window; whereas with media-libs/libsdl2[X], it does. Thus, -# unconditionally require media-libs/libsdl2[X] for better user experience. -# -# DOSBox-X works with multiple audio backends of SDL 2 but requires at least -# one available backend (https://bugs.gentoo.org/901303). Unconditionally -# depending on media-libs/libsdl2[alsa] to satisfy this requirement since -# this ebuild already unconditionally pulls in media-libs/alsa-lib. -RDEPEND=" - media-libs/alsa-lib - media-libs/libsdl2[X,alsa,opengl?,sound,threads,video] - media-libs/sdl2-net - net-libs/libpcap - sys-libs/zlib - X? ( - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libxkbfile - ) - debug? ( sys-libs/ncurses:= ) - ffmpeg? ( media-video/ffmpeg:= ) - fluidsynth? ( media-sound/fluidsynth:= ) - freetype? ( media-libs/freetype ) - opengl? ( media-libs/libglvnd[X] ) - png? ( media-libs/libpng:= ) - slirp? ( net-libs/libslirp ) -" - -DEPEND=" - ${RDEPEND} -" - -pkg_pretend() { - if use ffmpeg && use !png; then - ewarn "Setting the 'ffmpeg' USE flag when the 'png' USE flag is" - ewarn "unset does not have any effect. Unsetting the 'png' USE" - ewarn "flag disables the video capture feature, so additional" - ewarn "video capture formats enabled by the 'ffmpeg' USE flag" - ewarn "will end up being unused." - fi -} - -src_prepare() { - default - - # https://bugs.gentoo.org/887669 - # Mask lines touching '-O*', and avoid creating an empty command - # list as a result to not break 'if', 'for', or functions - sed -i -E -e 's/((C|CXX)FLAGS=.*-O)/: \1/' configure.ac || - die "Failed to stop configure.ac from touching '-O*' compiler flags" - - eautoreconf -} - -src_configure() { - local myconf=( - # Always use SDL 2, even though the package provides the option to - # build with SDL 1.x, because this package is expected to be built - # with the bundled, heavily-modified version of SDL 1.x if that - # branch is used. Compiler errors are likely to occur if the - # bundled version of SDL 1.x is not used. Bundled dependencies - # should be avoided on Gentoo, so SDL 2 is more preferable. - --enable-sdl2 - - # Explicitly enable ALSA MIDI support, same as default. As of - # v2022.08.0, even when it is disabled, media-libs/alsa-lib will - # still be automagically linked if it is present in the build - # environment (presumably for other components of this package), - # so the dependency cannot be made optional by disabling this - # option. Plus, disabling this option has no observable effect - # on build time, build size, or the program's functionality, as - # 'mididevice=alsa' still works with '--disable-alsa-midi'. - --enable-alsa-midi - - $(use_enable debug '' heavy) - - $(use_enable X x11) - $(use_enable ffmpeg avcodec) - $(use_enable fluidsynth libfluidsynth) - $(use_enable freetype) - $(use_enable opengl) - $(use_enable png screenshots) - $(use_enable slirp libslirp) - ) - - econf "${myconf[@]}" -} - -src_compile() { - # https://bugs.gentoo.org/856352 - emake AR="$(tc-getAR)" -} - -src_test() { - set -- src/dosbox-x -tests - echo "${@}" >&2 - "${@}" || die "Unit tests failed" -} - -pkg_preinst() { - xdg_pkg_preinst - - # Returns whether or not the USE flag specified with the first positional - # argument is newly enabled for this installation of the package. - newuse() { - local flag="${1}" - - # The 'has_version' call tests if any USE flags are newly enabled. - # It is to extract information about any existing copy of this - # package installed on the system, which is why it should be made - # before the new copy of this package just built is merged. - use "${flag}" && ! has_version "${CATEGORY}/${PN}[${flag}]" - } - - newuse debug && PRINT_NOTES_FOR_DEBUGGER=1 - newuse fluidsynth && PRINT_NOTES_FOR_FLUIDSYNTH=1 -} - -pkg_postinst() { - xdg_pkg_postinst - - if [[ "${PRINT_NOTES_FOR_DEBUGGER}" ]]; then - elog - elog "Note on the Debugger" - elog - elog "The debugger can only be started when DOSBox-X is launched" - elog "from a terminal. Otherwise, the \"Start DOSBox-X Debugger\"" - elog "option in the \"Debug\" drop-down menu would be unavailable." - elog - elog "For more information about the debugger, please consult:" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.debugger*" - fi - - if [[ "${PRINT_NOTES_FOR_FLUIDSYNTH}" ]]; then - elog - elog "Note on FluidSynth" - elog - elog "To use FluidSynth as the MIDI device for DOSBox-X, a soundfont" - elog "is required. If no existing soundfont is available, a new one" - elog "can be installed and configured for DOSBox-X very easily:" - elog - elog "1. Install the following package:" - elog " media-sound/fluid-soundfont" - elog "2. Add the following lines to DOSBox-X's configuration file:" - elog " [midi]" - elog " mididevice=fluidsynth" - elog - elog "Usually, there is no need to explicitly specify the soundfont" - elog "file's path because the package mentioned in step 1 installs" - elog "soundfont files to a standard location, allowing them to be" - elog "detected and selected automatically." - elog - elog "For advanced FluidSynth configuration, please consult:" - elog " https://dosbox-x.com/wiki/Guide%3ASetting-up-MIDI-in-DOSBox%E2%80%90X#_fluidsynth" - fi -}