Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

1 files changed, 18 insertions, 1 deletions

diff --git a/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp b/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
index 8bb6c642b11..b1bac964c61 100644
--- a/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
+++ b/intern/SoundSystem/sdl/SND_SDLCDDevice.cpp
@@ -41,7 +41,9 @@
 #include "SND_SDLCDDevice.h"
 #include "SoundDefines.h"
 
+#ifndef DISABLE_SDL
 #include <SDL.h>
+#endif
 
 SND_SDLCDDevice::SND_SDLCDDevice() :
 	m_cdrom(NULL),
@@ -55,6 +57,10 @@ SND_SDLCDDevice::SND_SDLCDDevice() :
 
 void SND_SDLCDDevice::init()
 {
+#ifdef DISABLE_SDL
+	fprintf(stderr, "Blender compiled without SDL, no CDROM support\n");
+	return;
+#else
 	if (SDL_InitSubSystem(SDL_INIT_CDROM))
 	{
 		fprintf(stderr, "Error initializing CDROM\n");
@@ -75,19 +81,23 @@ void SND_SDLCDDevice::init()
 	/* Did if open? Check if cdrom is NULL */
 	if(!m_cdrom)
 	{
-		fprintf(stderr, "Couldn't open drive: %s", SDL_GetError());
+		fprintf(stderr, "Couldn't open drive: %s\n", SDL_GetError());
 		return;
 	}
+#endif
 }
 
 SND_SDLCDDevice::~SND_SDLCDDevice()
 {
+#ifndef DISABLE_SDL
 	StopCD();
 	SDL_CDClose(m_cdrom);
+#endif
 }
 
 void SND_SDLCDDevice::NextFrame()
 {
+#ifndef DISABLE_SDL
 	m_frame++;
 	m_frame &= 127;
 	
@@ -111,20 +121,24 @@ void SND_SDLCDDevice::NextFrame()
 		}
 	
 	}
+#endif
 }
 	
 void SND_SDLCDDevice::PlayCD(int track)
 {
+#ifndef DISABLE_SDL
 	if ( m_cdrom && CD_INDRIVE(SDL_CDStatus(m_cdrom)) ) {
 		SDL_CDPlayTracks(m_cdrom, track-1, 0, track, 0);
 		m_cdplaying = true;
 		m_cdtrack = track;
 	}
+#endif
 }
 
 
 void SND_SDLCDDevice::PauseCD(bool pause)
 {
+#ifndef DISABLE_SDL
 	if (!m_cdrom)
 		return;
 		
@@ -132,13 +146,16 @@ void SND_SDLCDDevice::PauseCD(bool pause)
 		SDL_CDPause(m_cdrom);
 	else
 		SDL_CDResume(m_cdrom);
+#endif
 }
 
 void SND_SDLCDDevice::StopCD()
 {
+#ifndef DISABLE_SDL
 	if (m_cdrom)
 		SDL_CDStop(m_cdrom);
 	m_cdplaying = false;
+#endif
 }
 
 void SND_SDLCDDevice::SetCDPlaymode(int playmode)