diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
commit | 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch) | |
tree | 44068672445b1418489aed82de58df3c470289e7 /games-emulation/dosbox-staging | |
parent | 0f15659d48c193027158492acb726297501202c5 (diff) |
gentoo resync : 04.01.2022
Diffstat (limited to 'games-emulation/dosbox-staging')
4 files changed, 104 insertions, 1 deletions
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest index a6029c795c77..ea0517af206d 100644 --- a/games-emulation/dosbox-staging/Manifest +++ b/games-emulation/dosbox-staging/Manifest @@ -1,7 +1,10 @@ +AUX dosbox-staging-0.78.0-fix_tests.patch 1289 BLAKE2B 2ba0b7a146948f3fa70a4f0bba86327c67cd3d8cdddd8d6d988f01ef7b6fce826d99eea42efe614a78f884075501ed991b2e6fd26708fcf17a06eaf943ff8b6b SHA512 c4a62b2f68cf26a64843c316ffdc702ecd1813fd38a8cf318b2c1a4762ac278d0b4fd3ad64f8e7a859e35ac4842a47d73d73594675d603649038b2e6610972f8 DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142 SHA512 8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6 SHA512 37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0 DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff SHA512 fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac +DIST dosbox-staging-0.78.0.tar.gz 2908118 BLAKE2B 77dd6afd7c8f62e2936c2ed1545faf1f2700b7bceba4afd6f77eff6b2bd1ea7b7693e3975d38098774f4f6076099251e7aa53cd20a5dec7daefb34a3533fdf40 SHA512 e56b4735f1a741f2c160646f205776e2407ab3333d4d13ce918ff447a08817862a32167afa47b3c7e35bc942bc06aea7d14e25bfe64fce9ee88a843488733746 EBUILD dosbox-staging-0.76.0.ebuild 1431 BLAKE2B d6fefe9c171bd48de4246e239d95ebc78bbc02cf1aa138712cc3a2ed76fa9a5a5a181770e8d3f2173079770ef56b4adb83f8843d2fbfcfa6996c8806936912c6 SHA512 3fa322c2f91c97d0f86befc97c93d0e4dd4dcdba56055a97a8dd0fe85907e7319353cf85790dfc790fe811a9ba8990eaece8d86040255cf55f99ea8b502b5ea5 EBUILD dosbox-staging-0.77.0-r1.ebuild 1458 BLAKE2B 0e0f6a28fe7851bded45749a2322b9b9225335c14923ed4ce1aeeb915f0a5a2eb21daba8b7862d8fdffc267210354053c10b0e038a7c5e41beb0020490c05c7b SHA512 88e4b4aa99fd3c25475aca2e522a23300b9af2628c7f64b9a8832105a350d99f451d6634b5336b11fdee173374d34975f41f46df25840c09178fb3286bf1f4a5 EBUILD dosbox-staging-0.77.1.ebuild 1727 BLAKE2B f1ddc2fef8fb1afc6c02c3013270a45c618630796b349275e40ef24a8084609f897bd0dfc1a8ac2d6684d740e23eba27f3dfbedce205592e0191d32660d06254 SHA512 aab080cf5293e8db0c344b8b713eac51a5525e3b0fffafc0a0f802388e315e0c0a39a902f0037ecc726b590e961587ad9051f5a82c784e9b2d06a4a54e1df6e1 -MISC metadata.xml 798 BLAKE2B e8e6368cfb116669c3359a665d5709c9bdc0eb778275599946e208a16909901ed23d852e7d45feaf6fd3897f786e1400d7eb46b19dcca45886df4872055b4577 SHA512 f513b215767cb39d8b92e8ece09110075d3c81ecb5d293b225e85d3e9368c2f10075435db6e31c758db89635ef9d99008d15430a0f7b891c0ae9278b7d97475e +EBUILD dosbox-staging-0.78.0.ebuild 1842 BLAKE2B 243e1725fce94f68c2da2edfad0aed9ecd3ad99ab223ced92a407689f6fdb05225052347a153ed7eba25eeda6377cd4e338eb8128f075a0d0933b902ca19224a SHA512 49704bb349db19852dcbd1726c5fb09b9bb5a08768344cfe12a50d70da915c6ae64a8208e93bde551924d8a648e9d847c2c49149e43b7ab12707d71cbf93048d +MISC metadata.xml 887 BLAKE2B b7d3d47e105c5217c97f6bca8088e39525dcca272b1d24da98df099b8cc7f9d380264b2ba703648dc05e4738f6c12b6617b376b6457da8573f585e7f5e250b61 SHA512 e7d147a2837d74775439a6e3b96f01e021f96fa141614802e5dd8d52670208b733956ee6e9694c15d86c4fc79546712972f3511efc4966aa1dab1060184d1c62 diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild new file mode 100644 index 000000000000..ec44d977dad6 --- /dev/null +++ b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit meson xdg + +DESCRIPTION="Modernized DOSBox soft-fork" +HOMEPAGE="https://dosbox-staging.github.io/" +SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test" + +RESTRICT="!test? ( test )" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + debug? ( sys-libs/ncurses:0= ) + fluidsynth? ( + media-sound/fluid-soundfont + media-sound/fluidsynth + ) + mt-32? ( media-libs/munt-mt32emu ) + network? ( media-libs/sdl2-net ) + opengl? ( virtual/opengl ) + slirp? ( net-libs/libslirp ) + media-libs/libpng:0= + media-libs/libsdl2[joystick,opengl?,video,X] + media-libs/opusfile + sys-libs/zlib + !games-emulation/dosbox" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-cpp/gtest )" + +DOCS=( AUTHORS README THANKS ) + +PATCHES=( "${FILESDIR}"/${P}-fix_tests.patch ) + +src_prepare() { + default + + # We do not have default.sf2, use actual name from fluid-soundfont + sed -e "s/default.sf2/FluidR3_GM.sf2/" \ + -i src/midi/midi_fluidsynth.cpp || die + + # Disable license and docs install (handled by ebuild) + sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die + + # Test failing on some platforms, bug #817908 + # https://github.com/dosbox-staging/dosbox-staging/issues/1230 + sed -i 's/.*soft_limit.*//' tests/meson.build || die +} + +src_configure() { + local emesonargs=( + $(meson_use alsa use_alsa) + $(meson_use debug) + -Ddynamic_core=$(usex dynrec dynrec dyn-x86) + $(meson_use fluidsynth use_fluidsynth) + $(meson_use mt-32 use_mt32emu) + $(meson_use network use_sdl2_net) + $(meson_use opengl use_opengl) + $(meson_use slirp use_slirp) + $(meson_feature test unit_tests) + ) + meson_src_configure +} diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.78.0-fix_tests.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.0-fix_tests.patch new file mode 100644 index 000000000000..d75aad0275ff --- /dev/null +++ b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.0-fix_tests.patch @@ -0,0 +1,31 @@ +From 4499e4566d2e488be1c0e0a20328b13652ed14cb Mon Sep 17 00:00:00 2001 +From: kcgen <kcgen@users.noreply.github.com> +Date: Sat, 1 Jan 2022 07:48:27 -0800 +Subject: [PATCH] Remove the project's main to prevent masking gmock's main + (#1476) + +clang/llvm ensure gmock's main() function always overrides the main +function coming from the dosbox library, however sometimes with +gcc/ld, gmock's main() doesn't take precedent and instead dosbox's +main is run. + +This fixes an issue reported on Fedora and Gentoo where unit tests +were popping up SDL's graphical window, and then either timing our +failing. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index d885da1b9..59f677b59 100644 +--- a/meson.build ++++ b/meson.build +@@ -444,7 +444,7 @@ executable('dosbox', dosbox_sources, + include_directories : incdir, + install : true) + # create a library so we can test things inside DOSBOX dep path +-libdosbox = static_library('dosbox', ['src/main.cpp', 'src/dosbox.cpp', version_file], ++libdosbox = static_library('dosbox', ['src/dosbox.cpp', version_file], + include_directories : incdir, + dependencies : [atomic_dep, + threads_dep, diff --git a/games-emulation/dosbox-staging/metadata.xml b/games-emulation/dosbox-staging/metadata.xml index 639809d4af9f..f4c7e89956af 100644 --- a/games-emulation/dosbox-staging/metadata.xml +++ b/games-emulation/dosbox-staging/metadata.xml @@ -11,6 +11,7 @@ <flag name="mt-32">use <pkg>media-libs/munt-mt32emu</pkg> for MT-32 emulation</flag> <flag name="network">Enable networking features (modem, ipx)</flag> <flag name="opus">Support compressed audio tracks (.opus) used with CDROM images</flag> + <flag name="slirp">Enable Ethernet emulation using <pkg>net-libs/libslirp</pkg></flag> </use> <upstream> <remote-id type="github">dosbox-staging/dosbox-staging</remote-id> |