Author: pabs
Date: 2011-08-13 11:50:54 +0000 (Sat, 13 Aug 2011)
New Revision: 12581
Modified:
packages/trunk/funguloids/debian/patches/alc_error.patch
packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch
packages/trunk/funguloids/debian/patches/g++4.3_fix.patch
packages/trunk/funguloids/debian/patches/makefile_modifications.diff
packages/trunk/funguloids/debian/patches/ogre-1.6.1.patch
packages/trunk/funguloids/debian/patches/size_chunks_reverse.patch
packages/trunk/funguloids/debian/rules
Log:
Switch the patches to using the same line endings as the code for sanity
Modified: packages/trunk/funguloids/debian/patches/alc_error.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/alc_error.patch 2011-08-13
09:51:44 UTC (rev 12580)
+++ packages/trunk/funguloids/debian/patches/alc_error.patch 2011-08-13
11:50:54 UTC (rev 12581)
@@ -1,21 +1,20 @@
Check ALC errors instead of AL errors.
-=====================================================================
---- a/src/openalsoundsystem.cpp.bak 2008-05-04 16:41:32.000000000 -0400
-+++ b/src/openalsoundsystem.cpp 2008-05-04 16:20:52.000000000 -0400
+--- a/src/openalsoundsystem.cpp
++++ b/src/openalsoundsystem.cpp
@@ -266,14 +266,14 @@
-
- int attributes[] = { 0 };
- mContext = alcCreateContext(mDevice, attributes);
-- if ( (err = alGetError()) != AL_NO_ERROR) {
-+ if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) {
- LogManager::getSingleton().logMessage("OpanAL: error creating
context: " + lastALError(err) );
- return 1;
- }
- // check_alc_error("Couldn't create audio context: ");
- alcMakeContextCurrent(mContext);
- // check_alc_error("Couldn't select audio context: ");
-- if ( (err = alGetError()) != AL_NO_ERROR) {
-+ if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) {
- LogManager::getSingleton().logMessage("OpanAL: error making
context current: " + lastALError(err) );
- return 2;
- }
+
+ int attributes[] = { 0 };
+ mContext = alcCreateContext(mDevice, attributes);
+- if ( (err = alGetError()) != AL_NO_ERROR) {
++ if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) {
+ LogManager::getSingleton().logMessage("OpanAL: error creating
context: " + lastALError(err) );
+ return 1;
+ }
+ // check_alc_error("Couldn't create audio context: ");
+ alcMakeContextCurrent(mContext);
+ // check_alc_error("Couldn't select audio context: ");
+- if ( (err = alGetError()) != AL_NO_ERROR) {
++ if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) {
+ LogManager::getSingleton().logMessage("OpanAL: error making
context current: " + lastALError(err) );
+ return 2;
+ }
Modified: packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch
2011-08-13 09:51:44 UTC (rev 12580)
+++ packages/trunk/funguloids/debian/patches/disable_mouse_capture.patch
2011-08-13 11:50:54 UTC (rev 12581)
@@ -1,26 +1,25 @@
Support disabling of keyboard and mouse capture for debugging.
-=====================================================================
---- a/src/input.cpp.bak 2008-05-04 14:51:35.000000000 -0400
-+++ b/src/input.cpp 2008-05-04 14:35:00.000000000 -0400
+--- a/src/input.cpp
++++ b/src/input.cpp
@@ -37,6 +37,21 @@
- OIS::ParamList pl;
- pl.insert(OIS::ParamList::value_type("WINDOW",
Ogre::StringConverter::toString(hWnd)));
-
-+ // Disable mouse capture for debugging.
-+ #ifdef DISABLE_MOUSE_CAPTURE
-+ #if defined OIS_WIN32_PLATFORM
-+ pl.insert(std::make_pair(std::string("w32_mouse"),
std::string("DISCL_FOREGROUND" )));
-+ pl.insert(std::make_pair(std::string("w32_mouse"),
std::string("DISCL_NONEXCLUSIVE")));
-+ pl.insert(std::make_pair(std::string("w32_keyboard"),
std::string("DISCL_FOREGROUND")));
-+ pl.insert(std::make_pair(std::string("w32_keyboard"),
std::string("DISCL_NONEXCLUSIVE")));
-+ #elif defined OIS_LINUX_PLATFORM
-+ pl.insert(std::make_pair(std::string("x11_mouse_grab"),
std::string("false")));
-+ pl.insert(std::make_pair(std::string("x11_mouse_hide"),
std::string("false")));
-+
pl.insert(std::make_pair(std::string("x11_keyboard_grab"),
std::string("false")));
-+ pl.insert(std::make_pair(std::string("XAutoRepeatOn"),
std::string("true")));
-+ #endif
-+ #endif
-+
- mHWnd = hWnd;
- mInputManager = OIS::InputManager::createInputSystem(pl);
- mMouse =
static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
+ OIS::ParamList pl;
+ pl.insert(OIS::ParamList::value_type("WINDOW",
Ogre::StringConverter::toString(hWnd)));
+
++ // Disable mouse capture for debugging.
++ #ifdef DISABLE_MOUSE_CAPTURE
++ #if defined OIS_WIN32_PLATFORM
++ pl.insert(std::make_pair(std::string("w32_mouse"),
std::string("DISCL_FOREGROUND" )));
++ pl.insert(std::make_pair(std::string("w32_mouse"),
std::string("DISCL_NONEXCLUSIVE")));
++ pl.insert(std::make_pair(std::string("w32_keyboard"),
std::string("DISCL_FOREGROUND")));
++ pl.insert(std::make_pair(std::string("w32_keyboard"),
std::string("DISCL_NONEXCLUSIVE")));
++ #elif defined OIS_LINUX_PLATFORM
++ pl.insert(std::make_pair(std::string("x11_mouse_grab"),
std::string("false")));
++ pl.insert(std::make_pair(std::string("x11_mouse_hide"),
std::string("false")));
++
pl.insert(std::make_pair(std::string("x11_keyboard_grab"),
std::string("false")));
++ pl.insert(std::make_pair(std::string("XAutoRepeatOn"),
std::string("true")));
++ #endif
++ #endif
++
+ mHWnd = hWnd;
+ mInputManager = OIS::InputManager::createInputSystem(pl);
+ mMouse =
static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
Modified: packages/trunk/funguloids/debian/patches/g++4.3_fix.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/g++4.3_fix.patch 2011-08-13
09:51:44 UTC (rev 12580)
+++ packages/trunk/funguloids/debian/patches/g++4.3_fix.patch 2011-08-13
11:50:54 UTC (rev 12581)
@@ -1,7 +1,6 @@
Fix for compiling with g++4.3
-=====================================================================
---- a/src/mp3stream.cpp.bak 2008-07-22 00:26:28.000000000 -0400
-+++ b/src/mp3stream.cpp 2008-07-22 00:26:38.000000000 -0400
+--- a/src/mp3stream.cpp
++++ b/src/mp3stream.cpp
@@ -35,6 +35,7 @@
#include <sys/stat.h>
#include <sstream>
Modified: packages/trunk/funguloids/debian/patches/makefile_modifications.diff
===================================================================
--- packages/trunk/funguloids/debian/patches/makefile_modifications.diff
2011-08-13 09:51:44 UTC (rev 12580)
+++ packages/trunk/funguloids/debian/patches/makefile_modifications.diff
2011-08-13 11:50:54 UTC (rev 12581)
@@ -1,24 +1,7 @@
Some modifications to get some of the data files installed in the correct
places. This is mainly for the purpose of building Debian packages.
-==========================================================================
---- a/bin/music/Makefile.am~ 2007-06-23 18:03:05.000000000 -0400
-+++ b/bin/music/Makefile.am 2007-06-23 18:04:00.000000000 -0400
-@@ -1,12 +1,10 @@
--musicinstall_DATA = playlist.lua
-+musicinstall_DATA = playlist.lua MarylandInMay.ogg
-
- EXTRA_DIST = playlist.lua.in
-
- playlist.lua: playlist.lua.in
- cat playlist.lua.in | sed 's,%%musicinstalldir%%,@musicinstalldir@,' >
playlist.lua
-
--install-data-hook:
-- if test -r MarylandInMay.ogg; then cp MarylandInMay.ogg
"@musicinstalldir@"; fi;
-
-
- distclean: clean
---- a/bin/Makefile.am~ 2007-06-23 18:36:56.000000000 -0400
-+++ b/bin/Makefile.am 2007-06-23 18:39:50.000000000 -0400
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
@@ -4,7 +4,7 @@
dist_pixmapinstall_DATA = funguloids.png
dist_gameinstall_DATA = gamesettings.cfg
@@ -39,3 +22,19 @@
uninstall-hook:
rm -rf "@docinstalldir@"
+--- a/bin/music/Makefile.am
++++ b/bin/music/Makefile.am
+@@ -1,12 +1,10 @@
+-musicinstall_DATA = playlist.lua
++musicinstall_DATA = playlist.lua MarylandInMay.ogg
+
+ EXTRA_DIST = playlist.lua.in
+
+ playlist.lua: playlist.lua.in
+ cat playlist.lua.in | sed 's,%%musicinstalldir%%,@musicinstalldir@,' >
playlist.lua
+
+-install-data-hook:
+- if test -r MarylandInMay.ogg; then cp MarylandInMay.ogg
"@musicinstalldir@"; fi;
+
+
+ distclean: clean
Modified: packages/trunk/funguloids/debian/patches/ogre-1.6.1.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/ogre-1.6.1.patch 2011-08-13
09:51:44 UTC (rev 12580)
+++ packages/trunk/funguloids/debian/patches/ogre-1.6.1.patch 2011-08-13
11:50:54 UTC (rev 12581)
@@ -1,42 +1,42 @@
---- funguloids-1.06.orig/include/mpakogre.h
-+++ funguloids-1.06/include/mpakogre.h
+--- a/include/mpakogre.h
++++ b/include/mpakogre.h
@@ -56,6 +56,7 @@
- FileInfoListPtr findFileInfo(const String &pattern, bool recursive,
bool dirs = false);
-
- bool exists(const String &filename);
-+ time_t getModifiedTime(const String& filename);
- };
-
-
---- funguloids-1.06.orig/src/mpakogre.cpp
-+++ funguloids-1.06/src/mpakogre.cpp
+ FileInfoListPtr findFileInfo(const String &pattern, bool recursive,
bool dirs = false);
+
+ bool exists(const String &filename);
++ time_t getModifiedTime(const String& filename);
+ };
+
+
+--- a/src/mpakogre.cpp
++++ b/src/mpakogre.cpp
@@ -198,6 +198,11 @@
- return (i != -1);
- }
-
-+time_t MPakArchive::getModifiedTime(const String& filename) {
-+ // TODO: This is currently only a dummy implementation.
-+ return 0;
-+}
-+
- const String &MPakArchiveFactory::getType(void) const {
- static String name = "MPK";
- return name;
---- funguloids-1.06.orig/src/scriptsystem.cpp
-+++ funguloids-1.06/src/scriptsystem.cpp
+ return (i != -1);
+ }
+
++time_t MPakArchive::getModifiedTime(const String& filename) {
++ // TODO: This is currently only a dummy implementation.
++ return 0;
++}
++
+ const String &MPakArchiveFactory::getType(void) const {
+ static String name = "MPK";
+ return name;
+--- a/src/scriptsystem.cpp
++++ b/src/scriptsystem.cpp
@@ -137,7 +137,6 @@
- Asteroid *roid = new Asteroid(String(name),
ScriptSystem::getSingleton().getSceneMgr(), String(mesh), String(mat), pos);
- roid->setScale(scale, scale, scale);
- roid->setMass(scale * 10.0f);
-- roid->getEntity()->setNormaliseNormals(true);
- return 0;
- }
-
+ Asteroid *roid = new Asteroid(String(name),
ScriptSystem::getSingleton().getSceneMgr(), String(mesh), String(mat), pos);
+ roid->setScale(scale, scale, scale);
+ roid->setMass(scale * 10.0f);
+- roid->getEntity()->setNormaliseNormals(true);
+ return 0;
+ }
+
@@ -435,6 +434,7 @@
- ScriptSystem::ScriptSystem(SceneManager *mgr, const char *startup_file) {
- assert(mgr);
- mSceneMgr = mgr;
-+ mgr->setNormaliseNormalsOnScale(true);
- scriptLights.clear();
-
- LogManager::getSingleton().logMessage("Using " + String(LUA_VERSION));
+ ScriptSystem::ScriptSystem(SceneManager *mgr, const char *startup_file) {
+ assert(mgr);
+ mSceneMgr = mgr;
++ mgr->setNormaliseNormalsOnScale(true);
+ scriptLights.clear();
+
+ LogManager::getSingleton().logMessage("Using " + String(LUA_VERSION));
Modified: packages/trunk/funguloids/debian/patches/size_chunks_reverse.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/size_chunks_reverse.patch
2011-08-13 09:51:44 UTC (rev 12580)
+++ packages/trunk/funguloids/debian/patches/size_chunks_reverse.patch
2011-08-13 11:50:54 UTC (rev 12581)
@@ -1,14 +1,13 @@
Correction for MPakDataStream::read(). This reflects what's done in the
FileHandleDataStream::read() method in OgreDataStream.cpp in the Ogre library.
-=====================================================================
---- a/src/mpakogre.cpp.bak 2008-05-04 01:05:10.000000000 -0400
-+++ b/src/mpakogre.cpp 2008-05-04 00:56:05.000000000 -0400
+--- a/src/mpakogre.cpp
++++ b/src/mpakogre.cpp
@@ -219,7 +219,7 @@
- }
-
- size_t MPakDataStream::read(void *buf, size_t count) {
-- return fread(buf, count, 1, mFileHandle);
-+ return fread(buf, 1, count, mFileHandle);
- }
-
- void MPakDataStream::skip(long count) {
+ }
+
+ size_t MPakDataStream::read(void *buf, size_t count) {
+- return fread(buf, count, 1, mFileHandle);
++ return fread(buf, 1, count, mFileHandle);
+ }
+
+ void MPakDataStream::skip(long count) {
Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules 2011-08-13 09:51:44 UTC (rev
12580)
+++ packages/trunk/funguloids/debian/rules 2011-08-13 11:50:54 UTC (rev
12581)
@@ -29,15 +29,6 @@
DEB_CXXFLAGS += -DDISABLE_MOUSE_CAPTURE
endif
-fromdos: fromdos-stamp
-fromdos-stamp:
- dh_testdir
- fromdos -e include/mpakogre.h
- fromdos -e src/mpakogre.cpp
- fromdos -e src/input.cpp
- fromdos -e src/openalsoundsystem.cpp
- fromdos -e src/scriptsystem.cpp
-
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -58,7 +49,7 @@
$(MAKE)
touch build-stamp
-clean: clean-stamp todos
+clean: clean-stamp
clean-stamp:
dh_testdir
dh_testroot
@@ -73,14 +64,6 @@
rm -rf .pc
dh_clean
-todos:
- dh_testdir
- todos -e include/mpakogre.h
- todos -e src/mpakogre.cpp
- todos -e src/input.cpp
- todos -e src/openalsoundsystem.cpp
- todos -e src/scriptsystem.cpp
-
install: build
dh_testdir
dh_testroot
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
