Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (8cad66e255dd9a66f5389399e646c80b26d1a803)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (8cad66e255dd9a66f5389399e646c80b26d1a803)
  • Date: Sun, 6 Jan 2008 16:58:43 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

archive-libs/zziplib/BUILD | 3 +++
archive-libs/zziplib/DETAILS | 5 +++--
archive-libs/zziplib/HISTORY | 4 ++++
audio-libs/openal/DETAILS | 2 +-
audio-libs/openal/HISTORY | 4 ++++
audio-libs/openal/INSTALL | 5 +++++
graphics-libs/cegui/DEPENDS | 16 +++++++++-------
graphics-libs/cegui/HISTORY | 6 ++++++
graphics-libs/cegui/PRE_BUILD | 5 +++++
graphics-libs/cegui/PRE_SUB_DEPENDS | 7 +++++++
graphics-libs/cegui/SUB_DEPENDS | 5 +++++
graphics-libs/ogre/DETAILS | 10 +++++-----
graphics-libs/ogre/HISTORY | 4 ++++
graphics-libs/ogre/PRE_SUB_DEPENDS | 7 +++++++
graphics-libs/ogre/SUB_DEPENDS | 5 +++++
graphics-libs/ogre/ogre-linux_osx-v1-4-6.tar.bz2.sig |binary
16 files changed, 73 insertions(+), 15 deletions(-)

New commits:
commit 8cad66e255dd9a66f5389399e646c80b26d1a803
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cegui: Depends on g++

commit f3b652386eff33e79bc006e7542f7dae351ef2b7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ogre: Allow forcing dependency on cegui

commit 84ceda25075efebff872931178ab5c2bcdb4b2ae
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cegui: Build tolua++cegui module

commit 321d5f445d2b5fba63e17ca728f2a9058d049250
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cegui: Work with lua >= 5.0 (we have 5.1.2)

commit 03cb9abd6ea743acb9288c07d8cde6f1747e92ba
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cegui: Allow forcing dependencing on lua for ember

commit 81789e9c68b91d51daf3836fb92dcd0012210faa
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ogre: Updated to 1.4.6

commit 900e0e363c62f26093bc20fd2f9cb6fe8d747811
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

openal: Fix openal.pc for release version

commit 7b6e06118722f733fdace7ab4c7a3251db6f4be4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

zziplib: Fix Debian Bug #439395 (datadir not properly defined)
Needed for ogre to find zziplib

diff --git a/archive-libs/zziplib/BUILD b/archive-libs/zziplib/BUILD
new file mode 100755
index 0000000..1432110
--- /dev/null
+++ b/archive-libs/zziplib/BUILD
@@ -0,0 +1,3 @@
+OPTS="--datadir=$INSTALL_ROOT/usr \
+ $OPTS" &&
+default_build
diff --git a/archive-libs/zziplib/DETAILS b/archive-libs/zziplib/DETAILS
index 8e1e4b7..4616a88 100755
--- a/archive-libs/zziplib/DETAILS
+++ b/archive-libs/zziplib/DETAILS
@@ -4,10 +4,11 @@
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
- WEB_SITE=http://zziplib.sourceforge.net/
- ENTERED=20050309
+ PATCHLEVEL=1
LICENSE[0]=LGPL
+ WEB_SITE=http://zziplib.sourceforge.net/
KEYWORDS="archive libs"
+ ENTERED=20050309
SHORT="Library for read access on ZIP-archives"
cat << EOF
The ZZIPlib provides read access on ZIP-archives. The library uses only the
patent-free compression-algorithms supported by Zlib. It provides functions
that transparently access files being either real files or zipped files, both
with the same filepath.
diff --git a/archive-libs/zziplib/HISTORY b/archive-libs/zziplib/HISTORY
index a6781a2..cace951 100644
--- a/archive-libs/zziplib/HISTORY
+++ b/archive-libs/zziplib/HISTORY
@@ -1,3 +1,7 @@
+2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: Fix datadir location (See Debian Bug #439395)
+
2007-09-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.13.49

diff --git a/audio-libs/openal/DETAILS b/audio-libs/openal/DETAILS
index dfc26da..081739a 100755
--- a/audio-libs/openal/DETAILS
+++ b/audio-libs/openal/DETAILS
@@ -24,7 +24,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=http://download.sourcemage.org/mirror/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
fi
- PATCHLEVEL=2
+ PATCHLEVEL=3
WEB_SITE=http://www.openal.org/
LICENSE[0]=LGPL
ENTERED=20030508
diff --git a/audio-libs/openal/HISTORY b/audio-libs/openal/HISTORY
index 7e65fab..35dca1a 100644
--- a/audio-libs/openal/HISTORY
+++ b/audio-libs/openal/HISTORY
@@ -1,3 +1,7 @@
+2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=3
+ * INSTALL: Fix openal.pc having "@requirements@", should be empty
+
2008-01-05 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: release version fails with multiple make jobs
* PRE_SUB_DEPENDS, SUB_DEPENDS: Added to allow forcing the version
diff --git a/audio-libs/openal/INSTALL b/audio-libs/openal/INSTALL
new file mode 100755
index 0000000..810e04d
--- /dev/null
+++ b/audio-libs/openal/INSTALL
@@ -0,0 +1,5 @@
+if [[ "$OPENAL_VERSION" == "release" ]]
+then
+ sedit 's:@requirements@::' $SOURCE_DIRECTORY/admin/pkgconfig/openal.pc
+fi &&
+default_install
diff --git a/graphics-libs/cegui/DEPENDS b/graphics-libs/cegui/DEPENDS
index 0899c88..51f3c22 100755
--- a/graphics-libs/cegui/DEPENDS
+++ b/graphics-libs/cegui/DEPENDS
@@ -1,6 +1,8 @@
-depends freetype2 &&
-depends pcre &&
-depends X11-LIBS '--with-x' &&
+depends freetype2 &&
+depends g++ &&
+depends pcre &&
+depends X11-LIBS '--with-x' &&
+
optional_depends xerces-c \
"--enable-xerces-c" \
"--disable-xerces-c" \
@@ -13,10 +15,10 @@ optional_depends expat \
"--enable-expat" \
"--disable-expat" \
"Enable expat xml parser" &&
-optional_depends lua \
- "--enable-lua-module" \
- "--disable-lua-module" \
- "Enable lua scripting support?" &&
+optional_depends lua \
+ "--enable-lua-module --enable-toluacegui" \
+ "--disable-lua-module" \
+ "Enable lua scripting support?" &&
optional_depends gtk+2 \
"--with-gtk2" \
"--without-gtk2" \
diff --git a/graphics-libs/cegui/HISTORY b/graphics-libs/cegui/HISTORY
index 1ec10cd..f6535a8 100644
--- a/graphics-libs/cegui/HISTORY
+++ b/graphics-libs/cegui/HISTORY
@@ -1,3 +1,9 @@
+2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing of lua (for ember)
+ * SUB_DEPENDS, DEPENDS: Enable tolua++cegui module as well
+ * PRE_BUILD: Work with lua > 5.0 as well
+ * DEPENDS: Depends on g++
+
2007-04-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: version update
* DEPENDS: revamp
diff --git a/graphics-libs/cegui/PRE_BUILD b/graphics-libs/cegui/PRE_BUILD
new file mode 100755
index 0000000..1959299
--- /dev/null
+++ b/graphics-libs/cegui/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit 's: lua < 5.1::' acinclude.m4 &&
+touch INSTALL NEWS &&
+autoreconf
diff --git a/graphics-libs/cegui/PRE_SUB_DEPENDS
b/graphics-libs/cegui/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..142ba4b
--- /dev/null
+++ b/graphics-libs/cegui/PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+. $GRIMOIRE/is_depends_enabled.function &&
+
+case "$THIS_SUB_DEPENDS" in
+ LUA) is_depends_enabled $SPELL lua && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1 ;;
+esac
diff --git a/graphics-libs/cegui/SUB_DEPENDS b/graphics-libs/cegui/SUB_DEPENDS
new file mode 100755
index 0000000..7ae6216
--- /dev/null
+++ b/graphics-libs/cegui/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case "$THIS_SUB_DEPENDS" in
+ LUA) depends lua '--enable-lua-module --enable-toluacegui' ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/graphics-libs/ogre/DETAILS b/graphics-libs/ogre/DETAILS
index 625b5ce..7b97598 100755
--- a/graphics-libs/ogre/DETAILS
+++ b/graphics-libs/ogre/DETAILS
@@ -1,14 +1,14 @@
SPELL=ogre
- VERSION=1-4-3
-
SOURCE_HASH=sha512:14b5cd7979d45f554b1718e76cefe17883bdc709afba6fd332ae763532b264a2cc760e9e7c149b529a90e7652423000222ffaf3cf05fea4d4203ab2da200f65f
+ VERSION=1-4-6
SOURCE=$SPELL-linux_osx-v$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ogrenew
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- WEB_SITE=http://www.ogre3d.org/
- ENTERED=20031008
+#
SOURCE_HASH=sha512:14b5cd7979d45f554b1718e76cefe17883bdc709afba6fd332ae763532b264a2cc760e9e7c149b529a90e7652423000222ffaf3cf05fea4d4203ab2da200f65f
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
+ WEB_SITE=http://www.ogre3d.org/
KEYWORDS="graphics libs"
+ ENTERED=20031008
SHORT="Object-Oriented Graphics Rendering Engine"
cat << EOF
OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
flexible 3D engine written in C++ designed to make it easier and more
intuitive for developers to produce games and demos utilising 3D hardware.
The class library abstracts all the details of using the underlying system
libraries like Direct3D and OpenGL and provides an interface based on world
objects and other intuitive classes.
diff --git a/graphics-libs/ogre/HISTORY b/graphics-libs/ogre/HISTORY
index 5cb1ec9..49872de 100644
--- a/graphics-libs/ogre/HISTORY
+++ b/graphics-libs/ogre/HISTORY
@@ -1,3 +1,7 @@
+2008-01-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.4.6
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing dependency on cegui
+
2007-08-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: added a missing $ which made BUILD fail

diff --git a/graphics-libs/ogre/PRE_SUB_DEPENDS
b/graphics-libs/ogre/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..8ef9c57
--- /dev/null
+++ b/graphics-libs/ogre/PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+. $GRIMOIRE/is_depends_enabled.function &&
+
+case "$THIS_SUB_DEPENDS" in
+ CEGUI) is_depends_enabled $SPELL cegui && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1 ;;
+esac
diff --git a/graphics-libs/ogre/SUB_DEPENDS b/graphics-libs/ogre/SUB_DEPENDS
new file mode 100755
index 0000000..7203918
--- /dev/null
+++ b/graphics-libs/ogre/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case "$THIS_SUB_DEPENDS" in
+ CEGUI) depends cegui '--enable-lua-module --enable-toluacegui' ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/graphics-libs/ogre/ogre-linux_osx-v1-4-6.tar.bz2.sig
b/graphics-libs/ogre/ogre-linux_osx-v1-4-6.tar.bz2.sig
new file mode 100644
index 0000000..0ba824c
Binary files /dev/null and
b/graphics-libs/ogre/ogre-linux_osx-v1-4-6.tar.bz2.sig differ



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (8cad66e255dd9a66f5389399e646c80b26d1a803), Eric Sandall, 01/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page