[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (73317a9a9e7f4c7b9fa1204c61853a40c64881b2)

Vlad Glagolev scm at sourcemage.org
Thu Jan 3 21:52:35 EST 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 libs/sdl/DEPENDS                   |    5 +++++
 libs/sdl/DETAILS                   |    7 +++----
 libs/sdl/HISTORY                   |    5 +++++
 libs/sdl/PRE_BUILD                 |    2 --
 libs/sdl/no-yasm.patch             |   26 --------------------------
 libs/sdl_image/DEPENDS             |   18 ++++++++++++++++--
 libs/sdl_image/DETAILS             |    6 ++----
 libs/sdl_image/HISTORY             |    5 ++++-
 libs/sdl_mixer/DETAILS             |   10 +++-------
 libs/sdl_mixer/HISTORY             |    3 +++
 libs/sdl_mixer/timidity.tar.gz.sig |binary
 11 files changed, 41 insertions(+), 46 deletions(-)

New commits:
commit 73317a9a9e7f4c7b9fa1204c61853a40c64881b2
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    sdl_mixer: => 1.2.8

commit d017a8ea991ea6ceca4d5f0c749fa0e9fb6d7c1d
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    sdl_image: => 1.2.6, added tiff and jpeg as opt deps, made libpng as opt dep

commit 25b422b3831deb21bd68a1daa7e169b7e260b100
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    sdl: => 1.2.13, added pulseaudio as opt dep

diff --git a/libs/sdl/DEPENDS b/libs/sdl/DEPENDS
index d410495..34a693b 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 98bf200..001dedc 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 a826d25..5941212 100644
--- a/libs/sdl/HISTORY
+++ b/libs/sdl/HISTORY
@@ -1,3 +1,8 @@
+2008-01-04 Vlad Glagolev <stealth at 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 at 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 f32ccf3..74b2580 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 3409ebc..0000000
--- 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
-
diff --git a/libs/sdl_image/DEPENDS b/libs/sdl_image/DEPENDS
index 865c856..2e40139 100755
--- a/libs/sdl_image/DEPENDS
+++ b/libs/sdl_image/DEPENDS
@@ -1,2 +1,16 @@
-depends  libpng  &&
-depends  sdl
+depends sdl &&
+
+optional_depends libpng \
+                 "--enable-png" \
+		 "--disable-png" \
+		 "for PNG support" &&
+
+optional_depends jpeg \
+                 "--enable-jpg" \
+		 "--disable-jpg" \
+		 "for JPG support" &&
+
+optional_depends tiff \
+                 "--enable-tif" \
+		 "--disable-tif" \
+		 "for TIFF support"
diff --git a/libs/sdl_image/DETAILS b/libs/sdl_image/DETAILS
index 2469d64..cbe912a 100755
--- a/libs/sdl_image/DETAILS
+++ b/libs/sdl_image/DETAILS
@@ -1,13 +1,11 @@
            SPELL=sdl_image
-         VERSION=1.2.5
+         VERSION=1.2.6
           SOURCE=SDL_image-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_image-$VERSION
    SOURCE_URL[0]=http://www.libsdl.org/projects/SDL_image/release/$SOURCE
-     SOURCE_HASH=sha512:cb2b25868e5814c9dd8ea0e4bf3f0b9df587103f64d9fd354c0612cc7cea49d97a9a8f1cab81d196a613d28a4d12764bb8e54904c726256964bcae1a500e17ce
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+     SOURCE_HASH=sha512:ec6ec4060021f89ce2e4e3ffa573addf314814ac0ee25083c2acc954a230da653fe1509e5e136d8f697391b000c6dc673fc288e18c7758c1ade17afc6620e400
         WEB_SITE=http://www.libsdl.org/projects/SDL_image
          ENTERED=20010922
-         UPDATED=20020424
       LICENSE[0]=LGPL
         KEYWORDS="sdl images libs"
            SHORT="Simple library to load images of various formats as SDL surfaces."
diff --git a/libs/sdl_image/HISTORY b/libs/sdl_image/HISTORY
index e352401..829a147 100644
--- a/libs/sdl_image/HISTORY
+++ b/libs/sdl_image/HISTORY
@@ -1,3 +1,7 @@
+2008-01-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.2.6
+	* DEPENDS: libpng [req -> opt], tiff [opt], jpeg [opt]
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
@@ -28,4 +32,3 @@
 
 2002-10-09 Julian v. Bock <julian at wongr.net>
 	* DETAILS: add LICENSE and MD5 fields.
-
diff --git a/libs/sdl_mixer/DETAILS b/libs/sdl_mixer/DETAILS
index bd1e7a7..d5537bb 100755
--- a/libs/sdl_mixer/DETAILS
+++ b/libs/sdl_mixer/DETAILS
@@ -1,20 +1,16 @@
            SPELL=sdl_mixer
-         VERSION=1.2.7
+         VERSION=1.2.8
           SOURCE=SDL_mixer-$VERSION.tar.gz
          SOURCE2=timidity.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_mixer-$VERSION
    SOURCE_URL[0]=http://www.libsdl.org/projects/SDL_mixer/release/$SOURCE
   SOURCE2_URL[0]=http://www.libsdl.org/projects/SDL_mixer/timidity/$SOURCE2
-
-     SOURCE_HASH=sha512:d7f818adacbd233a2518a4ece451401a2603cadc24eabb2a1a43a3eefbf287f18027d11b63f3579b9c572e77843dafb1a6068867dbaa0f5389ef8d121aab6cb6
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-
-     SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
+     SOURCE_HASH=sha512:e38d00661319b1e16648dcb1ae990f51978bd1c1ca299f5faf979e83f9731cacec7b118a631d5512cd653723bd2f676e8e99c21edabcc803da1d76ebbacdf60a
+     SOURCE2_GPG=gurus.gpg:$SOURCE2.sig
         WEB_SITE=http://www.libsdl.org/projects/SDL_mixer/
          ENTERED=20010922
       LICENSE[0]=LGPL
         KEYWORDS="mixer sdl libs"
-      PATCHLEVEL=1
            SHORT="SDL multi-channel audio mixer"
 cat << EOF
 SDL_mixer is a simple multi-channel audio mixer. It supports 8 channels
diff --git a/libs/sdl_mixer/HISTORY b/libs/sdl_mixer/HISTORY
index 67b485a..fc09e5f 100644
--- a/libs/sdl_mixer/HISTORY
+++ b/libs/sdl_mixer/HISTORY
@@ -1,3 +1,6 @@
+2008-01-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.2.8
+
 2007-11-04 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: patchlevel++, removed UPDATED
 	* DEPENDS: fixed mikmod options
diff --git a/libs/sdl_mixer/timidity.tar.gz.sig b/libs/sdl_mixer/timidity.tar.gz.sig
index 17e0c3e..529fd37 100644
Binary files a/libs/sdl_mixer/timidity.tar.gz.sig and b/libs/sdl_mixer/timidity.tar.gz.sig differ



More information about the SM-Commit mailing list