summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-rpg/lipsofsuna/files')
-rw-r--r--games-rpg/lipsofsuna/files/01_add_OgreOverlay_to_wscript.patch36
-rw-r--r--games-rpg/lipsofsuna/files/02_add_ogre_h.patch10
-rw-r--r--games-rpg/lipsofsuna/files/03_fix_member_name_change.patch33
-rw-r--r--games-rpg/lipsofsuna/files/04_add_missing_includes.patch18
-rw-r--r--games-rpg/lipsofsuna/files/05_add_more_missing_includes.patch25
5 files changed, 0 insertions, 122 deletions
diff --git a/games-rpg/lipsofsuna/files/01_add_OgreOverlay_to_wscript.patch b/games-rpg/lipsofsuna/files/01_add_OgreOverlay_to_wscript.patch
deleted file mode 100644
index ebb01d0..0000000
--- a/games-rpg/lipsofsuna/files/01_add_OgreOverlay_to_wscript.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/wscript 2015-09-30 15:03:26.862409759 +0200
-+++ b/wscript 2015-09-30 15:03:45.054410305 +0200
-@@ -91,6 +91,7 @@
- if Options.options.graphics:
- conf.check_ogre()
- conf.check_ogre_plugindir()
-+ conf.check_ogre_overlay()
- conf.check_ogre_terrain()
- conf.check_ois()
- conf.check_xlib()
-@@ -509,6 +510,25 @@
- conf.end_msg(False)
-
- @conf
-+def check_ogre_overlay(conf):
-+ conf.start_msg('Checking for package OGRE-Overlay')
-+ conf.env.stash()
-+ if conf.check_cfg(package='OGRE-Overlay', atleast_version='1.7.0', args='--cflags --libs', mandatory=False, uselib_store='OGRE'):
-+ conf.end_msg('pkg-config OGRE-Overlay')
-+ return
-+ conf.env.revert()
-+ conf.env.stash()
-+ if conf.check_cxx(lib='OgreOverlay', mandatory=False, uselib='TEST', uselib_store='OGRE') and\
-+ conf.check_cxx(header_name='Overlay/OgreOverlay.h', mandatory=False, uselib='TEST', uselib_store='OGRE', fragment='''
-+ #include <stdio.h>
-+ int main() { printf(""); return 0; }'''):
-+ conf.end_msg('library OgreOverlay')
-+ return
-+ conf.env.revert()
-+ conf.end_msg(False)
-+ conf.fatal('Could not find OGRE-Overlay')
-+
-+@conf
- def check_ogre_terrain(conf):
- conf.start_msg('Checking for package OGRE-Terrain')
- conf.env.stash()
diff --git a/games-rpg/lipsofsuna/files/02_add_ogre_h.patch b/games-rpg/lipsofsuna/files/02_add_ogre_h.patch
deleted file mode 100644
index a48b63d..0000000
--- a/games-rpg/lipsofsuna/files/02_add_ogre_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/lipsofsuna/render/internal/render.hpp 2017-05-17 11:30:23.462652690 +0200
-+++ b/src/lipsofsuna/render/internal/render.hpp 2017-05-17 11:30:50.238652210 +0200
-@@ -21,6 +21,7 @@
- #include "lipsofsuna/paths.h"
- #include "render-unique-id.hpp"
- #include "../render-types.h"
-+#include <Ogre.h>
- #include <OgreRoot.h>
- #include <OgreCamera.h>
- #include <OgreMaterialManager.h>
diff --git a/games-rpg/lipsofsuna/files/03_fix_member_name_change.patch b/games-rpg/lipsofsuna/files/03_fix_member_name_change.patch
deleted file mode 100644
index 83520fb..0000000
--- a/games-rpg/lipsofsuna/files/03_fix_member_name_change.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/lipsofsuna/extension/particle/particle-model-system.cpp 2017-05-17 11:46:02.912635866 +0200
-+++ b/src/lipsofsuna/extension/particle/particle-model-system.cpp 2017-05-17 11:48:36.374633118 +0200
-@@ -85,20 +85,20 @@
- particle->mOwnDimensions = false;
- particle->mWidth = 2.0f * system->particle_size;
- particle->mHeight = 2.0f * system->particle_size;
-- particle->rotation = 0.0f;
-- particle->position = Ogre::Vector3 (pos.x, -pos.y, pos.z);
-- particle->direction = Ogre::Vector3 (0.0f, 0.0f, 0.0f);
-- particle->colour = Ogre::ColourValue (color[0], color[1], color[2], color[3]);
-- particle->timeToLive = 1000.0f;
-- particle->totalTimeToLive = 1000.0f;
-- particle->rotationSpeed = 0.0f;
-- particle->particleType = Ogre::Particle::Visual;
-+ particle->mRotation = 0.0f;
-+ particle->mPosition = Ogre::Vector3 (pos.x, -pos.y, pos.z);
-+ particle->mDirection = Ogre::Vector3 (0.0f, 0.0f, 0.0f);
-+ particle->mColour = Ogre::ColourValue (color[0], color[1], color[2], color[3]);
-+ particle->mTimeToLive = 1000.0f;
-+ particle->mTotalTimeToLive = 1000.0f;
-+ particle->mRotationSpeed = 0.0f;
-+ particle->mParticleType = Ogre::Particle::Visual;
- }
- else if (created[i])
- {
- Ogre::Particle* particle = created[i];
-- particle->timeToLive = 0.0f;
-- particle->totalTimeToLive = 0.0f;
-+ particle->mTimeToLive = 0.0f;
-+ particle->mTotalTimeToLive = 0.0f;
- created[i] = NULL;
- }
- }
diff --git a/games-rpg/lipsofsuna/files/04_add_missing_includes.patch b/games-rpg/lipsofsuna/files/04_add_missing_includes.patch
deleted file mode 100644
index dc95e6b..0000000
--- a/games-rpg/lipsofsuna/files/04_add_missing_includes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/lipsofsuna/render/internal/render-terrain-material-generator.hpp 2017-05-17 11:35:06.934647613 +0200
-+++ b/src/lipsofsuna/render/internal/render-terrain-material-generator.hpp 2017-05-17 11:35:27.350647248 +0200
-@@ -38,10 +38,11 @@
- #define __RENDER_INTERNAL_TERRAIN_MATERIAL_GENERATOR_HPP__
-
- #include "lipsofsuna/system.h"
--#include "OgreTerrainPrerequisites.h"
--#include "OgreTerrainMaterialGenerator.h"
--#include "OgreGpuProgramParams.h"
--#include "OgreShadowCameraSetupPSSM.h"
-+#include <Ogre.h>
-+#include <OgreTerrainPrerequisites.h>
-+#include <OgreTerrainMaterialGenerator.h>
-+#include <OgreGpuProgramParams.h>
-+#include <OgreShadowCameraSetupPSSM.h>
-
- using namespace Ogre;
-
diff --git a/games-rpg/lipsofsuna/files/05_add_more_missing_includes.patch b/games-rpg/lipsofsuna/files/05_add_more_missing_includes.patch
deleted file mode 100644
index 3833d92..0000000
--- a/games-rpg/lipsofsuna/files/05_add_more_missing_includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/lipsofsuna/render/overlay/render-overlay.hpp 2017-05-17 11:39:30.575642892 +0200
-+++ b/src/lipsofsuna/render/overlay/render-overlay.hpp 2017-05-17 11:42:30.935639662 +0200
-@@ -21,6 +21,7 @@
- #include "lipsofsuna/math.h"
- #include "lipsofsuna/render/internal/render.hpp"
- #if OGRE_VERSION_MAJOR >= 1 && OGRE_VERSION_MINOR >= 9
-+#include <Overlay/OgreOverlay.h>
- #include <Overlay/OgreOverlaySystem.h>
- #include <Overlay/OgreOverlayManager.h>
- #include <Overlay/OgreOverlayElementFactory.h>
---- a/src/lipsofsuna/extension/physics-debug/render-physics-debug.hpp 2017-05-17 11:51:02.807630495 +0200
-+++ b/src/lipsofsuna/extension/physics-debug/render-physics-debug.hpp 2017-05-17 11:52:49.630628582 +0200
-@@ -10,7 +10,12 @@
- #include <btBulletCollisionCommon.h>
- #include <OgreFrameListener.h>
- #include <OgreSceneManager.h>
-+#include <OgreSceneNode.h>
- #include <OgreManualObject.h>
-+#include <OgreTechnique.h>
-+#include <OgreTimer.h>
-+#include <OgreLogManager.h>
-+#include <OgreMaterialManager.h>
-
- class OgreDebugDrawer: public btIDebugDraw, public Ogre::FrameListener{
- public: