gentoo resync : 31.05.2021

15 files changed, 93 insertions, 131 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 56678797bae6..ba53c898fdda 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/frobtads/Manifest b/games-engines/frobtads/Manifest
index 9980d587ff20..c9bcc1487660 100644
--- a/games-engines/frobtads/Manifest
+++ b/games-engines/frobtads/Manifest
@@ -1,4 +1,3 @@
-AUX frobtads-1.2.4-tinfo.patch 345 BLAKE2B cf4ffb8870f064aac6d302c5dd4dcaea4a1ee1cc7aacc1d74b299f18de25b2150571ecc468cb1ba326680402c7cf99b95d4f0dc78959a5a7d4209e53f56d66df SHA512 632b599b115cc73c3642e8462fd916146e2451be47b44c43860f5dc87bc6c510eabc62f4d575b814eee55e89e99f03b3a445d60e45dc6cc8d60052835ccac685
-DIST frobtads-1.2.4.tar.bz2 3801366 BLAKE2B 871a4cfd432f1a72915de0652def2f2a9a3cf1bfa20b070c2e59ced673c736584a36b3d17e7d5812ad7cd883c3e038e49f962635a5794d6c914d99651bfd0a55 SHA512 f49f58114cbd78f23fcc3835025af7874da968af825abd449e9ab83c4a90e8d70f8cfafa83780f0631ae9bd2793cce2d5dd947c13ee38ba0d06829d2803abf12
-EBUILD frobtads-1.2.4.ebuild 1166 BLAKE2B 85b02bc732f16d376b386443a8962678054c0bfa828ad124d356f67961ffedcefc4ad616326807eec85a675b58a3cfe6817eb7ce23fc5f7be61b4e0d3e2f8957 SHA512 d52c491d53070b64116bbb08b25ded057b13e25c7af1483ec505bf2c63fa4dd2d9dae7fd890b96f5b0a21a290ca4f07dbd0307e22c2c1782f00df1bd65f6ee1b
+DIST frobtads-2.0.tar.bz2 3870691 BLAKE2B 0f73137428db818b674534cec05ff7993ddc8e6d104d61c5a3a57bac05b185175ce92be1d571c0ca463e5420059a1e59274499c1620a5c0f75c37a89701bc4a4 SHA512 28c84447c1ab43cfd6956b1933f9e7ab3ac0d8b7d0767f23d8535e2ea0cac0e07f17ade07776d646102caa8c23474c3ae3d46a3eef243ad8c7aec702eea04854
+EBUILD frobtads-2.0.ebuild 1088 BLAKE2B db21cb982fd4545f09f2b7f7730b976a71df398fa04089b8504e616a770ed6009472bec659ff0c9fb86e44b217ff62d3ba2c5206867d61556318fb2c6f010a29 SHA512 534be20992d664c935e98bda4ed13f098567899d7625495d419f7b17342c5542fc4fc92b2f581329fb442cf6b4bb21bf91496ab2df5cbd74d9533aff5df2d6a7
 MISC metadata.xml 394 BLAKE2B db39dd99a448935896847c3ce0c824a3043d65d82e7d35cad3afab2538aebffca96c532f83182bf2e28fab22fcb0d6145e6e5a383def6d956db6d0558e73f481 SHA512 591c0df18a2e4e1469e1f95dce9c74f3b66261377b88ec9dde79c56094253a5579427a2fa836fb1c2926344b95a471b7d13bda4a53f4c6a064b06c61d89e1ab3
diff --git a/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch b/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch
deleted file mode 100644
index f37f2ed22ce2..000000000000
--- a/games-engines/frobtads/files/frobtads-1.2.4-tinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/602446
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,6 +88,7 @@
- # doesn't hust to try pdcurses as a last resort.)
- #
- AC_SEARCH_LIBS([initscr], [ncurses curses pdcurses], [curseslibfound=true], [curseslibfound=false])
-+AC_SEARCH_LIBS([keypad], [tinfo])
- 
- # Check for libcurl (network client library for http et al).
- #
diff --git a/games-engines/frobtads/frobtads-1.2.4.ebuild b/games-engines/frobtads/frobtads-2.0.ebuild
index 6270e7fa08f6..1a49e8fce5e5 100644
--- a/games-engines/frobtads/frobtads-1.2.4.ebuild
+++ b/games-engines/frobtads/frobtads-2.0.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-inherit autotools
+inherit cmake
 
 DESCRIPTION="Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures"
 HOMEPAGE="http://www.tads.org/frobtads.htm"
-SRC_URI="https://github.com/realnc/${PN}/releases/download/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/realnc/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="TADS2 TADS3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug tads2compiler tads3compiler"
+IUSE="debug +tads2compiler +tads3compiler"
 
 RESTRICT="!tads3compiler? ( test )"
 
@@ -24,30 +24,19 @@ DEPEND="${RDEPEND}"
 
 DOCS=( doc/{AUTHORS,BUGS,ChangeLog.old,NEWS,README,SRC_GUIDELINES,THANKS} )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-tinfo.patch #602446
-)
-
-src_prepare() {
-	default
-
-	# bug #602446
-	eautoreconf
-}
-
 src_configure() {
-	local myeconfargs=(
-		$(use_enable debug error-checking)
-		$(use_enable debug t3debug)
-		$(use_enable tads2compiler t2-compiler)
-		$(use_enable tads3compiler t3-compiler)
+	local mycmakeargs=(
+		-DENABLE_T2_COMPILER=$(usex tads2compiler)
+		-DENABLE_T2_RUNTIME_CHECKS=$(usex debug)
+		-DENABLE_T3_COMPILER=$(usex tads3compiler)
+		-DENABLE_T3_DEBUG=$(usex debug)
 	)
-	econf "${myeconfargs[@]}"
+	cmake_src_configure
 }
 
 src_test() {
-	emake -j1 sample
-	./frob -i plain -p samples/sample.t3 <<- END_FROB_TEST
+	cmake_build sample
+	"${BUILD_DIR}"/frob -i plain -p "${BUILD_DIR}"/samples/sample.t3 <<- END_FROB_TEST
 		save
 		testsave.sav
 		restore
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index b5e09fb0d266..09dfb31a4a42 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,9 +1,7 @@
-AUX odamex-0.8.1-miniupnpc.patch 1378 BLAKE2B 06ea9b7154e574d487a2a241474e401951319c7dd0ce71135605d84c8b3442fce1e23fc30ec5b12c77521dff2215640faa4eb1b99484272a51b0ccf67e232cb2 SHA512 5bcf602ae484eed180dbd02c315e2a6bab38a5e90711466a5ba005fed6782ea6a7244b9e8b8ebea38df5875f1d4eced1e51aaaa98e1124710f11aaafe4480049
-AUX odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch 879 BLAKE2B ac627db089ddeab8d4c34601b44d70a54e5de0a3e7bfdb6eccf3c0798df81526df5e7be97323b5c33f8594c5f83be8d336cd23c6aadd34eb7046b0ad32eca028 SHA512 67a48daeb9774694ed957e4583deddb6e19e1bac965e823c5c165165013b987d5c0ec62e2272ab5e75694270b2c0f793d5bbef4f4946e98047a17c897ce45a77
 AUX odamex-0.9.0-Set-IMPORTED_LOCATION-for-jsoncpp.patch 835 BLAKE2B c15d7fcf8e2992a01f8c329c494f118c4d7279b10fd1acce97a03a6bd08a4aeede40b44b7f3d99c6140e252ff154ff607861733e35fa5e0f898f6b56b592cd2c SHA512 86fe37efa3bbb03d89ef02ea7792809d38c6abfaa607af74cda4815722ffc4bd35502a83bccd4c902b697d9420bde078228d8e40b21e722a48cb608627366c71
 AUX odamex-0.9.0-Unbundle-miniupnpc.patch 2765 BLAKE2B f1a7307c82d6ab9ee17524d0384ec7b54ee51a1ee611a89cad9cdd3e8a98b448327a85242f71f0432ec266cbb8b24b893a0ca86dd62b994bc1320ef4157dc9f6 SHA512 a310ede1fc3340e6ee28ea0925da828dae517d7f9f83d015b744e0b3185ed82fa737f0a1d6c73ab000edf87a4467910ab14aa3a6bb34dc7c157535bd8270173c
-DIST odamex-0.8.3.tar.bz2 8532510 BLAKE2B 751d65dfe07a4c4c0cb5ff360e76a1291cf4ba289c459f15a0c277aca4d15b1e0989e1606cdc4e0f0bec56d6ae437027046302f5c55efb3b835a42df512fb18f SHA512 01a875973d43c87dde7953464e0e3c37fa088b00b6cc0ecbef1a8b3b9a87257ab24ef4e3c224ebcbc0e38cd3139c7adc56b12a03ae2528b66d6498bb8d84d720
 DIST odamex-0.9.0.tar.bz2 6644055 BLAKE2B 656a469665783e0a5aa1a39792454a7ec34843b7fa11539f5504463701b5485eed0b5fabcd4f9f39eef3bdad9062f657c0b1d6147bcd41defa4142b51b4096a4 SHA512 f86e61afd5fdd9be6db03554e07fa140fdcc61747ce9312706af2cada8ec88705647abdfff4f221d8cfbd4a53b991e08edf4cbf0025cf6e5a74d2213fc662855
-EBUILD odamex-0.8.3.ebuild 1801 BLAKE2B a96d8efba5ca414b51ac6a3d45e381ae6fc2ecd2dcaec437deab66338152c4f5bf056ea6cb4a3d6505266a0535a39019a4f9a65c8c4eb31e05af9ab7d9284d60 SHA512 3c443abd87b5599f74413020e4f84d5b273357117717dd32b7d8ac3a76dd2c6a33a977878f765a0a793a1994fade7e6ca11c2faba425322203a4258472218cd4
+DIST odamex-0.9.2.tar.bz2 6657974 BLAKE2B 60bf542806fe9d66711b45211f646607875621b014175fa3c4b9948c1c02d45af36d4a324349f22f4a7a4e11c13f48f2b96c731a9bb5f18c9d43111c56676f18 SHA512 69fb2ecc1d642c9c90da7503712aba628c753534ee56003945e4d267dc38bca0136d155a75695e483b0b4ec739aa331fca8c7493263b39a2521e8abcb378b5e4
 EBUILD odamex-0.9.0.ebuild 1837 BLAKE2B fef2b8796d963b50f1995a2dd216858c588df500d445e6f851a1ff12cd6260291aee07ab3d58965d4ceef083960d7603adc7432e4c849533a6077fc362df802c SHA512 3d7de60fdeb55593e31ab92d90782b5d2063de1966dddb9235e389523217023fe226572ceef76497c829bb9e4f07028dd7c2399113ef11bb62b50d1bbf3f6ef2
+EBUILD odamex-0.9.2.ebuild 1784 BLAKE2B b839525adfa4f0d0e2b29dd0b5d76f80568fb79d5c5ea2b9f6d2ba4a0a30d922db86b732ff92e345afe1f27f111aac92e0b8a6946440805901234b22bed8bf54 SHA512 5948ffd6eadc5ac78902a8e674c85727ac937b42309dff653fa9f4eea84a76fdf820e473983c4ca9af759add321acf71cb85e950684a82ebc0a8d6310d900ca6
 MISC metadata.xml 1560 BLAKE2B 9005fa7ad7cf0c111c7f1843320a325ab2859e125a7fe173585a41efa0c255b7cb547af627bb574e4276052ccc4797d0de214cacf8aa39b9e14576f326f8ba30 SHA512 da4fc9f0f98577b4e221649b6dca286cc00037cd2579d4adafc98bc00b0761ac5f553018394ea8509784754c4adf86963c1098db555aca0b01d62c1bc9efb843
diff --git a/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch b/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
deleted file mode 100644
index 5fca5815162b..000000000000
--- a/games-engines/odamex/files/odamex-0.8.1-miniupnpc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 656306d3e68f7f1f1441f03e1765530f34ea2611 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:16:02 +0000
-Subject: [PATCH] unbundle miniupnpc
-
----
- CMakeLists.txt        | 1 -
- server/CMakeLists.txt | 5 ++---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cafdbd5..00e033a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -124,7 +124,6 @@ if (USE_MINIUPNP)
-   set(UPNPC_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)

-   set(UPNPC_INSTALL OFF CACHE INTERNAL "" FORCE)

-   mark_as_advanced(FORCE UPNPC_INSTALL)

--  add_subdirectory(libraries/libminiupnpc)

- endif()

- 

- # Subdirectories for Odamex projects

-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index d8e57257..5badceef 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -35,8 +35,7 @@ set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp)
- 
- # MiniUPnPc
- if (USE_MINIUPNP)
--  set(MINIUPNPC_DIR ../libraries/libminiupnpc)
--  set(MINIUPNPC_STATIC_LIBRARIES upnpc-static)
-+  set(MINIUPNPC_DIR /usr/include/miniupnpc)
- endif()
- 
- # git describe
-@@ -74,7 +73,7 @@ add_executable(odasrv
-   ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES})
- 
- if (USE_MINIUPNP)
--  target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES})
-+  target_link_libraries(odasrv -lminiupnpc)
- endif()
- 
- if(WIN32)
--- 
-2.23.0
-
diff --git a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch b/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
deleted file mode 100644
index 935d43466c41..000000000000
--- a/games-engines/odamex/files/odamex-0.8.3-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9e3ae8538475e6f15757ce51e214f5cd29f223e7 Mon Sep 17 00:00:00 2001
-From: Michael Wood <mwoodj@huntsvegas.org>
-Date: Tue, 25 Aug 2020 02:34:37 -0500
-Subject: [PATCH] Use C++11 on odalaunch target for wx 3.0.4 and up
-
-This addresses bug #1311. wxWidgets 3.0.4 requires C++11 support.
----
- odalaunch/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
-index f68a4d4d..4abbe0d8 100644
---- a/odalaunch/CMakeLists.txt
-+++ b/odalaunch/CMakeLists.txt
-@@ -32,6 +32,11 @@ endif()
- 

- # Odalaunch target

- if(wxWidgets_FOUND)

-+  # wxWidgets 3.0.4 requires C++11

-+  if(wxWidgets_VERSION_STRING VERSION_GREATER 3.0.3)

-+    set(CMAKE_CXX_STANDARD 11)

-+  endif()

-+

-   add_custom_command(

-     OUTPUT ${XRCRES_HEADER}

-     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res

--- 
-2.28.0
-
diff --git a/games-engines/odamex/odamex-0.8.3.ebuild b/games-engines/odamex/odamex-0.9.2.ebuild
index ff1b19128574..34a596cc2ee8 100644
--- a/games-engines/odamex/odamex-0.8.3.ebuild
+++ b/games-engines/odamex/odamex-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ RDEPEND="
 		X? ( x11-libs/libX11 )
 	)
 	server? (
+		dev-libs/jsoncpp:=
 		upnp? ( net-libs/miniupnpc:= )
 	)"
 DEPEND="${RDEPEND}"
@@ -34,12 +35,11 @@ BDEPEND="games-util/deutex"
 S="${WORKDIR}/${PN}-src-${PV}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.8.1-miniupnpc.patch"
-	"${FILESDIR}/${P}-Use-C-11-on-odalaunch-target-for-wx-3.0.4-and-up.patch"
+	"${FILESDIR}/${PN}-0.9.0-Unbundle-miniupnpc.patch"
 )
 
 src_prepare() {
-	rm -r libraries/libminiupnpc wad/odamex.wad || die
+	rm -r libraries/libminiupnpc || die
 	hprefixify common/d_main.cpp
 
 	use odalaunch && setup-wxwidgets
@@ -50,10 +50,12 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DUSE_INTERNAL_LIBS=0
 		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_LAUNCHER=$(usex odalaunch)
 		-DBUILD_MASTER=$(usex master)
-		-DBUILD_ODALAUNCH=$(usex odalaunch)
 		-DBUILD_SERVER=$(usex server)
+		-DBUILD_OR_FAIL=1
 		-DENABLE_PORTMIDI=$(usex portmidi)
 		-DUSE_MINIUPNP=$(usex upnp)
 	)
diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest
index 784570c980d7..9018b7de037c 100644
--- a/games-engines/qtads/Manifest
+++ b/games-engines/qtads/Manifest
@@ -1,3 +1,4 @@
+AUX qtads-3.0-fluidsynth.patch 1817 BLAKE2B 32f61fde3f3521c7d50ca8b67d5a66721caec4595e6a98a15f4434f6da6dda62b75521d64349252a11fd15e0fc62d301db0329dc07ce56783e7eac8beafef791 SHA512 37c0c5e7ad76d9b483c6e3aa02d1b8673bae50820c48197dc1649efed888ee6156a3a935add16ccd006de43e9067e29f0de8b893c85a476ae4b4b32597799253
 DIST qtads-3.0.0-source.tar.xz 5325048 BLAKE2B cb60908e71edb32157638891a58bed83aba01d484821473716c17845094be9232f9e989bad474db27c1e06734b073ee301756b0528ca880e4c40c0994e95bc48 SHA512 e7b72350876475e0b5b9b8c8c953aa380f5f25dade25785d15c5004a6866bb614c3ca2a3b34f84989013e350f9e73d339ce8ddd7d36766d80a981cfbfda7d1c6
-EBUILD qtads-3.0.0.ebuild 849 BLAKE2B a469fe456498ad1f5cb4b7febfdaeb830f4dd10bc9e9997fe22b1fc0c11b4228debfc92b3e0485167f5770315d3db03c208ddf25039abb1635c6ce696cf93f74 SHA512 6617c58720706b65c60101bc60677850352c09a7312f1037347da4dabe1b351ae70bd0c2c8ee243edf9fb3bb085f069a177dd1bcaf683b9ac259162533750f4c
+EBUILD qtads-3.0.0.ebuild 912 BLAKE2B 227fa26b32e4b8e3f41341930fff294bb491d5fddba9dc3624b5a72611704e1932b2d872826c404670a42d4ba098da949288826165c000248031a48144fe3427 SHA512 4d71f4eaffb9dfdd589a67ef123535d1289b03d18139afb81de60c3b0a91488a9985b5549ad35abe895c5e50bb0fcba4be8c1edde8797cffd7943424bf574fd7
 MISC metadata.xml 599 BLAKE2B 51ed09fd074eb06d9b3abd5274531653f791323717dc3e1f1ab246f10a80daec5c689f9c0083b62d84560862ec1932b892b4896c122c1cfa284613a0f27663df SHA512 73b2eeac86fd8e65a122adc472e108173d2f9423500ef2bce48f32a0c3b956e41c4bdff1bd8e451d07a8b973e358238b482d28866056c60785c39b47c0e8c5f9
diff --git a/games-engines/qtads/files/qtads-3.0-fluidsynth.patch b/games-engines/qtads/files/qtads-3.0-fluidsynth.patch
new file mode 100644
index 000000000000..0104d35098dc
--- /dev/null
+++ b/games-engines/qtads/files/qtads-3.0-fluidsynth.patch
@@ -0,0 +1,55 @@
+From eedae0e7c67da4e12c65ef049665258c1d8f44a8 Mon Sep 17 00:00:00 2001
+From: Michal Petrucha <michal.petrucha@koniiiik.org>
+Date: Thu, 22 Apr 2021 22:55:40 +0200
+Subject: [PATCH] Add support for fluidsynth 2.2.0
+
+---
+ SDL_audiolib/src/DecoderFluidsynth.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/SDL_audiolib/src/DecoderFluidsynth.cpp b/SDL_audiolib/src/DecoderFluidsynth.cpp
+index 62a99df..0f4760d 100644
+--- a/SDL_audiolib/src/DecoderFluidsynth.cpp
++++ b/SDL_audiolib/src/DecoderFluidsynth.cpp
+@@ -11,6 +11,14 @@
+ #include <cstdio>
+ #include <fluidsynth.h>
+ 
++#if FLUIDSYNTH_VERSION_MAJOR == 2 && FLUIDSYNTH_VERSION_MINOR >= 2
++using read_cb_count_type = fluid_long_long_t;
++using seek_cb_offset_type = fluid_long_long_t;
++#else
++using read_cb_count_type = int;
++using seek_cb_offset_type = long;
++#endif
++
+ namespace chrono = std::chrono;
+ 
+ static fluid_settings_t* settings = nullptr;
+@@ -36,7 +44,7 @@ static void* sfontOpenCb(const char* filename)
+     return rwops;
+ }
+ 
+-static int sfontReadCb(void* dst, int count, void* rwops)
++static int sfontReadCb(void* dst, read_cb_count_type count, void* rwops)
+ {
+     Buffer<char> buf(count);
+     if (SDL_RWread(static_cast<SDL_RWops*>(rwops), buf.get(), 1, count) <= 0) {
+@@ -46,7 +54,7 @@ static int sfontReadCb(void* dst, int count, void* rwops)
+     return FLUID_OK;
+ }
+ 
+-static int sfontSeekCb(void* rwops, long offset, int whence)
++static int sfontSeekCb(void* rwops, seek_cb_offset_type offset, int whence)
+ {
+     switch (whence) {
+     case SEEK_SET:
+@@ -72,7 +80,7 @@ static int sfontCloseCb(void* rwops)
+     return FLUID_OK;
+ }
+ 
+-static long sfontTellCb(void* rwops)
++static seek_cb_offset_type sfontTellCb(void* rwops)
+ {
+     auto pos = SDL_RWtell(static_cast<SDL_RWops*>(rwops));
+     if (pos == -1) {
diff --git a/games-engines/qtads/qtads-3.0.0.ebuild b/games-engines/qtads/qtads-3.0.0.ebuild
index 57d338defea2..e375495f938f 100644
--- a/games-engines/qtads/qtads-3.0.0.ebuild
+++ b/games-engines/qtads/qtads-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,6 +31,10 @@ DEPEND="
 "
 RDEPEND=${DEPEND}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-fluidsynth.patch #785235
+)
+
 src_configure() {
 	eqmake5 \
 		PREFIX="${EPREFIX}/usr" \
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index c0f530bc217a..0cb96d825b3e 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1,6 @@
 AUX scummvm-2.2.0-fluidsynth-2.2.patch 5627 BLAKE2B 42a4d2bc56ffb9f13bce8de4af27511e0603ce8abcc17fa8ca2501e1e0fd464bdc57b2b81c7b98ca9a7d57149d1d848de1986127e7f777a8673d0f83f67b7f08 SHA512 b69d7fc1d14ea4f4cdbb0105d294b00f5f0248b8d37920cac8e11c54ee3ef1636dbde2f304d6e1b5c924aa1a8714697f2d3f8583c588961c0ff7162ba5d67c71
 AUX scummvm-2.2.0-ultima_engine_lua_dep.patch 785 BLAKE2B 73c9ef3272ce9c71d1575775a966ff38b8369ab6cb68b3ce17353dc4b0ba7590020f7288451cfe5cb2ee94ccacfa33da1ca02389d82bcc8d8570e4f2139aaa58 SHA512 bb1e67955834b8e0544e58258f31e5fe8ba0e4ec701426cad6c032714708ce6928698de42b8a3ba7b1c0bb0eda87c6fd87c5162e396595956e70df0aa5beaac1
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-EBUILD scummvm-2.2.0-r1.ebuild 3055 BLAKE2B f0c889a16fad8891ce657b71f5b00e85f263c94d3adfc256720e9512b188a33bf6236dee7e0407db1c2620e5f90ab20d04d0c581120c303a0cd8f55856648cf3 SHA512 615e638aeb605b8386721d45a9564072ecf287942fedc750649149f4be319901ea60f495c8ec5cc9012cf6b275ff64a6efce7f4b8d8df558f46e48271fd0823c
-EBUILD scummvm-9999.ebuild 2995 BLAKE2B 1a484a278b024fe7a2ac4210f3a18b4a860c5c66ef313c2855b2dfce328c74dd507278042998e0503830851045ea86664d1d106175dfedb0422acd5c66a3feef SHA512 7417b5169f5b3b2e818749940b55bea092888bd216e960bbe76e33f1cb9c4a6278fbb8f431f1b1caefb1b60e0faf7c997bcf63edd5743049a231c413aa351d1d
-MISC metadata.xml 1119 BLAKE2B 69d76e676244d618d769418d210acc4a705ef155215ced601bd1cb7075faf99789f9d771d8333d13a7e62f54846a31f14c4b4f00860a0927f2593ae2786e7cfd SHA512 41dc677a597ced02d76ea1610ad1e7a68cfba4c9622d2e9144eea61574752fbd7958ea7452c3213685c34ea89d24631adc96a93991bd27f32bf29677be31787d
+EBUILD scummvm-2.2.0-r1.ebuild 3083 BLAKE2B be5bcd2c84bce46dc2ef1fd3af0e01c4099bb98a3ac2a2524e14f9d234c4cba56b4df867a6ac1ea13d8d7fe7a189ad435671756cd5751108c7cd70b96f67e0ee SHA512 a218edbee1a4f0388e223f448f6cd7128f342cb38ffb50467ec898a90fd29f8ee31043a5ffd26cc837c50a873bf7f08ce94f4a9eeefde699871582151b8a464b
+EBUILD scummvm-9999.ebuild 3023 BLAKE2B 1db51f2c18df2dff4721f496e4a51ce46ba85aa6e70be1d0a8892ef35bb8fe858734120188860b6cf6a22d94d09dbc9c37811ac39c91aa066057006fd9c6ae3e SHA512 df839f3191fdcf8098e3796f4e51ae2c0aad1293034c7d0e2f7eb33c8fb66a03b4ad603fad44449a5e15770ceb2844b5075d160b744c74eb110152c5fa632e8b
+MISC metadata.xml 1214 BLAKE2B 39ff67a7d7dc25406d9418349d47631fb1bbd4d10b4e6c86dc35188987e6177cffc64087ebed51137ed00431605997479ca45a426f3cfdd7f1bc30dc98eba42f SHA512 02fe128e97f053e669fcb5b65a317689c492b4ea0bb1873ccf77f70c2de8b6dd7532d55026b94a87fc6a8c5c71c44a736c3a571d94d78af71a79cbdd99a53e8a
diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml
index dd278d4911d0..4b13f3aa2adc 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -15,6 +15,7 @@
     <flag name="glew">enable support for OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
     <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
     <flag name="net">enable cloud support via <pkg>media-libs/sdl2-net</pkg></flag>
+    <flag name="sndio">Enable support for MIDI music using <pkg>media-sound/sndio</pkg></flag>
     <flag name="speech">enable text-to-speech support through <pkg>app-accessibility/speech-dispatcher</pkg></flag>
     <flag name="unsupported">enable unsupported and/or broken game engines (you're on your own)</flag>
   </use>
diff --git a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild b/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
index f4ab2f0515e9..b6022c564f3f 100644
--- a/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -99,6 +99,7 @@ src_configure() {
 		$(use_enable mpeg2)
 		$(use_enable net sdlnet)
 		$(use_enable png)
+		$(use_enable sndio)
 		$(use_enable speech tts)
 		$(use_enable theora theoradec)
 		$(use_enable truetype freetype2)
diff --git a/games-engines/scummvm/scummvm-9999.ebuild b/games-engines/scummvm/scummvm-9999.ebuild
index 22e410bbb259..f6a91ef83cd0 100644
--- a/games-engines/scummvm/scummvm-9999.ebuild
+++ b/games-engines/scummvm/scummvm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/scummvm/scummvm"
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
 KEYWORDS=""
-IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 +net opengl png speech theora truetype unsupported vorbis zlib"
+IUSE="a52 aac alsa debug flac fluidsynth fribidi glew +gtk jpeg lua mpeg2 mp3 +net opengl png sndio speech theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
 RDEPEND="
@@ -98,6 +98,7 @@ src_configure() {
 		$(use_enable mpeg2)
 		$(use_enable net sdlnet)
 		$(use_enable png)
+		$(use_enable sndio)
 		$(use_enable speech tts)
 		$(use_enable theora theoradec)
 		$(use_enable truetype freetype2)