From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1I4eez-0008Gi-1N for qemu-devel@nongnu.org; Sat, 30 Jun 2007 11:14:53 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1I4eeu-0008FB-7H for qemu-devel@nongnu.org; Sat, 30 Jun 2007 11:14:52 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I4eet-0008F8-Vc for qemu-devel@nongnu.org; Sat, 30 Jun 2007 11:14:48 -0400 Received: from eastrmmtao104.cox.net ([68.230.240.46]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1I4eeJ-0005q1-R3 for qemu-devel@nongnu.org; Sat, 30 Jun 2007 11:14:46 -0400 Received: from eastrmimpo02.cox.net ([68.1.16.120]) by eastrmmtao104.cox.net (InterMail vM.7.08.02.01 201-2186-121-102-20070209) with ESMTP id <20070630151320.FEZA1411.eastrmmtao104.cox.net@eastrmimpo02.cox.net> for ; Sat, 30 Jun 2007 11:13:20 -0400 Message-ID: <23518129.1183216398890.JavaMail.root@eastrmwml11> Date: Sat, 30 Jun 2007 11:13:18 -0400 From: Ben Taylor MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_32022_8773825.1183216398872" Subject: [Qemu-devel] Patches Reply-To: sol10x86@cox.net, qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ------=_Part_32022_8773825.1183216398872 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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 ------=_Part_32022_8773825.1183216398872 Content-Type: text/x-patch; name=qemu-sdl-error.diff Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=qemu-sdl-error.diff --- 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 ------=_Part_32022_8773825.1183216398872 Content-Type: text/x-patch; name=qemu-sdl-whitespace.diff Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=qemu-sdl-whitespace.diff --- 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 #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 ########################################## ------=_Part_32022_8773825.1183216398872--