sdl: => 1.2.13, added pulseaudio as opt dep

5 files changed, 13 insertions, 32 deletions

diff --git a/libs/sdl/DEPENDS b/libs/sdl/DEPENDS
index d410495ab1..34a693ba6b 100755
--- a/libs/sdl/DEPENDS
+++ b/libs/sdl/DEPENDS
@@ -50,6 +50,11 @@ optional_depends  directfb                      \
                   "--enable-video-directfb=no"  \
                   "for DirectFB support"        &&
 
+optional_depends  pulseaudio                       \
+                  "--enable-pulseaudio"            \
+                  "--disable-pulseaudio"           \
+                  "for PulseAudio output support"  &&
+
 source  $GRIMOIRE/FUNCTIONS  &&
 
 if  check_if_xorg_modular_libs
diff --git a/libs/sdl/DETAILS b/libs/sdl/DETAILS
index 98bf2006e1..001dedcd9d 100755
--- a/libs/sdl/DETAILS
+++ b/libs/sdl/DETAILS
@@ -1,15 +1,14 @@
            SPELL=sdl
-         VERSION=1.2.11
+         VERSION=1.2.13
           SOURCE=SDL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
       SOURCE_GPG=A7763BE6.gpg:$SOURCE2:UPSTREAM_KEY
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL-$VERSION
    SOURCE_URL[0]=http://www.libsdl.org/release/$SOURCE
-  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-        WEB_SITE=http://www.libsdl.org
+  SOURCE2_URL[0]=$SOURCE_URL[0].sig
+        WEB_SITE=http://www.libsdl.org/
          ENTERED=20010922
-         UPDATED=20040216
       LICENSE[0]=LGPL
             DOCS="docs/html docs/index.html COPYING README*"
         KEYWORDS="libs"
diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY
index a826d25a3f..594121217c 100644
--- a/libs/sdl/HISTORY
+++ b/libs/sdl/HISTORY
@@ -1,3 +1,8 @@
+2008-01-04 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 1.2.13
+	* DEPENDS: added pulseaudio as optional
+	* PRE_BUILD: removed no-yasm patch
+
 2007-07-12 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
 	* DETAILS: converted to upstream signature checking
 	* A7763BE6.gpg: added gpg keyring
diff --git a/libs/sdl/PRE_BUILD b/libs/sdl/PRE_BUILD
index f32ccf33f5..74b2580ae8 100755
--- a/libs/sdl/PRE_BUILD
+++ b/libs/sdl/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build                  &&
 cd $SOURCE_DIRECTORY               &&
-patch -p0 < $SCRIPT_DIRECTORY/no-yasm.patch  &&
-
 mkdir -p smgl                      &&
 cp $SCRIPT_DIRECTORY/sdl smgl/     &&
 cp $SCRIPT_DIRECTORY/sdl.sh smgl/
diff --git a/libs/sdl/no-yasm.patch b/libs/sdl/no-yasm.patch
deleted file mode 100644
index 3409ebcac4..0000000000
--- a/libs/sdl/no-yasm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
-