Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

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

 dev/null                                             |binary
 graphics-libs/ogre/BUILD                             |    6 +++++-
 graphics-libs/ogre/DEPENDS                           |   13 +++++++++----
 graphics-libs/ogre/DETAILS                           |    8 ++++----
 graphics-libs/ogre/HISTORY                           |    9 +++++++++
 graphics-libs/ogre/ogre-linux_osx-v1-4-6.tar.bz2.sig |    0 
 graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig           |binary
 7 files changed, 27 insertions(+), 9 deletions(-)

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

    ogre: freeimage and devil support conflict, but devil is preferred
    List devil first, don't list freeimage of enabling devil, and force
    freeimage being disabled if using devil

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

    ogre: Updated to 1-6-2

diff --git a/graphics-libs/ogre/BUILD b/graphics-libs/ogre/BUILD
index 9910fc4..3e1ee83 100755
--- a/graphics-libs/ogre/BUILD
+++ b/graphics-libs/ogre/BUILD
@@ -1,2 +1,6 @@
-OPTS="$OGRE_DOUBLE $OPTS"   &&
+if is_depends_enabled $SPELL devil;  then
+  OPTS="--disable-freeimage $OPTS"
+fi  &&
+
+OPTS="$OGRE_DOUBLE $OPTS"  &&
 default_build
diff --git a/graphics-libs/ogre/DEPENDS b/graphics-libs/ogre/DEPENDS
index 13ffd0d..bd4ee24 100755
--- a/graphics-libs/ogre/DEPENDS
+++ b/graphics-libs/ogre/DEPENDS
@@ -19,16 +19,21 @@ fi                                                        
     &&
 optional_depends  cegui "" "" "for sample programs"            &&
 optional_depends  ode   "" "" "used in demos"                  &&
 
-optional_depends  freeimage                                    \
-                  '--enable-freeimage'                         \
-                  '--disable-freeimage'                        \
-                  'image viewer'                               &&
+message "${SPELL_COLOR}devil${MESSAGE_COLOR} and 
${SPELL_COLOR}freeimage${MESSAGE_COLOR} support conflicts,"  \
+        "picking ${SPELL_COLOR}devil${MESSAGE_COLOR} will exclude 
${SPELL_COLOR}freeimage${DEFAULT_COLOR}"    &&
 
 optional_depends  devil                                        \
                   "--enable-devil"                             \
                   "--disable-devil"                            \
                   "Use DevIL for image loading (RECOMMENDED)"  &&
 
+if ! is_depends_enabled $SPELL devil; then
+  optional_depends  freeimage                                    \
+                    '--enable-freeimage'                         \
+                    '--disable-freeimage'                        \
+                    'image viewer (NOT RECOMMENDED)'
+fi  &&
+
 optional_depends  libcg                                        \
                   "--enable-cg"                                \
                   "--disable-cg"                               \
diff --git a/graphics-libs/ogre/DETAILS b/graphics-libs/ogre/DETAILS
index 7b97598..6cfb3d4 100755
--- a/graphics-libs/ogre/DETAILS
+++ b/graphics-libs/ogre/DETAILS
@@ -1,10 +1,10 @@
            SPELL=ogre
-         VERSION=1-4-6
-          SOURCE=$SPELL-linux_osx-v$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ogrenew
+         VERSION=1-6-2
+          SOURCE=$SPELL-v$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ogre
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
 #     
SOURCE_HASH=sha512:14b5cd7979d45f554b1718e76cefe17883bdc709afba6fd332ae763532b264a2cc760e9e7c149b529a90e7652423000222ffaf3cf05fea4d4203ab2da200f65f
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
       LICENSE[0]=LGPL
         WEB_SITE=http://www.ogre3d.org/
         KEYWORDS="graphics libs"
diff --git a/graphics-libs/ogre/HISTORY b/graphics-libs/ogre/HISTORY
index a9ce20d..1732f08 100644
--- a/graphics-libs/ogre/HISTORY
+++ b/graphics-libs/ogre/HISTORY
@@ -1,3 +1,12 @@
+2009-04-12 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 1-6-2
+         SOURCE no longer includes linux_osx-
+         SOURCE_DIRECTORY is now plain ogre
+       * DEPENDS: devil and freeimage support conflict, note this and
+         list devil first as it's recommended
+       * BUILD: Force disable freeimage if using devil, as even passing
+         --disable-freeimage when enabling devil doesn't seem to work
+
 2008-09-03 Mathieu Lonjaret <lejatorn AT sourcemage.org>
        * DEPENDS: fixed mistake: s/enable/disable/
 
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
deleted file mode 100644
index 0ba824c..0000000
Binary files a/graphics-libs/ogre/ogre-linux_osx-v1-4-6.tar.bz2.sig and 
/dev/null differ
diff --git a/graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig 
b/graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig
new file mode 100644
index 0000000..b2d9e09
Binary files /dev/null and b/graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig differ