r11409 - in packages/trunk/cultivation/debian: . patches source
Paul Wise
pabs at alioth.debian.org
Sun Oct 24 08:17:11 UTC 2010
Author: pabs
Date: 2010-10-24 08:17:00 +0000 (Sun, 24 Oct 2010)
New Revision: 11409
Added:
packages/trunk/cultivation/debian/source/
packages/trunk/cultivation/debian/source/format
Removed:
packages/trunk/cultivation/debian/patches/build.patch
packages/trunk/cultivation/debian/patches/cflags.patch
packages/trunk/cultivation/debian/patches/mouse_pos.patch
packages/trunk/cultivation/debian/patches/rng_64bit.patch
Modified:
packages/trunk/cultivation/debian/changelog
packages/trunk/cultivation/debian/control
packages/trunk/cultivation/debian/patches/abs_paths.patch
packages/trunk/cultivation/debian/patches/math_h.patch
packages/trunk/cultivation/debian/patches/portaudio.patch
packages/trunk/cultivation/debian/patches/series
packages/trunk/cultivation/debian/rules
Log:
* Switch to dpkg-source v3 format
* Refresh, clean patches
- Drop rng_64bit.patch, merged upstream
- Drop mouse_pos.patch, issue fixed in mesa
- Drop cflags.patch, using sed is better
- Merge build.patch into portaudio.patch
Modified: packages/trunk/cultivation/debian/changelog
===================================================================
--- packages/trunk/cultivation/debian/changelog 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/changelog 2010-10-24 08:17:00 UTC (rev 11409)
@@ -2,6 +2,12 @@
* Team upload.
* New upstream release
+ * Switch to dpkg-source v3 format
+ * Refresh, clean patches
+ - Drop rng_64bit.patch, merged upstream
+ - Drop mouse_pos.patch, issue fixed in mesa
+ - Drop cflags.patch, using sed is better
+ - Merge build.patch into portaudio.patch
-- Paul Wise <pabs at debian.org> Sun, 24 Oct 2010 15:18:36 +0800
Modified: packages/trunk/cultivation/debian/control
===================================================================
--- packages/trunk/cultivation/debian/control 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/control 2010-10-24 08:17:00 UTC (rev 11409)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 5), quilt, freeglut3-dev, libglu1-mesa-dev, libgl1-mesa-dev, libx11-dev, libxext-dev, libxi-dev, libxmu-dev, libportaudio-dev
+Build-Depends: debhelper (>= 5), freeglut3-dev, libglu1-mesa-dev, libgl1-mesa-dev, libx11-dev, libxext-dev, libxi-dev, libxmu-dev, libportaudio-dev
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/cultivation/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/cultivation/?op=log
Modified: packages/trunk/cultivation/debian/patches/abs_paths.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/abs_paths.patch 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/patches/abs_paths.patch 2010-10-24 08:17:00 UTC (rev 11409)
@@ -1,11 +1,9 @@
# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
# Distributed under the same license as the game. See debian/copyright.
-Index: cultivation-8.20070809.dfsg1/game2/gameSource/game.cpp
-===================================================================
---- cultivation-8.20070809.dfsg1.orig/game2/gameSource/game.cpp 2007-08-09 14:00:20.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/game2/gameSource/game.cpp 2007-08-28 15:51:12.000000000 +0000
-@@ -43,6 +43,8 @@
+--- a/game2/gameSource/game.cpp
++++ b/game2/gameSource/game.cpp
+@@ -50,6 +50,8 @@
#include <time.h>
@@ -14,7 +12,7 @@
#include "minorGems/graphics/openGL/ScreenGL.h"
#include "minorGems/graphics/openGL/SceneHandlerGL.h"
#include "minorGems/graphics/Color.h"
-@@ -902,7 +904,7 @@
+@@ -912,7 +914,7 @@
// load font image
TGAImageConverter tga;
@@ -23,7 +21,7 @@
FileInputStream fontInput( &fontFile );
Image *fontImage = tga.deformatImage( &fontInput );
-@@ -985,7 +987,7 @@
+@@ -995,7 +997,7 @@
mCurrentTipStoredItem = -1;
// translation language for tool tips
@@ -32,7 +30,7 @@
if( languageNameFile.exists() ) {
char *languageNameText = languageNameFile.readFileContents();
-@@ -998,6 +1000,7 @@
+@@ -1008,6 +1010,7 @@
if( numTokens > 0 ) {
char *languageName = *( tokens->getElement( 0 ) );
@@ -40,10 +38,8 @@
TranslationManager::setLanguage( languageName );
}
else {
-Index: cultivation-8.20070809.dfsg1/game2/gameSource/features.cpp
-===================================================================
---- cultivation-8.20070809.dfsg1.orig/game2/gameSource/features.cpp 2006-12-27 05:30:28.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/game2/gameSource/features.cpp 2007-08-28 15:51:12.000000000 +0000
+--- a/game2/gameSource/features.cpp
++++ b/game2/gameSource/features.cpp
@@ -7,6 +7,7 @@
@@ -61,10 +57,8 @@
char stringBuffer[100];
int switchValue;
-Index: cultivation-8.20070809.dfsg1/game2/gameSource/defs.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/game2/gameSource/defs.h 2007-08-28 15:51:12.000000000 +0000
+--- /dev/null
++++ b/game2/gameSource/defs.h
@@ -0,0 +1,8 @@
+#ifndef DEFS_INCLUDED
+#define DEFS_INCLUDED
Deleted: packages/trunk/cultivation/debian/patches/build.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/build.patch 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/patches/build.patch 2010-10-24 08:17:00 UTC (rev 11409)
@@ -1,16 +0,0 @@
-# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
-# Distributed under the same license as the game. See debian/copyright.
-
-Index: cultivation-8.20070809.dfsg1/game2/Makefile.GnuLinux
-===================================================================
---- cultivation-8.20070809.dfsg1.orig/game2/Makefile.GnuLinux 2007-08-28 15:51:06.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/game2/Makefile.GnuLinux 2007-08-28 15:51:08.000000000 +0000
-@@ -20,7 +20,7 @@
-
- # various GL and X windows librariesneeded for linux
- # also need portaudio library (which in turn needs pthreads)
--PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 ${PORT_AUDIO_PATH}/lib/libportaudio.a -lpthread
-+PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lportaudio -lpthread
-
-
- # All platforms but OSX support g++ and need no linker hacks
Deleted: packages/trunk/cultivation/debian/patches/cflags.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/cflags.patch 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/patches/cflags.patch 2010-10-24 08:17:00 UTC (rev 11409)
@@ -1,18 +0,0 @@
-# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
-# Distributed under the same license as the game. See debian/copyright.
-
-Index: cultivation-8.20070809.dfsg1/game2/Makefile.common
-===================================================================
---- cultivation-8.20070809.dfsg1.orig/game2/Makefile.common 2007-08-28 15:51:09.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/game2/Makefile.common 2007-08-28 15:51:11.000000000 +0000
-@@ -51,7 +51,9 @@
-
-
-
--COMPILE_FLAGS = -Wall ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH}
-+CFLAGS=-Wall ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG}
-+
-+COMPILE_FLAGS = ${CFLAGS} -I${ROOT_PATH}
-
-
- COMPILE = ${GXX} ${COMPILE_FLAGS} -c
Modified: packages/trunk/cultivation/debian/patches/math_h.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/math_h.patch 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/patches/math_h.patch 2010-10-24 08:17:00 UTC (rev 11409)
@@ -1,10 +1,8 @@
# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
# Distributed under the same license as the game. See debian/copyright.
-Index: cultivation-8.20070809.dfsg1/game2/gameSource/sound/SoundEffectsBank.cpp
-===================================================================
---- cultivation-8.20070809.dfsg1.orig/game2/gameSource/sound/SoundEffectsBank.cpp 2007-08-28 15:57:18.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/game2/gameSource/sound/SoundEffectsBank.cpp 2007-08-28 15:57:32.000000000 +0000
+--- a/game2/gameSource/sound/SoundEffectsBank.cpp
++++ b/game2/gameSource/sound/SoundEffectsBank.cpp
@@ -10,6 +10,7 @@
#include "minorGems/util/random/StdRandomSource.h"
Deleted: packages/trunk/cultivation/debian/patches/mouse_pos.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/mouse_pos.patch 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/patches/mouse_pos.patch 2010-10-24 08:17:00 UTC (rev 11409)
@@ -1,89 +0,0 @@
-# Copyright (C) 2007 David Martinez Marti <deavidsedice at gmail.com>
-# Distributed under the same license as the game. See debian/copyright.
-# Hacky patch to temporarily fix #440137
-
-Index: cultivation-8.20070809.dfsg1/game2/gameSource/game.cpp
-===================================================================
---- cultivation-8.20070809.dfsg1.orig/game2/gameSource/game.cpp 2007-08-31 20:12:42.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/game2/gameSource/game.cpp 2007-08-31 20:30:46.000000000 +0000
-@@ -2627,69 +2627,20 @@
- void GameSceneHandler::projectScreenPointIntoScene( int inX, int inY,
- double *outSceneX,
- double *outSceneY ) {
-- // first, get our current matrices
-- GLdouble modelMatrix[16];
-- GLdouble projMatrix[16];
-- GLint viewport[4];
--
-- glGetDoublev( GL_MODELVIEW_MATRIX, modelMatrix );
-- glGetDoublev( GL_PROJECTION_MATRIX, projMatrix );
-- glGetIntegerv( GL_VIEWPORT, viewport );
--
--
--
-- /*
-- From the OpenGL FAQ
--
-- The concept of window space Z is often confusing. It's the depth buffer
-- value expressed as a GLdouble in the range 0.0 to 1.0. Assuming a
-- default glDepthRange(), a window coordinate with a Z value of 0.0
-- corresponds to an eye coordinate located on the zNear clipping plane.
-- Similarly, a window space Z value of 1.0 corresponds to an eye space
-- coordinate located on the zFar plane. You can obtain any window space Z
-- value by reading the depth buffer with glReadPixels().
-- */
--
-- // so, use screen z of 0 for near clipping plane, which ScreenGL has
-- // set to 1 unit away from screen.
--
-- // Thus, we need to find the z buffer value of our world plane (a z=0)
-- // we can call this our "windowZ", since it is how z space is represented
-- // in the window
--
-- // if we project world (0,0,0) onto the screen, we will get the windowZ
-- // of our world zero
--
-- double windowXForWorldZero, windowYForWorldZero, windowZForWorldZero;
-- gluProject( 0, 0, 0,
-- modelMatrix, projMatrix, viewport,
-- &windowXForWorldZero,
-- &windowYForWorldZero,
-- &windowZForWorldZero );
--
--
-- // use unproject to map our window coordinates back into the world
-- double xWorld, yWorld, zWorld;
-- gluUnProject( inX,
-- inY,
-- windowZForWorldZero,
-- modelMatrix, projMatrix, viewport,
-- &xWorld, &yWorld, &zWorld );
--
--
--
-- // need to invert the resulting y and translate it for some reson
--
- Vector3D *viewPosition = screen->getViewPosition();
-+ double xsize,ysize,w=screen->getWidth(),h=screen->getHeight(), f=46, r;
-+ r=w/h;
-+ if (r>1.0 && r<1.5) f=46*(1.5-r)*2+48*(r-1)*2;
-+ r=h/w;
-+ if (r>1.0 && r<1.5) f=46*(1.5-r)*2+48*(r-1)*2;
-+ xsize=ysize=f;
-
-- yWorld = -yWorld + 2 * viewPosition->mY;
--
-- delete viewPosition;
--
--
-+ if (w>h) xsize=f*w/h;
-+ if (w<h) ysize=f*h/w;
-
-- *outSceneX = xWorld;
-- *outSceneY = yWorld;
-+ *outSceneX = viewPosition->mX-(inX-w/2.0)*xsize/screen->getWidth();
-+ *outSceneY = viewPosition->mY-(inY-h/2.0)*ysize/screen->getHeight();
-+ delete viewPosition;
- }
-
- void GameSceneHandler::keyPressed(
Modified: packages/trunk/cultivation/debian/patches/portaudio.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/portaudio.patch 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/patches/portaudio.patch 2010-10-24 08:17:00 UTC (rev 11409)
@@ -1,10 +1,8 @@
# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
# Distributed under the same license as the game. See debian/copyright.
-Index: cultivation-8.20070809.dfsg1/game2/gameSource/sound/SoundPlayer.h
-===================================================================
---- cultivation-8.20070809.dfsg1.orig/game2/gameSource/sound/SoundPlayer.h 2006-10-02 22:29:43.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/game2/gameSource/sound/SoundPlayer.h 2007-08-28 15:51:09.000000000 +0000
+--- a/game2/gameSource/sound/SoundPlayer.h
++++ b/game2/gameSource/sound/SoundPlayer.h
@@ -52,8 +52,7 @@
#include "SoundFilter.h"
#include "PlayableSound.h"
@@ -15,10 +13,8 @@
#include "minorGems/util/SimpleVector.h"
-Index: cultivation-8.20070809.dfsg1/game2/Makefile.common
-===================================================================
---- cultivation-8.20070809.dfsg1.orig/game2/Makefile.common 2007-04-23 14:30:54.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/game2/Makefile.common 2007-08-28 15:51:22.000000000 +0000
+--- a/game2/Makefile.common
++++ b/game2/Makefile.common
@@ -43,7 +43,6 @@
OPTIMIZE_FLAG = ${OPTIMIZE_ON_FLAG}
@@ -31,15 +27,13 @@
--COMPILE_FLAGS = -Wall ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH} -I${PORT_AUDIO_PATH}/pa_common
-+COMPILE_FLAGS = -Wall ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH}
+-COMPILE_FLAGS = -Wall -Wwrite-strings -Wchar-subscripts -Wparentheses ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH} -I${PORT_AUDIO_PATH}/pa_common
++COMPILE_FLAGS = -Wall -Wwrite-strings -Wchar-subscripts -Wparentheses ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH}
COMPILE = ${GXX} ${COMPILE_FLAGS} -c
-Index: cultivation-8.20070809.dfsg1/runToBuild
-===================================================================
---- cultivation-8.20070809.dfsg1.orig/runToBuild 2007-08-09 16:14:40.000000000 +0000
-+++ cultivation-8.20070809.dfsg1/runToBuild 2007-08-28 15:51:09.000000000 +0000
+--- a/runToBuild
++++ b/runToBuild
@@ -16,13 +16,13 @@
./configure
@@ -60,3 +54,14 @@
echo "Building Cultivation..."
+--- a/game2/Makefile.GnuLinux
++++ b/game2/Makefile.GnuLinux
+@@ -20,7 +20,7 @@
+
+ # various GL and X windows librariesneeded for linux
+ # also need portaudio library (which in turn needs pthreads)
+-PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 ${PORT_AUDIO_PATH}/lib/libportaudio.a -lpthread -lpng
++PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lportaudio -lpthread -lpng
+
+
+ # All platforms but OSX support g++ and need no linker hacks
Deleted: packages/trunk/cultivation/debian/patches/rng_64bit.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/rng_64bit.patch 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/patches/rng_64bit.patch 2010-10-24 08:17:00 UTC (rev 11409)
@@ -1,225 +0,0 @@
---- a/game2/gameSource/landscape.cpp
-+++ b/game2/gameSource/landscape.cpp
-@@ -135,21 +135,21 @@
- */
- // this is the readable version of the funcion
- // it has been turned into a set of macros below
--inline unsigned long random32_readable( unsigned long inSeed ) {
-+inline unsigned int random32_readable( unsigned int inSeed ) {
- // this is the true hot-spot of the entire landscape function
- // thus, optimization is warranted.
-
- // multiplier = 3141592621
- // use hex to avoid warnings
-- //unsigned long multiplier = 0xBB40E62D;
-- //unsigned long increment = 1;
-+ //unsigned int multiplier = 0xBB40E62D;
-+ //unsigned int increment = 1;
-
- // better:
-- // unsigned long multiplier = 196314165
-- // unsigned long increment = 907633515
-+ // unsigned int multiplier = 196314165
-+ // unsigned int increment = 907633515
-
- // this will automatically be mod-ed by 2^32 because of the limit
-- // of the unsigned long type
-+ // of the unsigned int type
- // return multiplier * inSeed + increment;
- //return 0xBB40E62D * inSeed + 1;
- //return 196314165 * inSeed + 907633515;
-@@ -157,28 +157,28 @@
- //int n = ( inSeed << 13 ) ^ inSeed;
- //return n * (n * n * 15731 + 789221) + 1376312589;
-
-- //const unsigned long Num1 = (inSeed * 0xFEA09B9DLU) + 1;
-- //const unsigned long Num2 = ((inSeed * 0xB89C8895LU) + 1) >> 16;
-+ //const unsigned int Num1 = (inSeed * 0xFEA09B9DU) + 1;
-+ //const unsigned int Num2 = ((inSeed * 0xB89C8895U) + 1) >> 16;
- //return Num1 ^ Num2;
-
- /*
- unsigned int rseed=(inSeed*15064013)^(inSeed*99991+604322121)^(inSeed*45120321)^(inSeed*5034121+13);
-
-- const unsigned long Num1 = (inSeed * 0xFEA09B9DLU) + 1;
-+ const unsigned int Num1 = (inSeed * 0xFEA09B9DU) + 1;
-
-- const unsigned long Num2 = ((inSeed * 0xB89C8895LU) + 1) >> 16;
-+ const unsigned int Num2 = ((inSeed * 0xB89C8895U) + 1) >> 16;
-
- rseed *= Num1 ^ Num2;
-
- return rseed;
- */
-
-- const unsigned long Num1 = (inSeed * 0xFEA09B9DLU) + 1;
-- const unsigned long Num2 = ((inSeed^Num1) * 0x9C129511LU) + 1;
-- const unsigned long Num3 = (inSeed * 0x2512CFB8LU) + 1;
-- const unsigned long Num4 = ((inSeed^Num3) * 0xB89C8895LU) + 1;
-- const unsigned long Num5 = (inSeed * 0x6BF962C1LU) + 1;
-- const unsigned long Num6 = ((inSeed^Num5) * 0x4BF962C1LU) + 1;
-+ const unsigned int Num1 = (inSeed * 0xFEA09B9DU) + 1;
-+ const unsigned int Num2 = ((inSeed^Num1) * 0x9C129511U) + 1;
-+ const unsigned int Num3 = (inSeed * 0x2512CFB8U) + 1;
-+ const unsigned int Num4 = ((inSeed^Num3) * 0xB89C8895U) + 1;
-+ const unsigned int Num5 = (inSeed * 0x6BF962C1U) + 1;
-+ const unsigned int Num6 = ((inSeed^Num5) * 0x4BF962C1U) + 1;
-
- return Num2 ^ (Num4 >> 11) ^ (Num6 >> 22);
- }
-@@ -186,22 +186,22 @@
-
- // faster as a set of macros
- #define Num1( inSeed ) \
-- ( ( inSeed * 0xFEA09B9DLU ) + 1 )
-+ ( ( inSeed * 0xFEA09B9DU ) + 1 )
-
- #define Num2( inSeed ) \
-- ( ( ( inSeed ^ Num1( inSeed ) ) * 0x9C129511LU ) + 1 )
-+ ( ( ( inSeed ^ Num1( inSeed ) ) * 0x9C129511U ) + 1 )
-
- #define Num3( inSeed ) \
-- ( ( inSeed * 0x2512CFB8LU ) + 1 )
-+ ( ( inSeed * 0x2512CFB8U ) + 1 )
-
- #define Num4( inSeed ) \
-- ( ( ( inSeed ^ Num3( inSeed ) ) * 0xB89C8895LU ) + 1 )
-+ ( ( ( inSeed ^ Num3( inSeed ) ) * 0xB89C8895U ) + 1 )
-
- #define Num5( inSeed ) \
-- ( ( inSeed * 0x6BF962C1LU ) + 1 )
-+ ( ( inSeed * 0x6BF962C1U ) + 1 )
-
- #define Num6( inSeed ) \
-- ( ( ( inSeed ^ Num5( inSeed ) ) * 0x4BF962C1LU ) + 1 )
-+ ( ( ( inSeed ^ Num5( inSeed ) ) * 0x4BF962C1U ) + 1 )
-
- #define random32( inSeed ) \
- ( Num2( inSeed ) ^ (Num4( inSeed ) >> 11) ^ (Num6( inSeed ) >> 22) )
-@@ -236,10 +236,10 @@
- */
- // keep readable version around for reference
- // it has been replaced by a macro below
--inline double noise4dInt32_readable( unsigned long x,
-- unsigned long y,
-- unsigned long z,
-- unsigned long t ) {
-+inline double noise4dInt32_readable( unsigned int x,
-+ unsigned int y,
-+ unsigned int z,
-+ unsigned int t ) {
-
-
- //double maxIntAsDouble = 4294967295.0;
-@@ -251,14 +251,14 @@
- // up when using addition.
-
- // mix x, y, z, and t
-- unsigned long randomSeed =
-+ unsigned int randomSeed =
- x ^
- y * 57 ^
- z * 131 ^
- t * 2383;
-
-- // a random value between 0 and max unsigned long
-- unsigned long randomValue = random32( randomSeed );
-+ // a random value between 0 and max unsigned int
-+ unsigned int randomValue = random32( randomSeed );
-
- // a random value between 0 and 2
- double zeroTwoValue = randomValue * invHalfMaxIntAsDouble;
-@@ -312,20 +312,20 @@
- * with 3 fixed integer parameters.
- */
- inline double blendNoise1d( double x,
-- unsigned long y,
-- unsigned long z,
-- unsigned long t ) {
-+ unsigned int y,
-+ unsigned int z,
-+ unsigned int t ) {
-
- double floorX = floor( x );
-- unsigned long floorIntX = (unsigned long)floorX;
-+ unsigned int floorIntX = (unsigned int)floorX;
-
- if( floorX == x ) {
-- unsigned long precomputedMix = mixFour( floorIntX, y, z, t );
-+ unsigned int precomputedMix = mixFour( floorIntX, y, z, t );
-
- return noise1dInt32( precomputedMix );
- }
- else {
-- unsigned long ceilIntX = floorIntX + 1;
-+ unsigned int ceilIntX = floorIntX + 1;
-
- // cosine interpolation
- // from http://freespace.virgin.net/hugo.elias/models/m_perlin.htm
-@@ -337,7 +337,7 @@
- // macro
- // thus, we end up calling the noise1dInt32 function instead
-
-- unsigned long precomputedMix = mixFour( floorIntX, y, z, t );
-+ unsigned int precomputedMix = mixFour( floorIntX, y, z, t );
- double valueAtFloor = noise1dInt32( precomputedMix );
-
- precomputedMix = mixFour( ceilIntX, y, z, t );
-@@ -355,17 +355,17 @@
- */
- double blendNoise2d( double x,
- double y,
-- unsigned long z,
-- unsigned long t ) {
-+ unsigned int z,
-+ unsigned int t ) {
-
- double floorY = floor( y );
-- unsigned long floorIntY = (unsigned long)floorY;
-+ unsigned int floorIntY = (unsigned int)floorY;
-
- if( floorY == y ) {
- return blendNoise1d( x, floorIntY, z, t );
- }
- else {
-- unsigned long ceilIntY = floorIntY + 1;
-+ unsigned int ceilIntY = floorIntY + 1;
-
- // cosine interpolation
- // from http://freespace.virgin.net/hugo.elias/models/m_perlin.htm
-@@ -386,16 +386,16 @@
- double blendNoise3d( double x,
- double y,
- double z,
-- unsigned long t ) {
-+ unsigned int t ) {
-
- double floorZ = floor( z );
-- unsigned long floorIntZ = (unsigned long)floorZ;
-+ unsigned int floorIntZ = (unsigned int)floorZ;
-
- if( floorZ == z ) {
- return blendNoise2d( x, y, floorIntZ, t );
- }
- else {
-- unsigned long ceilIntZ = floorIntZ + 1;
-+ unsigned int ceilIntZ = floorIntZ + 1;
-
- // cosine interpolation
- // from http://freespace.virgin.net/hugo.elias/models/m_perlin.htm
-@@ -418,13 +418,13 @@
- double t ) {
-
- double floorT = floor( t );
-- unsigned long floorIntT = (unsigned long)floorT;
-+ unsigned int floorIntT = (unsigned int)floorT;
-
- if( floorT == t ) {
- return blendNoise3d( x, y, z, floorIntT );
- }
- else {
-- unsigned long ceilIntT = floorIntT + 1;
-+ unsigned int ceilIntT = floorIntT + 1;
-
- // cosine interpolation
- // from http://freespace.virgin.net/hugo.elias/models/m_perlin.htm
Modified: packages/trunk/cultivation/debian/patches/series
===================================================================
--- packages/trunk/cultivation/debian/patches/series 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/patches/series 2010-10-24 08:17:00 UTC (rev 11409)
@@ -1,7 +1,3 @@
-build.patch
portaudio.patch
-cflags.patch
abs_paths.patch
math_h.patch
-mouse_pos.patch
-rng_64bit.patch
Modified: packages/trunk/cultivation/debian/rules
===================================================================
--- packages/trunk/cultivation/debian/rules 2010-10-24 07:40:23 UTC (rev 11408)
+++ packages/trunk/cultivation/debian/rules 2010-10-24 08:17:00 UTC (rev 11409)
@@ -14,7 +14,6 @@
configure: configure-stamp
configure-stamp:
dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
chmod u+x game2/configure
cd game2 && ./configure --linux
touch $@
@@ -22,6 +21,7 @@
build: build-stamp
build-stamp: configure-stamp
dh_testdir
+ sed -i -e 's/^COMPILE_FLAGS = /COMPILE_FLAGS = $$(CFLAGS)/'
$(MAKE) -C game2/gameSource CFLAGS="$(CFLAGS) -DDATADIR=\\\"/usr/share/games/cultivation\\\""
mv game2/gameSource/Cultivation game2/gameSource/cultivation
touch $@
@@ -38,7 +38,6 @@
rm -f game2/gameSource/Makefile.dependencies.temp
rm -f game2/gameSource/Makefile.dependencies
rm -f game2/gameSource/Makefile
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
dh_clean
install: build
Added: packages/trunk/cultivation/debian/source/format
===================================================================
--- packages/trunk/cultivation/debian/source/format (rev 0)
+++ packages/trunk/cultivation/debian/source/format 2010-10-24 08:17:00 UTC (rev 11409)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-games-commits
mailing list