[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-12-22  0:46 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-12-22  0:46 UTC (permalink / raw
  To: gentoo-commits

commit:     331b5bbba4bfca44785c3ed7d3f367c8e7ef7621
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Thu Dec 22 00:06:40 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Thu Dec 22 00:36:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=331b5bbb

games-emulation/dosbox-x: Respect user's '-O*' compiler flags

Closes: https://bugs.gentoo.org/887669
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 .../{dosbox-x-2022.08.0.ebuild => dosbox-x-2022.08.0-r1.ebuild}    | 6 ++++++
 ...pre20221210.ebuild => dosbox-x-2022.09.1_pre20221210-r1.ebuild} | 7 +++++++
 games-emulation/dosbox-x/dosbox-x-9999.ebuild                      | 7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
similarity index 96%
rename from games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
rename to games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
index 473948a53..bec3c9a2e 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
@@ -81,6 +81,12 @@ pkg_pretend() {
 src_prepare() {
 	default
 
+	# https://bugs.gentoo.org/887669
+	# Comment out 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/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac ||
+		die "Failed to stop configure.ac from touching '-O*' compiler flags"
+
 	# Patch command lines like the following in Makefile.am:
 	#   -test -x /usr/sbin/setcap && setcap cap_net_raw=ep $(DESTDIR)$(bindir)/dosbox-x
 	#

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild
similarity index 95%
rename from games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild
rename to games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild
index 49f4ea171..9af962aef 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild
@@ -88,6 +88,13 @@ pkg_pretend() {
 
 src_prepare() {
 	default
+
+	# https://bugs.gentoo.org/887669
+	# Comment out 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/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac ||
+		die "Failed to stop configure.ac from touching '-O*' compiler flags"
+
 	eautoreconf
 }
 

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index e2738549f..39ecd4c1c 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -88,6 +88,13 @@ pkg_pretend() {
 
 src_prepare() {
 	default
+
+	# https://bugs.gentoo.org/887669
+	# Comment out 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/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac ||
+		die "Failed to stop configure.ac from touching '-O*' compiler flags"
+
 	eautoreconf
 }
 


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2024-10-04 22:47 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2024-10-04 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     3a74bcdf3ef29cc86bd3f6646486b8d1f1b4f620
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Fri Oct  4 22:18:15 2024 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Fri Oct  4 22:18:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3a74bcdf

games-emulation/dosbox-x: Update for libsdl2's dropped IUSE=threads

Closes: https://bugs.gentoo.org/940731
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild | 2 +-
 games-emulation/dosbox-x/dosbox-x-9999.ebuild       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild
index 3a9d16acc..7372dc2d4 100644
--- a/games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 # 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/libsdl2[X,alsa,opengl?,sound,threads(+),video]
 	media-libs/sdl2-net
 	net-libs/libpcap
 	sys-libs/zlib

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 3a9d16acc..7372dc2d4 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -49,7 +49,7 @@ BDEPEND="
 # 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/libsdl2[X,alsa,opengl?,sound,threads(+),video]
 	media-libs/sdl2-net
 	net-libs/libpcap
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2024-10-04 22:47 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2024-10-04 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     e33c0ad1960b09427afd76bc70176c2d534629eb
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Fri Oct  4 22:31:00 2024 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Fri Oct  4 22:31:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e33c0ad1

games-emulation/dosbox-x: Add 2024.10.01

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 .../dosbox-x/dosbox-x-2024.10.01.ebuild            | 215 +++++++++++++++++++++
 2 files changed, 216 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 63abd70e2..742ab5415 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
 DIST dosbox-x-v2024.07.01.tar.gz 119702042 BLAKE2B 1c046a54b5a94deef6413592c48be08542c6d9c6d5b437880a354eb9df137fafb5da57d5f99e4bdcd83eea99a7a3550117c8ed66adcbca38aea484b116321068 SHA512 e6a0478be160b115ab09ffe13d7574d604fc7778105171da3591bd4239903cb5766118e0b05d158a89344bbbd1383885aa4fd724dce4601595438634724b2f24
+DIST dosbox-x-v2024.10.01.tar.gz 121316697 BLAKE2B 27e653fe341146c71ed4059b8aba6660c06e41f39635c9d3e08a215793b31e3f28b4e7ba923cc8cc644357f92bdcfc20d604e61a15fb0c995b047129d857e437 SHA512 8a0a27476b27197ed942e60915749589324199fd89eabd0377ff7aadf293630db292a9eb6304336da87220092cfee3975259660623ecd0d775aa13938fd43658

diff --git a/games-emulation/dosbox-x/dosbox-x-2024.10.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2024.10.01.ebuild
new file mode 100644
index 000000000..7372dc2d4
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2024.10.01.ebuild
@@ -0,0 +1,215 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2024-07-31 17:26 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2024-07-31 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     75580952bb363b59ad7b194599e0a6f799a79327
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed Jul 31 17:22:24 2024 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Wed Jul 31 17:22:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=75580952

games-emulation/dosbox-x: Drop 2024.03.01

Closes: https://bugs.gentoo.org/921909
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 -
 .../dosbox-x/dosbox-x-2024.03.01.ebuild            | 215 ---------------------
 2 files changed, 216 deletions(-)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 279618515..63abd70e2 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1,2 +1 @@
-DIST dosbox-x-v2024.03.01.tar.gz 119593920 BLAKE2B 42c994247e55c1b2d67ed9e1bf90e99ddf9a08476b18ab802757becc0ee6959231d3665e39cfaef02a6b1c234e3faff10597d396d8d30ce01d8123b5107327bc SHA512 0eb835da3fdfd7f1c6160aa1a32a7eff7c38f46184f7cee088e0fb8edf09327f058fd45e7995955a7f335c704ddd69c1627731899a01687563990bb06f4d9cd1
 DIST dosbox-x-v2024.07.01.tar.gz 119702042 BLAKE2B 1c046a54b5a94deef6413592c48be08542c6d9c6d5b437880a354eb9df137fafb5da57d5f99e4bdcd83eea99a7a3550117c8ed66adcbca38aea484b116321068 SHA512 e6a0478be160b115ab09ffe13d7574d604fc7778105171da3591bd4239903cb5766118e0b05d158a89344bbbd1383885aa4fd724dce4601595438634724b2f24

diff --git a/games-emulation/dosbox-x/dosbox-x-2024.03.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2024.03.01.ebuild
deleted file mode 100644
index 3a9d16acc..000000000
--- a/games-emulation/dosbox-x/dosbox-x-2024.03.01.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
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2024-07-02 12:52 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2024-07-02 12:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3491265be0dbeab0322a259ec36eddacb09137a3
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Jul  2 12:47:50 2024 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Tue Jul  2 12:48:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3491265b

games-emulation/dosbox-x: Add 2024.07.01

Bug: https://bugs.gentoo.org/921909
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 .../dosbox-x/dosbox-x-2024.07.01.ebuild            | 215 +++++++++++++++++++++
 2 files changed, 216 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index c57446ce7..279618515 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
 DIST dosbox-x-v2024.03.01.tar.gz 119593920 BLAKE2B 42c994247e55c1b2d67ed9e1bf90e99ddf9a08476b18ab802757becc0ee6959231d3665e39cfaef02a6b1c234e3faff10597d396d8d30ce01d8123b5107327bc SHA512 0eb835da3fdfd7f1c6160aa1a32a7eff7c38f46184f7cee088e0fb8edf09327f058fd45e7995955a7f335c704ddd69c1627731899a01687563990bb06f4d9cd1
+DIST dosbox-x-v2024.07.01.tar.gz 119702042 BLAKE2B 1c046a54b5a94deef6413592c48be08542c6d9c6d5b437880a354eb9df137fafb5da57d5f99e4bdcd83eea99a7a3550117c8ed66adcbca38aea484b116321068 SHA512 e6a0478be160b115ab09ffe13d7574d604fc7778105171da3591bd4239903cb5766118e0b05d158a89344bbbd1383885aa4fd724dce4601595438634724b2f24

diff --git a/games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild
new file mode 100644
index 000000000..3a9d16acc
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2024.07.01.ebuild
@@ -0,0 +1,215 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2024-04-27 11:42 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2024-04-27 11:42 UTC (permalink / raw
  To: gentoo-commits

commit:     08b6f4025028a8040676daf0ac4c766ee7a5aac8
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Apr 27 11:38:43 2024 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
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 <liaoyuan <AT> 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
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2024-03-02  3:13 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2024-03-02  3:13 UTC (permalink / raw
  To: gentoo-commits

commit:     cee4e63668a82cc828fe09fe368e8c1cf4c89275
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Mar  2 03:08:24 2024 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Sat Mar  2 03:08:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cee4e636

games-emulation/dosbox-x: Add 2024.03.01

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 .../dosbox-x/dosbox-x-2024.03.01.ebuild            | 215 +++++++++++++++++++++
 2 files changed, 216 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 2c97267c41..d222844723 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
 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-2024.03.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2024.03.01.ebuild
new file mode 100644
index 0000000000..3a9d16acc2
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2024.03.01.ebuild
@@ -0,0 +1,215 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2024-02-07 23:49 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2024-02-07 23:49 UTC (permalink / raw
  To: gentoo-commits

commit:     514d2ce53274c5abb37fc8738c3a1a5bb9789b90
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed Feb  7 23:37:34 2024 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Wed Feb  7 23:37:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=514d2ce5

games-emulation/dosbox-x: Ensure dep for file dialog is present

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 ....10.06.ebuild => dosbox-x-2023.10.06-r1.ebuild} | 24 +++++++++++++++++++---
 games-emulation/dosbox-x/dosbox-x-9999.ebuild      | 24 +++++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-2023.10.06.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.10.06-r1.ebuild
similarity index 92%
rename from games-emulation/dosbox-x/dosbox-x-2023.10.06.ebuild
rename to games-emulation/dosbox-x/dosbox-x-2023.10.06-r1.ebuild
index 4c4100a93f..3a9d16acc2 100644
--- a/games-emulation/dosbox-x/dosbox-x-2023.10.06.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2023.10.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ BDEPEND="
 # 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="
+COMMON_DEPEND="
 	media-libs/alsa-lib
 	media-libs/libsdl2[X,alsa,opengl?,sound,threads,video]
 	media-libs/sdl2-net
@@ -68,7 +68,25 @@ RDEPEND="
 "
 
 DEPEND="
-	${RDEPEND}
+	${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() {

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 4c4100a93f..3a9d16acc2 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ BDEPEND="
 # 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="
+COMMON_DEPEND="
 	media-libs/alsa-lib
 	media-libs/libsdl2[X,alsa,opengl?,sound,threads,video]
 	media-libs/sdl2-net
@@ -68,7 +68,25 @@ RDEPEND="
 "
 
 DEPEND="
-	${RDEPEND}
+	${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() {


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-11-07 13:49 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-11-07 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     695f0106e42584f48193900450613d46443be55b
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Nov  7 13:41:01 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Tue Nov  7 13:41:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=695f0106

games-emulation/dosbox-x: Drop 2023.09.01

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 -
 .../dosbox-x/dosbox-x-2023.09.01.ebuild            | 197 ---------------------
 2 files changed, 198 deletions(-)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index b4fdb9065c..2c97267c41 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1,2 +1 @@
-DIST dosbox-x-v2023.09.01.tar.gz 70214880 BLAKE2B 4087360de329b093863c111d46fb0138c7d5f018f55de651e1646981f2b6adce39420b94343338969059712b069be3d37b09dab9a737f17ff6c57042626b2df8 SHA512 282363a395b47da70f007666f3878ee19136e0b46ad908fd46b227a71d8a58843f44b83ad22700e3a41c528b5b406c51b80f1679b9164d83172e7bef06a62d9b
 DIST dosbox-x-v2023.10.06.tar.gz 119420489 BLAKE2B dca4d6c6639e9121d8b88843a04ffabd552d10614d36508996eeb99323b32f912c8e9673baf4e2f29d7cb280aba745c330170e209a9ab0a7befa0be231ca1cc9 SHA512 906907d0eb1c8b0c0646c82aeefca6457ba6a6e72044c6343cd334ccef6e6c6298d63405f24281a56d9eaf4c1073c141311063ea9d5a420abad8302cbab7ec21

diff --git a/games-emulation/dosbox-x/dosbox-x-2023.09.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.09.01.ebuild
deleted file mode 100644
index 4c4100a93f..0000000000
--- a/games-emulation/dosbox-x/dosbox-x-2023.09.01.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 2022-2023 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.
-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:= )
-	opengl? ( media-libs/libglvnd[X] )
-	png? ( media-libs/libpng:= )
-	slirp? ( net-libs/libslirp )
-	truetype? ( media-libs/freetype )
-"
-
-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 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
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-10-07 14:26 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-10-07 14:26 UTC (permalink / raw
  To: gentoo-commits

commit:     0cc46571a5603696a7227567d08d5bd905d3d108
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Oct  7 14:26:42 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Sat Oct  7 14:26:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0cc46571

games-emulation/dosbox-x: Add 2023.10.06

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 .../dosbox-x/dosbox-x-2023.10.06.ebuild            | 197 +++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index b312912d88..b4fdb9065c 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
 DIST dosbox-x-v2023.09.01.tar.gz 70214880 BLAKE2B 4087360de329b093863c111d46fb0138c7d5f018f55de651e1646981f2b6adce39420b94343338969059712b069be3d37b09dab9a737f17ff6c57042626b2df8 SHA512 282363a395b47da70f007666f3878ee19136e0b46ad908fd46b227a71d8a58843f44b83ad22700e3a41c528b5b406c51b80f1679b9164d83172e7bef06a62d9b
+DIST dosbox-x-v2023.10.06.tar.gz 119420489 BLAKE2B dca4d6c6639e9121d8b88843a04ffabd552d10614d36508996eeb99323b32f912c8e9673baf4e2f29d7cb280aba745c330170e209a9ab0a7befa0be231ca1cc9 SHA512 906907d0eb1c8b0c0646c82aeefca6457ba6a6e72044c6343cd334ccef6e6c6298d63405f24281a56d9eaf4c1073c141311063ea9d5a420abad8302cbab7ec21

diff --git a/games-emulation/dosbox-x/dosbox-x-2023.10.06.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.10.06.ebuild
new file mode 100644
index 0000000000..4c4100a93f
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2023.10.06.ebuild
@@ -0,0 +1,197 @@
+# Copyright 2022-2023 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.
+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:= )
+	opengl? ( media-libs/libglvnd[X] )
+	png? ( media-libs/libpng:= )
+	slirp? ( net-libs/libslirp )
+	truetype? ( media-libs/freetype )
+"
+
+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 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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-10-07 14:26 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-10-07 14:26 UTC (permalink / raw
  To: gentoo-commits

commit:     2d4a0bfbe9cc81cf920e92931b48e79cea04dce5
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Oct  7 14:09:41 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Sat Oct  7 14:09:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2d4a0bfb

games-emulation/dosbox-x: Drop 2023.05.01

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 -
 .../dosbox-x/dosbox-x-2023.05.01.ebuild            | 197 ---------------------
 2 files changed, 198 deletions(-)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 5ecdad5259..b312912d88 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1,2 +1 @@
-DIST dosbox-x-v2023.05.01.tar.gz 68071717 BLAKE2B ce03956b9efc3c4470ee811e3062fe66d727946d8355f2a3de42260c21c499cb03cc5079e6a6c9883fdbae48c3b4f7d30dd702834150e2121e6549189a02d082 SHA512 2fd1022aff0a5468321f02a611927f5e33b19a87efaca0c298e83fed736379cc1fbe96b05ce61d997fa19b5cc6de95b4bc4697fe3a0ba761e7eea30cb6da4455
 DIST dosbox-x-v2023.09.01.tar.gz 70214880 BLAKE2B 4087360de329b093863c111d46fb0138c7d5f018f55de651e1646981f2b6adce39420b94343338969059712b069be3d37b09dab9a737f17ff6c57042626b2df8 SHA512 282363a395b47da70f007666f3878ee19136e0b46ad908fd46b227a71d8a58843f44b83ad22700e3a41c528b5b406c51b80f1679b9164d83172e7bef06a62d9b

diff --git a/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild
deleted file mode 100644
index 4c4100a93f..0000000000
--- a/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 2022-2023 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.
-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:= )
-	opengl? ( media-libs/libglvnd[X] )
-	png? ( media-libs/libpng:= )
-	slirp? ( net-libs/libslirp )
-	truetype? ( media-libs/freetype )
-"
-
-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 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
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-09-02 14:18 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-09-02 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     2e420d3b873f9210f2b98cd42a9bf6fc15a9be4a
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Sep  2 14:09:05 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Sat Sep  2 14:09:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2e420d3b

games-emulation/dosbox-x: Add 2023.09.01

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 .../dosbox-x/dosbox-x-2023.09.01.ebuild            | 197 +++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index b6cd02f784..5ecdad5259 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
 DIST dosbox-x-v2023.05.01.tar.gz 68071717 BLAKE2B ce03956b9efc3c4470ee811e3062fe66d727946d8355f2a3de42260c21c499cb03cc5079e6a6c9883fdbae48c3b4f7d30dd702834150e2121e6549189a02d082 SHA512 2fd1022aff0a5468321f02a611927f5e33b19a87efaca0c298e83fed736379cc1fbe96b05ce61d997fa19b5cc6de95b4bc4697fe3a0ba761e7eea30cb6da4455
+DIST dosbox-x-v2023.09.01.tar.gz 70214880 BLAKE2B 4087360de329b093863c111d46fb0138c7d5f018f55de651e1646981f2b6adce39420b94343338969059712b069be3d37b09dab9a737f17ff6c57042626b2df8 SHA512 282363a395b47da70f007666f3878ee19136e0b46ad908fd46b227a71d8a58843f44b83ad22700e3a41c528b5b406c51b80f1679b9164d83172e7bef06a62d9b

diff --git a/games-emulation/dosbox-x/dosbox-x-2023.09.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.09.01.ebuild
new file mode 100644
index 0000000000..4c4100a93f
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2023.09.01.ebuild
@@ -0,0 +1,197 @@
+# Copyright 2022-2023 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.
+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:= )
+	opengl? ( media-libs/libglvnd[X] )
+	png? ( media-libs/libpng:= )
+	slirp? ( net-libs/libslirp )
+	truetype? ( media-libs/freetype )
+"
+
+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 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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-08-19 17:29 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-08-19 17:29 UTC (permalink / raw
  To: gentoo-commits

commit:     8bd80372a6c1b4b03140b3833976846501e27b57
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Aug 19 17:18:19 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Sat Aug 19 17:18:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8bd80372

games-emulation/dosbox-x: Change `freetype` USE flag to `truetype`

`truetype` is a global USE flag, which is more preferable.

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild | 6 +++---
 games-emulation/dosbox-x/dosbox-x-9999.ebuild       | 6 +++---
 games-emulation/dosbox-x/metadata.xml               | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild
index f5c74e3b75..4c4100a93f 100644
--- a/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://dosbox-x.com/"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="X debug ffmpeg fluidsynth freetype opengl png slirp"
+IUSE="X debug ffmpeg fluidsynth opengl png slirp truetype"
 # Unit tests are only available in debug builds
 RESTRICT="!debug? ( test )"
 
@@ -61,10 +61,10 @@ RDEPEND="
 	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 )
+	truetype? ( media-libs/freetype )
 "
 
 DEPEND="
@@ -118,10 +118,10 @@ src_configure() {
 		$(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)
+		$(use_enable truetype freetype)
 	)
 
 	econf "${myconf[@]}"

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index f5c74e3b75..4c4100a93f 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://dosbox-x.com/"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="X debug ffmpeg fluidsynth freetype opengl png slirp"
+IUSE="X debug ffmpeg fluidsynth opengl png slirp truetype"
 # Unit tests are only available in debug builds
 RESTRICT="!debug? ( test )"
 
@@ -61,10 +61,10 @@ RDEPEND="
 	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 )
+	truetype? ( media-libs/freetype )
 "
 
 DEPEND="
@@ -118,10 +118,10 @@ src_configure() {
 		$(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)
+		$(use_enable truetype freetype)
 	)
 
 	econf "${myconf[@]}"

diff --git a/games-emulation/dosbox-x/metadata.xml b/games-emulation/dosbox-x/metadata.xml
index cdbdb12b16..c13d207aed 100644
--- a/games-emulation/dosbox-x/metadata.xml
+++ b/games-emulation/dosbox-x/metadata.xml
@@ -40,10 +40,6 @@
 		<flag name="fluidsynth">
 			Enable FluidSynth to be used as the MIDI synthesizer
 		</flag>
-		<flag name="freetype">
-			Enable TrueType font (TTF) output and printing support
-			via <pkg>media-libs/freetype</pkg>
-		</flag>
 		<flag name="opengl">
 			Enable OpenGL as a video system to use for output
 		</flag>
@@ -54,5 +50,9 @@
 		<flag name="slirp">
 			Enable the SLIRP back-end for network adapter emulation
 		</flag>
+		<flag name="truetype">
+			Enable TrueType font (TTF) output and printing support
+			via <pkg>media-libs/freetype</pkg>
+		</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-06-02  1:26 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-06-02  1:26 UTC (permalink / raw
  To: gentoo-commits

commit:     a589c0117707a28fcc8249cb8f32017e8bd62ed6
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Fri Jun  2 01:25:37 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Fri Jun  2 01:25:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a589c011

games-emulation/dosbox-x: Drop 2023.03.31

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 -
 .../dosbox-x/dosbox-x-2023.03.31.ebuild            | 197 ---------------------
 2 files changed, 198 deletions(-)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 019ac1981..b6cd02f78 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1,2 +1 @@
-DIST dosbox-x-v2023.03.31.tar.gz 67926579 BLAKE2B d5668bfed2fb05f93364cc0b0886716f919666ce3743d6bd371f55ea280848fc880067d6e2c6b327be606a44e5518ffb0e3c140774ed29a169ddaa9e1da8136c SHA512 376901f7795ba3f98af6b4cb8afc52298065c96e58be3db285dce81f5eb82455a7e7dac00d170aa54a7f83183dae71c7e6951494480cb726239bc22313790733
 DIST dosbox-x-v2023.05.01.tar.gz 68071717 BLAKE2B ce03956b9efc3c4470ee811e3062fe66d727946d8355f2a3de42260c21c499cb03cc5079e6a6c9883fdbae48c3b4f7d30dd702834150e2121e6549189a02d082 SHA512 2fd1022aff0a5468321f02a611927f5e33b19a87efaca0c298e83fed736379cc1fbe96b05ce61d997fa19b5cc6de95b4bc4697fe3a0ba761e7eea30cb6da4455

diff --git a/games-emulation/dosbox-x/dosbox-x-2023.03.31.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.03.31.ebuild
deleted file mode 100644
index f5c74e3b7..000000000
--- a/games-emulation/dosbox-x/dosbox-x-2023.03.31.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 2022-2023 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
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-05-03  1:03 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-05-03  1:03 UTC (permalink / raw
  To: gentoo-commits

commit:     db1d43aa490ca328ce7c53f19aaaca1974de239a
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed May  3 00:50:43 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Wed May  3 00:50:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=db1d43aa

games-emulation/dosbox-x: Add 2023.05.01

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 .../dosbox-x/dosbox-x-2023.05.01.ebuild            | 197 +++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 906992a36..019ac1981 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
 DIST dosbox-x-v2023.03.31.tar.gz 67926579 BLAKE2B d5668bfed2fb05f93364cc0b0886716f919666ce3743d6bd371f55ea280848fc880067d6e2c6b327be606a44e5518ffb0e3c140774ed29a169ddaa9e1da8136c SHA512 376901f7795ba3f98af6b4cb8afc52298065c96e58be3db285dce81f5eb82455a7e7dac00d170aa54a7f83183dae71c7e6951494480cb726239bc22313790733
+DIST dosbox-x-v2023.05.01.tar.gz 68071717 BLAKE2B ce03956b9efc3c4470ee811e3062fe66d727946d8355f2a3de42260c21c499cb03cc5079e6a6c9883fdbae48c3b4f7d30dd702834150e2121e6549189a02d082 SHA512 2fd1022aff0a5468321f02a611927f5e33b19a87efaca0c298e83fed736379cc1fbe96b05ce61d997fa19b5cc6de95b4bc4697fe3a0ba761e7eea30cb6da4455

diff --git a/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild
new file mode 100644
index 000000000..f5c74e3b7
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2023.05.01.ebuild
@@ -0,0 +1,197 @@
+# Copyright 2022-2023 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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-05-03  1:03 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-05-03  1:03 UTC (permalink / raw
  To: gentoo-commits

commit:     47268339043ca47d6ac3f4f1a410637263de0cbd
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed May  3 00:11:52 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> 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 <liaoyuan <AT> 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
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-04-01 16:55 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-04-01 16:55 UTC (permalink / raw
  To: gentoo-commits

commit:     01bd1151ad1f6c8ccf811c531dc2dd20f3e114ad
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Apr  1 16:49:31 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Sat Apr  1 16:49:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=01bd1151

games-emulation/dosbox-x: Update copyright year in live ebuild

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 688fc4f58..f5c74e3b7 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-04-01 16:55 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-04-01 16:55 UTC (permalink / raw
  To: gentoo-commits

commit:     31347df0ea767ef2931f03b9d815bc5fce18e349
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Apr  1 16:50:02 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Sat Apr  1 16:50:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=31347df0

games-emulation/dosbox-x: Add 2023.03.31

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 .../dosbox-x/dosbox-x-2023.03.31.ebuild            | 197 +++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 787d6cf30..eaef75815 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
 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-2023.03.31.ebuild b/games-emulation/dosbox-x/dosbox-x-2023.03.31.ebuild
new file mode 100644
index 000000000..f5c74e3b7
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2023.03.31.ebuild
@@ -0,0 +1,197 @@
+# Copyright 2022-2023 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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2023-03-15 20:26 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2023-03-15 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     e55cf39750ddcb46926c182f35710c9556db75a2
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed Mar 15 19:03:20 2023 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Wed Mar 15 20:22:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e55cf397

games-emulation/dosbox-x: Always depend on media-libs/libsdl2[alsa]

Closes: https://bugs.gentoo.org/901303
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 .../{dosbox-x-2022.12.26.ebuild => dosbox-x-2022.12.26-r1.ebuild}  | 7 ++++++-
 games-emulation/dosbox-x/dosbox-x-9999.ebuild                      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.12.26.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.12.26-r1.ebuild
similarity index 94%
rename from games-emulation/dosbox-x/dosbox-x-2022.12.26.ebuild
rename to games-emulation/dosbox-x/dosbox-x-2022.12.26-r1.ebuild
index 065a583ee..688fc4f58 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.12.26.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.12.26-r1.ebuild
@@ -42,9 +42,14 @@ BDEPEND="
 # 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,opengl?,sound,threads,video]
+	media-libs/libsdl2[X,alsa,opengl?,sound,threads,video]
 	media-libs/sdl2-net
 	net-libs/libpcap
 	sys-libs/zlib

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 065a583ee..688fc4f58 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -42,9 +42,14 @@ BDEPEND="
 # 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,opengl?,sound,threads,video]
+	media-libs/libsdl2[X,alsa,opengl?,sound,threads,video]
 	media-libs/sdl2-net
 	net-libs/libpcap
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-12-27  6:24 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-12-27  6:24 UTC (permalink / raw
  To: gentoo-commits

commit:     77c69ab2dd63de0e2cc1b3a8c52f5b45238d14c0
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Dec 27 06:21:48 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Tue Dec 27 06:21:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=77c69ab2

games-emulation/dosbox-x: Add 2022.12.26

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 .../dosbox-x/dosbox-x-2022.12.26.ebuild            | 192 +++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 753e294ae..50af68e75 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1,2 +1,3 @@
 DIST dosbox-x-2022.09.1_pre20221210.tar.gz 67879960 BLAKE2B f6a6dc0bea3a56577088ee632b17b74489ede8b9cbcd51328c709a6f9bf301a301dff853acab5cb3786aff4c94a2f180e98bfe828cc2d1255a7f7edad29b9f41 SHA512 b5d996611e28e86f7ad45d09bbdcbaf161faec572f3192f034e5acead8014ba2f7f3c3a12e6fc9a5e49742cc08b3f3c4272568491322e7d400a511ce65dbd042
+DIST dosbox-x-v2022.12.26.tar.gz 67886370 BLAKE2B a748c18bd51833f8532ee76cf30c1bed994458acf56f36be3207c9714678f8e1b4c4fb130aeaa54d5cac39f60484b6aa12a4d59fcd8ce1a7ddbb5d98cede9df7 SHA512 18895a3cd9b46a226490f4eda160b92f80e6a9022d22cc192cbf8ddea93803d72b658e9d88ebc3163b93d214389e74f67193e8aac37bf58f7068a1daf68dd550
 DIST dosbox-x-windows-v2022.08.0.tar.gz 67809452 BLAKE2B d0d8c6b6b328b363ea939de93e920ce33b260f4f986be50028c4a2e188c292be38c256bed7b0d6e052bf2b74600ece662f05b16943e90fbd44e48e2c6b4bc3cc SHA512 d11b907ff99e8599b454dc5979055dd85a64215913cb905c66d534930ce31afaab14d04169450eef5cb286c65933159f44be6cecad6adf6c7adad1a249758d7b

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.12.26.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.12.26.ebuild
new file mode 100644
index 000000000..065a583ee
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2022.12.26.ebuild
@@ -0,0 +1,192 @@
+# 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.
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/libsdl2[X,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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-12-27  6:24 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-12-27  6:24 UTC (permalink / raw
  To: gentoo-commits

commit:     1bbe30bbd093369cdd7d626ad8c27827d3f6783b
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Dec 27 05:57:37 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Tue Dec 27 06:12:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1bbe30bb

games-emulation/dosbox-x: Revert changes for rolling release adoption

This reverts commit b8194cde46d4fb966090f5291ca21d88dcfd9a46.

The upstream has just made a new release after I started to believe that
they had ditched tagged releases.  Who knows what will happen next...

Not revision-bumping the 2022.09.1_pre20221210 ebuild because there is
just a trivial documentation change for it; existing users of this
package will likely update to a new version soon.

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 .../dosbox-x/dosbox-x-2022.08.0-r1.ebuild          |  2 --
 .../dosbox-x-2022.09.1_pre20221210-r1.ebuild       |  3 +--
 games-emulation/dosbox-x/dosbox-x-9999.ebuild      | 26 +++-------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
index d05ffb418..5956244b0 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Note: This is the last release (non-pre-release) tagged by upstream
-
 EAPI=8
 
 inherit autotools toolchain-funcs xdg

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild
index f489f2b6b..3e9516b1f 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild
@@ -12,8 +12,7 @@ else
 	# https://github.com/joncampbell123/dosbox-x/discussions/3862
 	GIT_COMMIT="982c44176e7619ae2a40b5c5d8df31f2911384da"
 	DOC_CONTENTS="
-		DOSBox-X upstream has stopped making releases.  Therefore, this
-		package has installed a copy of DOSBox-X built from an upstream
+		This package has installed a copy of DOSBox-X built from an upstream
 		repository snapshot at the following Git commit:\n
 		\n
 		${GIT_COMMIT}

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 1b813f7ff..065a583ee 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -3,24 +3,14 @@
 
 EAPI=8
 
-inherit autotools readme.gentoo-r1 toolchain-funcs xdg
+inherit autotools toolchain-funcs xdg
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git"
 else
-	# https://github.com/joncampbell123/dosbox-x/discussions/3862
-	GIT_COMMIT=""
-	DOC_CONTENTS="
-		DOSBox-X upstream has stopped making releases.  Therefore, this
-		package has installed a copy of DOSBox-X built from an upstream
-		repository snapshot at the following Git commit:\n
-		\n
-		${GIT_COMMIT}
-	"
-
-	SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+	SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-v${PV}"
 	KEYWORDS="~amd64"
 fi
 
@@ -143,11 +133,6 @@ src_test() {
 	"${@}" || die "Unit tests failed"
 }
 
-src_install() {
-	default
-	[[ -n "${DOC_CONTENTS}" ]] && readme.gentoo_create_doc
-}
-
 pkg_preinst() {
 	xdg_pkg_preinst
 
@@ -170,11 +155,6 @@ pkg_preinst() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if ! has "${PVR}" ${REPLACING_VERSIONS} && [[ -n "${DOC_CONTENTS}" ]]; then
-		FORCE_PRINT_ELOG=1
-		readme.gentoo_print_elog
-	fi
-
 	if [[ "${PRINT_NOTES_FOR_DEBUGGER}" ]]; then
 		elog
 		elog "Note on the Debugger"


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-12-26 17:19 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-12-26 17:19 UTC (permalink / raw
  To: gentoo-commits

commit:     4889f43448320722c9181cc1d0d252dab1187387
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Mon Dec 26 17:04:44 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Mon Dec 26 17:13:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4889f434

games-emulation/dosbox-x: Simplify sed script for configure.ac

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild             | 6 +++---
 games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild | 6 +++---
 games-emulation/dosbox-x/dosbox-x-9999.ebuild                     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
index d208c6afb..d05ffb418 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild
@@ -89,9 +89,9 @@ src_prepare() {
 	default
 
 	# https://bugs.gentoo.org/887669
-	# Comment out 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/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac ||
+	# 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"
 
 	# Patch command lines like the following in Makefile.am:

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild
index 9af962aef..f489f2b6b 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild
@@ -90,9 +90,9 @@ src_prepare() {
 	default
 
 	# https://bugs.gentoo.org/887669
-	# Comment out 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/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac ||
+	# 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

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 39ecd4c1c..1b813f7ff 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -90,9 +90,9 @@ src_prepare() {
 	default
 
 	# https://bugs.gentoo.org/887669
-	# Comment out 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/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac ||
+	# 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


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-12-14 17:23 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-12-14 17:23 UTC (permalink / raw
  To: gentoo-commits

commit:     b8194cde46d4fb966090f5291ca21d88dcfd9a46
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed Dec 14 16:27:10 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Wed Dec 14 17:18:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b8194cde

games-emulation/dosbox-x: Update for upstream's rolling release adoption

Without a clear explanation, the upstream of this package has stopped
tagging releases and willy-nilly switched to "continuously built"
"nightly builds" (a.k.a. prone-to-break-on-any-day binaries put for user
downloads at an obscure place).  To allow Gentoo users to use recent
versions of this package without having to resort to the live ebuild, we
have no choice other than to make new non-live ebuilds based on GitHub
snapshot tarballs from now on.

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild |  2 ++
 games-emulation/dosbox-x/dosbox-x-9999.ebuild      | 26 +++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
index 396f0023f..473948a53 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Note: This is the last release (non-pre-release) tagged by upstream
+
 EAPI=8
 
 inherit autotools flag-o-matic toolchain-funcs xdg

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index fba8467c0..e2738549f 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -3,14 +3,24 @@
 
 EAPI=8
 
-inherit autotools toolchain-funcs xdg
+inherit autotools readme.gentoo-r1 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-windows-v${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-windows-v${PV}"
+	# https://github.com/joncampbell123/dosbox-x/discussions/3862
+	GIT_COMMIT=""
+	DOC_CONTENTS="
+		DOSBox-X upstream has stopped making releases.  Therefore, this
+		package has installed a copy of DOSBox-X built from an upstream
+		repository snapshot at the following Git commit:\n
+		\n
+		${GIT_COMMIT}
+	"
+
+	SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 	KEYWORDS="~amd64"
 fi
 
@@ -126,6 +136,11 @@ src_test() {
 	"${@}" || die "Unit tests failed"
 }
 
+src_install() {
+	default
+	[[ -n "${DOC_CONTENTS}" ]] && readme.gentoo_create_doc
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 
@@ -148,6 +163,11 @@ pkg_preinst() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
+	if ! has "${PVR}" ${REPLACING_VERSIONS} && [[ -n "${DOC_CONTENTS}" ]]; then
+		FORCE_PRINT_ELOG=1
+		readme.gentoo_print_elog
+	fi
+
 	if [[ "${PRINT_NOTES_FOR_DEBUGGER}" ]]; then
 		elog
 		elog "Note on the Debugger"


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-12-14 17:23 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-12-14 17:23 UTC (permalink / raw
  To: gentoo-commits

commit:     1d02a77abccac38ce8b77682cbf05b1aba843e5c
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed Dec 14 17:03:17 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Wed Dec 14 17:18:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1d02a77a

games-emulation/dosbox-x: Add 2022.09.1_pre20221210

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 .../dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild | 205 +++++++++++++++++++++
 2 files changed, 206 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index 150dfe080..753e294ae 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
+DIST dosbox-x-2022.09.1_pre20221210.tar.gz 67879960 BLAKE2B f6a6dc0bea3a56577088ee632b17b74489ede8b9cbcd51328c709a6f9bf301a301dff853acab5cb3786aff4c94a2f180e98bfe828cc2d1255a7f7edad29b9f41 SHA512 b5d996611e28e86f7ad45d09bbdcbaf161faec572f3192f034e5acead8014ba2f7f3c3a12e6fc9a5e49742cc08b3f3c4272568491322e7d400a511ce65dbd042
 DIST dosbox-x-windows-v2022.08.0.tar.gz 67809452 BLAKE2B d0d8c6b6b328b363ea939de93e920ce33b260f4f986be50028c4a2e188c292be38c256bed7b0d6e052bf2b74600ece662f05b16943e90fbd44e48e2c6b4bc3cc SHA512 d11b907ff99e8599b454dc5979055dd85a64215913cb905c66d534930ce31afaab14d04169450eef5cb286c65933159f44be6cecad6adf6c7adad1a249758d7b

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild
new file mode 100644
index 000000000..49f4ea171
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild
@@ -0,0 +1,205 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1 toolchain-funcs xdg
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git"
+else
+	# https://github.com/joncampbell123/dosbox-x/discussions/3862
+	GIT_COMMIT="982c44176e7619ae2a40b5c5d8df31f2911384da"
+	DOC_CONTENTS="
+		DOSBox-X upstream has stopped making releases.  Therefore, this
+		package has installed a copy of DOSBox-X built from an upstream
+		repository snapshot at the following Git commit:\n
+		\n
+		${GIT_COMMIT}
+	"
+
+	SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+	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.
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/libsdl2[X,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
+	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"
+}
+
+src_install() {
+	default
+	[[ -n "${DOC_CONTENTS}" ]] && readme.gentoo_create_doc
+}
+
+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 ! has "${PVR}" ${REPLACING_VERSIONS} && [[ -n "${DOC_CONTENTS}" ]]; then
+		FORCE_PRINT_ELOG=1
+		readme.gentoo_print_elog
+	fi
+
+	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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-12-05 18:29 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-12-05 18:29 UTC (permalink / raw
  To: gentoo-commits

commit:     b010132352bb0f511b673b208ce080af29023b9a
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Mon Dec  5 18:01:05 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Mon Dec  5 18:01:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b0101323

games-emulation/dosbox-x: Enable unit tests

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild | 8 ++++++++
 games-emulation/dosbox-x/dosbox-x-9999.ebuild      | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
index 55b6b1acc..396f0023f 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
@@ -25,6 +25,8 @@ 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
@@ -151,6 +153,12 @@ src_compile() {
 	emake AR="$(tc-getAR)"
 }
 
+src_test() {
+	set -- src/dosbox-x -tests
+	echo "${@}" >&2
+	"${@}" || die "Unit tests failed"
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 3fb2d9f29..fba8467c0 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -25,6 +25,8 @@ 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
@@ -118,6 +120,12 @@ src_compile() {
 	emake AR="$(tc-getAR)"
 }
 
+src_test() {
+	set -- src/dosbox-x -tests
+	echo "${@}" >&2
+	"${@}" || die "Unit tests failed"
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-10-06 16:54 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-10-06 16:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d4052f4cc1416e95155bdace0e6e3b11976d3ec8
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Thu Oct  6 16:43:30 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Thu Oct  6 16:43:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d4052f4c

games-emulation/dosbox-x: Sync live ebuild

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-9999.ebuild | 28 ---------------------------
 1 file changed, 28 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 8605437e9..3fb2d9f29 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -76,39 +76,11 @@ pkg_pretend() {
 
 src_prepare() {
 	default
-
-	# Patch command lines like the following in Makefile.am:
-	#   -test -x /usr/sbin/setcap && setcap cap_net_raw=ep $(DESTDIR)$(bindir)/dosbox-x
-	#
-	# The purpose of these commands is, if the 'setcap' program exists and is
-	# executable, then invoke it to set capabilities required by the PCAP
-	# networking back-end for better out-of-box user experience; otherwise,
-	# ignore unsatisfied preconditions or 'setcap' errors since they are not
-	# critical, which is achieved by having a '-' in front of each line.
-	#
-	# Unfortunately, 'test -x /usr/sbin/setcap' does not always work as
-	# expected on Gentoo because it ignores the fact that some distributions,
-	# including Gentoo, may still have split /sbin and /usr/sbin and install
-	# 'setcap' to /sbin.
-	#
-	# As long as sys-libs/libcap is declared in BDEPEND of this ebuild, the
-	# availability of 'setcap' can be assumed, rendering the test redundant.
-	# However, successfully setting capabilities via 'setcap' usually requires
-	# the root account (which is not guaranteed on Prefix) and xattr support
-	# for the file system being used, so the '-' in front of each line is
-	# preserved to tolerate the expected 'setcap' failures.
-	sed -i -e 's|test -x /usr/sbin/setcap && ||' Makefile.am ||
-		die "Failed to remove check for setcap in Makefile.am"
-
 	eautoreconf
 }
 
 src_configure() {
 	local myconf=(
-		# --disable-core-inline could cause compiler errors
-		# as of v2022.08.0, so enable it unconditionally
-		--enable-core-inline
-
 		# 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


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-09-07 14:55 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-09-07 14:55 UTC (permalink / raw
  To: gentoo-commits

commit:     dcc517c60cca527a2d32569575032e00875fac1f
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed Sep  7 14:49:13 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Wed Sep  7 14:49:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dcc517c6

games-emulation/dosbox-x: Unfilter LTO flags for latest Git revisions

The upstream has fixed the LTO build failure.

Bug: https://bugs.gentoo.org/859973
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-9999.ebuild | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 55b6b1acc..8605437e9 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic toolchain-funcs xdg
+inherit autotools toolchain-funcs xdg
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -101,11 +101,6 @@ src_prepare() {
 		die "Failed to remove check for setcap in Makefile.am"
 
 	eautoreconf
-
-	# https://bugs.gentoo.org/859973
-	# https://github.com/joncampbell123/dosbox-x/issues/3663
-	# No upstream response regarding LTO yet; disable it for now
-	filter-lto
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-08-23 20:07 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-08-23 20:07 UTC (permalink / raw
  To: gentoo-commits

commit:     d1ff3cc3ee1e50e94bf9b49660c515d27a3a15de
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 19:57:43 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Tue Aug 23 19:58:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d1ff3cc3

games-emulation/dosbox-x: Filter LTO flags

Closes: https://bugs.gentoo.org/859973
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild    | 7 ++++++-
 games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild | 7 ++++++-
 games-emulation/dosbox-x/dosbox-x-9999.ebuild      | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild b/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild
index bc26e3bdb..55c5d316c 100644
--- a/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools toolchain-funcs xdg
+inherit autotools flag-o-matic toolchain-funcs xdg
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -106,6 +106,11 @@ src_prepare() {
 		die "Failed to remove check for setcap in Makefile.am"
 
 	eautoreconf
+
+	# https://bugs.gentoo.org/859973
+	# https://github.com/joncampbell123/dosbox-x/issues/3663
+	# No upstream response regarding LTO yet; disable it for now
+	filter-lto
 }
 
 src_configure() {

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
index 8605437e9..55b6b1acc 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools toolchain-funcs xdg
+inherit autotools flag-o-matic toolchain-funcs xdg
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -101,6 +101,11 @@ src_prepare() {
 		die "Failed to remove check for setcap in Makefile.am"
 
 	eautoreconf
+
+	# https://bugs.gentoo.org/859973
+	# https://github.com/joncampbell123/dosbox-x/issues/3663
+	# No upstream response regarding LTO yet; disable it for now
+	filter-lto
 }
 
 src_configure() {

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 8605437e9..55b6b1acc 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools toolchain-funcs xdg
+inherit autotools flag-o-matic toolchain-funcs xdg
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -101,6 +101,11 @@ src_prepare() {
 		die "Failed to remove check for setcap in Makefile.am"
 
 	eautoreconf
+
+	# https://bugs.gentoo.org/859973
+	# https://github.com/joncampbell123/dosbox-x/issues/3663
+	# No upstream response regarding LTO yet; disable it for now
+	filter-lto
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-08-02  0:27 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-08-02  0:27 UTC (permalink / raw
  To: gentoo-commits

commit:     fb061079aed4b1b1405c38f3ec3cd47b22b8fd8c
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Aug  2 00:07:25 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Tue Aug  2 00:17:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb061079

games-emulation/dosbox-x: Add 2022.08.0

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/Manifest                  |   1 +
 games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild | 205 +++++++++++++++++++++
 2 files changed, 206 insertions(+)

diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest
index b6ecb3b67..8727cde70 100644
--- a/games-emulation/dosbox-x/Manifest
+++ b/games-emulation/dosbox-x/Manifest
@@ -1 +1,2 @@
 DIST dosbox-x-v0.84.1.tar.gz 67617800 BLAKE2B b7a93ac662d987f99884078fa8a2b566c8aef691861cd8b8270698470cef70e352616970e46439664eedb37b11f673a3cf7d253e45ed756e28740dd06080fffc SHA512 2104352f5756fa394c6a38f6b82694e4b17878b87d64cb67aeeb8ef9f9cf12cadfc8cd23b4626bbb59b8f0657ae6747633ac80016df511b7d9612245b32d21ca
+DIST dosbox-x-windows-v2022.08.0.tar.gz 67809452 BLAKE2B d0d8c6b6b328b363ea939de93e920ce33b260f4f986be50028c4a2e188c292be38c256bed7b0d6e052bf2b74600ece662f05b16943e90fbd44e48e2c6b4bc3cc SHA512 d11b907ff99e8599b454dc5979055dd85a64215913cb905c66d534930ce31afaab14d04169450eef5cb286c65933159f44be6cecad6adf6c7adad1a249758d7b

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
new file mode 100644
index 000000000..8605437e9
--- /dev/null
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
@@ -0,0 +1,205 @@
+# 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-windows-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-windows-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"
+
+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.
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/libsdl2[X,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
+
+	# Patch command lines like the following in Makefile.am:
+	#   -test -x /usr/sbin/setcap && setcap cap_net_raw=ep $(DESTDIR)$(bindir)/dosbox-x
+	#
+	# The purpose of these commands is, if the 'setcap' program exists and is
+	# executable, then invoke it to set capabilities required by the PCAP
+	# networking back-end for better out-of-box user experience; otherwise,
+	# ignore unsatisfied preconditions or 'setcap' errors since they are not
+	# critical, which is achieved by having a '-' in front of each line.
+	#
+	# Unfortunately, 'test -x /usr/sbin/setcap' does not always work as
+	# expected on Gentoo because it ignores the fact that some distributions,
+	# including Gentoo, may still have split /sbin and /usr/sbin and install
+	# 'setcap' to /sbin.
+	#
+	# As long as sys-libs/libcap is declared in BDEPEND of this ebuild, the
+	# availability of 'setcap' can be assumed, rendering the test redundant.
+	# However, successfully setting capabilities via 'setcap' usually requires
+	# the root account (which is not guaranteed on Prefix) and xattr support
+	# for the file system being used, so the '-' in front of each line is
+	# preserved to tolerate the expected 'setcap' failures.
+	sed -i -e 's|test -x /usr/sbin/setcap && ||' Makefile.am ||
+		die "Failed to remove check for setcap in Makefile.am"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# --disable-core-inline could cause compiler errors
+		# as of v2022.08.0, so enable it unconditionally
+		--enable-core-inline
+
+		# 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)"
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-08-02  0:27 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-08-02  0:27 UTC (permalink / raw
  To: gentoo-commits

commit:     dc6f7122c02df39b7ddeb4483cc61ee5ab3f629f
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Aug  2 00:22:54 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Tue Aug  2 00:22:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dc6f7122

games-emulation/dosbox-x: Sync live ebuild

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 052e563f5..8605437e9 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -9,8 +9,8 @@ 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}"
+	SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-windows-v${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-windows-v${PV}"
 	KEYWORDS="~amd64"
 fi
 
@@ -106,7 +106,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		# --disable-core-inline could cause compiler errors
-		# as of v0.84.1, so enable it unconditionally
+		# as of v2022.08.0, so enable it unconditionally
 		--enable-core-inline
 
 		# Always use SDL 2, even though the package provides the option to
@@ -118,7 +118,7 @@ src_configure() {
 		--enable-sdl2
 
 		# Explicitly enable ALSA MIDI support, same as default.  As of
-		# v0.84.1, even when it is disabled, media-libs/alsa-lib will
+		# 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


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/
@ 2022-07-04 16:10 Yuan Liao
  0 siblings, 0 replies; 31+ messages in thread
From: Yuan Liao @ 2022-07-04 16:10 UTC (permalink / raw
  To: gentoo-commits

commit:     69b445fb0adf73818e5d67f5cb6b32ff2bf90579
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Mon Jul  4 16:01:25 2022 +0000
Commit:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Mon Jul  4 16:10:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=69b445fb

games-emulation/dosbox-x: Respect the 'AR' variable

Closes: https://bugs.gentoo.org/856352
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>

 games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild | 7 ++++++-
 games-emulation/dosbox-x/dosbox-x-9999.ebuild   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild b/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild
index 9db968900..bc26e3bdb 100644
--- a/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-0.84.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools xdg
+inherit autotools toolchain-funcs xdg
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -146,6 +146,11 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
+src_compile() {
+	# https://bugs.gentoo.org/856352
+	emake AR="$(tc-getAR)"
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 

diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index f2da3a0e0..052e563f5 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools xdg
+inherit autotools toolchain-funcs xdg
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -141,6 +141,11 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
+src_compile() {
+	# https://bugs.gentoo.org/856352
+	emake AR="$(tc-getAR)"
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 


^ permalink raw reply related	[flat|nested] 31+ messages in thread

end of thread, other threads:[~2024-10-04 22:47 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-22  0:46 [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/dosbox-x/ Yuan Liao
  -- strict thread matches above, loose matches on Subject: below --
2024-10-04 22:47 Yuan Liao
2024-10-04 22:47 Yuan Liao
2024-07-31 17:26 Yuan Liao
2024-07-02 12:52 Yuan Liao
2024-04-27 11:42 Yuan Liao
2024-03-02  3:13 Yuan Liao
2024-02-07 23:49 Yuan Liao
2023-11-07 13:49 Yuan Liao
2023-10-07 14:26 Yuan Liao
2023-10-07 14:26 Yuan Liao
2023-09-02 14:18 Yuan Liao
2023-08-19 17:29 Yuan Liao
2023-06-02  1:26 Yuan Liao
2023-05-03  1:03 Yuan Liao
2023-05-03  1:03 Yuan Liao
2023-04-01 16:55 Yuan Liao
2023-04-01 16:55 Yuan Liao
2023-03-15 20:26 Yuan Liao
2022-12-27  6:24 Yuan Liao
2022-12-27  6:24 Yuan Liao
2022-12-26 17:19 Yuan Liao
2022-12-14 17:23 Yuan Liao
2022-12-14 17:23 Yuan Liao
2022-12-05 18:29 Yuan Liao
2022-10-06 16:54 Yuan Liao
2022-09-07 14:55 Yuan Liao
2022-08-23 20:07 Yuan Liao
2022-08-02  0:27 Yuan Liao
2022-08-02  0:27 Yuan Liao
2022-07-04 16:10 Yuan Liao

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox