[pkgsrc/trunk]: pkgsrc/graphics/osg graphics/osg: Fix all platforms

[marino <marino%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e7e24cb500b
branches:  trunk
changeset: 596643:5e7e24cb500b
user:      marino <marino%pkgsrc.org@localhost>
date:      Sun Dec 11 11:59:06 2011 +0000

description:
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:

 graphics/osg/Makefile                                              |   5 +-
 graphics/osg/PLIST                                                 |   3 +-
 graphics/osg/distinfo                                              |   5 +-
 graphics/osg/patches/patch-ab                                      |   4 +-
 graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp |  20 ++++++++++
 5 files changed, 30 insertions(+), 7 deletions(-)

diffs (98 lines):

diff -r 194af5834312 -r 5e7e24cb500b graphics/osg/Makefile
--- a/graphics/osg/Makefile     Sun Dec 11 11:57:08 2011 +0000
+++ b/graphics/osg/Makefile     Sun Dec 11 11:59:06 2011 +0000
@@ -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 @@
 .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 -r 194af5834312 -r 5e7e24cb500b graphics/osg/PLIST
--- a/graphics/osg/PLIST        Sun Dec 11 11:57:08 2011 +0000
+++ b/graphics/osg/PLIST        Sun Dec 11 11:59:06 2011 +0000
@@ -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_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 -r 194af5834312 -r 5e7e24cb500b graphics/osg/distinfo
--- a/graphics/osg/distinfo     Sun Dec 11 11:57:08 2011 +0000
+++ b/graphics/osg/distinfo     Sun Dec 11 11:59:06 2011 +0000
@@ -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 -r 194af5834312 -r 5e7e24cb500b graphics/osg/patches/patch-ab
--- a/graphics/osg/patches/patch-ab     Sun Dec 11 11:57:08 2011 +0000
+++ b/graphics/osg/patches/patch-ab     Sun Dec 11 11:59:06 2011 +0000
@@ -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 @@
          #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 -r 194af5834312 -r 5e7e24cb500b graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/osg/patches/patch-src_osgPlugins_ffmpeg_FFmpegHeaders.hpp        Sun Dec 11 11:59:06 2011 +0000
@@ -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>