Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Flavien Bridault (21bf8566c19e014cab19ce455d53c541fde74cb2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Flavien Bridault <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Flavien Bridault (21bf8566c19e014cab19ce455d53c541fde74cb2)
  • Date: Sat, 15 Jul 2006 19:10:47 -0500

GIT changes to master grimoire by Flavien Bridault <vlaaad AT sourcemage.org>:

dev/null |binary
disk/bonfire/DETAILS | 2 +-
disk/bonfire/HISTORY | 3 +++
disk/bonfire/bonfire-0.4.0.tar.bz2.sig | 0
disk/bonfire/bonfire-0.4.1.tar.bz2.sig |binary
graphics/blender/BUILD | 26 +++++++++++++++-----------
graphics/blender/CONFIGURE | 3 ++-
graphics/blender/DEPENDS | 6 +++++-
graphics/blender/DETAILS | 6 ++----
graphics/blender/HISTORY | 6 ++++++
graphics/blender/INSTALL | 4 ++--
graphics/blender/blender-2.41.tar.gz.sig | 0
graphics/blender/blender-2.42.tar.gz.sig |binary
security/shadow/HISTORY | 2 +-
14 files changed, 37 insertions(+), 21 deletions(-)

New commits:
commit 21bf8566c19e014cab19ce455d53c541fde74cb2
Merge: 93b31941d6932c39b4c68d7fe2ea7d87569e8b28
9a58b4cb7afc317784c603cf18fe4a7d93b7ce6d
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

Merge branch 'master' of ssh://fbridault AT scm.sourcemage.org/smgl/grimoire

commit 93b31941d6932c39b4c68d7fe2ea7d87569e8b28
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

blender 2.42

commit 0230b1cf5a8554d62b121b492d47a5e356f41d51
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

wrong spaces instead of a tab in HISTORY

commit 83e56106d356d78b3c5114aced7175a68149b39f
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

bonfire updated to 0.4.1

diff --git a/disk/bonfire/DETAILS b/disk/bonfire/DETAILS
index 9d977dd..2d933dc 100755
--- a/disk/bonfire/DETAILS
+++ b/disk/bonfire/DETAILS
@@ -1,5 +1,5 @@
SPELL=bonfire
- VERSION=0.4.0
+ VERSION=0.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/disk/bonfire/HISTORY b/disk/bonfire/HISTORY
index 372c58c..0e87b85 100644
--- a/disk/bonfire/HISTORY
+++ b/disk/bonfire/HISTORY
@@ -1,3 +1,6 @@
+2006-07-15 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 0.4.1
+
2006-07-12 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 0.4.0
* BUILD: Added, disable caches to avoid tracking by sorcery
diff --git a/disk/bonfire/bonfire-0.4.0.tar.bz2.sig
b/disk/bonfire/bonfire-0.4.0.tar.bz2.sig
deleted file mode 100644
index 1b2e9b9..0000000
Binary files a/disk/bonfire/bonfire-0.4.0.tar.bz2.sig and /dev/null differ
diff --git a/disk/bonfire/bonfire-0.4.1.tar.bz2.sig
b/disk/bonfire/bonfire-0.4.1.tar.bz2.sig
new file mode 100644
index 0000000..1ce87e8
Binary files /dev/null and b/disk/bonfire/bonfire-0.4.1.tar.bz2.sig differ
diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index f8a88c4..545506f 100755
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -1,17 +1,21 @@
-# scons leaves mess behind ...
-# intentionally ignore the result of next two commands
-rm -rf "$BUILD_DIRECTORY/build"
-rm -rf "$BUILD_DIRECTORY/lib"
+if [ $OPENAL == y ]; then
+ USE_OPENAL="WITH_BF_OPENAL=1"
+else
+ USE_OPENAL="WITH_BF_OPENAL=0"
+fi &&

-if [ $OPENAL == y ]
-then
- USE_OPENAL="USE_OPENAL=1"
+if [ $OPENEXR == y ]; then
+ USE_OPENEXR="WITH_BF_OPENEXR=1"
else
- USE_OPENAL="USE_OPENAL=0"
+ USE_OPENEXR="WITH_BF_OPENEXR=0"
fi &&

scons \
$USE_OPENAL \
- USE_INTERNATIONAL=1 \
- BUILD_BLENDER_PLAYER=1 \
- BUILD_GAMEENGINE=1
+ $USE_OPENEXR \
+ WITH_BF_INTERNATIONAL=1 \
+ WITH_BF_PLAYER=1 \
+ WITH_BF_GAMEENGINE=1 \
+ BF_INSTALLDIR=$SOURCE_DIRECTORY/install
+# Do not build outside the default tree because of a bug in makesdna
compiling
+# BF_BUILDDIR=$SOURCE_DIRECTORY/build
diff --git a/graphics/blender/CONFIGURE b/graphics/blender/CONFIGURE
index 0507991..6ac1f01 100755
--- a/graphics/blender/CONFIGURE
+++ b/graphics/blender/CONFIGURE
@@ -1 +1,2 @@
-config_query OPENAL "Use blender audio ability (openal) ?" y
+config_query OPENAL "Use blender audio ability (openal) ?" y &&
+config_query OPENEXR "Enable High Dynamic Range graphics (openexr)" y
diff --git a/graphics/blender/DEPENDS b/graphics/blender/DEPENDS
index 36112d9..dacd4aa 100755
--- a/graphics/blender/DEPENDS
+++ b/graphics/blender/DEPENDS
@@ -5,10 +5,14 @@ depends zlib &&
depends python &&
depends jpeg &&

-if [ $OPENAL == y ]; then
+if [ "$OPENAL" == "y" ]; then
depends openal
fi &&

+if [ "$OPENEXR" == "y" ]; then
+ depends openexr
+fi &&
+
optional_depends libpng \
"" \
"" \
diff --git a/graphics/blender/DETAILS b/graphics/blender/DETAILS
index 6730d17..0cd11a8 100755
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -1,13 +1,11 @@
SPELL=blender
- VERSION=2.41
- PATCHLEVEL=1
+ VERSION=2.42
SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${VERSION}
SOURCE_URL[0]=http://download.blender.org/source/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.blender.org/
ENTERED=20021018
- UPDATED=20060101
LICENSE[0]=GPL
KEYWORDS="graphics"
SHORT="Opensource 3d modelling/animation tool"
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index c06d7ad..0e8b260 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,9 @@
+2006-07-15 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: Updated to 2.42
+ * CONFIGURE, DEPENDS: Added optional openexr
+ * BUILD: Updated configuration variables
+ * INSTALL: Updated to work with this version
+
2006-05-06 Flavien Bridault <vlaaad AT sourcemage.org>
* desktop/blender: updated
* blender48x48.png: created
diff --git a/graphics/blender/INSTALL b/graphics/blender/INSTALL
index f1934bb..57ca120 100755
--- a/graphics/blender/INSTALL
+++ b/graphics/blender/INSTALL
@@ -1,3 +1,3 @@
-install -m 755 blender ${INSTALL_ROOT}/usr/bin &&
-install -m 755 blenderplayer ${INSTALL_ROOT}/usr/bin &&
+install -m 755 install/blender ${INSTALL_ROOT}/usr/bin &&
+install -m 755 install/blenderplayer ${INSTALL_ROOT}/usr/bin &&
install -m 644 ${SCRIPT_DIRECTORY}/blender48x48.png
${INSTALL_ROOT}/usr/share/pixmaps
diff --git a/graphics/blender/blender-2.41.tar.gz.sig
b/graphics/blender/blender-2.41.tar.gz.sig
deleted file mode 100644
index 3060505..0000000
Binary files a/graphics/blender/blender-2.41.tar.gz.sig and /dev/null differ
diff --git a/graphics/blender/blender-2.42.tar.gz.sig
b/graphics/blender/blender-2.42.tar.gz.sig
new file mode 100644
index 0000000..0af03e8
Binary files /dev/null and b/graphics/blender/blender-2.42.tar.gz.sig differ
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index 5fbe01e..55829ab 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,5 +1,5 @@
2006-07-15 Flavien Bridault <vlaaad AT sourcemage.org>
- * BUILD: do not install default /etc/pam.d/* files from the tarball
+ * BUILD: do not install default /etc/pam.d/* files from the tarball
* DETAILS: PATCHLEVEL++

2006-07-12 Treeve Jelbert <treeve AT pi.be>



  • [SM-Commit] GIT changes to master grimoire by Flavien Bridault (21bf8566c19e014cab19ce455d53c541fde74cb2), Flavien Bridault, 07/15/2006

Archive powered by MHonArc 2.6.24.

Top of Page