gentoo resync : 15.01.2020

5 files changed, 42 insertions, 201 deletions

diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 86e1d27e8dd4..d5cfff21c75f 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,7 +1,5 @@
-AUX scummvm-2.0.0-freetype_pkgconfig.patch 3651 BLAKE2B 59d53792e79b01e65d604f35b7947c83f700fa6019625c925f798bd389fbe3e1f21b28577ed93ce9c22ebd065ab61538cc80792a9a7c5e71248e6fd6a61690e1 SHA512 6e4cae49814442d111fb07f238108cbe995a8af4d0e23951e4d040d08db7e3925ff97b91b9053495cfd757396ed8790ec4dc8a44d7782cde915837118be95b44
+AUX scummvm-2.1.0-fluidsynth.patch 1393 BLAKE2B 080c704d493d21f0e5e4387bba0bf1a2354aaccf0e96b7383f956ef89eb973cf0cdf9f60a922a8e7bd25e520a6922a1879cc5614b42731c610c2c7da64033cad SHA512 6e577087ad6d67ee45d488c762ea41d4899001a31730c47cdf263619cc079e0abd3871aa8f947f681b6d59d76094c0278bd4ed8c2439ccc4d700aa32f860c318
 AUX scummvm-2.1.0-tts_pthread_link.patch 610 BLAKE2B 7ae2613cb65f47888a668504c64196bbcb9aafa48f37e8f08cba52a21e765adb20fd9255f1218f2e3b887111587f32919cd448017543c3df303d1ed5ae1ac80c SHA512 93137b7bea5d8c6528dba3aa81b0486d64f53f57aaf975561b79a3fccc882f36f0acf327a997892b2d2c3fe1d7134cc3a3d029bd14852dbae932b07d7633da55
-DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
 DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09 SHA512 9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218
-EBUILD scummvm-2.0.0-r1.ebuild 2482 BLAKE2B 0ad1eae79e72b50e4f49deacaeca039d17b468a80ed10a68cf8ccc1dad424bad041de47aec35b4db5432903362d9073d1e3dc99234c5ddcb859ee596a7db60c7 SHA512 66fd6811e5b7ad4287c6aa59334eaa58be86f00b620b1222cb76d09ff75e76b3d3c1dbaccf603a0566fc46cf60921959a590e73a5d1415f34da0edc1582327f8
-EBUILD scummvm-2.1.0.ebuild 2728 BLAKE2B cd6a2e2aada44f0e4420b32dfc4e55996ba525f856a68f9546f2d169ac16afd21f2a141683dff5453ee380692956720e7f122020aca57e4d33a5cecf5c9c12fa SHA512 23d0c55d04c21cbc961f1bbe7a0b1daba44e03b22b9315a885a1ad8f3e48ee14877945faf627664aafd0548a65adc5c1e64d0bcdaa4da7467a9278846f4e578d
+EBUILD scummvm-2.1.0.ebuild 2765 BLAKE2B bfb9bddcb3c8bca3a2046e8f6e70b2c49e5cac41248689d57323013f9f15a45e0b57ef5e4b535f9848c33d8274733b4fdef1abbe15db530e3a52576e83bef2d7 SHA512 ae0c50a090892c2242d9617b6976f407dc67cafae072eed6cba951b861090863fee937a4b640e3a4744b7fa9545181b6427db10d8c9e27f3ace049ba92a5221b
 MISC metadata.xml 794 BLAKE2B 55a51df988ba376df42552e2e943f3028aba2b9125d671f026d4a47a10da79d5da49f6307aabd33aa237812a3440b8014d498794c9837b859274221832625cca SHA512 03f3a6e1554afecc3d4f57ca58ed73a5887649170872df4940ad2bcab90a7a98fde3d2de3524c528b60f37f8ecf2b463189be72057d4495c849363d97b824b83
diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index ca5c5e892710..000000000000
--- a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 48a3f5bcba1837517e3d9d029ebe5e8fbd3f0966 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 6 May 2018 20:55:29 +0200
-Subject: [PATCH] Prefer pkg-config over freetype-config if possible
-
-As of freetype-2.9.1 the freetype-config script no longer gets installed
-by default.
----
- configure | 56 ++++++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 37 insertions(+), 19 deletions(-)
-
-diff --git a/configure b/configure
-index 8e2a387acc..210951e343 100755
---- a/configure
-+++ b/configure
-@@ -204,6 +204,7 @@ _sparklepath=
- _sdlconfig=sdl2-config
- _libcurlconfig=curl-config
- _freetypeconfig=freetype-config
-+_freetype_found="false"
- _sdlpath="$PATH"
- _freetypepath="$PATH"
- _libcurlpath="$PATH"
-@@ -4668,28 +4669,45 @@ echo "$_libunity"
- #
- # Check for FreeType2 to be present
- #
--if test "$_freetype2" != "no"; then
--
--	# Look for the freetype-config script
--	find_freetypeconfig
--
--	if test -z "$_freetypeconfig"; then
--		_freetype2=no
-+find_freetype() {
-+        # Wrapper function which tries to find freetype
-+        # either by callimg freetype-config or by using
-+        # pkg-config.
-+        # As of freetype-2.9.1 the freetype-config file
-+        # no longer gets installed by default.
-+
-+	if pkg-config --exists freetype2; then
-+		FREETYPE2_LIBS=`pkg-config --libs freetype2`
-+		FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-+		FREETYPE2_STATIC_LIBS=`pkg-config --static --libs freetype2`
-+		_freetype_found="true"
- 	else
--		# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
--		# This means we can't pass it a --prefix that includes $SYSROOT.
--		freetypeprefix="$_freetypepath"
--		if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
--			teststring=VeryImplausibleSysrootX1Y2Z3
--			if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
--				echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
--				freetypeprefix="${freetypeprefix##$SYSROOT}"
-+		# Look for the freetype-config script
-+		find_freetypeconfig
-+		if test -n "$_freetypeconfig"; then
-+			# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
-+			# This means we can't pass it a --prefix that includes $SYSROOT.
-+			freetypeprefix="$_freetypepath"
-+			if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
-+				teststring=VeryImplausibleSysrootX1Y2Z3
-+				if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
-+					echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
-+					freetypeprefix="${freetypeprefix##$SYSROOT}"
-+				fi
- 			fi
-+			FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
-+			FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
-+			FREETYPE2_STATIC_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --static --libs 2>/dev/null`
-+			_freetype_found="true"
- 		fi
-+	fi
-+}
- 
--		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
--		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
--
-+if test "$_freetype2" != "no"; then
-+	find_freetype
-+	if test $_freetype_found != true; then
-+		_freetype2=no
-+	else
- 		if test "$_freetype2" = "auto"; then
- 			_freetype2=no
- 
-@@ -4709,7 +4727,7 @@ EOF
- 			# required flags for static linking. We abuse this to detect
- 			# FreeType2 builds which are static themselves.
- 			if test "$_freetype2" != "yes"; then
--				FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --static --libs 2>/dev/null`
-+				FREETYPE2_LIBS="$FREETYPE2_STATIC_LIBS"
- 				cc_check_no_clean $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=yes
- 			fi
- 			cc_check_clean
--- 
-2.17.0
-
diff --git a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
new file mode 100644
index 000000000000..6b4760e16dda
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
@@ -0,0 +1,39 @@
+From 68758a879e0c8ecc0d40962516d4e808aa4e15e5 Mon Sep 17 00:00:00 2001
+From: D G Turner <digitall@scummvm.org>
+Date: Tue, 17 Dec 2019 04:21:04 +0000
+Subject: [PATCH] AUDIO: Really Fix Compilation Against Fluidsynth v2.1+
+
+The previous fix did not work as the forbidden exception had no effect
+since scummsys.h and thus forbidden.h had already been included prior
+to the fluidsynth header being included. This also meant that undefining
+the exception define after the header would have had no effect anyway.
+
+This new solution was suggest by eriktorbjorn on bug #11278 and should
+avoid the need to add an exception which would persist over the entire
+source file.
+---
+ audio/softsynth/fluidsynth.cpp | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
+index 33a74a15247..f8c2412492e 100644
+--- a/audio/softsynth/fluidsynth.cpp
++++ b/audio/softsynth/fluidsynth.cpp
+@@ -20,10 +20,16 @@
+  *
+  */
+ 
+-#include "common/scummsys.h"
++#include "config.h"
+ 
+ #ifdef USE_FLUIDSYNTH
+ 
++// Fluidsynth v2.1+ uses printf in one of it's headers,
++// include/fluidsynth/log.h around line 82 so need to include this
++// prior scummsys.h inclusion and thus forbidden.h
++#include <fluidsynth.h>
++
++#include "common/scummsys.h"
+ #include "common/config-manager.h"
+ #include "common/error.h"
+ #include "common/system.h"
diff --git a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
deleted file mode 100644
index ec9d93fc808e..000000000000
--- a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
-HOMEPAGE="https://www.scummvm.org/"
-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 ~ppc ~ppc64 ~x86"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
-	zlib? ( sys-libs/zlib:= )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	mp3? ( media-libs/libmad )
-	mpeg2? ( media-libs/libmpeg2 )
-	flac? ( media-libs/flac )
-	opengl? ( virtual/opengl )
-	truetype? ( media-libs/freetype:2 )
-	fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	truetype? ( virtual/pkgconfig )
-	x86? ( dev-lang/nasm )
-"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
-
-src_prepare() {
-	xdg_src_prepare
-
-	# -g isn't needed for nasm here
-	sed -i \
-		-e '/NASMFLAGS/ s/-g//' \
-		configure || die
-	sed -i \
-		-e '/INSTALL.*doc/d' \
-		-e '/INSTALL.*\/pixmaps/d' \
-		-e 's/-s //' \
-		ports.mk || die
-}
-
-src_configure() {
-	use x86 && append-ldflags -Wl,-z,noexecstack
-
-	local myconf=(
-		--backend=sdl
-		--host=${CHOST}
-		--enable-verbose-build
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--opengl-mode=$(usex opengl auto none)
-		$(use_enable aac faad)
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable !debug release-mode)
-		$(use_enable flac)
-		$(usex fluidsynth '' --disable-fluidsynth)
-		$(use_enable jpeg)
-		$(use_enable mp3 mad)
-		$(use_enable mpeg2)
-		$(use_enable png)
-		$(use_enable theora theoradec)
-		$(use_enable truetype freetype2)
-		$(usex unsupported --enable-all-engines '')
-		$(use_enable vorbis)
-		$(use_enable zlib)
-		$(use_enable x86 nasm)
-	)
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	SDL_CONFIG="sdl2-config" \
-	./configure "${myconf[@]}" "${EXTRA_ECONF}" || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) cru" RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	default
-	doicon -s scalable icons/scummvm.svg
-}
diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild b/games-engines/scummvm/scummvm-2.1.0.ebuild
index 6b43908481d2..06cc2f964fec 100644
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -47,6 +47,7 @@ S="${WORKDIR}/${P/_/}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-tts_pthread_link.patch"
+	"${FILESDIR}/${P}-fluidsynth.patch"
 )
 
 src_prepare() {