summaryrefslogtreecommitdiff
path: root/games-emulation
diff options
context:
space:
mode:
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/Manifest.gzbin12042 -> 12036 bytes
-rw-r--r--games-emulation/dosbox-staging/Manifest6
-rw-r--r--games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild66
-rw-r--r--games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild (renamed from games-emulation/dosbox-staging/dosbox-staging-0.79.1.ebuild)11
4 files changed, 11 insertions, 72 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 08605ed3fae0..ba498789f240 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
Binary files differ
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index 1e1dd0ff8df3..da9580b6af59 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,9 +1,7 @@
-DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8 SHA512 6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7
-DIST dosbox-staging-0.80.0.tar.gz 3871686 BLAKE2B 169f06bdaa2eec8490deb58d315c8ee05a165678d35e42f7970d0339d97a34e672cb5bf5f7252d35ec9a995dfb169927ace6e0a949da673dd8d36b545eef32aa SHA512 f1de336a6c996dc1bff23520d1f865b4aa16c8702200abf2c604084f846c00f1aa31d1940be817a307326ccdcc2f07c7f7e6c8c6fdbb61b331fe6428ed2ff9d6
DIST dosbox-staging-0.80.1.tar.gz 3876041 BLAKE2B bfc260cb4d2ff01ac8538bbb2de65847ac32e81873dae42d2d4e84f1b9be5370be5d19bd2d209e7b1bc92f03f072ecd349df615869dcefde2f27074a6712874b SHA512 8d28761e998c033b0cad5ca49c1a094d0ff2ca8a45183101c31805dda6a8e6861805739e723492329cab525af782849ec34ae97d29449d6c50e781475a011561
DIST dosbox-staging-0.81.0.tar.gz 6943457 BLAKE2B 088fef12a6e0627a146b47f6b581af39f07d4acd47098650aa18a61d5b77d6255196838036037f1df2b61dc288163dc8c1da57b0669a3a8e9ceea8a9ec275494 SHA512 96257602b0133ec78fbc7bd5803404d91abf673172e97319067a0f3f97db8860ae6d4771bb03cff5b73e033f220cb4fa6cd778cf549a9bc63e3550def9aa8797
-EBUILD dosbox-staging-0.79.1.ebuild 1666 BLAKE2B 3e618bf06a4f87ffb61131faab759f9580d4d0dec873d5b4086ddee9c593ed90d1b5a192808b52a7c10c77174a85d39053d7e3f709bf673542b28d5ead2ebced SHA512 e4c11f68c8ba5e7282379c2d006df89ef5f8ef65986a703e306eb9aaabcdbd4f69dcb2596aa445b2585806ce40b088280c26be694cf4d8525cdc03f61bd1954e
-EBUILD dosbox-staging-0.80.0.ebuild 1757 BLAKE2B d070b30d916d3d15c0db8332f97cac661a8658347079215dc3d974c3b08fa429f25b18edcb641fdeacc2197c4b9f0482361437b2a6c1bd7e776bf65e50f4ebd0 SHA512 e7fb45abe3d1accf8a806aad68af29a4ef644e093495155099730b137e669abefe099dfb7d4beaefdae87be6ee88d763cf0584a9de369b5394a96d6ccec214ef
+DIST dosbox-staging-0.81.1.tar.gz 7013870 BLAKE2B 60416ba06a4e003f50ccc56a4623450e604db7bb6d3d19f9127558c155c645f96b604556550b1ecb3de029b8f16ee485ba06b2dd4bd31373577b477989c40fb5 SHA512 61d3aec8234c90b01671d346b705c2b920370cc42bafd5aeb4d0810622e347249fa66e0cb9fba574645cef473331a9f2d33fdb87f41e8e053ef6034618544ba6
EBUILD dosbox-staging-0.80.1.ebuild 1811 BLAKE2B a7ef588529ed71a39e7df1b91d2206ac6768f9f574d7e34d94026e43c69b8bfb7b46862bdb5d37233267adbf8435bb81d37414de57cc666213ded1b540d9bc31 SHA512 a7bd8057cddb0493abba883aa327f95d602c2f3503f18e6ac32a30f9761069455fbaac244a47f0454a422e03cdf6adfff68dc8e92c812b31aa3c7a90f4da5cbc
EBUILD dosbox-staging-0.81.0.ebuild 1859 BLAKE2B 483aff5b7f552d445326b9b6e2f05488f1fe75ab89ce09d2aeeea6eacda7ed607ac53e0f02d2e95a1670028892035dd0458a08f4912adc9acbc7cb4fddadf060 SHA512 129512b540a315f06b8e3c7f225efab86b2567ecbfb1797e143afe484520d802832324297f40869be18eeff44ff3d056e4b2a4bd5cdc76ca4a7a9156a7cd1cfa
+EBUILD dosbox-staging-0.81.1.ebuild 1859 BLAKE2B 483aff5b7f552d445326b9b6e2f05488f1fe75ab89ce09d2aeeea6eacda7ed607ac53e0f02d2e95a1670028892035dd0458a08f4912adc9acbc7cb4fddadf060 SHA512 129512b540a315f06b8e3c7f225efab86b2567ecbfb1797e143afe484520d802832324297f40869be18eeff44ff3d056e4b2a4bd5cdc76ca4a7a9156a7cd1cfa
MISC metadata.xml 907 BLAKE2B d4d1f88337a4cb5154de5bc532b82b0853d76629819dc29f43899e6c498108f5deb46ba9acbfbd0fd290790dd8bdbef2f0aae7079f5c3876004bde6f1d2f14eb SHA512 eb52e2b50ebb74b40cdd28af4ba8d3026ddcceba910729a275a92c5951ced7130b728e39338f22721b5873883e455283ee7747d3f0dcd49608e43931467c3528
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild
deleted file mode 100644
index 0b11b68c3d99..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-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 screenshot 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 )
- screenshot? ( media-libs/sdl2-image )
- slirp? ( net-libs/libslirp )
- media-libs/iir1
- media-libs/libpng:0=
- media-libs/libsdl2[joystick,opengl?,video,X]
- media-libs/opusfile
- media-libs/speexdsp
- sys-libs/zlib
- !games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-DOCS=( AUTHORS README THANKS )
-
-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
-}
-
-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 screenshot use_sdl2_image)
- $(meson_use slirp use_slirp)
- $(meson_feature test unit_tests)
- )
- meson_src_configure
-}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.79.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
index 0a3180cceb83..8dc276da8126 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.79.1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit meson xdg
+inherit flag-o-matic meson xdg
DESCRIPTION="Modernized DOSBox soft-fork"
HOMEPAGE="https://dosbox-staging.github.io/"
@@ -49,7 +49,14 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/926078
+ # https://github.com/dosbox-staging/dosbox-staging/issues/3519
+ filter-lto
+
+ # xinput2 comes with libsdl2[X]
local emesonargs=(
+ -Duse_xinput2=true
$(meson_use alsa use_alsa)
$(meson_use debug)
-Ddynamic_core=$(usex dynrec dynrec dyn-x86)