sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Julien ROZO (f56efde59fd6c72dcef675c0b4986ce699239029)

From: Julien ROZO <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (f56efde59fd6c72dcef675c0b4986ce699239029)
Date: Fri, 4 Jan 2008 14:46:05 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

libs/sdl_sound/DETAILS | 2 -
libs/sdl_sound/HISTORY | 3 ++
libs/sdl_ttf/DETAILS | 5 +---
libs/sdl_ttf/HISTORY | 4 +++
libs/sdl_ttf/PRE_BUILD | 4 ---
libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch | 28
-------------------------
utils/virtualbox/BUILD | 10 --------
utils/virtualbox/DEPENDS | 8 +++++--
utils/virtualbox/HISTORY | 5 ++++
utils/virtualbox/Xcursor.patch | 10 --------
10 files changed, 22 insertions(+), 57 deletions(-)

New commits:
commit 0eb7afab62cd668c08a741f206b670a639a40f38
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

sdl_ttf: updated version to 2.0.9, and removed PRE_BUILD and
sdl-ttf-2.0.8-noftinternals.patch as they are no longer needed

commit 9253dd43a56ee189357902d191018aa112a6de6a
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

sdl_sound: fixed WEB_SITE

commit 0d74402dff713d62c3a5876a954b52ce0cc01ff6
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

virtualbox: pulseaudio is now an optional dependency, removed
Xcursor.patch as it's no longer needed

diff --git a/libs/sdl_sound/DETAILS b/libs/sdl_sound/DETAILS
index f438454..6eff2bd 100755
--- a/libs/sdl_sound/DETAILS
+++ b/libs/sdl_sound/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_sound-$VERSION
SOURCE_URL[0]=http://icculus.org/SDL_sound/downloads/$SOURCE

SOURCE_HASH=sha512:da70bd5b3fa298c15b9ea01b8f7b32513786684fc964921a04a514a2a74dd3afc7dae91518e424834b682b7b16b67476ee0e2f0be1f62aa0743577eb78695f2c
- WEB_SITE=http://icculus.org/$SPELL
+ WEB_SITE=http://icculus.org/SDL_sound/
ENTERED=20020209
UPDATED=20020213
LICENSE[0]=LGPL
diff --git a/libs/sdl_sound/HISTORY b/libs/sdl_sound/HISTORY
index 88933c9..b866ec7 100644
--- a/libs/sdl_sound/HISTORY
+++ b/libs/sdl_sound/HISTORY
@@ -1,3 +1,6 @@
+2008-01-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: fixed WEB_SITE
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/libs/sdl_ttf/DETAILS b/libs/sdl_ttf/DETAILS
index 8e2afa9..5fc7988 100755
--- a/libs/sdl_ttf/DETAILS
+++ b/libs/sdl_ttf/DETAILS
@@ -1,12 +1,11 @@
SPELL=sdl_ttf
- VERSION=2.0.8
+ VERSION=2.0.9
SOURCE=SDL_ttf-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_ttf-$VERSION
SOURCE_URL[0]=http://www.libsdl.org/projects/SDL_ttf/release/$SOURCE

-
SOURCE_HASH=sha512:33a913354acb728aa73d5908e7b385d0fe7a544fa1fe71431aa2abfa5d30e98385f1ffc69b245b1bf2c0918133b88029cf41ebd8614f73fa7de9898389e42a5a
+
SOURCE_HASH=sha512:990a8946456f5d6c25ac6ee4dc33202f031b53b06caf09a7d5e0d03a1476ba30d26e2c348117eb6bd2147a2a6f0feca78f4dd7a68cde6f09f025b2ab0e53191a
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-
WEB_SITE=http://www.libsdl.org/projects/SDL_ttf/
ENTERED=20020412
UPDATED=20020511
diff --git a/libs/sdl_ttf/HISTORY b/libs/sdl_ttf/HISTORY
index ca24cdc..7456c73 100644
--- a/libs/sdl_ttf/HISTORY
+++ b/libs/sdl_ttf/HISTORY
@@ -1,3 +1,7 @@
+2008-01-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.0.9
+ * PRE_BUILD, sdl-ttf-2.0.8-noftinternals.patch: removed, no longer
needed
+
2007-03-18 George Sherwood <george AT beernabeer.com>
* PRE_BUILD: Removed check for freetype 2.2.x. freetype2 >
2.2.x is now in stable. This patch is needed for all grimoires.
diff --git a/libs/sdl_ttf/PRE_BUILD b/libs/sdl_ttf/PRE_BUILD
deleted file mode 100755
index 786d6eb..0000000
--- a/libs/sdl_ttf/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/sdl-ttf-2.0.8-noftinternals.patch
-
diff --git a/libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch
b/libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch
deleted file mode 100644
index 106f3ff..0000000
--- a/libs/sdl_ttf/sdl-ttf-2.0.8-noftinternals.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- SDL_ttf.c.orig 2006-10-02 18:49:02.000000000 -0500
-+++ SDL_ttf.c 2006-10-02 18:51:21.000000000 -0500
-@@ -43,16 +43,6 @@
- #include FT_FREETYPE_H
- #include FT_OUTLINE_H
- #include FT_TRUETYPE_IDS_H
--/*
--#include <freetype/freetype.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
--*/
--#include <freetype/internal/ftobjs.h>
--
--#ifndef FT_OPEN_STREAM
--#define FT_OPEN_STREAM ft_open_stream
--#endif
-
- #include "SDL.h"
- #include "SDL_endian.h"
-@@ -278,7 +268,7 @@
- }
- memset(stream, 0, sizeof(*stream));
-
-- stream->memory = library->memory;
-+ stream->memory = NULL;
- stream->read = RWread;
- stream->descriptor.pointer = src;
- stream->pos = (unsigned long)position;
diff --git a/utils/virtualbox/BUILD b/utils/virtualbox/BUILD
index 76be213..78ab2bc 100755
--- a/utils/virtualbox/BUILD
+++ b/utils/virtualbox/BUILD
@@ -1,11 +1,3 @@
-./configure &&
-
-# patch to make this spell compiling with libxcursor from xorg-modular
-# this patch must be applied after configure is run
-if check_if_xorg_modular_libs ; then
- cd $SOURCE_DIRECTORY &&
- patch -p0 < $SCRIPT_DIRECTORY/Xcursor.patch
-fi &&
-
+./configure $OPTS &&
source ./env.sh &&
kmk all
diff --git a/utils/virtualbox/DEPENDS b/utils/virtualbox/DEPENDS
index fb6b721..ea1bf33 100755
--- a/utils/virtualbox/DEPENDS
+++ b/utils/virtualbox/DEPENDS
@@ -4,5 +4,9 @@ depends dev86 &&
depends iasl &&
depends xalan-c &&
depends sdl &&
-depends pulseaudio &&
-depends X11-LIBS
+depends X11-LIBS &&
+
+optional_depends pulseaudio \
+ "" \
+ "--disable-pulse" \
+ "for PulseAudio output support"
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index a170d02..ccd726a 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,8 @@
+2008-01-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: pulseaudio is now an optional dependency
+ * BUILD: added $OPTS to configure, removed patch for Xcursor from
xorg-modular
+ * Xcursor.patch: removed, no longer needed
+
2008-01-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.4
* DEPENDS: added pulseaudio
diff --git a/utils/virtualbox/Xcursor.patch b/utils/virtualbox/Xcursor.patch
deleted file mode 100644
index 8e2ec05..0000000
--- a/utils/virtualbox/Xcursor.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Config.kmk.orig 2007-09-11 01:11:29.000000000 +0200
-+++ Config.kmk 2007-09-11 01:12:23.000000000 +0200
-@@ -2048,6 +2048,7 @@ else # the gcc guys:
- TEMPLATE_VBOXQTGUIEXE_LIBS += \
- Xext \
- X11 \
-+ Xcursor \
- m \
- $(LIB_PTHREAD)
- TEMPLATE_VBOXQTGUIEXE_LIBPATH += \

[SM-Commit] GIT changes to master grimoire by Julien ROZO (f56efde59fd6c72dcef675c0b4986ce699239029), Julien ROZO, 01/04/2008