Automated merge with https://bitbucket.org/Markusk/sdl-gsoc

.hgignore

@@ -92,5 +92,7 @@ test/testwm
 test/testwm2
 test/threadwin
 test/torturethread
+test/testthread
+test/testgamma
 test/*.exe
 test/*.dSYM

Makefile.pandora

@@ -15,7 +15,7 @@ TARGET  = libSDL.a
 SOURCES = ./src/*.c ./src/audio/*.c ./src/cpuinfo/*.c ./src/events/*.c \
 	./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \
 	./src/joystick/*.c ./src/haptic/*.c ./src/power/*.c ./src/video/dummy/*.c ./src/audio/disk/*.c \
-	./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c ./src/audio/dma/*.c \
+	./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c \
 	./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \
 	./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \
 	./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c \

Makefile.wiz

@@ -15,7 +15,7 @@ TARGET_SHARED  = libSDL13.so
 SOURCES = ./src/*.c ./src/audio/*.c ./src/cdrom/*.c ./src/cpuinfo/*.c ./src/events/*.c \
 	./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \
 	./src/joystick/*.c ./src/haptic/*.c ./src/video/dummy/*.c ./src/audio/disk/*.c \
-	./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c ./src/audio/dma/*.c \
+	./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c \
 	./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \
 	./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \
 	./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c ./src/cdrom/dummy/*.c \

VisualC/SDL/SDL_VS2005.vcproj

@@ -580,7 +580,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windx5\directx.h"
+			RelativePath="..\..\src\audio\directsound\directx.h"
 			>
 		</File>
 		<File
@@ -796,11 +796,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
+			RelativePath="..\..\src\audio\winmm\SDL_winmm.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windib\SDL_dibaudio.h"
+			RelativePath="..\..\src\audio\winmm\SDL_winmm.h"
 			>
 		</File>
 		<File
@@ -840,11 +840,15 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windx5\SDL_dx5audio.c"
+			RelativePath="..\..\src\audio\directsound\SDL_directsound.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windx5\SDL_dx5audio.h"
+			RelativePath="..\..\src\audio\directsound\SDL_directsound.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.c"
 			>
 		</File>
 		<File
@@ -907,6 +911,10 @@
 			RelativePath="..\..\src\SDL_hints.c"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\SDL_hints_c.h"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\stdlib\SDL_iconv.c"
 			>

VisualC/SDL/SDL_VS2008.vcproj

@@ -569,7 +569,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windx5\directx.h"
+			RelativePath="..\..\src\audio\directsound\directx.h"
 			>
 		</File>
 		<File
@@ -785,11 +785,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
+			RelativePath="..\..\src\audio\winmm\SDL_winmm.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windib\SDL_dibaudio.h"
+			RelativePath="..\..\src\audio\winmm\SDL_winmm.h"
 			>
 		</File>
 		<File
@@ -829,11 +829,15 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windx5\SDL_dx5audio.c"
+			RelativePath="..\..\src\audio\directsound\SDL_directsound.c"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\audio\windx5\SDL_dx5audio.h"
+			RelativePath="..\..\src\audio\directsound\SDL_directsound.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\audio\xaudio2\SDL_xaudio2.c"
 			>
 		</File>
 		<File
@@ -896,6 +900,10 @@
 			RelativePath="..\..\src\SDL_hints.c"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\SDL_hints_c.h"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\stdlib\SDL_iconv.c"
 			>

VisualC/SDL/SDL_VS2010.vcxproj

@@ -250,7 +250,7 @@
     <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />
     <ClInclude Include="..\..\src\events\blank_cursor.h" />
     <ClInclude Include="..\..\src\events\default_cursor.h" />
-    <ClInclude Include="..\..\src\audio\windx5\directx.h" />
+    <ClInclude Include="..\..\src\audio\directsound\directx.h" />
     <ClInclude Include="..\..\src\events\SDL_clipboardevents_c.h" />
     <ClInclude Include="..\..\src\events\SDL_gesture_c.h" />
     <ClInclude Include="..\..\src\events\SDL_touch_c.h" />
@@ -276,11 +276,12 @@
     <ClInclude Include="..\..\src\video\SDL_blit_copy.h" />
     <ClInclude Include="..\..\src\video\SDL_blit_slow.h" />
     <ClInclude Include="..\..\src\video\SDL_shape_internals.h" />
-    <ClInclude Include="..\..\src\audio\windib\SDL_dibaudio.h" />
+    <ClInclude Include="..\..\src\audio\winmm\SDL_winmm.h" />
     <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
-    <ClInclude Include="..\..\src\audio\windx5\SDL_dx5audio.h" />
+    <ClInclude Include="..\..\src\audio\directsound\SDL_directsound.h" />
     <ClInclude Include="..\..\src\SDL_error_c.h" />
+    <ClInclude Include="..\..\src\SDL_hints_c.h" />
     <ClInclude Include="..\..\src\events\SDL_events_c.h" />
     <ClInclude Include="..\..\src\SDL_fatal.h" />
     <ClInclude Include="..\..\src\video\SDL_glesfuncs.h" />
@@ -376,10 +377,11 @@
     <ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c" />
     <ClCompile Include="..\..\src\video\SDL_clipboard.c" />
     <ClCompile Include="..\..\src\video\SDL_shape.c" />
-    <ClCompile Include="..\..\src\audio\windib\SDL_dibaudio.c" />
+    <ClCompile Include="..\..\src\audio\winmm\SDL_winmm.c" />
     <ClCompile Include="..\..\src\audio\disk\SDL_diskaudio.c" />
     <ClCompile Include="..\..\src\audio\dummy\SDL_dummyaudio.c" />
-    <ClCompile Include="..\..\src\audio\windx5\SDL_dx5audio.c" />
+    <ClCompile Include="..\..\src\audio\directsound\SDL_directsound.c" />
+    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />
     <ClCompile Include="..\..\src\joystick\windows\SDL_dxjoystick.c" />
     <ClCompile Include="..\..\src\SDL_error.c" />
     <ClCompile Include="..\..\src\events\SDL_events.c" />
@@ -436,4 +438,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

VisualCE/SDL.vcw

-Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "loopwave"=.\loopwave\loopwave.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name SDL
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SDLmain
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "SDL"=.\SDL\SDL.VCP - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "SDLmain"=.\SDLmain\SDLmain.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name SDL
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testtimer"=.\testtimer\testtimer.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name SDL
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SDLmain
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testalpha"=.\testalpha\testalpha.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name SDL
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SDLmain
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testwin"=.\testwin\testwin.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name SDL
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name SDLmain
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

Xcode/SDL/SDL.xcodeproj/project.pbxproj

@@ -1139,7 +1139,7 @@
 			children = (
 				04BDFD8712E6671700899322 /* disk */,
 				04BDFD9312E6671700899322 /* dummy */,
-				04BDFD9F12E6671700899322 /* macosx */,
+				04BDFD9F12E6671700899322 /* coreaudio */,
 				04BDFDB412E6671700899322 /* SDL_audio.c */,
 				04BDFDB512E6671700899322 /* SDL_audio_c.h */,
 				04BDFDB612E6671700899322 /* SDL_audiocvt.c */,
@@ -1174,13 +1174,13 @@
 			path = dummy;
 			sourceTree = "<group>";
 		};
-		04BDFD9F12E6671700899322 /* macosx */ = {
+		04BDFD9F12E6671700899322 /* coreaudio */ = {
 			isa = PBXGroup;
 			children = (
 				04BDFDA012E6671700899322 /* SDL_coreaudio.c */,
 				04BDFDA112E6671700899322 /* SDL_coreaudio.h */,
 			);
-			path = macosx;
+			path = coreaudio;
 			sourceTree = "<group>";
 		};
 		04BDFDD312E6671700899322 /* cpuinfo */ = {

android-project/src/org/libsdl/app/SDLActivity.java

@@ -114,6 +114,10 @@ public class SDLActivity extends Activity {
         mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
     }
 
+    public static Context getContext() {
+        return mSingleton;
+    }
+
     // Audio
     private static Object buf;
     

build-scripts/fatbuild.sh

@@ -16,60 +16,6 @@ fi
 # Generic, cross-platform CFLAGS you always want go here.
 CFLAGS="-O3 -g -pipe"
 
-# They changed this from "darwin9" to "darwin10" in Xcode 3.2 (Snow Leopard).
-GCCUSRPATH_PPC=`ls -d $SDK_PATH/MacOSX10.4u.sdk/usr/lib/gcc/powerpc-apple-darwin*/4.0.1`
-if [ ! -d "$GCCUSRPATH_PPC" ]; then
-    echo "Couldn't find any GCC usr path for 32-bit ppc"
-    exit 1
-fi
-GCCUSRPATH_PPC64=`ls -d $SDK_PATH/MacOSX10.5.sdk/usr/lib/gcc/powerpc-apple-darwin*/4.0.1`
-if [ ! -d "$GCCUSRPATH_PPC64" ]; then
-    echo "Couldn't find any GCC usr path for 64-bit ppc"
-    exit 1
-fi
-
-# PowerPC 32-bit configure flags (10.4 runtime compatibility)
-# We dynamically load X11, so using the system X11 headers is fine.
-CONFIG_PPC="--build=`uname -p`-apple-darwin --host=powerpc-apple-darwin \
---x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
-
-# PowerPC 32-bit compiler flags
-CC_PPC="gcc-4.0 -arch ppc"
-CXX_PPC="g++-4.0 -arch ppc"
-CFLAGS_PPC="-mmacosx-version-min=10.4"
-CPPFLAGS_PPC="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040 \
--nostdinc \
--F$SDK_PATH/MacOSX10.4u.sdk/System/Library/Frameworks \
--I$GCCUSRPATH_PPC/include \
--isystem $SDK_PATH/MacOSX10.4u.sdk/usr/include"
-
-# PowerPC 32-bit linker flags
-LFLAGS_PPC="-arch ppc -Wl,-headerpad_max_install_names -mmacosx-version-min=10.4 \
--F$SDK_PATH/MacOSX10.4u.sdk/System/Library/Frameworks \
--L$GCCUSRPATH_PPC \
--Wl,-syslibroot,$SDK_PATH/MacOSX10.4u.sdk"
-
-# PowerPC 64-bit configure flags (10.5 runtime compatibility)
-# We dynamically load X11, so using the system X11 headers is fine.
-CONFIG_PPC64="--build=`uname -p`-apple-darwin --host=powerpc-apple-darwin \
---x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib"
-
-# PowerPC 64-bit compiler flags
-CC_PPC64="gcc-4.0 -arch ppc64"
-CXX_PPC64="g++-4.0 -arch ppc64"
-CFLAGS_PPC64="-mmacosx-version-min=10.5"
-CPPFLAGS_PPC64="-DMAC_OS_X_VERSION_MIN_REQUIRED=1050 \
--nostdinc \
--F$SDK_PATH/MacOSX10.5.sdk/System/Library/Frameworks \
--I$GCCUSRPATH_PPC64/include \
--isystem $SDK_PATH/MacOSX10.5.sdk/usr/include"
-
-# PowerPC 64-bit linker flags
-LFLAGS_PPC64="-arch ppc64 -Wl,-headerpad_max_install_names -mmacosx-version-min=10.5 \
--F$SDK_PATH/MacOSX10.5.sdk/System/Library/Frameworks \
--L$GCCUSRPATH_PPC64/ppc64 \
--Wl,-syslibroot,$SDK_PATH/MacOSX10.5.sdk"
-
 # Intel 32-bit configure flags (10.4 runtime compatibility)
 # We dynamically load X11, so using the system X11 headers is fine.
 CONFIG_X86="--build=`uname -p`-apple-darwin --host=i386-apple-darwin \
@@ -134,8 +80,8 @@ cd $srcdir
 #
 # Figure out which phase to build:
 # all,
-# configure, configure-ppc, configure-ppc64, configure-x86, configure-x64
-# make, make-ppc, make-ppc64, make-x86, make-x64, merge
+# configure, configure-x86, configure-x64
+# make, make-x86, make-x64, merge
 # install
 # clean
 if test x"$1" = x; then
@@ -145,28 +91,16 @@ else
 fi
 case $phase in
     all)
-        configure_ppc="yes"
-        configure_ppc64="yes"
         configure_x86="yes"
         configure_x64="yes"
-        make_ppc="yes"
-        make_ppc64="yes"
         make_x86="yes"
         make_x64="yes"
         merge="yes"
         ;;
     configure)
-        configure_ppc="yes"
-        configure_ppc64="yes"
         configure_x86="yes"
         configure_x64="yes"
         ;;
-    configure-ppc)
-        configure_ppc="yes"
-        ;;
-    configure-ppc64)
-        configure_ppc64="yes"
-        ;;
     configure-x86)
         configure_x86="yes"
         ;;
@@ -174,18 +108,10 @@ case $phase in
         configure_x64="yes"
         ;;
     make)
-        make_ppc="yes"
-        make_ppc64="yes"
         make_x86="yes"
         make_x64="yes"
         merge="yes"
         ;;
-    make-ppc)
-        make_ppc="yes"
-        ;;
-    make-ppc64)
-        make_ppc64="yes"
-        ;;
     make-x86)
         make_x86="yes"
         ;;
@@ -218,17 +144,9 @@ case $phase in
         install_man="yes"
         ;;
     clean)
-        clean_ppc="yes"
-        clean_ppc64="yes"
         clean_x86="yes"
         clean_x64="yes"
         ;;
-    clean-ppc)
-        clean_ppc="yes"
-        ;;
-    clean-ppc64)
-        clean_ppc64="yes"
-        ;;
     clean-x86)
         clean_x86="yes"
         ;;
@@ -236,17 +154,11 @@ case $phase in
         clean_x64="yes"
         ;;
     *)
-        echo "Usage: $0 [all|configure[-ppc|-ppc64|-x86|-x64]|make[-ppc|-ppc64|-x86|-x64]|merge|install|clean[-ppc|-ppc64|-x86|-x64]]"
+        echo "Usage: $0 [all|configure[-x86|-x64]|make[-x86|-x64]|merge|install|clean[-x86|-x64]]"
         exit 1
         ;;
 esac
 case `uname -p` in
-    powerpc)
-        native_path=ppc
-        ;;
-    powerpc64)
-        native_path=ppc64
-        ;;
     *86)
         native_path=x86
         ;;
@@ -262,7 +174,7 @@ esac
 #
 # Create the build directories
 #
-for dir in build build/ppc build/ppc64 build/x86 build/x64; do
+for dir in build build/x86 build/x64; do
     if test -d $dir; then
         :
     else
@@ -270,28 +182,6 @@ for dir in build build/ppc build/ppc64 build/x86 build/x64; do
     fi
 done
 
-#
-# Build the PowerPC 32-bit binary
-#
-if test x$configure_ppc = xyes; then
-    (cd build/ppc && \
-     sh ../../configure $CONFIG_PPC CC="$CC_PPC" CXX="$CXX_PPC" CFLAGS="$CFLAGS $CFLAGS_PPC" CPPFLAGS="$CPPFLAGS_PPC" LDFLAGS="$LFLAGS_PPC") || exit 2
-fi
-if test x$make_ppc = xyes; then
-    (cd build/ppc && ls include && make -j$NJOB) || exit 3
-fi
-
-#
-# Build the PowerPC 64-bit binary
-#
-if test x$configure_ppc64 = xyes; then
-    (cd build/ppc64 && \
-     sh ../../configure $CONFIG_PPC64 CC="$CC_PPC64" CXX="$CXX_PPC64" CFLAGS="$CFLAGS $CFLAGS_PPC64" CPPFLAGS="$CPPFLAGS_PPC64" LDFLAGS="$LFLAGS_PPC64") || exit 2
-fi
-if test x$make_ppc64 = xyes; then
-    (cd build/ppc64 && ls include && make -j$NJOB) || exit 3
-fi
-
 #
 # Build the Intel 32-bit binary
 #
@@ -404,7 +294,6 @@ do_clean()
 if test x$clean_x86 = xyes; then
     do_clean rm -r build/x86
 fi
-if test x$clean_ppc = xyes; then
-    do_clean rm -r build/ppc
+if test x$clean_x64 = xyes; then
+    do_clean rm -r build/x64
 fi
-

include/SDL_quit.h

@@ -53,6 +53,6 @@
 /* There are no functions directly affecting the quit event */
 
 #define SDL_QuitRequested() \
-        (SDL_PumpEvents(), SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT))
+        (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0))
 
 #endif /* _SDL_quit_h */