diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-23 01:58:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-23 01:58:14 +0000 |
commit | 4921f12d049de1487e17383a32da50a03ea90d65 (patch) | |
tree | f96cddb6d290801562042528ed52a4a95d24afd1 /games-emulation/dosbox-staging | |
parent | 7ef0a54f9e5cc53b6f0eb75144a94d0ad98aeef5 (diff) |
gentoo auto-resync : 23:12:2022 - 01:58:14
Diffstat (limited to 'games-emulation/dosbox-staging')
-rw-r--r-- | games-emulation/dosbox-staging/Manifest | 9 | ||||
-rw-r--r-- | games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild | 68 | ||||
-rw-r--r-- | games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild (renamed from games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild) | 8 | ||||
-rw-r--r-- | games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch | 16 | ||||
-rw-r--r-- | games-emulation/dosbox-staging/metadata.xml | 1 |
5 files changed, 7 insertions, 95 deletions
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest index 4a7bd50d865c..eb1c3e52a53d 100644 --- a/games-emulation/dosbox-staging/Manifest +++ b/games-emulation/dosbox-staging/Manifest @@ -1,8 +1,5 @@ -AUX dosbox-staging-0.78.1-musl.patch 529 BLAKE2B fd0ce9ea24e8d921dcff9a77d6f01b54054868206c0abd2a96a4a89f4137969ff7c83ecd1e191b25fa7f1c1bf3f4232821e1405a84578c9a37323dbdebf6bad5 SHA512 ab7a5ee73872f654cf20e4736d9201af33bab170a717de6f6e0019a4383defd15448f8923057bc9dab236e577e7a0833aa5f198d8ffd21d30dab05fbe8afcd82 -DIST dosbox-staging-0.78.1.tar.gz 2968448 BLAKE2B 7b48763d10338d36e61696331358f7572a528c10d48e473dfaba6a8c96dd5d3ca2b9e1f5c595d653fbbe64f2b5f1d9f1ff8279dfab8f2cb49ac6faba697e97ca SHA512 3179e8eac00e22e35b36623c11688b8c60408bf487a56683269ff065988fbdf4319c16097232cc191695cf2e10c05f4c4eee15e92d9887ebf03a23f808d5db7c -DIST dosbox-staging-0.79.0.tar.gz 3114176 BLAKE2B 1206aed3d87ead0315a1e7e4ff814c4a787026521653b68532cb231590417c9124511ad8f39132d8d595b227675cfafdec4236a6f8dece43c139a401b7e9d11a SHA512 573365258d2fdc82ad8a803ce8f2b7f47b7219eeba9bc3253447ad48b9df793bc459947dbaa7a484bcce7e23ed3d0385438335dcdd2790c7eba6723960dfc890 DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8 SHA512 6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7 -EBUILD dosbox-staging-0.78.1.ebuild 1837 BLAKE2B 348e7961693ef926388a3a71911d334ccbfb5d416314ed7767fb1176260cf20e9d9bb8832536f3dfb1274ac17d88c1ca308d8da45fcb3c105aedb5775933b02b SHA512 3ba80b137691ea234b7bfbd2d3b10cc4fe829ad88395a02b94f40d88113e1ce9952f6d428783c9424198c759bc004a9a3d4d27a4e384501e9000ac67c91986d2 -EBUILD dosbox-staging-0.79.0.ebuild 1812 BLAKE2B e861fd380c7a7f5c51a1a345f24e7503681e62a1a7975a7a7680bb69cc34bd6e8b7f2b2961ccece86e1ffb78e375449c58d02a03ecbd5d2d15db59c3ed78af7e SHA512 9b728673c121d11ebfe3ddaabdc82affabb02694341b97563ec433570ec0671bd9e89cdbdeb6f3f0c5f1b02ed3e7f5916c8cdd2702b7875462986ccefd4f4650 +DIST dosbox-staging-0.80.0.tar.gz 3871598 BLAKE2B 59cb6515f17b9a661f5e9d7787b01ecef4fe047dfd0ca4573cc12c73af1f9fe433f4c20a1c42e1fcd259c31af3922738c057aa64fc777a513a7881a86436a1fa SHA512 aed548df29d5d4aa6593f0b589d7548caaf02be31668dc2c6bcbb0eb324a73d9344ce471a8449e90706b379ed6794e6584e5ebc6b3628274f5ec6667c14a3d8a EBUILD dosbox-staging-0.79.1.ebuild 1666 BLAKE2B 3e618bf06a4f87ffb61131faab759f9580d4d0dec873d5b4086ddee9c593ed90d1b5a192808b52a7c10c77174a85d39053d7e3f709bf673542b28d5ead2ebced SHA512 e4c11f68c8ba5e7282379c2d006df89ef5f8ef65986a703e306eb9aaabcdbd4f69dcb2596aa445b2585806ce40b088280c26be694cf4d8525cdc03f61bd1954e -MISC metadata.xml 797 BLAKE2B c7d440ebd04ed5cedb3c97e95295e5120223e61920baea68c13857395ad4c117e577a597cc6eb46bdc637b6ecc8642348fb27ac7ff449650bf3eb68a038fc6bf SHA512 aa32bedd4eadb03665259ded49733267573a9dee6d2135d881c657e21183fcbd8d4a8983ede0c0931655434ac302fa0633368bb3ab839928e0a5a8d13a435870 +EBUILD dosbox-staging-0.80.0.ebuild 1757 BLAKE2B d070b30d916d3d15c0db8332f97cac661a8658347079215dc3d974c3b08fa429f25b18edcb641fdeacc2197c4b9f0482361437b2a6c1bd7e776bf65e50f4ebd0 SHA512 e7fb45abe3d1accf8a806aad68af29a4ef644e093495155099730b137e669abefe099dfb7d4beaefdae87be6ee88d763cf0584a9de369b5394a96d6ccec214ef +MISC metadata.xml 907 BLAKE2B d4d1f88337a4cb5154de5bc532b82b0853d76629819dc29f43899e6c498108f5deb46ba9acbfbd0fd290790dd8bdbef2f0aae7079f5c3876004bde6f1d2f14eb SHA512 eb52e2b50ebb74b40cdd28af4ba8d3026ddcceba910729a275a92c5951ced7130b728e39338f22721b5873883e455283ee7747d3f0dcd49608e43931467c3528 diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild deleted file mode 100644 index a882bcb7b4a8..000000000000 --- a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# 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}-musl.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/dosbox-staging-0.79.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild index a22e5df9f7cb..0b11b68c3d99 100644 --- a/games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild +++ b/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test" +IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl screenshot slirp test" RESTRICT="!test? ( test )" @@ -24,6 +24,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) 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= @@ -49,11 +50,7 @@ src_prepare() { } src_configure() { - # Do not look for static libraries - # speexdsp system flag needs to be manually enabled local emesonargs=( - -Ddefault_library=shared - -Dsystem_libraries=speexdsp $(meson_use alsa use_alsa) $(meson_use debug) -Ddynamic_core=$(usex dynrec dynrec dyn-x86) @@ -61,6 +58,7 @@ src_configure() { $(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) ) diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch deleted file mode 100644 index a1f4fe3ca654..000000000000 --- a/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/libs/loguru/loguru.cpp b/src/libs/loguru/loguru.cpp -index 9675cc1d..c4b5c0e3 100644 ---- a/src/libs/loguru/loguru.cpp -+++ b/src/libs/loguru/loguru.cpp -@@ -83,7 +83,7 @@ - #ifndef LOGURU_STACKTRACES - #define LOGURU_STACKTRACES 0 - #endif --#elif defined(__rtems__) || defined(__ANDROID__) || defined(__FreeBSD__) -+#elif defined(__rtems__) || defined(__ANDROID__) || defined(__FreeBSD__) || !defined(__GLIBC__) - #define LOGURU_PTHREADS 1 - #define LOGURU_WINTHREADS 0 - #ifndef LOGURU_STACKTRACES --- -2.34.1 - diff --git a/games-emulation/dosbox-staging/metadata.xml b/games-emulation/dosbox-staging/metadata.xml index bcf5208f4d03..5f790a376160 100644 --- a/games-emulation/dosbox-staging/metadata.xml +++ b/games-emulation/dosbox-staging/metadata.xml @@ -10,6 +10,7 @@ <flag name="fluidsynth">use <pkg>media-sound/fluidsynth</pkg> for MIDI emulation</flag> <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="screenshot">Enable screenshots of rendered output using <pkg>media-libs/sdl2-image</pkg></flag> <flag name="slirp">Enable Ethernet emulation using <pkg>net-libs/libslirp</pkg></flag> </use> <upstream> |