[Python-ogre-commit] SF.net SVN: python-ogre:[673] trunk/python-ogre

[<mi...@us...>]

Revision: 673
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=673&view=rev
Author:   mithro
Date:     2008-07-23 12:08:42 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
Added support for ffmpeg module.

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_system.py
    trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h
    trunk/python-ogre/debian/changelog
    trunk/python-ogre/debian/control
    trunk/python-ogre/debian/rules

Modified: trunk/python-ogre/PythonOgreConfig_system.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_system.py	2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/PythonOgreConfig_system.py	2008-07-23 12:08:42 UTC (rev 673)
@@ -57,7 +57,7 @@
 PATH_Bullet=        os.path.join(BASE_DIR, 'bullet-2.66') 
 ###PATH_PhysX=         os.path.join(BASE_DIR, 'Physx/v2.7.3/SDKs')
 PATH_Theora=        os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
-PATH_ffmpeg=        os.path.join(BASE_DIR, 'ffmpeg')
+PATH_ffmpeg=        os.path.join(BASE_DIR) #, 'ffmpeg')
 PATH_navi =         os.path.join(BASE_DIR, 'navi','Navi')
 PATH_particleuniverse = os.path.join(PATH_Ogre, 'PlugIns', 'ParticleUniverse' )
 PATH_cadunetree=        os.path.join(PATH_THIRDPARTY, 'cadunetree')
@@ -136,7 +136,7 @@
 PATH_INCLUDE_TheoraDemo =       os.path.join (PATH_Theora,'..', 'CEGUI_TheoraDemo','include')
 
 PATH_INCLUDE_ogrevideoffmpeg =  PATH_ogrevideoffmpeg
-PATH_INCLUDE_ffmpeg =       os.path.join (PATH_ffmpeg,'include')
+PATH_INCLUDE_ffmpeg =       os.path.join (PATH_ffmpeg,'include', 'ffmpeg')
 PATH_INCLUDE_plib =         PATH_plib
 PATH_INCLUDE_navi =     os.path.join (PATH_navi,'include')
 PATH_INCLUDE_noise = PATH_noise 

Modified: trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h
===================================================================
--- trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h	2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h	2008-07-23 12:08:42 UTC (rev 673)
@@ -5,13 +5,13 @@
 #include "Ogre.h"
 
 // // ffmpeg includes
-// #include <ffmpeg/avcodec.h>
-// #include <ffmpeg/avformat.h>
 extern "C" {
 #define __STDC_CONSTANT_MACROS
 #define __STDC_LIMIT_MACROS
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
+#include <ffmpeg/avcodec.h>
+#include <ffmpeg/avformat.h>
+//#include <libavformat/avformat.h>
+//#include <libavcodec/avcodec.h>
 }
 
 using namespace Ogre;

Modified: trunk/python-ogre/debian/changelog
===================================================================
--- trunk/python-ogre/debian/changelog	2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/debian/changelog	2008-07-23 12:08:42 UTC (rev 673)
@@ -1,3 +1,8 @@
+python-ogre (0.0.0-5) unstable; urgency=low
+
+  * Fixed the ffmpeg package.
+
+ -- Tim 'Mithro' Ansell <mi...@mi...>  Wed, 23 Jul 2008 22:06:51 +1000
 python-ogre (0.0.0-4) unstable; urgency=low
 
   * Fixed ogreal to link against boost_python_index.

Modified: trunk/python-ogre/debian/control
===================================================================
--- trunk/python-ogre/debian/control	2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/debian/control	2008-07-23 12:08:42 UTC (rev 673)
@@ -16,6 +16,7 @@
 	libceguiogre-dev (>= 1.4) | libogre-dev (<< 1.4.5), 
 	libogre-dev (< 1.5), 
 	libopenal-dev, libogg-dev, libvorbis-dev,
+	libavformat-dev, libavcodec-dev,
 	gccxml (>=0.7.0),
 	pygccxml, pyplusplus
 Standards-Version: 3.7.2

Modified: trunk/python-ogre/debian/rules
===================================================================
--- trunk/python-ogre/debian/rules	2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/debian/rules	2008-07-23 12:08:42 UTC (rev 673)
@@ -27,6 +27,7 @@
 	LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c plib
 	LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c ogreforests
 	LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c ogreal
+	LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c ogrevideoffmpeg
 	LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c watermesh
 	touch $@
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.