[Qemu-devel] Patches

[Ben Taylor <sol10x86@cox.net>]

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]


There are two patches included in the mail

1) qemu-sdl-error.diff - patch to capture output from the sdl compile test, and output it if there
     is an error at reporting time (and delete the file when finished)

2) qemu-sdl-whitespace.diff -  patch to fix the indentation for the sdl-config section

Ben

[-- Attachment #2: qemu-sdl-error.diff --]
[-- Type: text/x-patch, Size: 1177 bytes --]

--- qemu/configure	2007-06-23 12:03:35.000000000 -0400
+++ ../062707/qemu/configure	2007-06-28 17:55:52.348903000 -0400
@@ -553,7 +553,7 @@
 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
 EOF
 
-if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /dev/null ; then
+if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-sdl-config.log ; then
 _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
 if test "$_sdlversion" -lt 121 ; then
 sdl_too_old=yes
@@ -562,6 +562,9 @@
    sdl=yes
  fi
 fi
+if [ -s /tmp/qemu-sdl-config.log ]; then
+  check_sdl_log=yes
+fi
 
 # static link with sdl ?
 if test "$sdl" = "yes" ; then
@@ -688,6 +691,11 @@
 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
 fi
+if test "$check_sdl_log" = "yes"; then
+  echo "The error log from compiling the libSDL test is: "
+  cat /tmp/qemu-sdl-config.log
+fi
+/usr/bin/rm -f /tmp/qemu-sdl-config.log
 #if test "$sdl_static" = "no"; then
 #  echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output"
 #fi

[-- Attachment #3: qemu-sdl-whitespace.diff --]
[-- Type: text/x-patch, Size: 3204 bytes --]

--- configure.ORIG	2007-06-29 22:59:52.754312000 -0400
+++ configure	2007-06-29 23:11:11.638889000 -0400
@@ -537,60 +537,60 @@
 
 if test -z "$sdl" ; then
 
-sdl_config="sdl-config"
-sdl=no
-sdl_static=no
-
-if test "$mingw32" = "yes" -a ! -z "$cross_prefix" ; then
-# win32 cross compilation case
-    sdl_config="i386-mingw32msvc-sdl-config"
-    sdl=yes
-else
-# normal SDL probe
+    sdl_config="sdl-config"
+    sdl=no
+    sdl_static=no
+
+    if test "$mingw32" = "yes" -a ! -z "$cross_prefix" ; then
+    # win32 cross compilation case
+        sdl_config="i386-mingw32msvc-sdl-config"
+        sdl=yes
+    else
+        # normal SDL probe
 cat > $TMPC << EOF
 #include <SDL.h>
 #undef main /* We don't want SDL to override our main() */
 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
 EOF
 
-if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-sdl-config.log ; then
-_sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
-if test "$_sdlversion" -lt 121 ; then
-sdl_too_old=yes
-else
- if test "$cocoa" = "no" ; then
-   sdl=yes
- fi
-fi
-if [ -s /tmp/qemu-sdl-config.log ]; then
-  check_sdl_log=yes
-fi
-
-# static link with sdl ?
-if test "$sdl" = "yes" ; then
-aa="no"
-`$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
-sdl_static_libs=`$sdl_config --static-libs 2>/dev/null`
-if [ "$aa" = "yes" ] ; then
-  sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
-fi
+        if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-sdl-config.log ; then
+            _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
+            if test "$_sdlversion" -lt 121 ; then
+                sdl_too_old=yes
+            else
+                if test "$cocoa" = "no" ; then
+                    sdl=yes
+                fi
+            fi
+            if [ -s /tmp/qemu-sdl-config.log ]; then
+                check_sdl_log=yes
+            fi
+
+            # static link with sdl ?
+            if test "$sdl" = "yes" ; then
+                aa="no"
+                `$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
+                sdl_static_libs=`$sdl_config --static-libs 2>/dev/null`
+                if [ "$aa" = "yes" ] ; then
+                    sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
+                fi
+
+                if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
+                    sdl_static=yes
+                fi
 
-if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
-  sdl_static=yes
-fi
+            fi # static link
 
-fi # static link
+        fi # sdl compile test
 
-fi # sdl compile test
-
-fi # cross compilation
+    fi # cross compilation
 
 else
- # Make sure to disable cocoa if sdl was set
- if test "$sdl" = "yes" ; then
-   cocoa="no"
-   coreaudio="no"
- fi
+    # Make sure to disable cocoa if sdl was set
+    if test "$sdl" = "yes" ; then
+        cocoa="no"
+        coreaudio="no"
+    fi
 fi # -z $sdl
 
 ##########################################