[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8dfd53adcb9ec50a9212cb93debd1fe66a84bde8)

Treeve Jelbert scm at sourcemage.org
Sat Jul 21 05:17:12 EDT 2007


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 dev/null                                             |binary
 graphics-libs/ogre/BUILD                             |    8 ----
 graphics-libs/ogre/CONFIGURE                         |   19 ----------
 graphics-libs/ogre/DEPENDS                           |   36 +++++++++----------
 graphics-libs/ogre/DETAILS                           |    6 +--
 graphics-libs/ogre/HISTORY                           |    9 ++++
 graphics-libs/ogre/ogre-linux_osx-v1-0-5.tar.bz2.sig |    0 
 7 files changed, 32 insertions(+), 46 deletions(-)

New commits:
commit 8dfd53adcb9ec50a9212cb93debd1fe66a84bde8
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    ogre-1-4-3

diff --git a/graphics-libs/ogre/BUILD b/graphics-libs/ogre/BUILD
index beabf4d..6bfd4ff 100755
--- a/graphics-libs/ogre/BUILD
+++ b/graphics-libs/ogre/BUILD
@@ -1,8 +1,2 @@
-OPTS="$OGRE_THREAD                      \
-      $OGRE_DOUBLE                      \
-      --with-cfgtk=cli                  \
-      --with-platform=$OGRE_PLATFORM    \
-      --with-gl-support=$OGRE_PLATFORM  \
-      $OPTS"                            &&
-
+OPTS="$OGRE_DOUBLE OPTS"   &&
 default_build
diff --git a/graphics-libs/ogre/CONFIGURE b/graphics-libs/ogre/CONFIGURE
index 099526e..1cbaa38 100755
--- a/graphics-libs/ogre/CONFIGURE
+++ b/graphics-libs/ogre/CONFIGURE
@@ -1,19 +1,2 @@
 config_query_option  OGRE_DOUBLE  "Enable double float precision (slow)?"  n  \
-                     "--enable-double"  "--disable-double"                    &&
-
-config_query_option  OGRE_THREAD  "Enable threading (EXPERIMENTAL)?"       n  \
-                     "--enable-threading"  "--disable-threading"              &&
-
-#
-# gtk option needs gtkmm2 2.0
-#
-#message  "${MESSAGE_COLOR}GTK support is through gtkmm2${DEFAULT_COLOR}"      &&
-#config_query_list    OGRE_TOOLKIT  "Which config toolkit to use?"             \
-#                     "gtk"  "cli"                                             &&
-
-#
-# gtk option needs gtkmm2 2.0
-#
-#message  "${MESSAGE_COLOR}GTK support is through gtkmm2${DEFAULT_COLOR}"      &&
-config_query_list    OGRE_PLATFORM  "Which platform to build for?"            \
-                     "sdl"  "glx"
+                     "--enable-double"  "--disable-double"                    
diff --git a/graphics-libs/ogre/DEPENDS b/graphics-libs/ogre/DEPENDS
index 6334eef..8cf22b0 100755
--- a/graphics-libs/ogre/DEPENDS
+++ b/graphics-libs/ogre/DEPENDS
@@ -1,29 +1,29 @@
-depends  cegui      &&
+depends  g++        &&
 depends  freetype2  &&
 depends  libmng     &&
 depends  pkgconfig  &&
 depends  stlport    &&
 depends  zziplib    &&
+depends  pkgconfig  &&
+depends  OPENGL     &&
+depends  gtkmm2     &&
+
+optional_depends  boost                                        \
+                  '--enable-threading'                         \
+                  '--enable-threading'                         \
+                  'Thread support'                             &&
+if is_depends_enabled $SPELL boost;then
+  sub_depends boost THREAD 
+fi                                                             &&
 
-if    [  "$OGRE_PLATFORM"  ==  "gtk"  ];  then
-  #
-  # Depends on gtkmm2 == 2.0
-  #
-  depends  gtkmm2
-elif  [  "$OGRE_PLATFORM"  ==  "sdl"  ];  then
-  depends  sdl
-elif  [  "$OGRE_PLATFORM"  ==  "cli"  ];  then
-  depends  OPENGL
-fi  &&
+optional_depends  cegui "" "" "for sample programs"            &&
+optional_depends  ode   "" "" "used in demos"                  &&
 
-if  [  "$OGRE_TOOLKIT"  ==  "gtk"  ];  then
-  #
-  # Depends on gtkmm2 == 2.0
-  #
-  depends  gtkmm2
-fi  &&
+optional_depends  freeimage                                    \
+                  '--enable-freeimage'                         \
+                  '--disable-freeimage'                        \
+                  'image viewer'                               &&
 
-# in z-rejected grimoire
 optional_depends  devil                                        \
                   "--enable-devil"                             \
                   "--disable-devil"                            \
diff --git a/graphics-libs/ogre/DETAILS b/graphics-libs/ogre/DETAILS
index aa429e5..625b5ce 100755
--- a/graphics-libs/ogre/DETAILS
+++ b/graphics-libs/ogre/DETAILS
@@ -1,12 +1,12 @@
            SPELL=ogre
-         VERSION=1-0-5
+         VERSION=1-4-3
+     SOURCE_HASH=sha512:14b5cd7979d45f554b1718e76cefe17883bdc709afba6fd332ae763532b264a2cc760e9e7c149b529a90e7652423000222ffaf3cf05fea4d4203ab2da200f65f
           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"
+#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
         WEB_SITE=http://www.ogre3d.org/
          ENTERED=20031008
-         UPDATED=20050311
       LICENSE[0]=LGPL
         KEYWORDS="graphics libs"
            SHORT="Object-Oriented Graphics Rendering Engine"
diff --git a/graphics-libs/ogre/HISTORY b/graphics-libs/ogre/HISTORY
index 96e4aa8..96b2e2e 100644
--- a/graphics-libs/ogre/HISTORY
+++ b/graphics-libs/ogre/HISTORY
@@ -1,3 +1,12 @@
+2007-07-09 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1-4-3
+	* DEPENDS: add optional boost (for threading)
+	  add freeimage, pkgconfig, ode, g++
+	  cegui is optional
+	  clear out old logic
+	* CONFIGURE, BUILD: adjust threading support
+	  clear out old logic
+
 2006-10-17 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DEPENDS: libcg is a cross-grimoire dependency
 
diff --git a/graphics-libs/ogre/ogre-linux_osx-v1-0-5.tar.bz2.sig b/graphics-libs/ogre/ogre-linux_osx-v1-0-5.tar.bz2.sig
deleted file mode 100644
index a28c93a..0000000
Binary files a/graphics-libs/ogre/ogre-linux_osx-v1-0-5.tar.bz2.sig and /dev/null differ



More information about the SM-Commit mailing list