diff options
| -rw-r--r-- | graphics/osg/Makefile | 5 | ||||
| -rw-r--r-- | graphics/osg/PLIST | 3 | ||||
| -rw-r--r-- | graphics/osg/distinfo | 5 | ||||
| -rw-r--r-- | graphics/osg/patches/patch-ab | 4 | ||||
| -rw-r--r-- | graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp | 20 |
5 files changed, 30 insertions, 7 deletions
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index cce9d14bfad..5cbfe739eb9 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2011/11/01 06:01:41 sbd Exp $ +# $NetBSD: Makefile,v 1.10 2011/12/11 11:59:06 marino Exp $ DISTNAME= OpenSceneGraph-${OSGVER} PKGNAME= osg-${OSGVER} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics devel MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${OSGVER}/source/ EXTRACT_SUFX= .zip @@ -36,6 +36,7 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../multimedia/ffmpeg/buildlink3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/graphics/osg/PLIST b/graphics/osg/PLIST index 82a3185b0ac..9d92b8e225e 100644 --- a/graphics/osg/PLIST +++ b/graphics/osg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/26 13:08:49 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/12/11 11:59:06 marino Exp $ bin/osgarchive bin/osgconv bin/osgfilecache @@ -553,6 +553,7 @@ lib/osgPlugins-${PKGVERSION}/osgdb_dot.so lib/osgPlugins-${PKGVERSION}/osgdb_dw.so lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so lib/osgPlugins-${PKGVERSION}/osgdb_exr.so +lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so lib/osgPlugins-${PKGVERSION}/osgdb_geo.so lib/osgPlugins-${PKGVERSION}/osgdb_gif.so lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo index 7921bd560ed..19b94eb2b3c 100644 --- a/graphics/osg/distinfo +++ b/graphics/osg/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.2 2011/09/24 12:58:11 joerg Exp $ +$NetBSD: distinfo,v 1.3 2011/12/11 11:59:06 marino Exp $ SHA1 (OpenSceneGraph-2.8.3.zip) = 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc RMD160 (OpenSceneGraph-2.8.3.zip) = 40a4988f4aefff7dbb6aab5225204ae41c945277 Size (OpenSceneGraph-2.8.3.zip) = 6740017 bytes -SHA1 (patch-ab) = 3707347bed3d597bc50ad81f0e5c974ffb60100a +SHA1 (patch-ab) = 28049bfe9e70301e5dba5c916ead51a31c86ac6c SHA1 (patch-ac) = bc35c9b0a9c7612137c66018b36b35b9897065be SHA1 (patch-ad) = 846f4f93104812125bffc8644948637de206bdc0 SHA1 (patch-ae) = d882f09acac61f74a25cf3efc8f3b7b3756adae3 SHA1 (patch-src-osgPlugins-curl-ReaderWriterCURL.cpp) = 4ece011ff1284011b7777f00b838d6673c22bd2a +SHA1 (patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp) = c828563699eb726214995bae63fcf028ff3a374a 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> |