[SCM] Packaging for ogre branch, master, updated. upstream/1.4.9.dfsg1-107-gfbacc08

[Federico Di Gregorio]

The following commit has been merged in the master branch:
commit fbacc08c6da5370c2a427ef3c891caa17baa41a7
Author: Federico Di Gregorio <fog at debian.org>
Date:   Thu Mar 19 01:15:04 2009 +0100

    Updated Samples compile script; now builds 90% of them

diff --git a/debian/extras/compiledemos.sh b/debian/extras/compiledemos.sh
index 9301132..2cdaaf1 100755
--- a/debian/extras/compiledemos.sh
+++ b/debian/extras/compiledemos.sh
@@ -8,7 +8,7 @@
 # This script will attempt to download the source tarball in case it's not
 # found in the current directory, unpack it, and compile the Samples.
 
-OGRESRC="ogre-v1-4-9.tar.bz2"
+OGRESRC="ogre-v1-6-1.tar.bz2"
 OGRESUM="8a73fbcf42fd6b156b2567839d0cd125"
 
 compile () {
@@ -33,34 +33,34 @@ check_deb () {
 check_deb libois-dev
 check_deb libogre-dev
 
-if [ ! -f $OGRESRC ]; then
+if [ ! -f $OGRESRC ] -o [ ! -f OGRE.pc.in ]; then
     wget http://downloads.sourceforge.net/ogre/$OGRESRC
 fi
 
-CHECKSUM=$(md5sum $OGRESRC | cut -d ' ' -f 1)
-if [ $OGRESUM != $CHECKSUM ]; then
-    echo "Error: checksum verification failed:"
-    echo "  computed checksum is  $CHECKSUM"
-    echo "  expected checksum was $OGRESUM"
-    exit 1
-else
-    echo "Checksum verified: $CHECKSUM"
-fi
+if [ ! -f OGRE.pc.in ] ; then
+    CHECKSUM=$(md5sum $OGRESRC | cut -d ' ' -f 1)
+    if [ $OGRESUM != $CHECKSUM ]; then
+        echo "Error: checksum verification failed:"
+        echo "  computed checksum is  $CHECKSUM"
+        echo "  expected checksum was $OGRESUM"
+        exit 1
+    else
+        echo "Checksum verified: $CHECKSUM"
+    fi
 
-# Unpack the tarball
-if [ ! -d ogre ]; then
+    # Unpack the tarball
+    if [ ! -d ogre ]; then
 	echo "Extracting $OGRESRC to ogrenew"
 	tar -xjf $OGRESRC
-else
+    else
 	echo "Using existing ogre directory (remove it and re-run this script if you want to start from scratch)"
+    fi
+    cd ogre
 fi
 
 # Link to the correct plugins.cfg for this system.
-rm -f ogre/Samples/Common/bin/plugins.cfg
-ln -s /etc/OGRE/plugins.cfg ogre/Samples/Common/bin/plugins.cfg
-
-# Go into ogre samples directory and compile everything
-cd ogre
+rm -f Samples/Common/bin/plugins.cfg
+ln -s /etc/OGRE/plugins.cfg Samples/Common/bin/plugins.cfg
 
 if [ -z "$1" ] ; then
     SAMPLES="$(find Samples -maxdepth 1 -type d)"
@@ -77,21 +77,13 @@ for sample in $SAMPLES ; do
         # nothing to do
       ;;
       
-      GTKDemo|HDRDemo)
-        # simply don't build
-      ;;
-	
-      Gui)
-        # compile $sample "OGRE CEGUI" -lCEGUIBase
-      ;;
-    
-      Shadows|Compositor|FacialAnimation|OceanDemo|Instancing)
-        # deactivated untill CEGUI is updated
+      Shadows|Compositor|FacialAnimation|OceanDemo|Instancing|Gui)
+        compile $sample "OGRE CEGUI-OGRE OIS"
       ;;
 
-	BSP)
-		# Don't build as it requires quake3 data files.
-	;;
+      PCZTestApp)
+        compile $sample "OGRE OIS" "-I ../../PlugIns/PCZSceneManager/include"
+      ;;
 
       *)
         compile $sample "OGRE OIS" 
@@ -104,7 +96,7 @@ if ! $(dpkg -l ogre-plugins-cgprogrammanager 2>&1 | grep >/dev/null 2>&1 ii) ; t
 	echo "The package ogre-plugins-cgprogrammanager is not installed (or is unavailable) on this system. This will significantly change the behavior of some demos."
 fi
 
-echo "Be sure to go into the ogrenew/Samples/Common/bin directory and run each demo from there."
+echo "Be sure to go into the Samples/Common/bin directory and run each demo from there."
 
 # TODO: A proper "clean" option and implementation
 # would also be useful to remove anything that was built.

-- 
Packaging for ogre