Thanks David, changes look sensible, I've tested then against ffmpeg installed from Ubuntu repositories and svn/trunk of ffmpeg and both are picked up fine. Fingers crossed things will continue working fine under other platforms as well.
On Tue, Mar 17, 2009 at 4:03 PM, David Callu <[email protected]> wrote: > Hi Robert > > I add some little change of original code : > > in CMakeModules/FindFFmpeg.cmake: > I add at the end of FIND_PATH macro > > PATH_SUFFIXES ffmpeg > DOC "Location of FFMPEG Headers" > > and a better explanation about old and new version of ffmpeg > and why we include 2 path > > > in src/osgPlugins/ffmpeg/CMakeLists.txt: > - refactor the code > - remove ${FFMPEG_libname_INCLUDE_DIRS}/ffmpeg > > > Cheer > David Callu > > > 2009/3/13 David Callu <[email protected]> > > Hi Robert >> >> Sleep on. >> >> >> We have to manage 2 version of ffmpeg: >> - The old one with ffmpeg's header which include "avcodec.h" ... >> - The new one with ffmpeg's header which include "libavcodec/avcodec.h" >> ... >> >> In osg plugin code, to handle old and new version, we have to include >> "avcodec.h", as the old version did. >> >> Then, on compilation command line, we have to include directory which >> contain >> - "avcodec.h" for old version >> - "libavcodec/avcodec.h" and "avcodec.h" for new version >> >> >> 2009/3/13 Robert Osfield <[email protected]> >> >>> Hi David, >>> >>> On Thu, Mar 12, 2009 at 6:45 PM, David Callu <[email protected]> wrote: >>> > FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS ${headername} >>> > ${FFMPEG_ROOT}/include >>> > $ENV{FFMPEG_DIR}/include >>> > $ENV{OSGDIR}/include >>> > $ENV{OSG_ROOT}/include >>> > ~/Library/Frameworks >>> > /Library/Frameworks >>> > /usr/local/include >>> > /usr/include/ >>> > /usr/include/ffmpeg # <<-- this >>> line >>> > /sw/include # Fink >>> > /opt/local/include # DarwinPorts >>> > /opt/csw/include # Blastwave >>> > /opt/include >>> > /usr/freeware/include >>> > ) >>> >>> This seems like a sensible change. >>> >>> Do you want to revise you changes then resubmit? >>> >> Yes, it will probably not really different, but comment will explain >> issue about new and old version. >> >> >>> >>> Something else I've considered is simplying the ffmpeg/CMakeLists.txt >>> so it just includes the directories directly without adding any extra >>> paths, >> >> As I explain before, for new version of ffmpeg, we have to include 2 path >> because ffmpeg's header use "libavcodec/avcodec.h" and osg code use >> "avcodec.h" >> >> Seem good for you ? >> >> David >> >> >> >>> this pushes the FindFFmpeg.cmake do to a thorough job, but that >>> is the normal practice for our Find scripts. >>> >>> Robert. >>> _______________________________________________ >>> osg-submissions mailing list >>> [email protected] >>> >>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >>> >> >> > > _______________________________________________ > osg-submissions mailing list > [email protected] > > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > >
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
