[SCM] Packaging for ogre branch, master, updated. upstream/1.4.9.dfsg1-107-gfbacc08

Federico Di Gregorio fog at debian.org
Sat May 23 19:09:58 UTC 2009


The following commit has been merged in the master branch:
commit ee95c7140db085caa4bc29a50ee787f74577f3bb
Author: Federico Di Gregorio <fog at debian.org>
Date:   Wed Mar 18 19:15:51 2009 +0100

    New patch to fix ExrCodec plugin and make it build with gcc 4.3.x

diff --git a/debian/extras/plugins.cfg b/debian/extras/plugins.cfg
index 1de0e8d..af6b264 100644
--- a/debian/extras/plugins.cfg
+++ b/debian/extras/plugins.cfg
@@ -10,7 +10,7 @@ Plugin=RenderSystem_GL.so
 Plugin=Plugin_ParticleFX.so
 Plugin=Plugin_BSPSceneManager.so
 Plugin=Plugin_OctreeSceneManager.so
-#Plugin=Plugin_EXRCodec.so
+Plugin=Plugin_EXRCodec.so
 
 # Don't edit anything starting from next line; it was autogenerated.
 # -*- ogre-plugins -*-  [Please, don't remove or modify this marker]
diff --git a/debian/patches/fix_exrcodec_plugin.diff b/debian/patches/fix_exrcodec_plugin.diff
new file mode 100644
index 0000000..4225788
--- /dev/null
+++ b/debian/patches/fix_exrcodec_plugin.diff
@@ -0,0 +1,62 @@
+Index: ogre/home/fog/Workspaces/debian/packages/ogre/ogre/PlugIns/EXRCodec/include/OgreEXRCodec.h
+===================================================================
+--- ogre.orig/home/fog/Workspaces/debian/packages/ogre/ogre/PlugIns/EXRCodec/include/OgreEXRCodec.h	2009-03-18 19:13:49.103759422 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,57 +0,0 @@
+-/*
+------------------------------------------------------------------------------
+-This source file is part of OGRE
+-(Object-oriented Graphics Rendering Engine)
+-For the latest info, see http://www.ogre3d.org/
+-
+-Copyright (c) 2000-2006 Torus Knot Software Ltd
+-Also see acknowledgements in Readme.html
+-
+-This program is free software; you can redistribute it and/or modify it under
+-the terms of the GNU Lesser General Public License as published by the Free Software
+-Foundation; either version 2 of the License, or (at your option) any later
+-version.
+-
+-This program is distributed in the hope that it will be useful, but WITHOUT
+-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+-
+-You should have received a copy of the GNU Lesser General Public License along with
+-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+-http://www.gnu.org/copyleft/lesser.txt.
+-
+-You may alternatively use this source under the terms of a specific version of
+-the OGRE Unrestricted License provided you have obtained such a license from
+-Torus Knot Software Ltd.
+------------------------------------------------------------------------------
+-*/
+-#ifndef _EXRImageCodec_H__
+-#define _EXRImageCodec_H__
+-
+-#include "OgreImageCodec.h"
+-
+-namespace Ogre {
+-
+-    /** 
+-     * Codec specialized in loading OpenEXR high dynamic range images.
+-     */
+-    class EXRCodec : public ImageCodec
+-    {
+-    public:
+-        EXRCodec();
+-        virtual ~EXRCodec();
+-
+-        /// @copydoc Codec::code
+-        DataStreamPtr code(MemoryDataStreamPtr& input, CodecDataPtr& pData) const;
+-        /// @copydoc Codec::codeToFile
+-        void codeToFile(MemoryDataStreamPtr& input, const String& outFileName, CodecDataPtr& pData) const;
+-        /// @copydoc Codec::decode
+-        DecodeResult decode(DataStreamPtr& input) const;
+-
+-        String getType() const;
+-    };
+-
+-} // namespace
+-
+-#endif
diff --git a/debian/patches/series b/debian/patches/series
index 92deb67..746e779 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disable_samples.diff
 fix_rpath.diff
 fix_distclean.patch
+fix_exrcodec_plugin.diff

-- 
Packaging for ogre



More information about the Pkg-games-commits mailing list