[Scummvm-cvs-logs] scummvm master -> df80820184c90a87511f0cabdca4addb9fa13a66

[lordhoto]

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

Summary:
a83bca79da CONFIGURE: Add initial virtual feature support.
ac720acc67 CONFIGURE: Update documentation for add_engine.
0612aac72b CONFIGURE: Make Wintermute dependent on vorbis.
df80820184 Revert "WINTERMUTE: Fix compilation when vorbis isn't available"


Commit: a83bca79dac51222394cd328abdc5a87ab3cb6a2
    https://github.com/scummvm/scummvm/commit/a83bca79dac51222394cd328abdc5a87ab3cb6a2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-09-04T11:38:17-07:00

Commit Message:
CONFIGURE: Add initial virtual feature support.

This is used to support features as dependencies, which can be supplied by
multiple sources, like it is the case for Vorbis support.

Changed paths:
    configure



diff --git a/configure b/configure
index 5d440ba..33d2de1 100755
--- a/configure
+++ b/configure
@@ -78,6 +78,14 @@ add_engine() {
 	done
 }
 
+# Add a feature: id name settings-list
+add_feature() {
+	set_var _feature_${1}_name "${2}"
+	# This is a list of settings, where one must be "yes" for the feature to
+	# be enabled
+	set_var _feature_${1}_settings "${3}"
+}
+
 _srcdir=`dirname $0`
 
 # Read list of engines
@@ -163,6 +171,17 @@ _endian=unknown
 _need_memalign=yes
 _have_x86=no
 
+# Add (virtual) features
+add_feature 16bit "16bit color" "_16bit"
+add_feature faad "libfaad" "_faad"
+add_feature flac "FLAC" "_flac"
+add_feature freetype2 "FreeType2" "_freetype2"
+add_feature mad "MAD" "_mad"
+add_feature png "PNG" "_png"
+add_feature theoradec "libtheoradec" "_theoradec"
+add_feature vorbis "Vorbis file support" "_vorbis _tremor"
+add_feature zlib "zlib" "_zlib"
+
 
 
 # Directories for installing ScummVM.
@@ -440,6 +459,26 @@ Try \`$0 --help' for more information." >&2
 }
 
 
+#
+# Feature handling functions
+#
+
+# Get the name of the feature
+get_feature_name() {
+	get_var _feature_$1_name
+}
+
+# Check whether the feature is enabled
+get_feature_state() {
+	for i in `get_var _feature_$1_settings`; do
+		if test `get_var $i` = "yes"; then
+			echo "yes"
+			return
+		fi
+	done
+	echo "no"
+}
+
 
 #
 # Engine handling functions
@@ -547,8 +586,9 @@ check_engine_deps() {
 	if test `get_engine_build $1` = yes ; then
 		# Collect unmet dependencies
 		for dep in `get_engine_dependencies $1`; do
-			if test `get_var _${dep}` = no ; then
-				unmet_deps="${unmet_deps}${dep} "
+			if test `get_feature_state $dep` = "no"; then
+				feature_name=`get_feature_name $dep`
+				unmet_deps="${unmet_deps}${feature_name} "
 			fi
 		done
 


Commit: ac720acc6701a491ad84bfea7f047825084eddfc
    https://github.com/scummvm/scummvm/commit/ac720acc6701a491ad84bfea7f047825084eddfc
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-09-04T11:38:21-07:00

Commit Message:
CONFIGURE: Update documentation for add_engine.

Changed paths:
    configure



diff --git a/configure b/configure
index 33d2de1..df2c210 100755
--- a/configure
+++ b/configure
@@ -62,7 +62,7 @@ get_var() {
 	eval echo \$${1}
 }
 
-# Add an engine: id name build subengines
+# Add an engine: id name build subengines dependencies
 add_engine() {
 	_engines="${_engines} ${1}"
 	if test "${3}" = "no" ; then


Commit: 0612aac72b160ef5db15c1ae004536155f8b3826
    https://github.com/scummvm/scummvm/commit/0612aac72b160ef5db15c1ae004536155f8b3826
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-09-04T11:38:21-07:00

Commit Message:
CONFIGURE: Make Wintermute dependent on vorbis.

This is done as discussed with somaen.

Changed paths:
    engines/configure.engines



diff --git a/engines/configure.engines b/engines/configure.engines
index 26fd2dd..b8b1677 100644
--- a/engines/configure.engines
+++ b/engines/configure.engines
@@ -45,4 +45,4 @@ add_engine toon "Toonstruck" yes
 add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes
 add_engine tsage "TsAGE" yes
 add_engine tucker "Bud Tucker in Double Trouble" yes
-add_engine wintermute "Wintermute" no "" "png zlib"
+add_engine wintermute "Wintermute" no "" "png zlib vorbis"


Commit: df80820184c90a87511f0cabdca4addb9fa13a66
    https://github.com/scummvm/scummvm/commit/df80820184c90a87511f0cabdca4addb9fa13a66
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-09-04T11:38:22-07:00

Commit Message:
Revert "WINTERMUTE: Fix compilation when vorbis isn't available"

This reverts commit 4cfd906cec08fec8c27f33c1a54651271a4fb104.

We now have vorbis as a hard requirement for Wintermute. Also somaen said this
commit causes issues, so we agreed on reverting this hack.

Changed paths:
    engines/wintermute/base/sound/base_sound_buffer.cpp



diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index 24414e3..e2d9c8c 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -104,9 +104,7 @@ bool BaseSoundBuffer::loadFromFile(const Common::String &filename, bool forceRel
 	Common::String strFilename(filename);

 	strFilename.toLowercase();

 	if (strFilename.hasSuffix(".ogg")) {

-#ifdef USE_VORBIS

 		_stream = Audio::makeVorbisStream(_file, DisposeAfterUse::YES);

-#endif

 	} else if (strFilename.hasSuffix(".wav")) {

 		int waveSize, waveRate;

 		byte waveFlags;