[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/files/, games-engines/scummvm/
commit: 063ed5a1495c41350c0efe5464f86d7d010251b2
Author: Lars Wendler gentoo org>
AuthorDate: Thu Sep 24 06:09:29 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Sep 24 06:13:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063ed5a1
games-engines/scummvm: Replaced sed call with upstream patch
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler gentoo.org>
.../files/scummvm-2.2.0-ultima_engine_lua_dep.patch| 18 ++
games-engines/scummvm/scummvm-2.2.0.ebuild | 9 -
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git
a/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
new file mode 100644
index 000..d73ad03820e
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
@@ -0,0 +1,18 @@
+From d546389b10518eabd34fd5b4e22265069b25a966 Mon Sep 17 00:00:00 2001
+From: Paul Gilbert
+Date: Wed, 23 Sep 2020 19:10:17 -0700
+Subject: [PATCH] ULTIMA: Add lua as an engine dependency
+
+---
+ engines/ultima/configure.engine | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
+index 6447e3eb7f96..704a79d1f61f 100644
+--- a/engines/ultima/configure.engine
b/engines/ultima/configure.engine
+@@ -1,3 +1,3 @@
+ # This file is included from the main "configure" script
+ # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+-add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2"
++add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2 lua"
diff --git a/games-engines/scummvm/scummvm-2.2.0.ebuild
b/games-engines/scummvm/scummvm-2.2.0.ebuild
index 2c3d39e3e7a..93e50eddec4 100644
--- a/games-engines/scummvm/scummvm-2.2.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0.ebuild
@@ -54,6 +54,10 @@ BDEPEND="
S="${WORKDIR}/${P/_/}"
+PATCHES=(
+ "${FILESDIR}/${P}-ultima_engine_lua_dep.patch"
+)
+
src_prepare() {
xdg_src_prepare
@@ -66,11 +70,6 @@ src_prepare() {
-e '/INSTALL.*\/pixmaps/d' \
-e 's/-s //' \
ports.mk || die
-
- # Without lua linking of ultima engine fails
- # Please remove with next version bump!!!
- sed '/^add_engine/s@"$@ lua"@' \
- -i engines/ultima/configure.engine || die
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/files/, games-engines/scummvm/
commit: d4b50daa7a356bbf112e37bd712d3d7b29d1c001
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Dec 30 22:37:09 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Dec 30 22:38:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b50daa
games-engines/scummvm: Upstream patch for fluidsynth-2.1.0
Closes: https://bugs.gentoo.org/704230
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot gentoo.org>
.../scummvm/files/scummvm-2.1.0-fluidsynth.patch | 39 ++
games-engines/scummvm/scummvm-2.1.0.ebuild | 1 +
2 files changed, 40 insertions(+)
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 000..6b4760e16dd
--- /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
+Date: Tue, 17 Dec 2019 04:21:04 +
+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
++
++#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.1.0.ebuild
b/games-engines/scummvm/scummvm-2.1.0.ebuild
index 6b43908481d..06cc2f964fe 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() {
[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/files/, games-engines/scummvm/
commit: f7daebb36ddf1612cea0cf0f1d6141c9bc01fb56
Author: Lars Wendler gentoo org>
AuthorDate: Tue Nov 5 07:05:29 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Nov 5 07:09:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7daebb3
games-engines/scummvm: Bump to version 2.1.0
Closes: https://bugs.gentoo.org/699334
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler gentoo.org>
games-engines/scummvm/Manifest | 1 +
.../files/scummvm-2.1.0-tts_pthread_link.patch | 22 +
games-engines/scummvm/metadata.xml | 1 +
games-engines/scummvm/scummvm-2.1.0.ebuild | 109 +
4 files changed, 133 insertions(+)
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index e3b863b3406..eafca9329bc 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1 +1,2 @@
DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B
303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948
SHA512
5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
+DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B
b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09
SHA512
9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218
diff --git a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
b/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
new file mode 100644
index 000..70440be0e13
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
@@ -0,0 +1,22 @@
+From 26c09be3a091e47419ba2629c5f2a346ad6a5543 Mon Sep 17 00:00:00 2001
+From: Christian Krause
+Date: Wed, 16 Oct 2019 22:41:27 +0200
+Subject: [PATCH] TTS: Link libpthread explicitly on Linux platform
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 0adf0bb7bad..dbfe336e6d0 100755
+--- a/configure
b/configure
+@@ -5504,7 +5504,7 @@ else
+ echo "linux"
+ _tts=yes
+ define_in_config_if_yes $_tts 'USE_SPEECH_DISPATCHER'
+- append_var LIBS '-lspeechd'
++ append_var LIBS '-lspeechd -lpthread'
+ ;;
+ mingw*)
+ echo "win32"
diff --git a/games-engines/scummvm/metadata.xml
b/games-engines/scummvm/metadata.xml
index 3f7ace82af0..e71c4a5e17b 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -8,6 +8,7 @@
compile with support for fluidsynth
enable mpeg2 codec for cutscenes
+enable text-to-speech support through
app-accessibility/speech-dispatcher
enable unsupported and/or broken game engines
(you're on your own)
diff --git a/games-engines/scummvm/scummvm-2.1.0.ebuild
b/games-engines/scummvm/scummvm-2.1.0.ebuild
new file mode 100644
index 000..f278a9a5471
--- /dev/null
+++ b/games-engines/scummvm/scummvm-2.1.0.ebuild
@@ -0,0 +1,109 @@
+# 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="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 opengl png speech
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]
+ media-libs/sdl2-net
+ a52? ( media-libs/a52dec )
+ aac? ( media-libs/faad2 )
+ alsa? ( media-libs/alsa-lib )
+ flac? ( media-libs/flac )
+ fluidsynth? ( media-sound/fluidsynth )
+ jpeg? ( virtual/jpeg:0 )
+ mp3? ( media-libs/libmad )
+ mpeg2? ( media-libs/libmpeg2 )
+ opengl? ( virtual/opengl )
+ png? ( media-libs/libpng:0 )
+ speech? ( app-accessibility/speech-dispatcher )
+ truetype? ( media-libs/freetype:2 )
+ theora? ( media-libs/libtheora )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-arch/xz-utils
+ truetype? ( virtual/pkgconfig )
+ x86? ( dev-lang/nasm )
+"
+
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-tts_pthread_link.patch"
+)
+
+src_prepare() {
+ xdg_src_prepare
+
+ # -g isn't needed for nasm her
[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/files/, games-engines/scummvm/
commit: de097e37dfa73706c033420fc8bdd147d2975788
Author: Lars Wendler gentoo org>
AuthorDate: Mon May 7 07:03:03 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon May 7 07:03:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de097e37
games-engines/scummvm: Added improved freetype_pkgconfig patch
which should be ready for upstream inclusion.
Bug: https://bugs.gentoo.org/655032
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../files/scummvm-2.0.0-freetype_pkgconfig.patch | 117 +++--
games-engines/scummvm/scummvm-2.0.0.ebuild | 1 +
2 files changed, 84 insertions(+), 34 deletions(-)
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
index 669cffc945c..ca5c5e89271 100644
--- a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
+++ b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
@@ -1,50 +1,99 @@
-From 86c7fd67e5ab2e721de8493d162d7605b1b08823 Mon Sep 17 00:00:00 2001
+From 48a3f5bcba1837517e3d9d029ebe5e8fbd3f0966 Mon Sep 17 00:00:00 2001
From: Lars Wendler
-Date: Sun, 6 May 2018 10:22:48 +0200
-Subject: [PATCH] Use pkg-config to find freetype if freetype-config is not
- available
+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 | 17 +++--
- 1 file changed, 11 insertions(+), 6 deletions(-)
+ configure | 56 ---
+ 1 file changed, 37 insertions(+), 19 deletions(-)
diff --git a/configure b/configure
-index 8e2a387acc..e3c15a9a2a 100755
+index 8e2a387acc..210951e343 100755
--- a/configure
+++ b/configure
-@@ -4674,7 +4674,13 @@ if test "$_freetype2" != "no"; then
- find_freetypeconfig
-
- if test -z "$_freetypeconfig"; then
+@@ -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
-+ if pkg-config --exists freetype2; then
-+ FREETYPE2_LIBS=`pkg-config --libs freetype2`
-+ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-+ _freetype2=yes
-+ else
-+ _freetype2=no
-+ fi
++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.
-@@ -4714,13 +4720,12 @@ EOF
+- # 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"
++
[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/files/, games-engines/scummvm/
commit: fdf3034423cf76c8a4ee2fc1abfc30aa539bd3dc
Author: Lars Wendler gentoo org>
AuthorDate: Sun May 6 08:29:21 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun May 6 08:29:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf30344
games-engines/scummvm: Added experimental freetype_pkgconfig patch
Bug: https://bugs.gentoo.org/655032
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../files/scummvm-2.0.0-freetype_pkgconfig.patch | 50 ++
games-engines/scummvm/scummvm-2.0.0.ebuild | 6 ++-
2 files changed, 54 insertions(+), 2 deletions(-)
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
new file mode 100644
index 000..669cffc945c
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
@@ -0,0 +1,50 @@
+From 86c7fd67e5ab2e721de8493d162d7605b1b08823 Mon Sep 17 00:00:00 2001
+From: Lars Wendler
+Date: Sun, 6 May 2018 10:22:48 +0200
+Subject: [PATCH] Use pkg-config to find freetype if freetype-config is not
+ available
+
+---
+ configure | 17 +++--
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index 8e2a387acc..e3c15a9a2a 100755
+--- a/configure
b/configure
+@@ -4674,7 +4674,13 @@ if test "$_freetype2" != "no"; then
+ find_freetypeconfig
+
+ if test -z "$_freetypeconfig"; then
+- _freetype2=no
++ if pkg-config --exists freetype2; then
++ FREETYPE2_LIBS=`pkg-config --libs freetype2`
++ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
++ _freetype2=yes
++ else
++ _freetype2=no
++ fi
+ else
+ # Since 2.3.12, freetype-config prepends $SYSROOT to everything.
+ # This means we can't pass it a --prefix that includes $SYSROOT.
+@@ -4714,13 +4720,12 @@ EOF
+ fi
+ cc_check_clean
+ fi
+-
+- if test "$_freetype2" = "yes"; then
+- append_var LIBS "$FREETYPE2_LIBS"
+- append_var INCLUDES "$FREETYPE2_CFLAGS"
+- fi
+ fi
+
++ if test "$_freetype2" = "yes"; then
++ append_var LIBS "$FREETYPE2_LIBS"
++ append_var INCLUDES "$FREETYPE2_CFLAGS"
++ fi
+ fi
+
+ echocheck "FreeType2"
+--
+2.17.0
+
diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild
b/games-engines/scummvm/scummvm-2.0.0.ebuild
index 4f775bc1705..0df104f23aa 100644
--- a/games-engines/scummvm/scummvm-2.0.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND}
app-arch/xz-utils
x86? ( dev-lang/nasm )"
-S=${WORKDIR}/${P/_/}
+S="${WORKDIR}/${P/_/}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
src_prepare() {
default
