r3318 - in packages/trunk/ogre/debian: . patches
Andres Mejia
ceros-guest at alioth.debian.org
Wed Jul 11 06:36:36 UTC 2007
Author: ceros-guest
Date: 2007-07-11 06:36:36 +0000 (Wed, 11 Jul 2007)
New Revision: 3318
Added:
packages/trunk/ogre/debian/patches/64-bit_architectures.dpatch
Modified:
packages/trunk/ogre/debian/changelog
packages/trunk/ogre/debian/control
packages/trunk/ogre/debian/patches/00list
packages/trunk/ogre/debian/patches/disable_samples.dpatch
packages/trunk/ogre/debian/patches/gcc_mips.dpatch
Log:
Fixing lots of bugs with ogre.
Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog 2007-07-11 06:17:26 UTC (rev 3317)
+++ packages/trunk/ogre/debian/changelog 2007-07-11 06:36:36 UTC (rev 3318)
@@ -2,8 +2,27 @@
[ Andres Mejia ]
* New upstream release
+ * Fixing FTBFS for mips, thanks to Brian M. Carlson (Closes: 358221)
+ * Fixing FTBFS for ppc64, thanks to Andreas Jochens (Closes: 364050)
+ * Fixing FTBFS for other 64-bit based architectures
+ + Major thanks to Steve Langasek for this fix.
+ + (Closes: 332514)
+ + (Closes: 342380)
+ * Closing some NMU bug reports.
+ + Build-dependencies are already fixed.
+ + Another method for using dh_compress is used.
+ + Upstream source of ogre compiles well with g++-4.1.
+ + (Closes: 349420)
+ + (Closes: 357374)
+ + (Closes: 358006)
+ * Closing FTBFS with G++ 4.1 bug. (Closes: 356442)
+ + All modification were already found upstream.
+ + Thanks goes to Martin Michlmayr for providing a fix.
+ * Forgot to close one new version bug. (Closes: 350059)
+ + A much newer script is provided upstream.
+ * Added proper check for determining whether to use SSE.
- -- Andres Mejia <mcitadel at gmail.com> Mon, 09 Jul 2007 13:01:44 -0400
+ -- Andres Mejia <mcitadel at gmail.com> Wed, 11 Jul 2007 00:29:41 -0400
ogre (1.4.2-2) unstable; urgency=low
Modified: packages/trunk/ogre/debian/control
===================================================================
--- packages/trunk/ogre/debian/control 2007-07-11 06:17:26 UTC (rev 3317)
+++ packages/trunk/ogre/debian/control 2007-07-11 06:36:36 UTC (rev 3318)
@@ -3,7 +3,7 @@
Section: libs
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch, libtool, automake, autoconf, pkg-config, libfreeimage-dev, libfreetype6-dev, libopenexr-dev, libcegui-mk2-dev, libzzip-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libxext-dev, libxrandr-dev, libxxf86vm-dev, libx11-dev, libxaw7-dev, libxt-dev, zlib1g-dev
+Build-Depends: debhelper (>= 5), dpatch, libtool, automake, autoconf, pkg-config, libfreeimage-dev | libdevil-dev, libfreetype6-dev, libopenexr-dev, libcegui-mk2-dev, libzzip-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libxext-dev, libxrandr-dev, libxxf86vm-dev, libx11-dev, libxaw7-dev, libxt-dev, zlib1g-dev
Standards-Version: 3.7.2
Package: libogre14
Modified: packages/trunk/ogre/debian/patches/00list
===================================================================
--- packages/trunk/ogre/debian/patches/00list 2007-07-11 06:17:26 UTC (rev 3317)
+++ packages/trunk/ogre/debian/patches/00list 2007-07-11 06:36:36 UTC (rev 3318)
@@ -1,3 +1,4 @@
disable_samples.dpatch
gcc_mips.dpatch
fix_soname_and_rpath.dpatch
+64-bit_architectures.dpatch
Added: packages/trunk/ogre/debian/patches/64-bit_architectures.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/64-bit_architectures.dpatch (rev 0)
+++ packages/trunk/ogre/debian/patches/64-bit_architectures.dpatch 2007-07-11 06:36:36 UTC (rev 3318)
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+## 64-bit_architectures.dpatch by Andres Mejia <mcitadel at gmail.com>
+## Major thanks to Steve Langasek <vorlon at debian.org> and
+## Andreas Jochens <aj at andaco.de> for this patch.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixing FTBFS for 64-bit based architectures.
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+ pdir="-d $3"
+ dir="$3/"
+elif [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $pdir -f --no-backup-if-mismatch -p0 < $0
+ ;;
+ -unpatch)
+ patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+ ;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+esac
+exit 0
+
+--- ogre-free/OgreMain/include/OgrePlatform.h~ 2007-07-10 20:56:43.000000000 -0400
++++ ogre-free/OgreMain/include/OgrePlatform.h 2007-07-10 20:59:12.000000000 -0400
+@@ -95,7 +95,7 @@
+ #endif
+
+ /* Find the arch type */
+-#if defined(__x86_64__) || defined(_M_X64)
++#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__)
+ # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64
+ #else
+ # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32
Property changes on: packages/trunk/ogre/debian/patches/64-bit_architectures.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/trunk/ogre/debian/patches/disable_samples.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/disable_samples.dpatch 2007-07-11 06:17:26 UTC (rev 3317)
+++ packages/trunk/ogre/debian/patches/disable_samples.dpatch 2007-07-11 06:36:36 UTC (rev 3318)
@@ -25,8 +25,8 @@
esac
exit 0
---- ogre-free/acinclude.m4~ 2007-04-27 12:37:44.000000000 -0400
-+++ ogre-free/acinclude.m4 2007-05-27 20:26:47.000000000 -0400
+--- ogre-free/acinclude.m4.bak 2007-07-11 01:07:04.000000000 -0400
++++ ogre-free/acinclude.m4 2007-07-11 01:10:13.000000000 -0400
@@ -450,14 +450,12 @@
AC_CONFIG_FILES([Samples/Common/CEGUIRenderer/Makefile \
Samples/Common/CEGUIRenderer/CEGUI-OGRE.pc
@@ -45,6 +45,22 @@
fi
AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
])
+## DP: Also properly checking target_cpu for use of SSE.
+@@ -593,11 +591,11 @@
+ [
+ AC_MSG_CHECKING(whether to use SSE)
+ case $target_cpu in
+- powerpc)
+- build_sse=no
++ i386 | i486 | i586 | i686 | x86_64)
++ build_sse=yes
+ ;;
+ *)
+- build_sse=yes
++ build_sse=no
+ ;;
+ esac
+ AC_MSG_RESULT($build_sse)
## DP: Also adding versioning info to use version-info instead of release in soname
--- ogre-free/configure.in~ 2007-06-11 17:45:54.000000000 -0400
+++ ogre-free/configure.in 2007-06-11 21:07:51.000000000 -0400
Modified: packages/trunk/ogre/debian/patches/gcc_mips.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/gcc_mips.dpatch 2007-07-11 06:17:26 UTC (rev 3317)
+++ packages/trunk/ogre/debian/patches/gcc_mips.dpatch 2007-07-11 06:36:36 UTC (rev 3318)
@@ -1,5 +1,5 @@
#! /bin/sh -e
-## gcc_mips.dpatch by Federico Di Gregorio <fog at debian.org>
+## gcc_mips.dpatch by Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Changing source to not use "mips" as a variable.
@@ -25,8 +25,45 @@
esac
exit 0
---- ogre-free/OgreMain/src/OgreMaterialSerializer.cpp~ 2007-05-27 20:24:06.000000000 -0400
-+++ ogre-free/OgreMain/src/OgreMaterialSerializer.cpp 2007-03-23 13:25:26.000000000 -0400
+--- ogre-free/OgreMain/src/OgreMaterialScriptCompiler.cpp~ 2007-07-10 20:34:42.000000000 -0400
++++ ogre-free/OgreMain/src/OgreMaterialScriptCompiler.cpp 2007-07-10 20:47:26.000000000 -0400
+@@ -1583,7 +1583,7 @@
+ {
+ assert(mScriptContext.textureUnit);
+ TextureType tt = TEX_TYPE_2D;
+- int mips = MIP_DEFAULT; // When passed to TextureManager::load, this means default to default number of mipmaps
++ int mipmaps = MIP_DEFAULT; // When passed to TextureManager::load, this means default to default number of mipmaps
+ bool isAlpha = false;
+ PixelFormat desiredFormat = PF_UNKNOWN;
+ const String& textureName = getNextTokenLabel();
+@@ -1605,14 +1605,14 @@
+ tt = TEX_TYPE_CUBE_MAP;
+ break;
+ case ID_UNLIMITED:
+- mips = MIP_UNLIMITED;
++ mipmaps = MIP_UNLIMITED;
+ break;
+ case ID_ALPHA:
+ isAlpha = true;
+ break;
+ case _value_:
+ replaceToken();
+- mips = static_cast<int>(getNextTokenValue());
++ mipmaps = static_cast<int>(getNextTokenValue());
+ break;
+ default:
+ desiredFormat = PixelUtil::getFormatFromName(getCurrentTokenLexeme(), true);
+@@ -1620,7 +1620,7 @@
+ }
+ }
+ mScriptContext.textureUnit->setTextureName(textureName, tt);
+- mScriptContext.textureUnit->setNumMipmaps(mips);
++ mScriptContext.textureUnit->setNumMipmaps(mipmaps);
+ mScriptContext.textureUnit->setIsAlpha(isAlpha);
+ mScriptContext.textureUnit->setDesiredFormat(desiredFormat);
+ }
+--- ogre-free/OgreMain/src/OgreMaterialSerializer.cpp~ 2007-07-10 20:45:04.000000000 -0400
++++ ogre-free/OgreMain/src/OgreMaterialSerializer.cpp 2007-07-10 20:46:01.000000000 -0400
@@ -759,7 +759,7 @@
context);
}
More information about the Pkg-games-commits
mailing list