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 080221581E7 for ; Sat, 27 Apr 2024 12:09:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28A6BE29F6; Sat, 27 Apr 2024 12:09:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 083D8E29F6 for ; Sat, 27 Apr 2024 12:09:30 +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 26FF2335DC5 for ; Sat, 27 Apr 2024 12:09:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91AF01752 for ; Sat, 27 Apr 2024 12:09:28 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1714217923.08b6f4025028a8040676daf0ac4c766ee7a5aac8.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:master 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-2023.10.06-r1.ebuild X-VCS-Directories: games-emulation/dosbox-x/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: 08b6f4025028a8040676daf0ac4c766ee7a5aac8 X-VCS-Branch: master Date: Sat, 27 Apr 2024 12:09:28 +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: beecbb72-e79a-46d9-9400-a36c1bb90984 X-Archives-Hash: c978411af8c4be2d3bddce7b5e5e9d22 commit: 08b6f4025028a8040676daf0ac4c766ee7a5aac8 Author: Yuan Liao gmail com> AuthorDate: Sat Apr 27 11:38:43 2024 +0000 Commit: Julien Roy jroy ca> CommitDate: Sat Apr 27 11:38:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=08b6f402 games-emulation/dosbox-x: Drop 2023.10.06-r1 Signed-off-by: Yuan Liao gmail.com> games-emulation/dosbox-x/Manifest | 1 - .../dosbox-x/dosbox-x-2023.10.06-r1.ebuild | 215 --------------------- 2 files changed, 216 deletions(-) diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest index d222844723..c57446ce7d 100644 --- a/games-emulation/dosbox-x/Manifest +++ b/games-emulation/dosbox-x/Manifest @@ -1,2 +1 @@ -DIST dosbox-x-v2023.10.06.tar.gz 119420489 BLAKE2B dca4d6c6639e9121d8b88843a04ffabd552d10614d36508996eeb99323b32f912c8e9673baf4e2f29d7cb280aba745c330170e209a9ab0a7befa0be231ca1cc9 SHA512 906907d0eb1c8b0c0646c82aeefca6457ba6a6e72044c6343cd334ccef6e6c6298d63405f24281a56d9eaf4c1073c141311063ea9d5a420abad8302cbab7ec21 DIST dosbox-x-v2024.03.01.tar.gz 119593920 BLAKE2B 42c994247e55c1b2d67ed9e1bf90e99ddf9a08476b18ab802757becc0ee6959231d3665e39cfaef02a6b1c234e3faff10597d396d8d30ce01d8123b5107327bc SHA512 0eb835da3fdfd7f1c6160aa1a32a7eff7c38f46184f7cee088e0fb8edf09327f058fd45e7995955a7f335c704ddd69c1627731899a01687563990bb06f4d9cd1 diff --git a/games-emulation/dosbox-x/dosbox-x-2023.10.06-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.10.06-r1.ebuild deleted file mode 100644 index 3a9d16acc2..0000000000 --- a/games-emulation/dosbox-x/dosbox-x-2023.10.06-r1.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 2022-2024 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 opengl png slirp truetype" -# 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. -COMMON_DEPEND=" - 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:= ) - opengl? ( media-libs/libglvnd[X] ) - png? ( media-libs/libpng:= ) - slirp? ( net-libs/libslirp ) - truetype? ( media-libs/freetype ) -" - -DEPEND=" - ${COMMON_DEPEND} -" - -# DOSBox-X can still run normally without any of these dependencies -- -# it just cannot show a file dialog. However, upon the initial launch, -# DOSBox-X will try to show a file dialog to let the user choose the -# working directory; without one of these dependencies, the user would -# see nothing when they launch DOSBox-X for the first time. -FILE_DIALOG_DEPEND=" - || ( - gnome-extra/zenity - kde-apps/kdialog - x11-misc/xdialog - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - ${FILE_DIALOG_DEPEND} -" - -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 opengl) - $(use_enable png screenshots) - $(use_enable slirp libslirp) - $(use_enable truetype freetype) - ) - - 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 -}