[Scummvm-git-logs] scummvm master -> 6d1b7fec1d07ce699e2b1d827d6fd0fe516b5a74

bgK bastien.bouclet at gmail.com
Tue Aug 30 21:20:23 CEST 2016


This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dac70196f0 GUI: Fix hidden files visibility getting out of sync in the files browser
b00cb955d9 BACKENDS: Use open instead of creat to create files
0ca22569b3 BUILD: Fix typos in find_libcurlconfig
8ba1bd0bd3 BUILD: Don't try to run the curl test executable when cross-compiling
6d1b7fec1d BUILD: Force the curl path when building the PS3 version


Commit: dac70196f08650dc90837a7d4d68b7e9d115345d
    https://github.com/scummvm/scummvm/commit/dac70196f08650dc90837a7d4d68b7e9d115345d
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-08-30T21:19:59+02:00

Commit Message:
GUI: Fix hidden files visibility getting out of sync in the files browser

- The checkbox state was not initialized when opening the dialog.
- The visibility state was initialized from ConfMan too early resuling
  in the value being incorrect when multiple file browsers are used.

Changed paths:
    gui/browser.cpp



diff --git a/gui/browser.cpp b/gui/browser.cpp
index 83e240a..19fa791 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -49,7 +49,7 @@ BrowserDialog::BrowserDialog(const char *title, bool dirBrowser)
 	_isDirBrowser = dirBrowser;
 	_fileList = NULL;
 	_currentPath = NULL;
-	_showHidden = ConfMan.getBool("gui_browser_show_hidden", Common::ConfigManager::kApplicationDomain);
+	_showHidden = false;
 
 	// Headline - TODO: should be customizable during creation time
 	new StaticTextWidget(this, "Browser.Headline", title);
@@ -85,8 +85,10 @@ void BrowserDialog::open() {
 	if (!_node.isDirectory())
 		_node = Common::FSNode(".");
 
-	// Alway refresh file list
-	updateListing();
+	_showHidden = ConfMan.getBool("gui_browser_show_hidden", Common::ConfigManager::kApplicationDomain);
+	_showHiddenWidget->setState(_showHidden);
+
+	// At this point the file list has already been refreshed by the kHiddenCmd handler
 }
 
 void BrowserDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {


Commit: b00cb955d9eda9829aee00ac548389f555cab29e
    https://github.com/scummvm/scummvm/commit/b00cb955d9eda9829aee00ac548389f555cab29e
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-08-30T21:19:59+02:00

Commit Message:
BACKENDS: Use open instead of creat to create files

creat is not defined on the PS3. Also close the file descriptor.

Changed paths:
    backends/fs/posix/posix-fs.cpp



diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp
index b38a076..8597158 100644
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@@ -259,7 +259,12 @@ bool POSIXFilesystemNode::create(bool isDirectory) {
 	if (isDirectory) {
 		success = mkdir(_path.c_str(), 0755) == 0;
 	} else {
-		success = creat(_path.c_str(), 0755) != -1;
+		int fd = open(_path.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0755);
+		success = fd >= 0;
+
+		if (fd >= 0) {
+			close(fd);
+		}
 	}
 
 	if (success) {		


Commit: 0ca22569b305c98b90d059cb127ebd7ffc0b6df1
    https://github.com/scummvm/scummvm/commit/0ca22569b305c98b90d059cb127ebd7ffc0b6df1
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-08-30T21:20:00+02:00

Commit Message:
BUILD: Fix typos in find_libcurlconfig

Changed paths:
    configure



diff --git a/configure b/configure
index 5975cf4..328d2ad 100755
--- a/configure
+++ b/configure
@@ -457,9 +457,9 @@ find_libcurlconfig() {
 				# Save the prefix
 				_libcurlpath=$path_dir
 				if test `basename $path_dir` = bin ; then
-					_sdlpath=`dirname $path_dir`
+					_libcurlpath=`dirname $path_dir`
 				fi
-				# break at first sdl-config found in path
+				# break at first curl-config found in path
 				break 2
 			fi
 		done


Commit: 8ba1bd0bd34feb39b9ac89d1ca90b98570f7cf7f
    https://github.com/scummvm/scummvm/commit/8ba1bd0bd34feb39b9ac89d1ca90b98570f7cf7f
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-08-30T21:20:00+02:00

Commit Message:
BUILD: Don't try to run the curl test executable when cross-compiling

Changed paths:
    configure



diff --git a/configure b/configure
index 328d2ad..42be5a3 100755
--- a/configure
+++ b/configure
@@ -4185,11 +4185,16 @@ EOF
 
 			cc_check_no_clean $LIBCURL_CFLAGS $LIBCURL_LIBS
 			if test "$?" -eq 0; then
-				$TMPO$HOSTEXEEXT
-				if test "$?" -eq 0; then
+				if test -n "$_host"; then
+					# In cross-compiling mode, we cannot run the result, assume SSL is available
 					_libcurl=yes
 				else
-					_libcurl="no SSL support"
+					$TMPO$HOSTEXEEXT
+					if test "$?" -eq 0; then
+						_libcurl=yes
+					else
+						_libcurl="no SSL support"
+					fi
 				fi
 			fi
 			cc_check_clean


Commit: 6d1b7fec1d07ce699e2b1d827d6fd0fe516b5a74
    https://github.com/scummvm/scummvm/commit/6d1b7fec1d07ce699e2b1d827d6fd0fe516b5a74
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2016-08-30T21:20:00+02:00

Commit Message:
BUILD: Force the curl path when building the PS3 version

Also, since SDL2 is enabled by default, there is no need to force using
sdl2-config anymore.

Changed paths:
    configure



diff --git a/configure b/configure
index 42be5a3..aa11d67 100755
--- a/configure
+++ b/configure
@@ -2597,9 +2597,9 @@ case $_host_os in
 		;;
 	ps3)
 		# Force use of SDL and freetype from the ps3 toolchain
-		_sdlconfig=sdl2-config
 		_sdlpath="$PS3DEV/portlibs/ppu:$PS3DEV/portlibs/ppu/bin"
 		_freetypepath="$PS3DEV/portlibs/ppu:$PS3DEV/portlibs/ppu/bin"
+		_libcurlpath="$PS3DEV/portlibs/ppu:$PS3DEV/portlibs/ppu/bin"
 
 		append_var DEFINES "-DPLAYSTATION3"
 		append_var CXXFLAGS "-mcpu=cell -mminimal-toc -I$PSL1GHT/ppu/include -I$PS3DEV/portlibs/ppu/include"





More information about the Scummvm-git-logs mailing list