From 490e6df8e390484ece962e3cd97b17271bc14392 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Mon, 23 Sep 2019 20:21:23 +0000 Subject: [PATCH] BUILDBOT: Let's go to new stable --- master/builds.py | 38 +------ master/patches/.empty | 0 master/patches/fix-freetype2.patch | 94 ---------------- master/patches/fix-mingw-sdl-FILE.patch | 42 ------- master/patches/fix-psp-debug.patch | 50 -------- master/patches/fix-psp-libpng.patch | 116 ------------------- master/patches/fix-tools-env.patch | 144 ------------------------ master/platforms.py | 8 +- 8 files changed, 9 insertions(+), 483 deletions(-) create mode 100644 master/patches/.empty delete mode 100644 master/patches/fix-freetype2.patch delete mode 100644 master/patches/fix-mingw-sdl-FILE.patch delete mode 100644 master/patches/fix-psp-debug.patch delete mode 100644 master/patches/fix-psp-libpng.patch delete mode 100644 master/patches/fix-tools-env.patch diff --git a/master/builds.py b/master/builds.py index 500275d..3069ba9 100644 --- a/master/builds.py +++ b/master/builds.py @@ -176,6 +176,7 @@ class ScummVMBuild(StandardBuild): "dists/engine-data/tony.dat", "dists/engine-data/toon.dat", "dists/engine-data/wintermute.zip", + "dists/networking/wwwroot.zip", "dists/pred.dic" ] @@ -279,40 +280,7 @@ class ScummVMBuild(StandardBuild): )] class ScummVMStableBuild(ScummVMBuild): - DATA_FILES = [ - "AUTHORS", - "COPYING", - "COPYING.LGPL", - "COPYING.BSD", - "COPYRIGHT", - "NEWS", - "README", - "gui/themes/translations.dat", - "gui/themes/scummclassic.zip", - "gui/themes/scummmodern.zip", - "dists/engine-data/access.dat", - "dists/engine-data/drascula.dat", - "dists/engine-data/hugo.dat", - "dists/engine-data/kyra.dat", - "dists/engine-data/lure.dat", - "dists/engine-data/mort.dat", - "dists/engine-data/neverhood.dat", - "dists/engine-data/queen.tbl", - "dists/engine-data/sky.cpt", - "dists/engine-data/teenagent.dat", - "dists/engine-data/tony.dat", - "dists/engine-data/toon.dat", - "dists/engine-data/wintermute.zip", - "dists/pred.dic" - ] - - PATCHES = [ - "./patches/fix-freetype2.patch", - "./patches/fix-tools-env.patch", - "./patches/fix-mingw-sdl-FILE.patch", - "./patches/fix-psp-libpng.patch", - "./patches/fix-psp-debug.patch", - ] + pass class ScummVMToolsBuild(StandardBuild): __slots__ = [ 'data_files', 'verbose_build' ] @@ -417,6 +385,6 @@ class ScummVMToolsBuild(StandardBuild): builds = [] builds.append(ScummVMBuild("master", "https://github.com/scummvm/scummvm", "master", verbose_build=True, nightly=(4, 1))) -builds.append(ScummVMStableBuild("stable", "https://github.com/scummvm/scummvm", "branch-2-0", verbose_build=True, nightly=(4, 1))) +builds.append(ScummVMStableBuild("stable", "https://github.com/scummvm/scummvm", "branch-2-1", verbose_build=True, nightly=(4, 1))) #builds.append(ScummVMBuild("gsoc2012", "https://github.com/digitall/scummvm", "gsoc2012-scalers-cont", verbose_build=True)) builds.append(ScummVMToolsBuild("tools-master", "https://github.com/scummvm/scummvm-tools", "master", verbose_build=True, nightly=(4, 1))) diff --git a/master/patches/.empty b/master/patches/.empty new file mode 100644 index 0000000..e69de29 diff --git a/master/patches/fix-freetype2.patch b/master/patches/fix-freetype2.patch deleted file mode 100644 index 1e6f8c6..0000000 --- a/master/patches/fix-freetype2.patch +++ /dev/null @@ -1,94 +0,0 @@ -commit 2a0a5f496574aa576b0fcdc5f0e8b683ce1070d2 -Author: Lars Wendler -Date: Sun May 6 20:55:29 2018 +0200 - - BUILD: Prefer pkg-config over freetype-config if possible - - As of freetype-2.9.1 the freetype-config script no longer gets installed - by default. - -diff --git a/configure b/configure -index f3e1bbbf9b..46d036e56e 100755 ---- a/configure -+++ b/configure -@@ -211,6 +211,7 @@ _sparklepath= - _sdlconfig=sdl2-config - _libcurlconfig=curl-config - _freetypeconfig=freetype-config -+_freetype_found="false" - _sdlpath="$PATH" - _freetypepath="$PATH" - _libcurlpath="$PATH" -@@ -4726,28 +4727,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 - -@@ -4767,7 +4785,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 diff --git a/master/patches/fix-mingw-sdl-FILE.patch b/master/patches/fix-mingw-sdl-FILE.patch deleted file mode 100644 index 0d7c14c..0000000 --- a/master/patches/fix-mingw-sdl-FILE.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f3f508882430221f26d346d532434bf14da9e503 Mon Sep 17 00:00:00 2001 -From: Colin Snover -Date: Tue, 30 Jan 2018 19:27:48 -0600 -Subject: [PATCH] SDL: Do not try to replace FILE with an incompatible type -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It’s questionable that the SDL backend code is trying so hard to -maintain forbidden symbols at all since backend code is exactly -where such things are allowed, and it is a game of whack-a-mole -to keep system API changes from breaking this fragile system of -symbol redefinitions. Probably this should all just get replaced -with a FORBIDDEN_SYMBOL_ALLOW_ALL, but for the time being this at -least gets builds working again on up-to-date msys2/mingw-w64 -compilers. - -Fixes Trac#10405. ---- - backends/platform/sdl/sdl-sys.h | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h -index 9ebd123bb46..9b87f5eabdf 100644 ---- a/backends/platform/sdl/sdl-sys.h -+++ b/backends/platform/sdl/sdl-sys.h -@@ -31,15 +31,8 @@ - - #include "common/scummsys.h" - --// Remove FILE override from common/forbidden.h, and replace --// it with an alternate slightly less unfriendly override. - #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_FILE) - #undef FILE --// Solaris has typedef __FILE FILE in several places already --#if !defined(__sun) --typedef struct { int FAKE; } FAKE_FILE; --#define FILE FAKE_FILE --#endif // (__sun) - #endif - - #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_strcasecmp) diff --git a/master/patches/fix-psp-debug.patch b/master/patches/fix-psp-debug.patch deleted file mode 100644 index 2320d40..0000000 --- a/master/patches/fix-psp-debug.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c240af799fa61f647073cfa5b94d76b26880c143 Mon Sep 17 00:00:00 2001 -From: Colin Snover -Date: Sun, 29 Oct 2017 13:15:38 -0500 -Subject: [PATCH] PSP: Fix compilation failures when debug printing is enabled - ---- - backends/platform/psp/display_manager.cpp | 2 +- - backends/platform/psp/osys_psp.cpp | 2 +- - backends/platform/psp/png_loader.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp -index 54ad0d3223c..fd94827e049 100644 ---- a/backends/platform/psp/display_manager.cpp -+++ b/backends/platform/psp/display_manager.cpp -@@ -435,7 +435,7 @@ bool DisplayManager::renderAll() { - _overlay->isDirty() ? "true" : "false", - _cursor->isDirty() ? "true" : "false", - _keyboard->isDirty() ? "true" : "false", -- _imageViewer->isDirty() ? "true" : "false", -+ _imageViewer->isDirty() ? "true" : "false" - ); - - _masterGuRenderer.guPreRender(); // Set up rendering -diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp -index 314580fd373..5d9e3aba61d 100644 ---- a/backends/platform/psp/osys_psp.cpp -+++ b/backends/platform/psp/osys_psp.cpp -@@ -314,7 +314,7 @@ void OSystem_PSP::setMouseCursor(const void *buf, uint w, uint h, int hotspotX, - _displayManager.waitUntilRenderFinished(); - _pendingUpdate = false; - -- PSP_DEBUG_PRINT("pbuf[%p], w[%u], h[%u], hotspot:X[%d], Y[%d], keycolor[%d], scale[%d], pformat[%p]\n", buf, w, h, hotspotX, hotspotY, keycolor, cursorTargetScale, format); -+ PSP_DEBUG_PRINT("pbuf[%p], w[%u], h[%u], hotspot:X[%d], Y[%d], keycolor[%d], scale[%d], pformat[%p]\n", buf, w, h, hotspotX, hotspotY, keycolor, !dontScale, format); - if (format) { - PSP_DEBUG_PRINT("format: bpp[%d], rLoss[%d], gLoss[%d], bLoss[%d], aLoss[%d], rShift[%d], gShift[%d], bShift[%d], aShift[%d]\n", format->bytesPerPixel, format->rLoss, format->gLoss, format->bLoss, format->aLoss, format->rShift, format->gShift, format->bShift, format->aShift); - } -diff --git a/backends/platform/psp/png_loader.cpp b/backends/platform/psp/png_loader.cpp -index 91187ae4d8f..502ebf52ccf 100644 ---- a/backends/platform/psp/png_loader.cpp -+++ b/backends/platform/psp/png_loader.cpp -@@ -144,7 +144,7 @@ bool PngLoader::findImageDimensions() { - - bool status = basicImageLoad(); - -- PSP_DEBUG_PRINT("width[%d], height[%d], paletteSize[%d], bitDepth[%d], channels[%d], rowBytes[%d]\n", _width, _height, _paletteSize, _bitDepth, _channels, _infoPtr->rowbytes); -+ PSP_DEBUG_PRINT("width[%d], height[%d], paletteSize[%d], bitDepth[%d], channels[%d], rowBytes[%d]\n", _width, _height, _paletteSize, _bitDepth, _channels, png_get_rowbytes(_pngPtr, _infoPtr)); - png_destroy_read_struct(&_pngPtr, &_infoPtr, NULL); - return status; - } diff --git a/master/patches/fix-psp-libpng.patch b/master/patches/fix-psp-libpng.patch deleted file mode 100644 index d3f767c..0000000 --- a/master/patches/fix-psp-libpng.patch +++ /dev/null @@ -1,116 +0,0 @@ -From ce1868a28abea643e3b4fe7797ec4328d6b54091 Mon Sep 17 00:00:00 2001 -From: Colin Snover -Date: Fri, 27 Oct 2017 22:22:31 -0500 -Subject: [PATCH] PSP: Fix usage of obsolete libpng APIs - -These APIs were deprecated as early as libpng1.2 and were removed -by libpng1.5. ---- - backends/platform/psp/png_loader.cpp | 37 +++++++++++++++++----------- - 1 file changed, 23 insertions(+), 14 deletions(-) - -diff --git a/backends/platform/psp/png_loader.cpp b/backends/platform/psp/png_loader.cpp -index e54541b75d1..277546a4136 100644 ---- a/backends/platform/psp/png_loader.cpp -+++ b/backends/platform/psp/png_loader.cpp -@@ -99,7 +99,7 @@ void PngLoader::warningFn(png_structp png_ptr, png_const_charp warning_msg) { - // Read function for png library to be able to read from our SeekableReadStream - // - void PngLoader::libReadFunc(png_structp pngPtr, png_bytep data, png_size_t length) { -- Common::SeekableReadStream &file = *(Common::SeekableReadStream *)pngPtr->io_ptr; -+ Common::SeekableReadStream &file = *(Common::SeekableReadStream *)png_get_io_ptr(pngPtr); - - file.read(data, length); - } -@@ -114,7 +114,7 @@ bool PngLoader::basicImageLoad() { - - _infoPtr = png_create_info_struct(_pngPtr); - if (!_infoPtr) { -- png_destroy_read_struct(&_pngPtr, png_infopp_NULL, png_infopp_NULL); -+ png_destroy_read_struct(&_pngPtr, NULL, NULL); - return false; - } - // Set the png lib to use our read function -@@ -126,11 +126,14 @@ bool PngLoader::basicImageLoad() { - png_read_info(_pngPtr, _infoPtr); - int interlaceType; - png_get_IHDR(_pngPtr, _infoPtr, (png_uint_32 *)&_width, (png_uint_32 *)&_height, &_bitDepth, -- &_colorType, &interlaceType, int_p_NULL, int_p_NULL); -+ &_colorType, &interlaceType, NULL, NULL); - _channels = png_get_channels(_pngPtr, _infoPtr); - -- if (_colorType & PNG_COLOR_MASK_PALETTE) -- _paletteSize = _infoPtr->num_palette; -+ if (_colorType & PNG_COLOR_MASK_PALETTE) { -+ int paletteSize; -+ png_get_PLTE(_pngPtr, _infoPtr, NULL, &paletteSize); -+ _paletteSize = paletteSize; -+ } - - return true; - } -@@ -142,7 +145,7 @@ bool PngLoader::findImageDimensions() { - bool status = basicImageLoad(); - - PSP_DEBUG_PRINT("width[%d], height[%d], paletteSize[%d], bitDepth[%d], channels[%d], rowBytes[%d]\n", _width, _height, _paletteSize, _bitDepth, _channels, _infoPtr->rowbytes); -- png_destroy_read_struct(&_pngPtr, &_infoPtr, png_infopp_NULL); -+ png_destroy_read_struct(&_pngPtr, &_infoPtr, NULL); - return status; - } - -@@ -153,22 +156,28 @@ bool PngLoader::loadImageIntoBuffer() { - DEBUG_ENTER_FUNC(); - - if (!basicImageLoad()) { -- png_destroy_read_struct(&_pngPtr, &_infoPtr, png_infopp_NULL); -+ png_destroy_read_struct(&_pngPtr, &_infoPtr, NULL); - return false; - } - png_set_strip_16(_pngPtr); // Strip off 16 bit channels in case they occur - - if (_paletteSize) { - // Copy the palette -- png_colorp srcPal = _infoPtr->palette; -- for (int i = 0; i < _infoPtr->num_palette; i++) { -- unsigned char alphaVal = (i < _infoPtr->num_trans) ? _infoPtr->trans[i] : 0xFF; // Load alpha if it's there -+ png_colorp srcPal; -+ int numPalette; -+ png_get_PLTE(_pngPtr, _infoPtr, &srcPal, &numPalette); -+ png_bytep transAlpha; -+ int numTrans; -+ png_color_16p transColor; -+ png_get_tRNS(_pngPtr, _infoPtr, &transAlpha, &numTrans, &transColor); -+ for (int i = 0; i < numPalette; i++) { -+ unsigned char alphaVal = (i < numTrans) ? transAlpha[i] : 0xFF; // Load alpha if it's there - _palette->setSingleColorRGBA(i, srcPal->red, srcPal->green, srcPal->blue, alphaVal); - srcPal++; - } - } else { // Not a palettized image - if (_colorType == PNG_COLOR_TYPE_GRAY && _bitDepth < 8) -- png_set_gray_1_2_4_to_8(_pngPtr); // Round up grayscale images -+ png_set_expand_gray_1_2_4_to_8(_pngPtr); // Round up grayscale images - if (png_get_valid(_pngPtr, _infoPtr, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha(_pngPtr); // Convert trans channel to alpha for 32 bits - -@@ -188,18 +197,18 @@ bool PngLoader::loadImageIntoBuffer() { - - unsigned char *line = (unsigned char*) malloc(rowBytes); - if (!line) { -- png_destroy_read_struct(&_pngPtr, png_infopp_NULL, png_infopp_NULL); -+ png_destroy_read_struct(&_pngPtr, NULL, NULL); - PSP_ERROR("Couldn't allocate line\n"); - return false; - } - - for (size_t y = 0; y < _height; y++) { -- png_read_row(_pngPtr, line, png_bytep_NULL); -+ png_read_row(_pngPtr, line, NULL); - _buffer->copyFromRect(line, rowBytes, 0, y, _width, 1); // Copy into buffer - } - free(line); - png_read_end(_pngPtr, _infoPtr); -- png_destroy_read_struct(&_pngPtr, &_infoPtr, png_infopp_NULL); -+ png_destroy_read_struct(&_pngPtr, &_infoPtr, NULL); - - return true; - } diff --git a/master/patches/fix-tools-env.patch b/master/patches/fix-tools-env.patch deleted file mode 100644 index ae4e08e..0000000 --- a/master/patches/fix-tools-env.patch +++ /dev/null @@ -1,144 +0,0 @@ -commit 454013f9484281feeee1ab41b34f914902e4912e -Author: Colin Snover -Date: Fri Oct 20 11:47:43 2017 -0500 - - BUILD: Respect all build tool overrides from environment - - Previously, only CXX could be overridden by the environment, which - made it impossible to correctly set tools for cross-compiler - toolchains which were not compatible with the default system tools. - -diff --git a/Makefile b/Makefile -index 36b4592b20..1b2f35527f 100644 ---- a/Makefile -+++ b/Makefile -@@ -88,10 +88,12 @@ config.h: $(srcdir)/configure $(ENGINE_SUBDIRS_CONFIGURE) - ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk" - @echo "Running $(srcdir)/configure with the last specified parameters" - @sleep 2 -- LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" \ -- CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" \ -- ASFLAGS="$(SAVED_ASFLAGS)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \ -- SDL_CONFIG="$(SAVED_SDL_CONFIG)" \ -+ AR="$(SAVED_AR)" AS="$(SAVED_AS)" ASFLAGS="$(SAVED_ASFLAGS)" \ -+ CPPFLAGS="$(SAVED_CPPFLAGS)" CXX="$(SAVED_CXX)" \ -+ CXXFLAGS="$(SAVED_CXXFLAGS)" LD="$(SAVED_LD)" \ -+ LDFLAGS="$(SAVED_LDFLAGS)" RANLIB="$(SAVED_RANLIB)" \ -+ SDL_CONFIG="$(SAVED_SDL_CONFIG)" STRIP="$(SAVED_STRIP)" \ -+ WINDRES="$(SAVED_WINDRES)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \ - $(srcdir)/configure $(SAVED_CONFIGFLAGS) - else - $(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters) -diff --git a/configure b/configure -index fe6a3c1ed3..c8ffc3be0e 100755 ---- a/configure -+++ b/configure -@@ -29,13 +29,19 @@ export LANGUAGE - - # Save the current environment variables for next runs - SAVED_CONFIGFLAGS=$@ --SAVED_LDFLAGS=$LDFLAGS -+SAVED_AR=$AR -+SAVED_AS=$AS -+SAVED_ASFLAGS=$ASFLAGS -+SAVED_CPPFLAGS=$CPPFLAGS - SAVED_CXX=$CXX - SAVED_CXXFLAGS=$CXXFLAGS --SAVED_CPPFLAGS=$CPPFLAGS --SAVED_ASFLAGS=$ASFLAGS --SAVED_WINDRESFLAGS=$WINDRESFLAGS -+SAVED_LD=$LD -+SAVED_LDFLAGS=$LDFLAGS -+SAVED_RANLIB=$RANLIB - SAVED_SDL_CONFIG=$SDL_CONFIG -+SAVED_STRIP=$STRIP -+SAVED_WINDRES=$WINDRES -+SAVED_WINDRESFLAGS=$WINDRESFLAGS - - # Use environment vars if set - CXXFLAGS="$CXXFLAGS $CPPFLAGS" -@@ -1094,7 +1100,7 @@ cat >> $TMPLOG <> "$TMPLOG" --if `which $_host_alias-strings >/dev/null 2>&1`; then --_strings=$_host_alias-strings --echo yes >> "$TMPLOG" -+if test -n "$STRINGS"; then -+ _strings=$STRINGS - else --_strings=strings --echo no >> "$TMPLOG" -+ echo_n "Checking for $_host_alias-strings... " >> "$TMPLOG" -+ if `which $_host_alias-strings >/dev/null 2>&1`; then -+ _strings=$_host_alias-strings -+ echo yes >> "$TMPLOG" -+ else -+ _strings=strings -+ echo no >> "$TMPLOG" -+ fi - fi - - # -@@ -5302,13 +5331,19 @@ $_mak_plugins - port_mk = $_port_mk - - SAVED_CONFIGFLAGS := $SAVED_CONFIGFLAGS --SAVED_LDFLAGS := $SAVED_LDFLAGS -+SAVED_AR := $SAVED_AR -+SAVED_AS := $SAVED_AS -+SAVED_ASFLAGS := $SAVED_ASFLAGS -+SAVED_CPPFLAGS := $SAVED_CPPFLAGS - SAVED_CXX := $SAVED_CXX - SAVED_CXXFLAGS := $SAVED_CXXFLAGS --SAVED_CPPFLAGS := $SAVED_CPPFLAGS --SAVED_ASFLAGS := $SAVED_ASFLAGS --SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS -+SAVED_LD := $SAVED_LD -+SAVED_LDFLAGS := $SAVED_LDFLAGS -+SAVED_RANLIB := $SAVED_RANLIB - SAVED_SDL_CONFIG := $SAVED_SDL_CONFIG -+SAVED_STRIP := $SAVED_STRIP -+SAVED_WINDRES := $SAVED_WINDRES -+SAVED_WINDRESFLAGS := $SAVED_WINDRESFLAGS - EOF - - # diff --git a/master/platforms.py b/master/platforms.py index 0a26193..32ab9be 100644 --- a/master/platforms.py +++ b/master/platforms.py @@ -235,8 +235,12 @@ def vita(): platform.env["CXX"] = "ccache /usr/local/vitasdk/bin/arm-vita-eabi-g++" platform.configureargs.append("--host=psp2") platform.buildconfigureargs = { - builds.ScummVMBuild: [ "--disable-engines=lastexpress", "--disable-engines=glk" ], - builds.ScummVMStableBuild: [ "--disable-engines=lastexpress" ], + builds.ScummVMBuild: [ + "--disable-engines=lastexpress", + "--disable-engines=glk", + "--disable-engines=dm", + "--disable-engines=director", + ], } platform.packaging_cmd = "psp2vpk" platform.built_files = {