diff options
| author | marino <marino@pkgsrc.org> | 2011-12-11 11:59:06 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2011-12-11 11:59:06 +0000 |
| commit | b8a2a7200c6989f9299af644e8a430044190af51 (patch) | |
| tree | 497c5506fde72559cca1c808f2925068c74aedb6 /graphics/osg/patches | |
| parent | 221d3d873c2881c684209b495f5b43ca0f262ed8 (diff) | |
| download | pkgsrc-b8a2a7200c6989f9299af644e8a430044190af51.tar.gz | |
graphics/osg: Fix all platforms
1) Modified current patch to support DragonFly
2) Fixed includes for ffmeg headers
3) The API for ffmpeg's sample format changed, so tell it to use old API.
This can be removed when OpenSceneGraph version is upgraded
4) The PLIST was missing ffmpeg plugin. I guess it never built before.
Diffstat (limited to 'graphics/osg/patches')
| -rw-r--r-- | graphics/osg/patches/patch-ab | 4 | ||||
| -rw-r--r-- | graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/graphics/osg/patches/patch-ab b/graphics/osg/patches/patch-ab index 6b06b40e270..90f00ea98ca 100644 --- a/graphics/osg/patches/patch-ab +++ b/graphics/osg/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $ +$NetBSD: patch-ab,v 1.2 2011/12/11 11:59:06 marino Exp $ --- src/osgDB/FileUtils.cpp.orig 2009-01-12 17:28:37.000000000 +0200 +++ src/osgDB/FileUtils.cpp 2009-01-12 17:30:14.000000000 +0200 @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $ #define stat64 stat #endif -#elif defined(__CYGWIN__) || defined(__FreeBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) -+#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined (__NetBSD__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) ++#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined (__NetBSD__) || (defined(__hpux) || defined(__DragonFly__) && !defined(_LARGEFILE64_SOURCE)) #define stat64 stat #endif diff --git a/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp b/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp new file mode 100644 index 00000000000..d454266de26 --- /dev/null +++ b/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp @@ -0,0 +1,20 @@ +$NetBSD: patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp,v 1.1 2011/12/11 11:59:06 marino Exp $ + +--- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp.orig 2010-03-19 08:03:02.000000000 +0000 ++++ src/osgPlugins/ffmpeg/FFmpegHeaders.hpp +@@ -6,11 +6,12 @@ + extern "C" + { + #define __STDC_CONSTANT_MACROS ++#define FF_API_OLD_SAMPLE_FMT 0 + #include <errno.h> // for error codes defined in avformat.h + #include <stdint.h> +-#include <avcodec.h> +-#include <avformat.h> +-#include <avdevice.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libavdevice/avdevice.h> + + #ifdef USE_SWSCALE + #include <swscale.h> |