[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/, games-engines/scummvm/files/
commit: eef60e8ead370b9be167a187719c83cb76ddcc42
Author: Michał Górny gentoo org>
AuthorDate: Sun Jul 17 06:27:30 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Jul 17 06:27:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef60e8e
games-engines/scummvm: Remove old
Signed-off-by: Michał Górny gentoo.org>
games-engines/scummvm/Manifest | 2 -
.../files/scummvm-2.2.0-fluidsynth-2.2.patch | 150 -
.../scummvm-2.2.0-ultima_engine_lua_dep.patch | 18 ---
games-engines/scummvm/scummvm-2.2.0-r2.ebuild | 139 ---
games-engines/scummvm/scummvm-2.5.0.ebuild | 140 ---
5 files changed, 449 deletions(-)
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index 4d59ebe6a9bd..abe9f6272320 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,4 +1,2 @@
-DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B
b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b
SHA512
001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
-DIST scummvm-2.5.0.tar.xz 130095472 BLAKE2B
a5153280999e321be5bf7b56411c163d5ba1d4fb142fc900e1c3cb709d357d199d3764a94af57ab7218ee201bdbe6288adf222add9ffc941324b84d0e6954fe8
SHA512
7ea702cf0f993994209fd692e82ab65f9686fb60d65f36624a31bd642067fe7dd35e55281c68d1592d7dd07333f085c124038f7a45acefae8f30bceff534
DIST scummvm-2.5.1.tar.xz 132828412 BLAKE2B
08fb2fa6cbeec3c1ec24a9b660aab4344f0dbcf4c42655392315aef0ce78105b2a669ef9c82fc09bc389856e592e4e5249d84512b288e7d790914d5caee3972d
SHA512
5e5aaf247e26434dd1594547a3066dce6f52e12370532b8bff09ae22149d697f6d3ab0a94b5c1cf578b2b8cba32d1cd6e5dc30fe0cd6266c8f2b23cba13d7d03
DIST scummvm-2.6.0.tar.xz 141331920 BLAKE2B
38cdce3e9b7954347d3ba05946c607aa5a62aa8fa1c2145030c1667632a4da43afd3f14ed19ebaf664bbf521610b2cfccc739c82dae95650572bfab81495cb80
SHA512
6bb2b22f9b11a8de2eaa48c520d63579f4907fa49d8b02d58702ece86945b38ea911376f5ae0dc6f3b6ed794ff32ca51fbf690e341401b4a03276b32e9bd7b69
diff --git a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
deleted file mode 100644
index 8bb94ec6ab6e..
--- a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
-index e0d7c4e3df..d8e82c24f5 100644
a/audio/softsynth/fluidsynth.cpp
-+++ b/audio/softsynth/fluidsynth.cpp
-@@ -46,6 +46,14 @@
- #include "backends/platform/ios7/ios7_common.h"
- #endif
-
-+// We assume here Fluidsynth minor will never be above 255 and
-+// that micro versions won't break API compatibility
-+#if defined(FLUIDSYNTH_VERSION_MAJOR) && defined(FLUIDSYNTH_VERSION_MINOR)
-+#define FS_API_VERSION ((FLUIDSYNTH_VERSION_MAJOR << 8) |
FLUIDSYNTH_VERSION_MINOR)
-+#else
-+#define FS_API_VERSION 0
-+#endif
-+
- class MidiDriver_FluidSynth : public MidiDriver_Emulated {
- private:
- MidiChannel_MPU401 _midiChannels[16];
-@@ -75,7 +83,7 @@ public:
-
- void setEngineSoundFont(Common::SeekableReadStream *soundFontData)
override;
- bool acceptsSoundFontData() override {
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
- return true;
- #else
- return false;
-@@ -134,7 +142,7 @@ void MidiDriver_FluidSynth::setStr(const char *name, const
char *val) {
-
- // Soundfont memory loader callback functions.
-
--#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
-+#if FS_API_VERSION >= 0x0200
- static void *SoundFontMemLoader_open(const char *filename) {
- void *p;
- if (filename[0] != '&') {
-@@ -144,11 +152,19 @@ static void *SoundFontMemLoader_open(const char
*filename) {
- return p;
- }
-
-+#if FS_API_VERSION >= 0x0202
-+static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void
*handle) {
-+#else
- static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
-+#endif
- return ((Common::SeekableReadStream *) handle)->read(buf, count) ==
(uint32)count ? FLUID_OK : FLUID_FAILED;
- }
-
-+#if FS_API_VERSION >= 0x0202
-+static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset,
int origin) {
-+#else
- static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
-+#endif
- return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ?
FLUID_OK : FLUID_FAILED;
- }
-
-@@ -157,7 +173,11 @@ static int SoundFontMemLoader_close(void *handle) {
- return FLUID_OK;
- }
-
-+#if FS_API_VERSION >= 0x0202
-+static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
-+#else
- static long SoundFontMemLoader_tell(void *handle) {
-+#endif
-
[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/, games-engines/scummvm/files/
commit: 713092ca1835ce8bc9981013c996abc563132054
Author: Michał Górny gentoo org>
AuthorDate: Thu Apr 15 19:56:08 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Apr 15 20:44:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713092ca
games-engines/scummvm: Remove old
Signed-off-by: Michał Górny gentoo.org>
games-engines/scummvm/Manifest | 1 -
.../scummvm/files/scummvm-2.1.0-fluidsynth.patch | 39
games-engines/scummvm/scummvm-2.1.2.ebuild | 110 -
3 files changed, 150 deletions(-)
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index a422ef4d771..7dda4a66415 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1 @@
-DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B
0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2
SHA512
a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc
DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B
b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b
SHA512
001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
diff --git a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
b/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
deleted file mode 100644
index 6b4760e16dd..000
--- a/games-engines/scummvm/files/scummvm-2.1.0-fluidsynth.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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.2.ebuild
b/games-engines/scummvm/scummvm-2.1.2.ebuild
deleted file mode 100644
index 5f7022f1055..000
--- a/games-engines/scummvm/scummvm-2.1.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 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 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net 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]
- 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 )
- net? ( media-libs/sdl2-net )
- opengl? ( || ( virtual/opengl media-libs/mesa[gles2]
media-libs/mesa[gles1] ) )
- 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=(
-
[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/, games-engines/scummvm/files/
commit: 08f671f9dce9ac08533038bca37c4a8563560710
Author: Michał Górny gentoo org>
AuthorDate: Thu Apr 15 19:57:47 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Apr 15 20:44:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f671f9
games-engines/scummvm: Backport fluidsynth-2.2 fix
Closes: https://bugs.gentoo.org/782805
Signed-off-by: Michał Górny gentoo.org>
.../files/scummvm-2.2.0-fluidsynth-2.2.patch | 150 +
...cummvm-2.2.0.ebuild => scummvm-2.2.0-r1.ebuild} | 5 +-
2 files changed, 153 insertions(+), 2 deletions(-)
diff --git a/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
new file mode 100644
index 000..8bb94ec6ab6
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.2.0-fluidsynth-2.2.patch
@@ -0,0 +1,150 @@
+diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
+index e0d7c4e3df..d8e82c24f5 100644
+--- a/audio/softsynth/fluidsynth.cpp
b/audio/softsynth/fluidsynth.cpp
+@@ -46,6 +46,14 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+
++// We assume here Fluidsynth minor will never be above 255 and
++// that micro versions won't break API compatibility
++#if defined(FLUIDSYNTH_VERSION_MAJOR) && defined(FLUIDSYNTH_VERSION_MINOR)
++#define FS_API_VERSION ((FLUIDSYNTH_VERSION_MAJOR << 8) |
FLUIDSYNTH_VERSION_MINOR)
++#else
++#define FS_API_VERSION 0
++#endif
++
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ MidiChannel_MPU401 _midiChannels[16];
+@@ -75,7 +83,7 @@ public:
+
+ void setEngineSoundFont(Common::SeekableReadStream *soundFontData)
override;
+ bool acceptsSoundFontData() override {
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++#if FS_API_VERSION >= 0x0200
+ return true;
+ #else
+ return false;
+@@ -134,7 +142,7 @@ void MidiDriver_FluidSynth::setStr(const char *name, const
char *val) {
+
+ // Soundfont memory loader callback functions.
+
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++#if FS_API_VERSION >= 0x0200
+ static void *SoundFontMemLoader_open(const char *filename) {
+ void *p;
+ if (filename[0] != '&') {
+@@ -144,11 +152,19 @@ static void *SoundFontMemLoader_open(const char
*filename) {
+ return p;
+ }
+
++#if FS_API_VERSION >= 0x0202
++static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void
*handle) {
++#else
+ static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
++#endif
+ return ((Common::SeekableReadStream *) handle)->read(buf, count) ==
(uint32)count ? FLUID_OK : FLUID_FAILED;
+ }
+
++#if FS_API_VERSION >= 0x0202
++static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset,
int origin) {
++#else
+ static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
++#endif
+ return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ?
FLUID_OK : FLUID_FAILED;
+ }
+
+@@ -157,7 +173,11 @@ static int SoundFontMemLoader_close(void *handle) {
+ return FLUID_OK;
+ }
+
++#if FS_API_VERSION >= 0x0202
++static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
++#else
+ static long SoundFontMemLoader_tell(void *handle) {
++#endif
+ return ((Common::SeekableReadStream *) handle)->pos();
+ }
+ #endif
+@@ -166,7 +186,8 @@ int MidiDriver_FluidSynth::open() {
+ if (_isOpen)
+ return MERR_ALREADY_OPEN;
+
+-#if defined(FLUIDSYNTH_VERSION_MAJOR) && FLUIDSYNTH_VERSION_MAJOR > 1
++
++#if FS_API_VERSION >= 0x0200
+ // When provided with in-memory SoundFont data, only use the configured
+ // SoundFont instead if it's explicitly configured on the current game.
+ bool isUsingInMemorySoundFontData = _engineSoundFontData &&
!ConfMan.getActiveDomain()->contains("soundfont");
+@@ -195,7 +216,11 @@ int MidiDriver_FluidSynth::open() {
+ _synth = new_fluid_synth(_settings);
+
+ if (ConfMan.getBool("fluidsynth_chorus_activate")) {
++#if FS_API_VERSION >= 0x0202
++ fluid_synth_chorus_on(_synth, -1, 1);
++#else
+ fluid_synth_set_chorus_on(_synth, 1);
++#endif
+
+ int chorusNr = ConfMan.getInt("fluidsynth_chorus_nr");
+ double chorusLevel =
(double)ConfMan.getInt("fluidsynth_chorus_level") / 100.0;
+@@ -210,22 +235,49 @@ int MidiDriver_FluidSynth::open() {
+ chorusType = FLUID_CHORUS_MOD_TRIANGLE;
+ }
+
++#if FS_API_VERSION >= 0x0202
++ fluid_synth_set_chorus_group_nr(_synth, -1, chorusNr);
++ fluid_synth_set_chorus_group_level(_synth, -1, chorusLevel);
++ fluid_synth_set_chorus_group_speed(_synth, -1, chorusSpeed);
++ fluid_synth_set_chorus_group_depth(_synth, -1, chorusDepthMs);
++
[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/, games-engines/scummvm/files/
commit: 0f43ed98a37ffddd26f18f1c6cbe53783148d9c8
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Jul 19 11:11:51 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Jul 19 11:49:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f43ed98
games-engines/scummvm: Drop old 2.1.0
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: James Le Cuirot gentoo.org>
games-engines/scummvm/Manifest | 1 -
.../files/scummvm-2.1.0-tts_pthread_link.patch | 22
games-engines/scummvm/scummvm-2.1.0.ebuild | 111 -
3 files changed, 134 deletions(-)
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index dd160ccc1dd..ce4c90ad0a3 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1 @@
-DIST scummvm-2.1.0.tar.xz 27188916 BLAKE2B
b808ff335e5b25c58c8caebfe660b4c2938dcb6eada0aa5b31777b97ff2fb7cb3732d516fc4d981ab1bee16876d62f634f69517158c7c233e11cc22575b15c09
SHA512
9a03cf207660aa49e49f53e1df10b774b7c9711dffd527e00518015e7e7057f25538a7dd89e248e9237434cf08a9f7ea6b215805fb65a770fb20596f5e713218
DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B
0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2
SHA512
a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc
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
deleted file mode 100644
index 70440be0e13..000
--- a/games-engines/scummvm/files/scummvm-2.1.0-tts_pthread_link.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/scummvm-2.1.0.ebuild
b/games-engines/scummvm/scummvm-2.1.0.ebuild
deleted file mode 100644
index 7aacd055d80..000
--- a/games-engines/scummvm/scummvm-2.1.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 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 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="a52 aac alsa debug flac fluidsynth jpeg lua mpeg2 mp3 net 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]
- 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 )
- net? ( media-libs/sdl2-net )
- 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"
- "${FILESDIR}/${P}-fluidsynth.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
-
[gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm/, games-engines/scummvm/files/
commit: 70c58a213ee7a2205cb7f6e7790063b97876ae60
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Dec 30 22:37:52 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Dec 30 22:38:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70c58a21
games-engines/scummvm: Drop old 2.0.0
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot gentoo.org>
games-engines/scummvm/Manifest | 1 -
.../files/scummvm-2.0.0-freetype_pkgconfig.patch | 99 --
games-engines/scummvm/scummvm-2.0.0-r1.ebuild | 98 -
3 files changed, 198 deletions(-)
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index eafca9329bc..75b986c1944 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,2 +1 @@
-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.0.0-freetype_pkgconfig.patch
b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index ca5c5e89271..000
--- 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
-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
-+
