[SM-Commit] GIT changes to master grimoire by George Sherwood (ced4b9721db9782d751cc5f84e46a6b4584b18bf)

George Sherwood scm at mail.sourcemage.org
Sat Sep 9 22:03:51 EDT 2006


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 libs/sdl/HISTORY       |    5 +++++
 libs/sdl/PRE_BUILD     |    1 +
 libs/sdl/no-yasm.patch |   26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

New commits:
commit ced4b9721db9782d751cc5f84e46a6b4584b18bf
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    Added patch to fix compile problems with yasm installed.  Fixed Bug
    12832.  Bug from:
    http://cvs.mandriva.com/cgi-bin/viewvc.cgi/SPECS/SDL12/SDL-1.2.11-no-yasm.patch?view=log

diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY
index 4268b25..bc413c6 100644
--- a/libs/sdl/HISTORY
+++ b/libs/sdl/HISTORY
@@ -1,3 +1,8 @@
+2006-09-10 George Sherwood <george at beernabeer.com>
+	* PRE_BUILD: Added patch from:
+	  http://cvs.mandriva.com/cgi-bin/viewvc.cgi/SPECS/SDL12/SDL-1.2.11-no-yasm.patch?view=log
+	* no-yasm.patch: Added file to fix Bug 12832
+
 2006-08-15 Eric Sandall <eric at sandall.us>
 	* PRE_SUB_DEPENDS, SUB_DEPENDS: Sub-depends support for sdl being
 	  built with X11-LIBS. Testing with Sorcery 1.13.7-rc1 (no sub_depends) and
diff --git a/libs/sdl/PRE_BUILD b/libs/sdl/PRE_BUILD
index 87f424b..f32ccf3 100755
--- a/libs/sdl/PRE_BUILD
+++ b/libs/sdl/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build                  &&
 cd $SOURCE_DIRECTORY               &&
+patch -p0 < $SCRIPT_DIRECTORY/no-yasm.patch  &&
 
 mkdir -p smgl                      &&
 cp $SCRIPT_DIRECTORY/sdl smgl/     &&
diff --git a/libs/sdl/no-yasm.patch b/libs/sdl/no-yasm.patch
new file mode 100644
index 0000000..3409ebc
--- /dev/null
+++ b/libs/sdl/no-yasm.patch
@@ -0,0 +1,26 @@
+--- configure.in	2006-07-19 15:29:05.000000000 +0200
++++ configure.in	2006-07-19 15:29:11.000000000 +0200
+@@ -597,10 +597,7 @@
+ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]),
+                   , enable_nasm=yes)
+     if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
+-        AC_PATH_PROG(NASM, yasm)
+-        if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then
+-            AC_PATH_PROG(NASM, nasm)
+-        fi
++        AC_PATH_PROG(NASM, nasm)
+         if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
+             AC_DEFINE(SDL_HERMES_BLITTERS)
+             SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
+--- configure~	2006-07-24 18:30:23.000000000 +0200
++++ configure	2006-07-24 18:33:03.000000000 +0200
+@@ -25062,7 +25062,7 @@ else
+ fi;
+     if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
+         # Extract the first word of "yasm", so it can be a program name with args.
+-set dummy yasm; ac_word=$2
++set dummy nasm; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_NASM+set}" = set; then
+



More information about the SM-Commit mailing list