r2889 - packages/trunk/ogre/debian/patches/old-patches
Andres Mejia
ceros-guest at alioth.debian.org
Fri Jun 8 22:33:53 UTC 2007
Author: ceros-guest
Date: 2007-06-08 22:33:53 +0000 (Fri, 08 Jun 2007)
New Revision: 2889
Added:
packages/trunk/ogre/debian/patches/old-patches/01_dont_build_samples
packages/trunk/ogre/debian/patches/old-patches/10_gcc_4.1_mips
Log:
adding old patches that were used in ogre-1.0.6 packaging.
Added: packages/trunk/ogre/debian/patches/old-patches/01_dont_build_samples
===================================================================
--- packages/trunk/ogre/debian/patches/old-patches/01_dont_build_samples (rev 0)
+++ packages/trunk/ogre/debian/patches/old-patches/01_dont_build_samples 2007-06-08 22:33:53 UTC (rev 2889)
@@ -0,0 +1,130 @@
+diff -ruN ogre-free-old/acinclude.m4 ogre-free/acinclude.m4
+--- ogre-free-old/acinclude.m4 2005-02-12 02:56:12 +0100
++++ ogre-free/acinclude.m4 2005-03-12 19:12:05 +0100
+@@ -430,14 +430,12 @@
+ if test x$build_cegui_sample = xtrue; then
+ AC_CONFIG_FILES([Samples/Common/CEGUIRenderer/Makefile \
+ Samples/Common/CEGUIRenderer/src/Makefile \
+- Samples/Common/CEGUIRenderer/include/Makefile \
+- Samples/Gui/Makefile \
+- Samples/Gui/src/Makefile])
++ Samples/Common/CEGUIRenderer/include/Makefile])
+ AC_SUBST(CEGUI_CFLAGS)
+ AC_SUBST(CEGUI_LIBS)
+- AC_MSG_RESULT([CEGUI available, Gui sample will be built])
++ AC_MSG_RESULT([CEGUI available, Renderer will be built])
+ else
+- AC_MSG_RESULT([CEGUI not available, Gui sample will not be built])
++ AC_MSG_RESULT([CEGUI not available, Renderer will not be built])
+ fi
+ AM_CONDITIONAL([BUILD_CEGUI_SAMPLE], [test x$build_cegui_sample = xtrue])
+ ])
+diff -ruN ogre-free-old/configure.in ogre-free/configure.in
+--- ogre-free-old/configure.in 2005-02-12 02:49:46 +0100
++++ ogre-free/configure.in 2005-03-12 19:21:51 +0100
+@@ -139,71 +139,6 @@
+ RenderSystems/Direct3D9/include/Makefile \
+ Samples/Makefile \
+ Samples/Common/Makefile \
+- Samples/Common/include/Makefile \
+- Samples/BezierPatch/Makefile \
+- Samples/BezierPatch/src/Makefile \
+- Samples/BezierPatch/include/Makefile \
+- Samples/CameraTrack/Makefile \
+- Samples/CameraTrack/src/Makefile \
+- Samples/CelShading/Makefile \
+- Samples/CelShading/src/Makefile \
+- Samples/CubeMapping/Makefile \
+- Samples/CubeMapping/src/Makefile \
+- Samples/CubeMapping/include/Makefile \
+- Samples/Dot3Bump/Makefile \
+- Samples/Dot3Bump/src/Makefile \
+- Samples/EnvMapping/Makefile \
+- Samples/EnvMapping/src/Makefile \
+- Samples/EnvMapping/include/Makefile \
+- Samples/Fresnel/Makefile \
+- Samples/Fresnel/src/Makefile \
+- Samples/Grass/Makefile \
+- Samples/Grass/src/Makefile \
+- Samples/Transpacency/Makefile \
+- Samples/Transpacency/src/Makefile \
+- Samples/Transpacency/include/Makefile \
+- Samples/Lighting/Makefile \
+- Samples/Lighting/src/Makefile \
+- Samples/Lighting/include/Makefile \
+- Samples/ParticleFX/Makefile \
+- Samples/ParticleFX/src/Makefile \
+- Samples/ParticleFX/include/Makefile \
+- Samples/RenderToTexture/Makefile \
+- Samples/RenderToTexture/src/Makefile \
+- Samples/TextureFX/Makefile \
+- Samples/TextureFX/src/Makefile \
+- Samples/TextureFX/include/Makefile \
+- Samples/Shadows/Makefile \
+- Samples/Shadows/src/Makefile \
+- Samples/SkyBox/Makefile \
+- Samples/SkyBox/src/Makefile \
+- Samples/SkyBox/include/Makefile \
+- Samples/SkyDome/Makefile \
+- Samples/SkyDome/src/Makefile \
+- Samples/SkyDome/include/Makefile \
+- Samples/SkyPlane/Makefile \
+- Samples/SkyPlane/src/Makefile \
+- Samples/SkyPlane/include/Makefile \
+- Samples/Smoke/Makefile \
+- Samples/Smoke/src/Makefile \
+- Samples/Smoke/include/Makefile \
+- Samples/BSP/Makefile \
+- Samples/BSP/src/Makefile \
+- Samples/SkeletalAnimation/Makefile \
+- Samples/SkeletalAnimation/src/Makefile \
+- Samples/SkeletalAnimation/include/Makefile \
+- Samples/Terrain/Makefile \
+- Samples/Terrain/src/Makefile \
+- Samples/Terrain/include/Makefile \
+- Samples/Water/Makefile \
+- Samples/Water/src/Makefile \
+- Samples/Water/include/Makefile \
+- Samples/DynTex/Makefile \
+- Samples/DynTex/src/Makefile \
+- Samples/DynTex/include/Makefile \
+- Samples/VolumeTex/Makefile \
+- Samples/VolumeTex/src/Makefile \
+- Samples/VolumeTex/include/Makefile \
+ Tests/Makefile \
+ Tests/src/Makefile \
+ Tools/Makefile \
+diff -ruN ogre-free-old/Makefile.am ogre-free/Makefile.am
+--- ogre-free-old/Makefile.am 2004-12-20 01:15:52 +0100
++++ ogre-free/Makefile.am 2005-03-12 19:13:52 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = OgreMain PlatformManagers PlugIns RenderSystems Samples Tools Tests
++SUBDIRS = OgreMain PlatformManagers PlugIns RenderSystems Tools Samples
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = OGRE.pc
+diff -ruN ogre-free-old/Samples/Common/Makefile.am ogre-free/Samples/Common/Makefile.am
+--- ogre-free-old/Samples/Common/Makefile.am 2005-02-12 02:56:12 +0100
++++ ogre-free/Samples/Common/Makefile.am 2005-03-12 19:14:59 +0100
+@@ -1,5 +1 @@
+-SUBDIRS = include
+-
+-if BUILD_CEGUI_SAMPLE
+-SUBDIRS += CEGUIRenderer
+-endif
++SUBDIRS = CEGUIRenderer
+diff -ruN ogre-free-old/Samples/Makefile.am ogre-free/Samples/Makefile.am
+--- ogre-free-old/Samples/Makefile.am 2005-01-31 00:31:35 +0100
++++ ogre-free/Samples/Makefile.am 2005-03-12 19:14:31 +0100
+@@ -1,10 +1 @@
+-SUBDIRS = SkeletalAnimation BezierPatch EnvMapping Transpacency Lighting \
+-ParticleFX TextureFX SkyDome BSP Common SkyPlane SkyBox CameraTrack Terrain \
+-RenderToTexture Water CubeMapping Dot3Bump Smoke CelShading Fresnel Shadows \
+-DynTex VolumeTex Grass
+-
+-if BUILD_CEGUI_SAMPLE
+-SUBDIRS += Gui
+-endif
+-
+-
++SUBDIRS = Common
Added: packages/trunk/ogre/debian/patches/old-patches/10_gcc_4.1_mips
===================================================================
--- packages/trunk/ogre/debian/patches/old-patches/10_gcc_4.1_mips (rev 0)
+++ packages/trunk/ogre/debian/patches/old-patches/10_gcc_4.1_mips 2007-06-08 22:33:53 UTC (rev 2889)
@@ -0,0 +1,29 @@
+--- ./ogre-free/OgreMain/src/OgreMaterialSerializer.cpp.orig 2006-05-13 05:05:19.000000000 +0000
++++ ./ogre-free/OgreMain/src/OgreMaterialSerializer.cpp 2006-05-13 05:06:16.000000000 +0000
+@@ -606,7 +606,7 @@
+ context);
+ }
+ TextureType tt = TEX_TYPE_2D;
+- int mips = -1; // When passed to TextureManager::load, this means default to default number of mipmaps
++ int mipmaps = -1; // When passed to TextureManager::load, this means default to default number of mipmaps
+ if (vecparams.size() >= 2)
+ {
+ StringUtil::toLowerCase(vecparams[1]);
+@@ -637,14 +637,14 @@
+ StringUtil::toLowerCase(vecparams[2]);
+ if (vecparams[2] == "unlimited")
+ {
+- mips = MIP_UNLIMITED;
++ mipmaps = MIP_UNLIMITED;
+ }
+ else
+ {
+- mips = StringConverter::parseInt(vecparams[2]);
++ mipmaps = StringConverter::parseInt(vecparams[2]);
+ }
+ }
+- context.textureUnit->setTextureName(vecparams[0], tt, mips);
++ context.textureUnit->setTextureName(vecparams[0], tt, mipmaps);
+ return false;
+ }
+ //-----------------------------------------------------------------------
More information about the Pkg-games-commits
mailing list